From 387c91e752db95448797a9ffa80917e37c5be437 Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 14 Feb 2026 18:06:57 +1100 Subject: [PATCH 1/5] fixed issue 5 --- Enemies/Skitter/scn_skitter.tscn | 5 +++++ Levels/Level1/testwave.tres | 25 ------------------------- 2 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 Levels/Level1/testwave.tres diff --git a/Enemies/Skitter/scn_skitter.tscn b/Enemies/Skitter/scn_skitter.tscn index 39ebd09..95d7e85 100644 --- a/Enemies/Skitter/scn_skitter.tscn +++ b/Enemies/Skitter/scn_skitter.tscn @@ -100,4 +100,9 @@ script = ExtResource("5_f7xim") critical_zone = true metadata/_custom_type_script = "uid://cummt2be3r1gq" +[connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"] +[connection signal="took_damage" from="Hitbox" to="." method="take_damage"] +[connection signal="recieved_effect" from="Hitbox2" to="StatusEffector" method="add_effect"] +[connection signal="took_damage" from="Hitbox2" to="." method="take_damage"] + [editable path="mdl_skitter"] diff --git a/Levels/Level1/testwave.tres b/Levels/Level1/testwave.tres deleted file mode 100644 index 1759555..0000000 --- a/Levels/Level1/testwave.tres +++ /dev/null @@ -1,25 +0,0 @@ -[gd_resource type="Resource" script_class="WaveConfig" format=3 uid="uid://bkcmdtfrhq43v"] - -[ext_resource type="Script" uid="uid://3grc2j4bjrnw" path="res://enemy_group.gd" id="1_bojkk"] -[ext_resource type="Resource" uid="uid://cvehqh4tt28g7" path="res://Enemies/BabyEyeDog/baby_eye_dog.tres" id="2_a2eo6"] -[ext_resource type="Script" uid="uid://bp6q371iypd06" path="res://Scripts/wave_config.gd" id="2_ptt5n"] - -[sub_resource type="Resource" id="Resource_crjd6"] -script = ExtResource("1_bojkk") -enemy = ExtResource("2_a2eo6") -count = 40 -metadata/_custom_type_script = "uid://3grc2j4bjrnw" - -[sub_resource type="Resource" id="Resource_llpiq"] -script = ExtResource("1_bojkk") -enemy = ExtResource("2_a2eo6") -count = 20 -metadata/_custom_type_script = "uid://3grc2j4bjrnw" - -[resource] -script = ExtResource("2_ptt5n") -enemy_groups = Dictionary[ExtResource("1_bojkk"), int]({ -SubResource("Resource_crjd6"): 0, -SubResource("Resource_llpiq"): 0 -}) -metadata/_custom_type_script = "uid://bp6q371iypd06" From 89d1f5b4b75436658375453bf3eb7e1a525dfb59 Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 14 Feb 2026 18:11:00 +1100 Subject: [PATCH 2/5] fixed issue #3 --- Scenes/CardPrinter/card_printer.gd | 12 ++---------- Scripts/Resources/card.gd | 7 +++++++ UI/Menus/MainMenu/main_menu.gd | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Scenes/CardPrinter/card_printer.gd b/Scenes/CardPrinter/card_printer.gd index 4301f33..18d2041 100644 --- a/Scenes/CardPrinter/card_printer.gd +++ b/Scenes/CardPrinter/card_printer.gd @@ -13,14 +13,6 @@ func _ready() -> void: button.hover_text = tr("PROMPT_RADIO_INTERACT") -func get_faction_cards(faction: Card.Faction) -> Array[Card]: - var valid_cards: Array[Card] = [] - for card: Card in Data.cards: - if card.faction == faction: - valid_cards.append(card) - return valid_cards - - func generate_rarity() -> int: var weight_total: int = 0 for rarity: String in Data.Rarity: @@ -43,7 +35,7 @@ func randomize_cards(faction: Card.Faction) -> void: var pos_x: float = 0.0 for x: int in cards_to_spawn: var decided_rarity: int = generate_rarity() - var card_choices: Array[Card] = get_faction_cards(faction) + var card_choices: Array[Card] = Card.get_faction_cards(faction) var card_array: Array = [] var cards_chosen: bool = false while !cards_chosen: @@ -76,7 +68,7 @@ func find_cards(faction: Card.Faction, rarity: Data.Rarity, allowed_cards: Array decided_rarity = generate_rarity() var card_choices: Array[Card] = allowed_cards if !card_choices: - card_choices = get_faction_cards(faction) + card_choices = Card.get_faction_cards(faction) var cards: Array[Card] = [] var valid_cards_found: bool = false var testing_rarity: int = decided_rarity diff --git a/Scripts/Resources/card.gd b/Scripts/Resources/card.gd index d466942..7770426 100644 --- a/Scripts/Resources/card.gd +++ b/Scripts/Resources/card.gd @@ -7,6 +7,13 @@ enum Faction { MAGE = 2, } +static func get_faction_cards(faction: Card.Faction) -> Array[Card]: + var valid_cards: Array[Card] = [] + for card: Card in Data.cards: + if card.faction == faction: + valid_cards.append(card) + return valid_cards + @export var cost: int @export var rarity: Data.Rarity @export var faction: Faction diff --git a/UI/Menus/MainMenu/main_menu.gd b/UI/Menus/MainMenu/main_menu.gd index 88d03b8..ad71889 100644 --- a/UI/Menus/MainMenu/main_menu.gd +++ b/UI/Menus/MainMenu/main_menu.gd @@ -157,7 +157,7 @@ func level_selected(level: LevelConfig, side: int) -> void: gamemode.rng_seed = generate_seed() if gamemode.endless else level.game_seed gamemode.daily = false if gamemode.endless: - level.allowed_cards = level.hero_class.deck + level.allowed_cards = Card.get_faction_cards(level.hero_class.faction) level.waves = [] game.level_config = level if !gamemode.multiplayer: From 11b1745c9df39bb4ffc10d3ccb2f834908d6f0c6 Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 14 Feb 2026 18:17:17 +1100 Subject: [PATCH 3/5] fixed issue #4 --- PCs/PathEditTool/path_edit_tool.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCs/PathEditTool/path_edit_tool.gd b/PCs/PathEditTool/path_edit_tool.gd index baadb34..7ba77f6 100644 --- a/PCs/PathEditTool/path_edit_tool.gd +++ b/PCs/PathEditTool/path_edit_tool.gd @@ -120,7 +120,7 @@ func process_looking_at_tower() -> void: point = ray_collider.point if last_point != point: clear_previous_point() - + last_point = null wall_preview.set_visible(false) ray_collider.set_color(Color.RED) ray_collider.set_float(0.0) From b7ed9461a337c4b8da1d7859fd93c09cf615453c Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 14 Feb 2026 18:20:09 +1100 Subject: [PATCH 4/5] fixed issue #8 --- PCs/FSM/fighting_state.gd | 1 + 1 file changed, 1 insertion(+) diff --git a/PCs/FSM/fighting_state.gd b/PCs/FSM/fighting_state.gd index e7077b9..9e0305a 100644 --- a/PCs/FSM/fighting_state.gd +++ b/PCs/FSM/fighting_state.gd @@ -3,6 +3,7 @@ extends HeroState func enter_state() -> void: + hero.hud.unset_hover_text() hero.hud.set_currencies_visible(false) hero.left_hand_model.visible = false if hero.weapons[hero.equipped_weapon]: From eb177adffe373b993353c9d609ca2fc1e60b7f8e Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Sat, 14 Feb 2026 18:25:54 +1100 Subject: [PATCH 5/5] fixed issue #7 --- wave_viewer.gd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wave_viewer.gd b/wave_viewer.gd index df90470..aeadb96 100644 --- a/wave_viewer.gd +++ b/wave_viewer.gd @@ -11,9 +11,10 @@ signal closed() func _unhandled_input(event: InputEvent) -> void: - if event.is_action_pressed("Pause"): + if event.is_action_pressed("Pause") or event.is_action_pressed("Show Wave Preview"): queue_free() closed.emit() + get_viewport().set_input_as_handled() func set_waves(waves: Array[WaveConfig], starting_wave_number: int) -> void: