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

RESTORED ORIGINAL addons/escoria-core/game/escoria.gd

Browse Source
This commit is contained in:
Eneko Nieto
2023-03-07 23:41:30 +01:00
parent 50ad55ce14
commit 0380acc353
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/escoria-core/game/escoria.gd
View File

@@ -18,8 +18,7 @@ onready var main = $main
func _init(): func _init():
escoria.inventory_manager = ESCInventoryManager.new() escoria.inventory_manager = ESCInventoryManager.new()
# MODIFIED FOR RETURN TO MONKEY UI escoria.action_manager = ESCActionManager.new()
escoria.action_manager = ESCActionManagerMonkey.new()
escoria.event_manager = ESCEventManager.new() escoria.event_manager = ESCEventManager.new()
escoria.globals_manager = ESCGlobalsManager.new() escoria.globals_manager = ESCGlobalsManager.new()
add_child(escoria.event_manager) add_child(escoria.event_manager)

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

@@ -82,6 +82,9 @@ var _current_mouse_pos = Vector2.ZERO
var tooltip2_node: Object var tooltip2_node: Object
func _ready(): 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: 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") escoria.logger.error(self, "Error connecting tooltip_size_updated")