From 47161be549915e926428588b271f50512fbb3037 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Wed, 20 Mar 2024 23:43:16 +0100 Subject: [PATCH] Hide items for dialog chooser. Fixes #59 --- .../rtmi_dialog_simple.gd | 5 ++--- .../states/dialog_finish.gd | 2 ++ .../inventory/inventory_ui.gd | 18 +++++++----------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd index c9e55919..f0ce34ee 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd @@ -140,7 +140,6 @@ func _on_say_finished(): emit_signal("say_finished") - func _on_say_visible(): emit_signal("say_visible") @@ -155,6 +154,7 @@ func _on_say_visible(): func choose(dialog_player: Node, dialog: ESCDialog, type: String): _dialog_player = dialog_player + escoria.game_scene.close_inventory() state_machine.states_map["choices"].initialize(dialog_player, self, dialog, type) state_machine._change_state("choices") @@ -166,11 +166,10 @@ func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"): chooser = preload(\ "res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\ ).instance() - + dialog_player.add_child(chooser) chooser.set_dialog(dialog) chooser.show_chooser() - var option = yield(chooser, "option_chosen") dialog_player.remove_child(chooser) # MODIFIED FOR RETURN TO MONKEY UI diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd index e7f0036a..eb6b0a7f 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd @@ -11,6 +11,8 @@ func initialize(dialog_player) -> void: func enter(): escoria.logger.trace(self, "Dialog State Machine: Entered 'finish'.") + escoria.game_scene.open_inventory() + func update(_delta): diff --git a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd index c918ea60..c4c47837 100644 --- a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd +++ b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd @@ -25,11 +25,9 @@ func show_inventory(): $FloatingInventory/InventoryTween.remove_all() $FloatingInventory/InventoryTween.interpolate_property( $FloatingInventory/panel, - "rect_position:x", - $FloatingInventory/panel.rect_position.x, - $FloatingInventory/panel.rect_position.x - \ - $FloatingInventory/panel.rect_size.x - \ - $HBoxContainer/inventory_button.rect_size.x, + "visible", + 0, + 1, 0.6 ) $FloatingInventory/InventoryTween.start() @@ -43,12 +41,10 @@ func hide_inventory(): $FloatingInventory/InventoryTween.remove_all() $FloatingInventory/InventoryTween.interpolate_property( $FloatingInventory/panel, - "rect_position:x", - $FloatingInventory/panel.rect_position.x, - $FloatingInventory/panel.rect_position.x + \ - $FloatingInventory/panel.rect_size.x + \ - $HBoxContainer/inventory_button.rect_size.x, - 0.6 + "visible", + 1, + 0, + 0.01 ) $FloatingInventory/InventoryTween.start() yield($FloatingInventory/InventoryTween,"tween_all_completed")