diff --git a/Globals/Player.tscn b/Globals/Player.tscn index 67a3ebb..046b262 100644 --- a/Globals/Player.tscn +++ b/Globals/Player.tscn @@ -1,42 +1,42 @@ [gd_scene load_steps=65 format=2] [ext_resource path="res://Scripts/Globals/Player.gd" type="Script" id=1] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore right.png" type="Texture" id=2] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore left.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore left.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore right.png" type="Texture" id=3] [ext_resource path="res://Sprites/Characters/Fiore/Fiore up.png" type="Texture" id=4] [ext_resource path="res://Sprites/Characters/Fiore/Fiore down.png" type="Texture" id=5] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing left 1.png" type="Texture" id=6] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing left 2.png" type="Texture" id=7] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing left 3.png" type="Texture" id=8] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 1.png" type="Texture" id=9] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 2.png" type="Texture" id=10] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 3.png" type="Texture" id=11] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 1.png" type="Texture" id=12] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 2.png" type="Texture" id=13] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 3.png" type="Texture" id=14] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 1.png" type="Texture" id=15] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 2.png" type="Texture" id=16] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 3.png" type="Texture" id=17] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 1.png" type="Texture" id=18] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 2.png" type="Texture" id=19] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 3.png" type="Texture" id=20] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk right 1.png" type="Texture" id=21] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk right 2.png" type="Texture" id=22] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore down die.png" type="Texture" id=23] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore left die.png" type="Texture" id=24] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk up 1.png" type="Texture" id=25] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk up 2.png" type="Texture" id=26] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 1.png" type="Texture" id=27] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 2.png" type="Texture" id=28] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 3.png" type="Texture" id=29] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore ending.png" type="Texture" id=30] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 1.png" type="Texture" id=31] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 2.png" type="Texture" id=32] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 3.png" type="Texture" id=33] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore up die.png" type="Texture" id=34] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk down 1.png" type="Texture" id=35] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk down 2.png" type="Texture" id=36] -[ext_resource path="res://Sprites/Characters/Fiore/Fiore right die.png" type="Texture" id=37] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 1.png" type="Texture" id=9] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 2.png" type="Texture" id=10] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing right 3.png" type="Texture" id=11] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk right 1.png" type="Texture" id=12] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk right 2.png" type="Texture" id=13] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 1.png" type="Texture" id=14] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 2.png" type="Texture" id=15] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow down 3.png" type="Texture" id=16] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore down die.png" type="Texture" id=17] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 1.png" type="Texture" id=18] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 2.png" type="Texture" id=19] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow right 3.png" type="Texture" id=20] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 1.png" type="Texture" id=21] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 2.png" type="Texture" id=22] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore swing up 3.png" type="Texture" id=23] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk up 1.png" type="Texture" id=24] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk up 2.png" type="Texture" id=25] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore ending.png" type="Texture" id=26] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 1.png" type="Texture" id=27] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 2.png" type="Texture" id=28] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow up 3.png" type="Texture" id=29] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore up die.png" type="Texture" id=30] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk down 1.png" type="Texture" id=31] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore walk down 2.png" type="Texture" id=32] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore left die.png" type="Texture" id=33] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore right die.png" type="Texture" id=34] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 1.png" type="Texture" id=35] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 2.png" type="Texture" id=36] +[ext_resource path="res://Sprites/Characters/Fiore/Fiore bow left 3.png" type="Texture" id=37] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing down 1.png" type="Texture" id=38] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing down 2.png" type="Texture" id=39] [ext_resource path="res://Sprites/Characters/Fiore/Fiore swing down 3.png" type="Texture" id=40] @@ -59,12 +59,12 @@ animations = [ { "frames": [ ExtResource( 2 ) ], "loop": true, -"name": "right", +"name": "left", "speed": 5.0 }, { "frames": [ ExtResource( 3 ) ], "loop": true, -"name": "left", +"name": "right", "speed": 5.0 }, { "frames": [ ExtResource( 4 ) ], @@ -84,80 +84,80 @@ animations = [ { }, { "frames": [ ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ) ], "loop": true, -"name": "shootleft", -"speed": 15.0 -}, { -"frames": [ ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ) ], -"loop": true, -"name": "swingup", +"name": "swingright", "speed": 16.0 }, { -"frames": [ ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ) ], +"frames": [ ExtResource( 12 ), ExtResource( 3 ), ExtResource( 13 ), ExtResource( 3 ) ], "loop": true, -"name": "swingright", -"speed": 16.0 +"name": "walkright", +"speed": 6.0 }, { -"frames": [ ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ) ], +"frames": [ ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ) ], "loop": true, "name": "shootdown", "speed": 15.0 }, { -"frames": [ ExtResource( 21 ), ExtResource( 2 ), ExtResource( 22 ), ExtResource( 2 ) ], -"loop": true, -"name": "walkright", -"speed": 6.0 -}, { -"frames": [ ExtResource( 23 ) ], +"frames": [ ExtResource( 17 ) ], "loop": true, "name": "diedown", "speed": 5.0 }, { -"frames": [ ExtResource( 24 ) ], +"frames": [ ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ) ], "loop": true, -"name": "dieleft", -"speed": 5.0 +"name": "shootright", +"speed": 15.0 }, { -"frames": [ ExtResource( 25 ), ExtResource( 4 ), ExtResource( 26 ), ExtResource( 4 ) ], +"frames": [ ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ) ], "loop": true, -"name": "walkup", -"speed": 6.0 +"name": "swingup", +"speed": 16.0 }, { -"frames": [ ExtResource( 27 ), ExtResource( 28 ), ExtResource( 29 ) ], +"frames": [ ExtResource( 24 ), ExtResource( 4 ), ExtResource( 25 ), ExtResource( 4 ) ], "loop": true, -"name": "shootright", -"speed": 15.0 +"name": "walkup", +"speed": 6.0 }, { -"frames": [ ExtResource( 30 ) ], +"frames": [ ExtResource( 26 ) ], "loop": true, "name": "ending", "speed": 5.0 }, { -"frames": [ ExtResource( 31 ), ExtResource( 32 ), ExtResource( 33 ) ], +"frames": [ ExtResource( 27 ), ExtResource( 28 ), ExtResource( 29 ) ], "loop": true, "name": "shootup", "speed": 15.0 }, { -"frames": [ ExtResource( 34 ) ], +"frames": [ ExtResource( 30 ) ], "loop": true, "name": "dieup", "speed": 5.0 }, { -"frames": [ ExtResource( 35 ), ExtResource( 5 ), ExtResource( 36 ), ExtResource( 5 ) ], +"frames": [ ExtResource( 31 ), ExtResource( 5 ), ExtResource( 32 ), ExtResource( 5 ) ], "loop": true, "name": "walkdown", "speed": 6.0 }, { -"frames": [ ExtResource( 37 ) ], +"frames": [ ExtResource( 33 ) ], +"loop": true, +"name": "dieleft", +"speed": 5.0 +}, { +"frames": [ ExtResource( 34 ) ], "loop": true, "name": "dieright", "speed": 5.0 }, { +"frames": [ ExtResource( 35 ), ExtResource( 36 ), ExtResource( 37 ) ], +"loop": true, +"name": "shootleft", +"speed": 15.0 +}, { "frames": [ ExtResource( 38 ), ExtResource( 39 ), ExtResource( 40 ) ], "loop": true, "name": "swingdown", "speed": 16.0 }, { -"frames": [ ExtResource( 41 ), ExtResource( 3 ), ExtResource( 42 ), ExtResource( 3 ) ], +"frames": [ ExtResource( 41 ), ExtResource( 2 ), ExtResource( 42 ), ExtResource( 2 ) ], "loop": true, "name": "walkleft", "speed": 6.0 @@ -622,6 +622,13 @@ wait_time = 60.0 one_shot = true autostart = false +[node name="TimerCorrections" type="Timer" parent="." index="25"] + +process_mode = 1 +wait_time = 0.05 +one_shot = true +autostart = false + [connection signal="timeout" from="TimerSwing" to="." method="_on_TimerSwing_timeout"] [connection signal="timeout" from="TimerSwingAnim" to="." method="_on_TimerSwingAnim_timeout"] @@ -636,4 +643,6 @@ autostart = false [connection signal="timeout" from="TimerBadEnding" to="." method="_on_TimerBadEnding_timeout"] +[connection signal="timeout" from="TimerCorrections" to="." method="_on_TimerCorrections_timeout"] + diff --git a/Scenes/Dungeon 2/Dungeon2-11.tscn b/Scenes/Dungeon 2/Dungeon2-11.tscn index c50584f..4043143 100644 --- a/Scenes/Dungeon 2/Dungeon2-11.tscn +++ b/Scenes/Dungeon 2/Dungeon2-11.tscn @@ -200,6 +200,10 @@ frames = SubResource( 3 ) shape = SubResource( 4 ) +[node name="Interact" parent="NPCGallaro" index="2"] + +frame = 1 + [node name="Gold" parent="." index="13" instance=ExtResource( 14 )] position = Vector2( 136, 59 ) diff --git a/Scenes/Dungeon 2/Dungeon2-BOSS.tscn b/Scenes/Dungeon 2/Dungeon2-BOSS.tscn index 58f3a13..61af5c6 100644 --- a/Scenes/Dungeon 2/Dungeon2-BOSS.tscn +++ b/Scenes/Dungeon 2/Dungeon2-BOSS.tscn @@ -24,9 +24,9 @@ [ext_resource path="res://Scripts/Objects/Dungeon 2/SesdinBoss.gd" type="Script" id=22] [ext_resource path="res://Sprites/Characters/Sesdin/Sesdin left.png" type="Texture" id=23] [ext_resource path="res://Sprites/Characters/Sesdin/Sesdin right.png" type="Texture" id=24] -[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast down.png" type="Texture" id=25] -[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast left.png" type="Texture" id=26] -[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast right.png" type="Texture" id=27] +[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast right.png" type="Texture" id=25] +[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast down.png" type="Texture" id=26] +[ext_resource path="res://Sprites/Characters/Sesdin/Sesdin cast left.png" type="Texture" id=27] [ext_resource path="res://Sprites/Particles/Impact.png" type="Texture" id=28] [ext_resource path="res://Sounds/Objects/Turret.wav" type="AudioStream" id=29] [ext_resource path="res://Sounds/Characters/Charge.wav" type="AudioStream" id=30] @@ -138,24 +138,24 @@ animations = [ { "name": "right", "speed": 5.0 }, { -"frames": [ ExtResource( 11 ) ], +"frames": [ ExtResource( 25 ) ], "loop": true, -"name": "down", +"name": "castright", "speed": 5.0 }, { -"frames": [ ExtResource( 25 ) ], +"frames": [ ExtResource( 26 ) ], "loop": true, "name": "castdown", "speed": 5.0 }, { -"frames": [ ExtResource( 26 ) ], +"frames": [ ExtResource( 27 ) ], "loop": true, "name": "castleft", "speed": 5.0 }, { -"frames": [ ExtResource( 27 ) ], +"frames": [ ExtResource( 11 ) ], "loop": true, -"name": "castright", +"name": "down", "speed": 5.0 } ] diff --git a/Scenes/Dungeon 2/Dungeon2-L2.tscn b/Scenes/Dungeon 2/Dungeon2-L2.tscn index 7e82c6f..70c49ca 100644 --- a/Scenes/Dungeon 2/Dungeon2-L2.tscn +++ b/Scenes/Dungeon 2/Dungeon2-L2.tscn @@ -37,7 +37,7 @@ extents = Vector2( 5, 11 ) flags = 0 load_path = "res://.import/Block 2.png-7438db7c09467e175d76987a1a12bf84.stex" -[node name="Node2D" type="Node2D" index="0"] +[node name="Node2D" type="Node2D"] _sections_unfolded = [ "Transform" ] @@ -139,25 +139,25 @@ not_cell = true [node name="OrbSwitch" parent="." index="10" instance=ExtResource( 9 )] position = Vector2( 145, 38 ) -time = 8.5 +time = 10.0 allow_sword = false [node name="OrbSwitch2" parent="." index="11" instance=ExtResource( 9 )] position = Vector2( 144, 111 ) -time = 8.5 +time = 10.0 allow_sword = false [node name="OrbSwitch3" parent="." index="12" instance=ExtResource( 9 )] position = Vector2( 16, 111 ) -time = 8.5 +time = 10.0 allow_sword = false [node name="OrbSwitch4" parent="." index="13" instance=ExtResource( 9 )] position = Vector2( 16, 38 ) -time = 8.5 +time = 10.0 allow_sword = false [node name="Area2D" type="StaticBody2D" parent="." index="14"] diff --git a/Scenes/GameOver.tscn b/Scenes/GameOver.tscn index e4aa56b..f904a9c 100644 --- a/Scenes/GameOver.tscn +++ b/Scenes/GameOver.tscn @@ -124,7 +124,7 @@ script = ExtResource( 7 ) modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -133,7 +133,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -142,7 +142,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -151,7 +151,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -160,7 +160,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -169,7 +169,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -178,7 +178,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -187,7 +187,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -196,7 +196,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -205,7 +205,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false _sections_unfolded = [ "Material", "Visibility" ] @@ -215,7 +215,7 @@ _sections_unfolded = [ "Material", "Visibility" ] modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -224,7 +224,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -233,7 +233,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -242,7 +242,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -251,7 +251,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -260,7 +260,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -269,7 +269,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false @@ -278,7 +278,7 @@ centered = false modulate = Color( 1, 1, 1, 0 ) frames = SubResource( 1 ) animation = "default" -frame = 15 +frame = 4 playing = true centered = false diff --git a/Scenes/Startup.tscn b/Scenes/Startup.tscn index 7e0a115..ede163c 100644 --- a/Scenes/Startup.tscn +++ b/Scenes/Startup.tscn @@ -7,7 +7,7 @@ [node name="Node2D" type="Node2D" index="0"] script = ExtResource( 1 ) -start_scene = "res://Scenes/GATE/Gate-3.tscn" +start_scene = "res://Scenes/Dungeon 2/Dungeon2-11.tscn" start_position = Vector2( 80, 72 ) flags = [ "jari_talk", "cultist40_talk", "holding_dungeon1key", "dungeon1_switchesTL", "dungeon1_switchesTR", "dungeon1_switchTL_1", "dungeon1_switchTL_2", "dungeon1_switchTL_3", "dungeon1_switchTL_4", "dungeon1_switchTR_1", "dungeon1_switchTR_2", "dungeon1_switchTR_3", "dungeon1_switchTR_4", "kein_talk", "keininside_talk", "dungeon1_switches2TL", "dungeon1_switches2TR", "dungeon1_switches2BL", "dungeon1_switches2BR", "dungeon1_switchTR_5", "dungeon1_switchBR2_1", "dungeon1_switchBR2_2", "dungeon1_switchBR2_3", "dungeon1_switchBR2_4", "dungeon1_switchTR2_1", "dungeon1_switchTR2_2", "dungeon1_switchTR2_3", "dungeon1_switchTR2_4", "dungeon1_switchTL2_1", "dungeon1_switchTL2_2", "dungeon1_switchBL2_1", "dungeon1_switchBL2_2", "dungeon1_switchBL2_3", "iiro_talk", "dungeon2_switchIntro", "dungeon2_switchesL", "dungeon2_switchesR", "dungeon2_switchL1", "dungeon2_switchL2", "dungeon2_switchR1", "dungeon2_switchR2", "dungeon2_switchR3", "dungeon2_switchR4", "dungeon2_door1", "gold_1", "gold_2", "gold_3", "gold_4", "gold_5", "gold_6", "gold_7", "gold_8", "gold_9", "dungeon2_switchesL2", "dungeon2_switchesR2", "holding_dungeon2key", "holding_bow", "dungeon1_complete", "keinoutside_talk", "dungeon2_complete", "holding_gatekey", "jarid1_talk", "jarid2_talk", "iiro00_talk", "azura_talk", "azura12_talk", "azura00_talk", "gallaro_talk", "gold_10", "gold_11", "kein00_talk" ] title_screen = true diff --git a/Scripts/Globals/Player.gd b/Scripts/Globals/Player.gd index f9fd5f3..e75dc0e 100644 --- a/Scripts/Globals/Player.gd +++ b/Scripts/Globals/Player.gd @@ -390,3 +390,8 @@ func _on_TimerIFrames_timeout(): func _on_TimerBadEnding_timeout(): controller.scene_change("res://Scenes/GATE/Gate-BadEnd2.tscn") hide() + +func _on_TimerCorrections_timeout(): + dead = false + state = WALK + print("RESPAWN") diff --git a/Scripts/Scenes/GameOver.gd b/Scripts/Scenes/GameOver.gd index 0b6b0e8..3d1db95 100644 --- a/Scripts/Scenes/GameOver.gd +++ b/Scripts/Scenes/GameOver.gd @@ -59,15 +59,9 @@ func _on_TimerEnd_timeout(): Player.set_position(Vector2(controller.x_checkpoint, controller.y_checkpoint)) Player.face = Vector2(0,1) Player.get_node("Sprite").play("down") - Player.state = Player.WALK Player.falling = false Player.jumping = false Player.dash = Vector2(0,0) - Player.dead = false Player.fully_corrupted = false Player.show() - -func _on_TimerBackToTitle_timeout(): - #controller.scene_change("res://Scenes/Title.tscn", false) - pass - + Player.get_node("TimerCorrections").start() diff --git a/Scripts/System/Transition.gd b/Scripts/System/Transition.gd index 82d3ce2..f985069 100644 --- a/Scripts/System/Transition.gd +++ b/Scripts/System/Transition.gd @@ -30,7 +30,7 @@ func _physics_process(delta): var colliding = get_overlapping_bodies() for obj in colliding: - if obj.get_name() == "Player" and not Player.warp and Player.state != Player.NO_INPUT: + if obj.get_name() == "Player" and not Player.warp and not Player.dead and Player.state != Player.NO_INPUT: var player_x = obj.get_position().x var player_y = obj.get_position().y var target_x_f diff --git a/export_presets.cfg b/export_presets.cfg index ef30401..b81dd30 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -18,7 +18,7 @@ binary_format/64_bits=true custom_template/release="" custom_template/debug="" application/icon="C:/Users/Duncan Sparks/Downloads/favicon.ico" -application/file_version="1.1" +application/file_version="1.2" application/product_version="" application/company_name="Studio Fractal" application/product_name=""