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

fix: adds proper player selectable checking in click events; also properly orders hover_stack in ascending z_index order

Browse Source
This commit is contained in:
Duncan Brown
2022-09-08 17:26:55 -04:00
parent 169a5b501a
commit 7201f02304
3 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/escoria-core/game/core-scripts/esc/commands/say.gd
View File

@@ -105,12 +105,12 @@ func run(command_params: Array) -> int:
# Replace the names of any globals in "{ }" with their value
command_params[1] = escoria.globals_manager.replace_globals(command_params[1])
var player_character_global_id = escoria.main.current_scene.player.global_id \
var speaking_character_global_id = escoria.main.current_scene.player.global_id \
if command_params[0].to_upper() == CURRENT_PLAYER_KEYWORD \
else command_params[0]
escoria.dialog_player.say(
player_character_global_id,
speaking_character_global_id,
command_params[2],
command_params[1]
)

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

@@ -331,7 +331,7 @@ func _get_event_to_queue(
else:
escoria.logger.warn(
self,
"Invalid action on item" +
"Invalid action on item: " +
"Trying to run action %s on object %s, " %
[
action,