diff --git a/entities/game/memory_game/scenes/MemoryGame.tscn b/entities/game/memory_game/scenes/MemoryGame.tscn index e661b6c..4734c8f 100644 --- a/entities/game/memory_game/scenes/MemoryGame.tscn +++ b/entities/game/memory_game/scenes/MemoryGame.tscn @@ -244,6 +244,14 @@ debug_functions = Array[ExtResource("34_4hsit")]([SubResource("Resource_8rpam")] [connection signal="game_paused" from="." to="Systems/PlayerInputSystem" method="game_paused"] [connection signal="game_paused" from="." to="World/Camera2D" method="game_paused"] [connection signal="load_game" from="." to="World/CardBoard/CardInteractionField" method="set_board_information"] +[connection signal="popup_menu_closed" from="." to="UI/PauseMenuButton" method="show_button_if_valid"] +[connection signal="popup_menu_closed" from="." to="UI/PlayersOverlay" method="show"] +[connection signal="popup_menu_closed" from="." to="UI/ZoomButtons/ZoomIn" method="show_button_if_valid"] +[connection signal="popup_menu_closed" from="." to="UI/ZoomButtons/ZoomOut" method="show_button_if_valid"] +[connection signal="popup_menu_shown" from="." to="UI/PauseMenuButton" method="hide"] +[connection signal="popup_menu_shown" from="." to="UI/PlayersOverlay" method="hide"] +[connection signal="popup_menu_shown" from="." to="UI/ZoomButtons/ZoomIn" method="hide"] +[connection signal="popup_menu_shown" from="." to="UI/ZoomButtons/ZoomOut" method="hide"] [connection signal="request_popup" from="." to="Systems/PopupSystem" method="add_and_show_popup"] [connection signal="force_close_popup" from="Systems/GameStateSystem" to="Systems/PopupSystem" method="force_close_popup_with_id"] [connection signal="game_has_ended" from="Systems/GameStateSystem" to="World/CardBoard/CardVisuals" method="hide"] diff --git a/entities/game/memory_game/scripts/MemoryGame.gd b/entities/game/memory_game/scripts/MemoryGame.gd index e300b45..8a1d803 100644 --- a/entities/game/memory_game/scripts/MemoryGame.gd +++ b/entities/game/memory_game/scripts/MemoryGame.gd @@ -7,6 +7,9 @@ signal game_paused(is_paused: bool) signal request_popup(window: PopupWindow) +signal popup_menu_shown() +signal popup_menu_closed() + signal game_loaded() const CARDS_PER_PLAYER: int = 2 @@ -92,6 +95,8 @@ func show_game_menu() -> void: game_menu = game_menu_template.instantiate() as GamePauseMenu game_menu.high_priority = true request_popup.emit(game_menu) + game_menu.popup_closed.connect(func() -> void: popup_menu_closed.emit()) + popup_menu_shown.emit() func set_is_multiplayer() -> void: _is_local_only = false