Fix bug where evolve timer was not stopped on unevolve

Fixes #5
Jacalz · May 7, 2021 · 1bd84c5 · 1bd84c5
1 parent 356cbad
commit 1bd84c5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/Enteties/Chameleon/Chameleon.tscn b/Enteties/Chameleon/Chameleon.tscn
@@ -22,11 +22,6 @@ animations = [ {
 "name": "Idle_evolved",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 10 ) ],
-"loop": false,
-"name": "Jump",
-"speed": 1.0
-}, {
 "frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
 "loop": true,
 "name": "Walk",
@@ -42,6 +37,11 @@ animations = [ {
 "name": "Idle",
 "speed": 1.0
 }, {
+"frames": [ ExtResource( 10 ) ],
+"loop": false,
+"name": "Jump",
+"speed": 1.0
+}, {
 "frames": [ ExtResource( 6 ), ExtResource( 9 ) ],
 "loop": true,
 "name": "Walk_evolved",
@@ -185,6 +185,7 @@ margin_right = 12.0
 margin_bottom = 20.0
 custom_fonts/font = SubResource( 6 )
 text = "  Exit to titlescreen  "
+
 [connection signal="on_grounded_updated" from="." to="Camera2D" method="_on_Chameleon_on_grounded_updated"]
 [connection signal="timeout" from="Camouflage/Timer" to="Camouflage" method="_on_Timer_timeout"]
 [connection signal="timeout" from="EvolveTimer" to="." method="_on_Initial_timeout"]

diff --git a/Enteties/Chameleon/chameleon.gd b/Enteties/Chameleon/chameleon.gd
@@ -27,6 +27,10 @@ var velocity = Vector2()
 var evolve_anim = ""
 var flip_h = true
 
+func _on_unevolving():
+	evolve_timer.stop()
+	_on_Evolve_timeout()
+
 func _on_Initial_timeout():
 	# Flicker 4 times
 	for i in 4:

diff --git a/Enteties/Enemies/AloeVera/aloevera.gd b/Enteties/Enemies/AloeVera/aloevera.gd
@@ -6,4 +6,4 @@ func _on_Area2D_body_entered(body):
 			yield(get_tree().create_timer(0.25), "timeout")
 			assert(get_tree().reload_current_scene() == OK)
 		else:
-			 body.evolve_anim = ""
+			 body._on_unevolving()
diff --git a/Enteties/Enemies/Lizard/lizard.gd b/Enteties/Enemies/Lizard/lizard.gd
@@ -27,7 +27,7 @@ func _on_Area2D_body_entered(body):
 				assert(get_tree().reload_current_scene() == OK)
 		elif body.flip_h != ASprite.flip_h: # Player is looking away if flip_h values are not equal
 			ASprite.play("block")
-			body.evolve_anim = ""
+			body._on_unevolving()
 			ASprite.play("move")
 		else:
 			queue_free()
diff --git a/Enteties/Enemies/Scorpion/scorpion.gd b/Enteties/Enemies/Scorpion/scorpion.gd
@@ -41,7 +41,7 @@ func _on_KillerInstinct_body_entered(body):
 		elif body.flip_h == ASprite.flip_h: # Player is looking away if flip_h values are equal
 			ASprite.position.y += 15
 			ASprite.play("attack")
-			body.evolve_anim = ""
+			body._on_unevolving()
 			ASprite.position.y -= 15
 			ASprite.play("move")
 		else: