From 6f6cd7fc55cc9267ee91b95950b413db33fbabe8 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sat, 6 Sep 2025 01:09:36 +0200 Subject: [PATCH] Event and target key. --- .../esc/esc_action_manager_monkey.gd | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 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 00c033b3..8a9d5da2 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 @@ -68,25 +68,21 @@ func _get_event_to_queue( do_combine = false if do_combine: -# var target_event = "%s %s" % [ -# action, -# combine_with.global_id -# ] -# var combine_with_event = "%s %s" % [ -# action, -# target.global_id -# ] + var action_name = action + if combine_with.global_id: + action_name += " " + combine_with.global_id + + var combine_name = action + if combine_with.global_id: + combine_name += " " + target.global_id - if _has_event_with_target(target.events, action, combine_with.global_id): - #if target.events.has(target_event): - #event_to_return = target.events[target_event] - event_to_return = target.events[action] - #elif combine_with.events.has(combine_with_event)\ - elif _has_event_with_target(combine_with.events, action, target.global_id)\ + if _has_event_with_target(target.events, action_name, combine_with.global_id): + event_to_return = target.events[action_name] + + elif _has_event_with_target(combine_with.events, combine_name, target.global_id)\ and not combine_with.node.combine_is_one_way: - #event_to_return = combine_with.events[combine_with_event] - event_to_return = combine_with.events[action] + event_to_return = combine_with.events[combine_name] else: # Check to see if there isn't a "fallback" action to # run before we declare this a failure.