From c91589ec89ce1e648df36e5cab7e97c07ba9469c Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Tue, 2 Sep 2025 13:25:35 +0200 Subject: [PATCH] fix(game.gd): if using an item cancel action on click on bg, fixes #116 --- .../esc/esc_action_manager_monkey.gd | 3 ++- addons/escoria-ui-return-monkey-island/game.gd | 1 + .../escoria-ui-return-monkey-island/rtmi_cursor_manager.gd | 1 - gymkhana/items/inventory/turno_cocina_frontal.tscn | 5 ++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd b/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd index b9cd4f54..00c033b3 100644 --- a/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd +++ b/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd @@ -270,7 +270,8 @@ func perform_inputevent_on_object( # player walking towards the destination. if current_action and not event_to_queue: # MODIFIED FOR RETURN TO MONKEY UI - # clear_current_action() + if action_state != ACTION_INPUT_STATE.AWAITING_TARGET_ITEM: + clear_current_action() action_finished.emit() return diff --git a/addons/escoria-ui-return-monkey-island/game.gd b/addons/escoria-ui-return-monkey-island/game.gd index a7ffc2f8..a73bcd2c 100644 --- a/addons/escoria-ui-return-monkey-island/game.gd +++ b/addons/escoria-ui-return-monkey-island/game.gd @@ -245,6 +245,7 @@ func click_on_bg(position: Vector2) -> void: # If we are using an inventory item reset mouse cursor and cancel action if escoria.action_manager.action_state == ESCActionManager.ACTION_INPUT_STATE.AWAITING_TARGET_ITEM: gymkhana.cursor_manager.clear_cursor() + escoria.action_manager.clear_current_tool() if escoria.main.current_scene.player: diff --git a/addons/escoria-ui-return-monkey-island/rtmi_cursor_manager.gd b/addons/escoria-ui-return-monkey-island/rtmi_cursor_manager.gd index 2b590e83..bfae6950 100644 --- a/addons/escoria-ui-return-monkey-island/rtmi_cursor_manager.gd +++ b/addons/escoria-ui-return-monkey-island/rtmi_cursor_manager.gd @@ -5,4 +5,3 @@ func set_cursor(texture: Texture) -> void: func clear_cursor(): Input.set_custom_mouse_cursor(null) - # escoria.action_manager.clear_current_tool() diff --git a/gymkhana/items/inventory/turno_cocina_frontal.tscn b/gymkhana/items/inventory/turno_cocina_frontal.tscn index 64cb2a36..b3210b47 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.tscn +++ b/gymkhana/items/inventory/turno_cocina_frontal.tscn @@ -12,16 +12,15 @@ process_mode = 1 script = ExtResource("1") global_id = "turno_cocina_frontal" esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc" +combine_when_selected_action_is_in = PackedStringArray("action4") inventory_texture = ExtResource("2") -dialog_color = Color(1, 1, 1, 1) +inventory_texture_hovered = ExtResource("2") custom_data = { "tooltips": { "action3": "tooltip_frontal_action3", "action4": "tooltip_frontal_action4" } } -combine_when_selected_action_is_in = ["action4"] -animations = null [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(-2, 0)