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

fix: apply changes to esc_action_manager.gd from escoria-demo-game

Browse Source
This commit is contained in:
Eneko Nieto
2025-08-04 12:12:42 +02:00
parent 97a57d5f3f
commit b57f56eb9f
1 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd
View File

@@ -220,8 +220,10 @@ func perform_inputevent_on_object(
# MODIFIED FOR RETURN TO MONKEY UI # MODIFIED FOR RETURN TO MONKEY UI
var need_combine = _check_item_needs_combine_obj(obj) var need_combine = _check_item_needs_combine_obj(obj)
# If the current tool was not set, this is our first item, make it the tool # If the clicked item is not in the inventory and the current tool was not set,
if not current_tool or (current_tool and not need_combine): # then this is our first item, make it the tool.
if (not escoria.inventory_manager.inventory_has(obj.global_id) and not current_tool) \
or (current_tool and not need_combine):
current_tool = obj current_tool = obj
# Else, if we have a tool and combination required, this is our second item, # Else, if we have a tool and combination required, this is our second item,
# make it the target. # make it the target.
@@ -234,47 +236,41 @@ func perform_inputevent_on_object(
elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and \ elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and \
not need_combine: not need_combine:
set_action_input_state(ACTION_INPUT_STATE.COMPLETED) set_action_input_state(ACTION_INPUT_STATE.COMPLETED)
elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and need_combine and not tool_just_set: elif action_state == ACTION_INPUT_STATE.AWAITING_ITEM and \
need_combine and not tool_just_set:
set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM) set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM)
var event_to_queue: ESCGrammarStmts.Event = null var event_to_queue: ESCGrammarStmts.Event = null
# Manage exits
# Manage exits first, actions last
# If the clicked object is an exit and current action is "walk"/unset, we need to run the exit scene action.
if obj.node.is_exit and current_action in ["", ACTION_WALK]: if obj.node.is_exit and current_action in ["", ACTION_WALK]:
event_to_queue = _get_event_to_queue(ACTION_EXIT_SCENE, obj) event_to_queue = _get_event_to_queue(ACTION_EXIT_SCENE, obj)
else: # If the clicked object is not an exit, we check if the current action is "walk"/unset
# Manage movements towards object before activating it # If so, and if the object is not in the inventory, we need to run the arrived action.
if current_action in ["", ACTION_WALK] and \ elif current_action in ["", ACTION_WALK] and not escoria.inventory_manager.inventory_has(obj.global_id):
not escoria.inventory_manager.inventory_has(obj.global_id):
event_to_queue = _get_event_to_queue(ACTION_ARRIVED, obj) event_to_queue = _get_event_to_queue(ACTION_ARRIVED, obj)
# Manage action on object # If the current action is set and different from "walk"/unset, we need to check for combinations.
elif not current_action in ["", ACTION_WALK]: elif not current_action in ["", ACTION_WALK]:
# If clicked object needs a combination, and current target is set, then perform the combination.
if need_combine and current_target: if need_combine and current_target:
event_to_queue = _get_event_to_queue( event_to_queue = _get_event_to_queue(current_action, current_tool, current_target)
current_action, # If clicked object needs a combination but can only be used from inventory, then we need to wait
current_tool, # for the target.
current_target elif obj.node.use_from_inventory_only \
) and escoria.inventory_manager.inventory_has(obj.global_id) \
else: and need_combine:
# Check if object must be in inventory to be used and update
# action state if necessary
if obj.node.use_from_inventory_only and \
escoria.inventory_manager.inventory_has(obj.global_id) and \
need_combine:
# We're missing a target here for our tool to be used on
current_tool = obj current_tool = obj
set_action_input_state( set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM)
ACTION_INPUT_STATE.AWAITING_TARGET_ITEM
)
# We need to wait for that target
return return
# If clicked object needs a combination and doesn't require to be in inventory,
# then we need to wait for the target.
elif need_combine:
set_action_input_state(ACTION_INPUT_STATE.AWAITING_TARGET_ITEM)
# If clicked object doesn't need a combination, then we simply run the action.
else: else:
event_to_queue = _get_event_to_queue( event_to_queue = _get_event_to_queue(current_action, obj)
current_action,
obj
)
# Get out of here if there's a specified action but an event couldn't be found. # Get out of here if there's a specified action but an event couldn't be found.
# Note that `event_to_queue` may still be null, but we do need to start the # Note that `event_to_queue` may still be null, but we do need to start the
@@ -293,7 +289,7 @@ func perform_inputevent_on_object(
# If clicked object not in inventory, player walks towards it # If clicked object not in inventory, player walks towards it
if not obj.node is ESCPlayer and \ if not obj.node is ESCPlayer and \
not escoria.inventory_manager.inventory_has(obj.global_id) and \ not escoria.inventory_manager.inventory_has(obj.global_id) and \
not event_flags & ESCEvent.FLAG_TK: not _telekinetic_applies_to(event_to_queue):
var context = await _walk_towards_object( var context = await _walk_towards_object(
obj, obj,
event.position, event.position,
@@ -347,7 +343,7 @@ func _set_tool_and_action(obj: ESCObject, default_action: bool):
# Check if current_action and current_tool are already set # Check if current_action and current_tool are already set
if current_action and current_tool: if current_action and current_tool:
# MODIFIED FOR RETURN TO MONKEY UI # MODIFIED FOR RETURN TO MONKEY UI
if (not current_action in escoria.action_manager\ if (not current_action in escoria.action_manager \
.current_tool.node.combine_when_selected_action_is_in and not current_action in obj.node.target_when_selected_action_is_in): .current_tool.node.combine_when_selected_action_is_in and not current_action in obj.node.target_when_selected_action_is_in):
current_tool = obj current_tool = obj
tool_just_set = true tool_just_set = true