Add the animation

oenvoyage · Feb 8, 2021 · de2b9aa · de2b9aa
1 parent bb3ffb0
commit de2b9aa
Show file tree

Hide file tree

Showing 19 changed files with 4,335 additions and 35 deletions.
diff --git a/3D/characters/Alien_bleu_v2.fbx b/3D/characters/Alien_bleu_v2.fbx
diff --git a/3D/characters/Alien_bleu_v2.fbx.import b/3D/characters/Alien_bleu_v2.fbx.import
diff --git a/3D/characters/Alien_gris_v2.fbx b/3D/characters/Alien_gris_v2.fbx
diff --git a/3D/characters/Alien_gris_v2.fbx.import b/3D/characters/Alien_gris_v2.fbx.import
diff --git a/3D/characters/Alien_jaune_v2.fbx b/3D/characters/Alien_jaune_v2.fbx
diff --git a/3D/characters/Alien_jaune_v2.fbx.import b/3D/characters/Alien_jaune_v2.fbx.import
diff --git a/3D/characters/Alien_vert_v2.fbx b/3D/characters/Alien_vert_v2.fbx
diff --git a/3D/characters/Alien_vert_v2.fbx.import b/3D/characters/Alien_vert_v2.fbx.import
diff --git a/Prefabs/Alien_bleu_v2.tscn b/Prefabs/Alien_bleu_v2.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://3D/characters/Alien_bleu_v2.fbx" type="PackedScene" id=1]
+
+[node name="Alien_bleu_v2" instance=ExtResource( 1 )]
+
+[node name="turquoise_armature" parent="." index="0"]
+transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
diff --git a/Prefabs/Alien_gris_v2.tscn b/Prefabs/Alien_gris_v2.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://3D/characters/Alien_gris_v2.fbx" type="PackedScene" id=1]
+
+[node name="Alien_gris_v2" instance=ExtResource( 1 )]
+
+[node name="gris_armature" parent="." index="0"]
+transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
diff --git a/Prefabs/Alien_jaune_v2.tscn b/Prefabs/Alien_jaune_v2.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://3D/characters/Alien_jaune_v2.fbx" type="PackedScene" id=1]
+
+[node name="Alien_jaune_v2" instance=ExtResource( 1 )]
+
+[node name="jaune_armature" parent="." index="0"]
+transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
diff --git a/Prefabs/Alien_turquoise.tscn b/Prefabs/Alien_turquoise.tscn
@@ -5,19 +5,22 @@
 [node name="Alien_turquoise" instance=ExtResource( 1 )]
 
 [node name="Basic_armature001" parent="." index="0"]
-transform = Transform( 49.9862, 0, 0, 0, -2.18497e-06, 49.9862, 0, -49.9862, -2.18497e-06, 0, 0, 0 )
+transform = Transform( 49.9862, 0, 0, 0, -5.95882e-06, 49.9862, 0, -49.9862, -5.95882e-06, 0, 0, 0 )
 
 [node name="body" parent="Basic_armature001" index="0"]
-transform = Transform( 1, 5.68434e-14, 2.38419e-07, 2.38419e-07, -1.19209e-07, -1, -2.84217e-14, 1, -1.19209e-07, 0, 0, 0 )
+transform = Transform( 1, 5.68434e-14, 2.38419e-07, 2.38419e-07, -1.19209e-07, -1, -2.84217e-14, 1, -1.19209e-07, -0.00337933, 0, 0 )
 
 [node name="claviculeL" parent="Basic_armature001/body" index="0"]
 transform = Transform( 0.172169, 0.98182, -0.0799241, -0.98182, 0.164453, -0.0947912, -0.0799241, 0.0947912, 0.992284, 0, 0.0231647, 0 )
 
 [node name="armL" parent="Basic_armature001/body/claviculeL" index="0"]
-transform = Transform( 0.0580221, 0.987508, -0.146498, -0.998113, 0.0603346, 0.0113874, 0.0200841, 0.145561, 0.989145, -4.09782e-10, 0.0103684, -1.49012e-10 )
+transform = Transform( 0.14187, 0.981822, -0.126091, -0.989837, 0.141971, -0.00823054, 0.00982044, 0.125977, 0.991985, -4.09782e-10, 0.0103684, -1.49012e-10 )
 
 [node name="claviculeR" parent="Basic_armature001/body" index="1"]
 transform = Transform( 0.172169, -0.98182, 0.0799236, 0.98182, 0.164453, -0.0947912, 0.0799242, 0.0947907, 0.992284, 0, 0.0231647, 0 )
 
 [node name="armR" parent="Basic_armature001/body/claviculeR" index="0"]
-transform = Transform( 0.0580216, -0.987508, 0.146499, 0.998113, 0.0603341, 0.0113875, -0.0200841, 0.145561, 0.989145, -1.85333e-09, 0.0103684, -7.45058e-11 )
+transform = Transform( 0.326735, -0.939569, 0.102242, 0.944924, 0.32693, -0.0153172, -0.0190345, 0.101616, 0.994642, -1.85333e-09, 0.0103684, -7.45058e-11 )
+
+[node name="head" parent="Basic_armature001/body" index="2"]
+transform = Transform( 0.984148, 0.177351, 0, -0.177351, 0.984148, 0, 0, 0, 1, 0, 0.0231647, 0 )
diff --git a/Prefabs/Alien_vert_v2.tscn b/Prefabs/Alien_vert_v2.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://3D/characters/Alien_vert_v2.fbx" type="PackedScene" id=1]
+
+[node name="Alien_vert_v2" instance=ExtResource( 1 )]
+
+[node name="vert_armature" parent="." index="0"]
+transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
diff --git a/Prefabs/UFOSpawner.gd b/Prefabs/UFOSpawner.gd
@@ -3,6 +3,7 @@ extends Spatial
 export var spawnerId = 1
 var ufos = []
 var currentUfo = null
+var rng = RandomNumberGenerator.new()
 
 func pop():
   if currentUfo != null:
@@ -12,6 +13,17 @@ func pop():
   currentUfo.translation = $Spawner.translation
   currentUfo.set_mode(RigidBody.MODE_RIGID)
   currentUfo.visible = true
+  var animation = currentUfo.get_node("Alien/AnimationPlayer") 
+  var animList = animation.get_animation_list()
+  for animName in animList:
+    if "Circle_animation" in  animName:
+        animation.get_animation(animName).set_loop(false)
+        animation.stop()
+    elif "tictac_animation" in  animName:
+        var anim = animation.get_animation(animName)
+        anim.set_loop(true)
+        animation.set_speed_scale(rng.randi_range(5,20))
+        animation.play(animName)
   currentUfo.add_to_group("Spawner%s" % spawnerId)
   $Spawner.add_child(currentUfo)
   print_debug("Spawner %s spawning %s" % [spawnerId, currentUfo.name])

diff --git a/Prefabs/UFOSpawner.tscn b/Prefabs/UFOSpawner.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=13 format=2]
 
+[ext_resource path="res://Prefabs/Alien_jaune_v2.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Prefabs/Alien_vert_v2.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Prefabs/Alien_gris_v2.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Prefabs/Alien_bleu_v2.tscn" type="PackedScene" id=4]
 [ext_resource path="res://materials/physics/luggage0.tres" type="PhysicsMaterial" id=10]
 [ext_resource path="res://Prefabs/UFOSpawner.gd" type="Script" id=11]
-[ext_resource path="res://Prefabs/Alien_gris.tscn" type="PackedScene" id=12]
-[ext_resource path="res://Prefabs/Alien_vert.tscn" type="PackedScene" id=13]
-[ext_resource path="res://Prefabs/Alien_turquoise.tscn" type="PackedScene" id=14]
-[ext_resource path="res://Prefabs/Alien_jaune.tscn" type="PackedScene" id=15]
 [ext_resource path="res://Prefabs/Alien_violet.tscn" type="PackedScene" id=16]
 
 [sub_resource type="ConvexPolygonShape" id=1]
@@ -14,8 +14,7 @@ points = PoolVector3Array( 0.01, 0.01, 0.01, -0.01, 0.01, 0.01, -0.01, -0.01, 0.
 [sub_resource type="ConvexPolygonShape" id=2]
 points = PoolVector3Array( 0, 0.007, -0.0015, 0, 0.007, 0.0015, 0.00606218, -0.0035, 0.0015, 0.00606218, -0.0035, -0.0015, 0.00606218, -0.0035, -0.0015, 0.00606218, -0.0035, 0.0015, -0.00606218, -0.0035, 0.0015, -0.00606218, -0.0035, -0.0015, 0.00606218, -0.0035, 0.0015, 0, 0.007, 0.0015, -0.00606218, -0.0035, 0.0015, -0.00606218, -0.0035, -0.0015, -0.00606218, -0.0035, 0.0015, 0, 0.007, 0.0015, 0, 0.007, -0.0015, 0, 0.007, -0.0015, 0.00606218, -0.0035, -0.0015, -0.00606218, -0.0035, -0.0015 )
 
-[sub_resource type="ConvexPolygonShape" id=3]
-points = PoolVector3Array( -0.005, -0.005, -0.005, -0.005, -0.005, 0.005, -0.005, 0.005, 0.005, -0.005, 0.005, -0.005, -0.005, 0.005, -0.005, -0.005, 0.005, 0.005, 0.005, 0.005, 0.005, 0.005, 0.005, -0.005, 0.005, 0.005, -0.005, 0.005, 0.005, 0.005, 0.005, -0.005, 0.005, 0.005, -0.005, -0.005, 0.005, -0.005, -0.005, 0.005, -0.005, 0.005, -0.005, -0.005, 0.005, -0.005, -0.005, -0.005, -0.005, 0.005, -0.005, 0.005, 0.005, -0.005, 0.005, -0.005, -0.005, -0.005, -0.005, -0.005, 0.005, 0.005, 0.005, -0.005, 0.005, 0.005, -0.005, -0.005, 0.005, 0.005, -0.005, 0.005 )
+[sub_resource type="BoxShape" id=6]
 
 [sub_resource type="ConvexPolygonShape" id=4]
 points = PoolVector3Array( -0.005, -0.005707, -0.00570697, -0.005, -0.005707, 0.00570697, -0.005, 0.005707, 0.00570697, -0.005, 0.005707, -0.00570697, -0.005, 0.005707, -0.00570697, -0.005, 0.005707, 0.00570697, 0.005, 0.005707, 0.00570697, 0.005, 0.005707, -0.00570697, 0.005, 0.005707, -0.00570697, 0.005, 0.005707, 0.00570697, 0.005, -0.005707, 0.00570697, 0.005, -0.005707, -0.00570697, 0.005, -0.005707, -0.00570697, 0.005, -0.005707, 0.00570697, -0.005, -0.005707, 0.00570697, -0.005, -0.005707, -0.00570697, -0.005, 0.005707, -0.00570697, 0.005, 0.005707, -0.00570697, 0.005, -0.005707, -0.00570697, -0.005, -0.005707, -0.00570697, 0.005, 0.005707, 0.00570697, -0.005, 0.005707, 0.00570697, -0.005, -0.005707, 0.00570697, 0.005, -0.005707, 0.00570697 )
@@ -33,11 +32,11 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 102.093, 0 )
 "Gris",
 "Ufo",
 ]]
-transform = Transform( 1, 0, 0, 0, 1, -1.42109e-14, 0, 1.42109e-14, 1, 0, 0, 0 )
+transform = Transform( 0.460184, 0, 0.887823, 0, 1, 0, -0.887823, 0, 0.460184, 0, 0, 0 )
 visible = false
 physics_material_override = ExtResource( 10 )
 
-[node name="Alien_gris" parent="TheUfo/Gris" instance=ExtResource( 12 )]
+[node name="Alien" parent="TheUfo/Gris" instance=ExtResource( 3 )]
 
 [node name="CollisionShape" type="CollisionShape" parent="TheUfo/Gris"]
 transform = Transform( 25, 0, 0, 0, -2.98023e-06, 25, 0, -25, -2.98023e-06, 0, 0, 0 )
@@ -51,7 +50,7 @@ transform = Transform( 1, 0, 0, 0, 1, -1.42109e-14, 0, 1.42109e-14, 1, 0, 0, 0 )
 visible = false
 physics_material_override = ExtResource( 10 )
 
-[node name="Alien_turquoise" parent="TheUfo/Turquoise" instance=ExtResource( 14 )]
+[node name="Alien" parent="TheUfo/Turquoise" instance=ExtResource( 4 )]
 
 [node name="CollisionShape" type="CollisionShape" parent="TheUfo/Turquoise"]
 transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
@@ -61,24 +60,25 @@ shape = SubResource( 2 )
 "Jaune",
 "Ufo",
 ]]
-transform = Transform( 1, 0, 0, 0, 1, -1.42109e-14, 0, 1.42109e-14, 1, 0, 0, 0 )
+transform = Transform( -0.417407, 1.29137e-14, 0.908719, 0, 1, -1.42109e-14, -0.908719, -5.93173e-15, -0.417407, 0, 0, 0 )
 visible = false
 physics_material_override = ExtResource( 10 )
 
-[node name="Alien_jaune" parent="TheUfo/Yellow" instance=ExtResource( 15 )]
+[node name="Alien" parent="TheUfo/Yellow" instance=ExtResource( 1 )]
 
 [node name="CollisionShape" type="CollisionShape" parent="TheUfo/Yellow"]
-transform = Transform( 50, 0, 0, 0, -1.19209e-05, 50, 0, -100, -5.96046e-06, 0, 0, 0 )
-shape = SubResource( 3 )
+transform = Transform( 1, 0, 2.98023e-08, -4.23516e-22, 1, 1.12232e-20, -2.98023e-08, -2.11758e-21, 1, 0, 1, 0 )
+shape = SubResource( 6 )
 
 [node name="Green" type="RigidBody" parent="TheUfo" groups=[
 "Ufo",
 "Vert",
 ]]
+transform = Transform( 0.556977, 0, 0.830528, 0, 1, 0, -0.830528, 0, 0.556977, 0, 0, 0 )
 visible = false
 physics_material_override = ExtResource( 10 )
 
-[node name="Alien_vert" parent="TheUfo/Green" instance=ExtResource( 13 )]
+[node name="Alien" parent="TheUfo/Green" instance=ExtResource( 2 )]
 
 [node name="CollisionShape" type="CollisionShape" parent="TheUfo/Green"]
 transform = Transform( 100, 0, 0, 0, -8.34465e-06, 30, 0, -70, -3.57628e-06, 0, 0, 0 )
@@ -88,17 +88,18 @@ shape = SubResource( 4 )
 "Mauve",
 "Ufo",
 ]]
-transform = Transform( 1, 0, 0, 0, 1, -1.42109e-14, 0, 1.42109e-14, 1, 0, 0, 0 )
+transform = Transform( 0.633651, 1.09938e-14, 0.773619, 0, 1, -1.42109e-14, -0.773619, 9.00475e-15, 0.633651, 0, 0, 0 )
 visible = false
 physics_material_override = ExtResource( 10 )
 
-[node name="Alien_violet" parent="TheUfo/Purple" instance=ExtResource( 16 )]
+[node name="Alien" parent="TheUfo/Purple" instance=ExtResource( 16 )]
 
 [node name="CollisionShape" type="CollisionShape" parent="TheUfo/Purple"]
 transform = Transform( 100, 0, 0, 0, -1.19209e-05, 100, 0, -100, -1.19209e-05, 0, 0, 0 )
 shape = SubResource( 5 )
 
 [node name="Spawner" type="Spatial" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.5, 0 )
 
 [node name="Timer" type="Timer" parent="."]
 one_shot = true

diff --git a/Scenes/Convey.tscn b/Scenes/Convey.tscn
@@ -24,20 +24,20 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.2868, 7.09787, -9.82727 )
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2, -6.5, -55.5 )
 
 [node name="UFOSpawner1" parent="." instance=ExtResource( 9 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7, -2.2, -55.5 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.08699, -2.2, -55.5438 )
 
 [node name="waiting_area2" parent="." instance=ExtResource( 11 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5, -6.5, -45.6 )
 
 [node name="UFOSpawner2" parent="." instance=ExtResource( 9 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -13.5, -2.1, -45.6 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -12.6624, -2.1, -45.6 )
 spawnerId = 2
 
 [node name="waiting_area3" parent="." instance=ExtResource( 11 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23, -6.5, -35.8 )
 
 [node name="UFOSpawner3" parent="." instance=ExtResource( 9 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.6, -2.4, -35.8 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2013, -2.4, -35.8 )
 spawnerId = 3
 
 [node name="Controller" type="Spatial" parent="."]

diff --git a/Scenes/Game.tscn b/Scenes/Game.tscn
@@ -15,7 +15,7 @@
 [ext_resource path="res://anims/camerat_to_backoffice.tres" type="Animation" id=13]
 
 [sub_resource type="BoxShape" id=1]
-extents = Vector3( 5.7, 1.6, 2.2 )
+extents = Vector3( 5.7, 3.64261, 2.2 )
 
 [sub_resource type="BoxShape" id=2]
 extents = Vector3( 86.4, 0.3, 83.8 )
@@ -41,7 +41,7 @@ script = ExtResource( 4 )
 exitNb = 3
 
 [node name="BaggageClaim" type="CollisionShape" parent="Counters/Exit3/Area"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, -3.2, -4.6 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.20573, -5.00008, -4.6 )
 shape = SubResource( 1 )
 
 [node name="Exit2" type="Spatial" parent="Counters"]
@@ -52,7 +52,7 @@ script = ExtResource( 4 )
 exitNb = 2
 
 [node name="BaggageClaim" type="CollisionShape" parent="Counters/Exit2/Area"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, -3.2, -4.6 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, -4.58896, -4.6 )
 shape = SubResource( 1 )
 
 [node name="Exit1" type="Spatial" parent="Counters"]
@@ -62,7 +62,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7, -1.1, -51.5 )
 script = ExtResource( 4 )
 
 [node name="BaggageClaim" type="CollisionShape" parent="Counters/Exit1/Area"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, -3.2, -4.6 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.4, -3.69229, -4.6 )
 shape = SubResource( 1 )
 
 [node name="Decor_Background" parent="." instance=ExtResource( 5 )]

diff --git a/Scenes/Welcome.tscn b/Scenes/Welcome.tscn
@@ -62,7 +62,7 @@ margin_left = 30.9231
 margin_top = 675.358
 margin_right = 70.9231
 margin_bottom = 689.358
-text = "v.1.5-RC1"
+text = "v.1.5"
 __meta__ = {
 "_edit_use_anchors_": false
 }

diff --git a/export_presets.cfg b/export_presets.cfg
@@ -32,8 +32,8 @@ codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
 application/icon=""
-application/file_version="1.5-RC1"
-application/product_version="1.5-RC1"
+application/file_version="1.5"
+application/product_version="1.5"
 application/company_name="Team Cuisine"
 application/product_name="Spaceport"
 application/file_description=""
@@ -59,12 +59,12 @@ script_encryption_key=""
 custom_template/debug=""
 custom_template/release=""
 application/name="Spaceport"
-application/info="v.1.5-RC1"
+application/info="v.1.5"
 application/icon=""
 application/identifier="io.teamcuisine"
 application/signature=""
-application/short_version="1.5-RC1"
-application/version="1.5-RC1"
+application/short_version="1.5"
+application/version="1.5"
 application/copyright=""
 display/high_res=true
 privacy/camera_usage_description=""
@@ -157,8 +157,8 @@ application/name="SpacePort"
 application/info="GGJ 2021"
 application/identifier="io.onorno.ggj"
 application/signature=""
-application/short_version="1.5-RC1"
-application/version="1.5-RC1"
+application/short_version="1.5"
+application/version="1.5"
 application/copyright=""
 capabilities/arkit=false
 capabilities/camera=false