From eaafc94d0a5e8ee1aec03fb3b7aa2e01cf43ed3a Mon Sep 17 00:00:00 2001 From: 2ManyProjects Date: Thu, 6 Feb 2025 21:19:00 -0600 Subject: [PATCH] fixed overlays --- Systems/Cards/Explosiveboots.gd | 6 +++--- Systems/Cards/Supernova.gd | 8 ++++---- Systems/PieceContainer.gd | 2 +- Systems/Tiles/FireWall.gd | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Systems/Cards/Explosiveboots.gd b/Systems/Cards/Explosiveboots.gd index 3f73e5c..35001c7 100644 --- a/Systems/Cards/Explosiveboots.gd +++ b/Systems/Cards/Explosiveboots.gd @@ -107,10 +107,10 @@ func setup_persistent_effect(game_state): func on_turn_changed(): # print("TURN CHANGED ==================", attached_piece, " | ", remaining_turns, ) - if attached_piece.stored_game_state.isPlayerTurn() and attached_piece and remaining_turns > 0: + if stored_game_state.isPlayerTurn() and attached_piece and remaining_turns > 0: var piece = attached_piece var flow = stored_board_flow - var state = attached_piece.stored_game_state + var state = stored_game_state # print("Debug values:") # print("- Piece: ", piece, " is null? ", piece == null) @@ -123,7 +123,7 @@ func on_turn_changed(): func remove_effect(): if attached_piece: - var game_state = attached_piece.stored_game_state + var game_state = stored_game_state if game_state.is_connected("turn_changed", on_turn_changed): game_state.disconnect("turn_changed", on_turn_changed) super.remove_effect() diff --git a/Systems/Cards/Supernova.gd b/Systems/Cards/Supernova.gd index 6e76587..ab7ad34 100644 --- a/Systems/Cards/Supernova.gd +++ b/Systems/Cards/Supernova.gd @@ -107,10 +107,10 @@ func setup_persistent_effect(game_state): func on_turn_changed(): - if attached_piece.stored_game_state.isPlayerTurn() and attached_piece and remaining_turns > 0: + if stored_game_state.isPlayerTurn() and attached_piece and remaining_turns > 0: var piece = attached_piece - var flow = attached_piece.stored_board_flow - var state = attached_piece.stored_game_state + var flow = stored_board_flow + var state = stored_game_state # print("Debug values:") # print("- Piece: ", piece, " is null? ", piece == null) @@ -123,7 +123,7 @@ func on_turn_changed(): func remove_effect(): if attached_piece: - var game_state = attached_piece.stored_game_state + var game_state = stored_game_state if game_state.is_connected("turn_changed", Callable(self, "on_turn_changed")): game_state.disconnect("turn_changed", Callable(self, "on_turn_changed")) super.remove_effect() diff --git a/Systems/PieceContainer.gd b/Systems/PieceContainer.gd index 2130061..a4e293c 100644 --- a/Systems/PieceContainer.gd +++ b/Systems/PieceContainer.gd @@ -40,7 +40,7 @@ func add_overlay(overlay: Node) -> void: func remove_overlay(overlay_name: String) -> void: for overlay in overlay_nodes: - if overlay.name == overlay_name: + if overlay != null and overlay.name == overlay_name: remove_child(overlay) overlay_nodes.erase(overlay) overlay.queue_free() diff --git a/Systems/Tiles/FireWall.gd b/Systems/Tiles/FireWall.gd index a55cc93..0450f21 100644 --- a/Systems/Tiles/FireWall.gd +++ b/Systems/Tiles/FireWall.gd @@ -28,6 +28,7 @@ func apply_effect(piece: Pawn = null) -> void: var container = piece.get_parent() as PieceContainer if container: + game.updatePoints(piece) container.remove_piece()