From 0380acc353732314702902604109f89fc9cca194 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Tue, 7 Mar 2023 23:41:30 +0100 Subject: [PATCH] RESTORED ORIGINAL addons/escoria-core/game/escoria.gd --- addons/escoria-core/game/escoria.gd | 3 +-- gymkhana/addons/escoria-ui-return-monkey-island/game.gd | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/escoria-core/game/escoria.gd b/addons/escoria-core/game/escoria.gd index 45941eca..0bfa5d45 100644 --- a/addons/escoria-core/game/escoria.gd +++ b/addons/escoria-core/game/escoria.gd @@ -18,8 +18,7 @@ onready var main = $main func _init(): escoria.inventory_manager = ESCInventoryManager.new() - # MODIFIED FOR RETURN TO MONKEY UI - escoria.action_manager = ESCActionManagerMonkey.new() + escoria.action_manager = ESCActionManager.new() escoria.event_manager = ESCEventManager.new() escoria.globals_manager = ESCGlobalsManager.new() add_child(escoria.event_manager) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index 192018a0..54b0984b 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -82,6 +82,9 @@ var _current_mouse_pos = Vector2.ZERO var tooltip2_node: Object func _ready(): + # We need a slightly modified version of Action Manager to combine items with different actions. + escoria.action_manager = ESCActionManagerMonkey.new() + if $tooltip_layer/tooltip.connect("tooltip_size_updated", self, "update_tooltip_following_mouse_position", [tooltip_node]) != 0: escoria.logger.error(self, "Error connecting tooltip_size_updated")