Game Over state

4 files changed, 24 insertions, 46 deletions

diff --git a/Scenes/Dungeon.gd b/Scenes/Dungeon.gd
index 556134e..6ea8ad0 100644
--- a/Scenes/Dungeon.gd
+++ b/Scenes/Dungeon.gd
@@ -50,6 +50,15 @@ func end_animation():
 	yield(get_tree().create_timer(2), "timeout")
 	next_stage()
 
+func game_over_animation():
+	block_input = true
+	$UIController.hand_animation()
+	yield(get_tree().create_timer(1.1), "timeout")
+	player.hide()
+	yield(get_tree().create_timer(2), "timeout")
+	Global.current_stage += 1
+	get_tree().change_scene("res://Scenes/Transition.tscn")
+
 func set_tile(entity, tile):
 	if not entities_tiles.has(entity):
 		entities_tiles[entity] = tile
@@ -68,7 +77,6 @@ func kill_entity(entity):
 func build_floor():
 	player = Player.instance()
 	camera.follow(player)
-
 	Builder.build(player, self)
 
 func _process(delta):
@@ -154,6 +162,8 @@ func process_turn_logic():
 		actionable.play_actions()
 
 	Global.turns -= 1
+	if Global.turns <= 0:
+		game_over_animation()
 
 func _input(event):
 	if block_input: return
diff --git a/Scenes/Transition.gd b/Scenes/Transition.gd
index 1cd57a6..eefc79c 100644
--- a/Scenes/Transition.gd
+++ b/Scenes/Transition.gd
@@ -11,7 +11,8 @@ func _ready():
 	prev_stage = Global.current_stage - 1
 	next_stage = Global.current_stage
 	
-	get_node(dices[prev_stage+1]).show()
+	if prev_stage >= 0:
+		get_node(dices[prev_stage]).show()
 	
 	if Global.turns > 0:
 		if prev_stage == 5:
@@ -44,16 +45,19 @@ func _input(event):
 
 func animate_next_stage():
 	var pos0 = $UIController/ArmPivot.rect_position
-	var pos1 = camera.unproject_position(get_node(dices[prev_stage+1]).translation)
-	var pos2 = camera.unproject_position(get_node(dices[next_stage+1]).translation)
+	var pos1 = null
+	if prev_stage >= 0:
+		pos1 = camera.unproject_position(get_node(dices[prev_stage]).translation)
+	var pos2 = camera.unproject_position(get_node(dices[next_stage]).translation)
 	
 	yield(get_tree().create_timer(1), "timeout")
-	tween_pos(pos1)
-	yield(get_tree().create_timer(1), "timeout")
-	get_node(dices[prev_stage+1]).hide()
+	if pos1 != null:
+		tween_pos(pos1)
+		yield(get_tree().create_timer(1), "timeout")
+		get_node(dices[prev_stage]).hide()
 	tween_pos(pos2)
 	yield(get_tree().create_timer(1), "timeout")
-	get_node(dices[next_stage+1]).show()
+	get_node(dices[next_stage]).show()
 	tween_pos(pos0)
 
 func tween_pos(pos):
diff --git a/Scenes/Transition.tscn b/Scenes/Transition.tscn
index b026651..e9db1c9 100644
--- a/Scenes/Transition.tscn
+++ b/Scenes/Transition.tscn
@@ -196,42 +196,7 @@ tracks/2/keys = {
 
 [node name="Transition" type="Spatial"]
 script = ExtResource( 3 )
-dices = [ NodePath("Mesh0"), NodePath("Mesh"), NodePath("Mesh2"), NodePath("Mesh3"), NodePath("Mesh4"), NodePath("Mesh5"), NodePath("Mesh6") ]
-
-[node name="Mesh0" type="Spatial" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3316, 0.5, 1.03296 )
-visible = false
-
-[node name="FaceUp" type="MeshInstance" parent="Mesh0"]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0.5, 0 )
-material_override = ExtResource( 9 )
-mesh = SubResource( 5 )
-material/0 = null
-
-[node name="FaceDown" type="MeshInstance" parent="Mesh0"]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, -0.5, 0 )
-mesh = SubResource( 5 )
-material/0 = SubResource( 6 )
-
-[node name="FaceRight" type="MeshInstance" parent="Mesh0"]
-transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.5, 0, 0 )
-mesh = SubResource( 5 )
-material/0 = SubResource( 7 )
-
-[node name="FaceLeft" type="MeshInstance" parent="Mesh0"]
-transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -0.5, 0, 0 )
-mesh = SubResource( 5 )
-material/0 = SubResource( 8 )
-
-[node name="FaceForward" type="MeshInstance" parent="Mesh0"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.5 )
-mesh = SubResource( 5 )
-material/0 = SubResource( 9 )
-
-[node name="FaceBackward" type="MeshInstance" parent="Mesh0"]
-transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, -0.5 )
-mesh = SubResource( 5 )
-material/0 = SubResource( 10 )
+dices = [ NodePath("Mesh"), NodePath("Mesh2"), NodePath("Mesh3"), NodePath("Mesh4"), NodePath("Mesh5"), NodePath("Mesh6") ]
 
 [node name="Mesh" type="Spatial" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.67083, 0.5, 1.03296 )
@@ -449,7 +414,6 @@ pixel_size = 0.03
 texture = ExtResource( 1 )
 
 [node name="Pitch" type="Spatial" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
 script = ExtResource( 2 )
 
 [node name="Yaw" type="Spatial" parent="Pitch"]
diff --git a/project.godot b/project.godot
index 5052b97..5a971eb 100644
--- a/project.godot
+++ b/project.godot
@@ -45,7 +45,7 @@ _global_script_class_icons={
 [application]
 
 config/name="gmtk2022"
-run/main_scene="res://Scenes/Dungeon.tscn"
+run/main_scene="res://Scenes/Transition.tscn"
 config/icon="res://icon.png"
 
 [autoload]