fix strike again

Lila-Kuhlt · Apr 16, 2024 · 9ab931a · 9ab931a
1 parent 81e8168
commit 9ab931a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/src/scenes/enemies/firedevil.tscn b/src/scenes/enemies/firedevil.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=15 format=3 uid="uid://b5f5lmrpjngrp"]
 
 [ext_resource type="PackedScene" uid="uid://cbej72vi5osrq" path="res://scenes/enemies/enemy.tscn" id="1_ylqlj"]
-[ext_resource type="Texture2D" uid="uid://beiqouigaecec" path="res://assets/fire-demon.png" id="2_cna0v"]
+[ext_resource type="Texture2D" uid="uid://cb7pd2huloiib" path="res://assets/fire-demon.png" id="2_cna0v"]
 [ext_resource type="Script" path="res://scripts/enemies/firedevil.gd" id="2_mcpaa"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_useh6"]
@@ -88,7 +88,6 @@ MOVEMENT_SPEED = 20.0
 position = Vector2(-1, 0)
 scale = Vector2(-1, 1)
 sprite_frames = SubResource("SpriteFrames_le66y")
-autoplay = "default"
 frame = 1
 
 [node name="CollisionShape2D" parent="HitCollider" index="0"]

diff --git a/src/scenes/rooms/room-illuminati.tscn b/src/scenes/rooms/room-illuminati.tscn
@@ -18,6 +18,7 @@ position = Vector2(510, 34)
 
 [node name="Bookworm" parent="." index="3" instance=ExtResource("2_8vdua")]
 position = Vector2(234, 218)
+ATTACK_DAMAGE = 10
 
 [node name="PlayerMarker" parent="." index="4"]
 position = Vector2(98, 51)
diff --git a/src/scenes/rooms/room-wheel.tscn b/src/scenes/rooms/room-wheel.tscn
@@ -22,6 +22,7 @@ position = Vector2(121, 147)
 
 [node name="Bookworm" parent="." index="4" instance=ExtResource("2_k1tg7")]
 position = Vector2(5, -21)
+ATTACK_DAMAGE = 10
 
 [node name="Bat" parent="." index="5" instance=ExtResource("3_sn00y")]
 position = Vector2(171, 38)
diff --git a/src/scenes/rooms/room1.tscn b/src/scenes/rooms/room1.tscn
@@ -29,12 +29,15 @@ position = Vector2(-1, -222)
 
 [node name="Bookworm" parent="." index="6" instance=ExtResource("4_ae0jt")]
 position = Vector2(-17, -119)
+ATTACK_DAMAGE = 10
 
 [node name="Unicorn3" parent="." index="7" instance=ExtResource("3_oi2kq")]
 position = Vector2(-21, -63)
 
 [node name="Bookworm2" parent="." index="8" instance=ExtResource("4_ae0jt")]
 position = Vector2(-41, 9)
+ATTACK_DAMAGE = 10
 
 [node name="Bookworm3" parent="." index="9" instance=ExtResource("4_ae0jt")]
 position = Vector2(66, -23)
+ATTACK_DAMAGE = 10
diff --git a/src/scenes/rooms/room3.tscn b/src/scenes/rooms/room3.tscn
@@ -30,6 +30,7 @@ position = Vector2(313, -78)
 
 [node name="Bookworm" parent="." index="6" instance=ExtResource("3_s0cjm")]
 position = Vector2(200, -23)
+ATTACK_DAMAGE = 10
 
 [node name="Firedevil" parent="." index="7" instance=ExtResource("4_a0t8x")]
 position = Vector2(418, -23)

diff --git a/src/scenes/rooms/room_4.tscn b/src/scenes/rooms/room_4.tscn
@@ -27,9 +27,11 @@ position = Vector2(89, 145)
 
 [node name="Bookworm" parent="." index="5" instance=ExtResource("3_tlvvn")]
 position = Vector2(170, 72)
+ATTACK_DAMAGE = 10
 
 [node name="Bookworm2" parent="." index="6" instance=ExtResource("3_tlvvn")]
 position = Vector2(74, -7)
+ATTACK_DAMAGE = 10
 
 [node name="Bat" parent="." index="7" instance=ExtResource("4_6f3u0")]
 position = Vector2(240, 118)

diff --git a/src/scenes/rooms/room_debug.tscn b/src/scenes/rooms/room_debug.tscn
@@ -68,6 +68,7 @@ spell = 11
 
 [node name="Bookworm" parent="." index="16" instance=ExtResource("4_bf5w7")]
 position = Vector2(170, 38)
+ATTACK_DAMAGE = 10
 
 [node name="Firedevil" parent="." index="17" instance=ExtResource("5_fqody")]
 position = Vector2(-147, 41)

diff --git a/src/scripts/world.gd b/src/scripts/world.gd
@@ -93,8 +93,10 @@ func check_room_cleared():
 		room.room_cleared()
 
 func get_next_spell() -> Spell:
-	if next_spell_idx == -1 or next_spell_idx >= spell_order.size() or next_spell_idx == Spell.STRIKE:
+	if next_spell_idx == -1 or next_spell_idx >= spell_order.size():
 		return Spell.PLACEHOLDER
+	if spell_order[next_spell_idx] == Spell.STRIKE:
+		next_spell_idx += 1
 	var spell = spell_order[next_spell_idx]
 	next_spell_idx += 1
 	return spell