oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

hide dialog chooser & floating when paused. Fixes #53

Browse Source
This commit is contained in:
Oier Bravo
2024-03-19 00:33:00 +01:00
parent 89fa3a28d6
commit 4bfea61e3d
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd
View File

@@ -14,6 +14,8 @@ var _no_more_options: bool = false
func _ready() -> void: func _ready() -> void:
hide_chooser() hide_chooser()
pause_mode = PAUSE_MODE_STOP pause_mode = PAUSE_MODE_STOP
escoria.connect("paused", self, "_on_paused")
escoria.connect("resumed", self, "_on_resumed")
# Process the timeout display # Process the timeout display
@@ -98,3 +100,12 @@ func _on_Timer_timeout() -> void:
func _remove_avatar(): func _remove_avatar():
if $AvatarContainer.get_child_count() > 0: if $AvatarContainer.get_child_count() > 0:
$AvatarContainer.remove_child($AvatarContainer.get_child(0)) $AvatarContainer.remove_child($AvatarContainer.get_child(0))
# Handler managing pause notification from Escoria
func _on_paused():
hide_chooser()
# Handler managing resume notification from Escoria
func _on_resumed():
show_chooser()

2
addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd
View File

@@ -235,6 +235,7 @@ func _on_dialog_finished():
func _on_paused(): func _on_paused():
if tween.is_active(): if tween.is_active():
is_paused = true is_paused = true
visible = false
tween.stop_all() tween.stop_all()
@@ -242,6 +243,7 @@ func _on_paused():
func _on_resumed(): func _on_resumed():
if not tween.is_active(): if not tween.is_active():
is_paused = false is_paused = false
visible = true
tween.resume_all() tween.resume_all()

10
addons/escoria-ui-return-monkey-island/game.gd
View File

@@ -393,23 +393,21 @@ func unpause_game():
escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.resume() escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.resume()
escoria.main.current_scene.game.show_ui() escoria.main.current_scene.game.show_ui()
escoria.main.current_scene.show() escoria.main.current_scene.show()
escoria.set_game_paused(false)
func pause_game(): func pause_game():
if get_video_player().is_playing(): if get_video_player().is_playing():
get_video_player().skip() get_video_player().skip()
return return
if not get_node(pause_menu).visible: if not get_node(pause_menu).visible and not get_node(main_menu).visible:
get_node(main_menu).reset()
get_node(pause_menu).reset() get_node(pause_menu).reset()
get_node(pause_menu).set_save_enabled( get_node(pause_menu).set_save_enabled(escoria.save_manager.save_enabled)
escoria.save_manager.save_enabled
)
get_node(pause_menu).show() get_node(pause_menu).show()
escoria.object_manager.get_object(ESCObjectManager.CAMERA).node.current = false escoria.object_manager.get_object(ESCObjectManager.CAMERA).node.current = false
escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.pause() escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.pause()
escoria.main.current_scene.game.hide_ui() escoria.main.current_scene.game.hide_ui()
escoria.main.current_scene.hide() escoria.main.current_scene.hide()
escoria.set_game_paused(true)
func apply_custom_settings(custom_settings: Dictionary): func apply_custom_settings(custom_settings: Dictionary):
if custom_settings.has("a_custom_setting"): if custom_settings.has("a_custom_setting"):