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

Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

Browse Source
This commit is contained in:
Oier Bravo
2023-08-28 16:44:47 +02:00
parent c4e732701f 7900f2a464
commit 5949f0713b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ func perform_inputevent_on_object(
# (because object is inactive for example) # (because object is inactive for example)
var dont_interact = false var dont_interact = false
# We need to have the new action input state BEFORE initiating the player # We need to have the new action input state BEFORE initiating the player
# move so we determine now if the object clicked will require a combination # move so we determine now if the object clicked will require a combination
# depending on the used action verb. # depending on the used action verb.
var tool_just_set = _set_tool_and_action(obj, default_action) var tool_just_set = _set_tool_and_action(obj, default_action)
@@ -175,7 +175,7 @@ func perform_inputevent_on_object(
# If the current tool was not set, this is our first item, make it the tool # If the current tool was not set, this is our first item, make it the tool
if not current_tool or (current_tool and not need_combine): if 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.
elif need_combine and not tool_just_set: elif need_combine and not tool_just_set:
current_target = obj current_target = obj
@@ -237,7 +237,7 @@ func perform_inputevent_on_object(
var destination_position: Vector2 = escoria.main.current_scene.player \ var destination_position: Vector2 = escoria.main.current_scene.player \
.global_position .global_position
# 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 event_flags & ESCEvent.FLAG_TK: