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

fix: Corrected variable name (#428)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-02 16:32:46 +01:00
committed by GitHub
parent e39483c0f5
commit d42c973369
9 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd
View File

@@ -53,7 +53,7 @@ func activate(
# If we're using an action which item requires to combine
if target.node is ESCItem\
and action in target.node.combine_if_action_used_among:
and action in target.node.combine_when_selected_action_is_in:
# Check if object must be in inventory to be used
if target.node.use_from_inventory_only:
if escoria.inventory_manager.inventory_has(target.global_id):

4
addons/escoria-core/game/core-scripts/esc_controller.gd
View File

@@ -221,7 +221,7 @@ func _check_item_needs_combine(obj: ESCObject, default_action: bool) -> bool:
if escoria.action_manager.current_action and \
escoria.action_manager.current_tool:
if escoria.action_manager.current_action in escoria.action_manager\
.current_tool.node.combine_if_action_used_among:
.current_tool.node.combine_when_selected_action_is_in:
need_combine = true
else:
escoria.action_manager.current_tool = obj
@@ -233,7 +233,7 @@ func _check_item_needs_combine(obj: ESCObject, default_action: bool) -> bool:
escoria.action_manager.current_action = \
obj.node.default_action
elif escoria.action_manager.current_action in \
obj.node.combine_if_action_used_among:
obj.node.combine_when_selected_action_is_in:
escoria.action_manager.current_tool = obj
return need_combine

2
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -92,7 +92,7 @@ export(String) var default_action_inventory
# If action used by player is in this list, the game will wait for a second
# click on another item to combine objects together (typical
# `USE <X> WITH <Y>`, `GIVE <X> TO <Y>`)
export(PoolStringArray) var combine_if_action_used_among = []
export(PoolStringArray) var combine_when_selected_action_is_in = []
# If true, combination must be done in the way it is written in ESC script
# ie. :use ON_ITEM