Skip to content
This repository has been archived by the owner on Jul 17, 2020. It is now read-only.

Commit

Permalink
Fix softlock on second boss
Browse files Browse the repository at this point in the history
  • Loading branch information
@FractalDiane
FractalDiane committed Jan 10, 2019
1 parent 308a38a commit 5b105ab
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 106 deletions.
137 changes: 73 additions & 64 deletions Globals/Player.tscn
View file
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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 ) ],
Expand All @@ -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
Expand Down Expand Up @@ -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"]
Expand All @@ -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"]


4 changes: 4 additions & 0 deletions Scenes/Dungeon 2/Dungeon2-11.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
18 changes: 9 additions & 9 deletions Scenes/Dungeon 2/Dungeon2-BOSS.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
} ]

Expand Down
10 changes: 5 additions & 5 deletions Scenes/Dungeon 2/Dungeon2-L2.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down Expand Up @@ -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"]
Expand Down
Loading

0 comments on commit 5b105ab

Please sign in to comment.