feat/house-keeping (#79)

* Smoke looks at camera, not player * Adjusting Goweti * Using simpler collision shapes for floating platforms * Using same green in Goweti as in main platform * Using convex polygon shape instead of concave * Giving meaningful names for nodes in Goweti * No 'goweti' scene anymore * Reorganizing nodes in TestMap * Removed invisible cylinders * Cleaning up test_map * Cleaning up test_map #2 Co-authored-by: Telmo Valverde <[email protected]>
telmotrooper · Jun 9, 2022 · a21abfc · a21abfc
1 parent baecaef
commit a21abfc
Show file tree

Hide file tree

Showing 10 changed files with 340 additions and 1,495 deletions.
diff --git a/entities/player/player.tscn b/entities/player/player.tscn
@@ -142,6 +142,7 @@ script = ExtResource( 3 )
 [node name="Vertical" type="Spatial" parent="CameraPivot/Horizontal"]
 
 [node name="ClippedCamera" type="ClippedCamera" parent="CameraPivot/Horizontal/Vertical"]
+unique_name_in_owner = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 10 )
 current = true
 process_mode = 1

diff --git a/maps/models/beach_island/beach_island.tscn b/maps/models/beach_island/beach_island.tscn
@@ -13,7 +13,3 @@ collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 shape = SubResource( 1 )
-
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 52.3, 0 )
-visible = false
diff --git a/maps/models/goweti/goweti.gd b/maps/models/goweti/goweti.gd
@@ -1,9 +1,5 @@
 extends Node
 
-# If re-importing from Blender, remember to "Clear inheritance" and make the
-# floating platforms of type "KinematicBody". Also, adjust the "move_platforms"
-# animation and make "RESET" go to meeting position.
-
 enum { MOVING_CLOSER, MOVING_AWAY }
 
 var direction := MOVING_AWAY
@@ -16,9 +12,9 @@ func _on_AnimationPlayer_animation_finished(anim_name: String):
     $FloatingPlatformTimer.start()
 
 func _on_FloatingPlatformTimer_timeout():
-  if direction == MOVING_CLOSER:
+  if direction == MOVING_AWAY:
     $AnimationPlayer.play("move_platforms")
-    direction = MOVING_AWAY
-  else: # MOVING_AWAY
-    $AnimationPlayer.play_backwards("move_platforms")
     direction = MOVING_CLOSER
+  else: # MOVING_CLOSER
+    $AnimationPlayer.play_backwards("move_platforms")
+    direction = MOVING_AWAY
diff --git a/maps/models/goweti/goweti.glb b/maps/models/goweti/goweti.glb