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

feat: Add walk fast flag to walk_pos commands to make them consistent with the walk commands

Browse Source
This commit is contained in:
Balloonpopper
2022-03-10 23:47:13 +11:00
committed by Julian Murgia
parent 29d0f6d6a9
commit 1b4f3dccfe
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addons/escoria-core/game/core-scripts/esc/commands/walk_to_pos.gd
View File

@@ -1,14 +1,16 @@
# `walk_to_pos object x y` # `walk_to_pos object x y [walk_fast]`
# #
# Moves the specified `ESCPlayer` or movable `ESCItem` to the absolute # Moves the specified `ESCPlayer` or movable `ESCItem` to the absolute
# coordinates provided while playing the `object`'s walking animation. # coordinates provided while playing the `object`'s walking animation.
# This command is non-blocking. # This command is non-blocking.
# This command will use the normal walk speed by default.
# #
# **Parameters** # **Parameters**
# #
# - *object*: Global ID of the object to move # - *object*: Global ID of the object to move
# - *x*: X-coordinate of target position # - *x*: X-coordinate of target position
# - *y*: Y-coordinate of target position # - *y*: Y-coordinate of target position
# - *walk_fast*: Whether to walk fast (`true`) or normal speed (`false`).
# #
# @ESC # @ESC
extends ESCBaseCommand extends ESCBaseCommand
@@ -19,8 +21,8 @@ class_name WalkToPosCommand
func configure() -> ESCCommandArgumentDescriptor: func configure() -> ESCCommandArgumentDescriptor:
return ESCCommandArgumentDescriptor.new( return ESCCommandArgumentDescriptor.new(
3, 3,
[TYPE_STRING, TYPE_INT, TYPE_INT], [TYPE_STRING, TYPE_INT, TYPE_INT, TYPE_BOOL],
[null, null, null] [null, null, null, false]
) )
@@ -41,6 +43,6 @@ func validate(arguments: Array):
func run(command_params: Array) -> int: func run(command_params: Array) -> int:
escoria.action_manager.do(escoria.action_manager.ACTION.BACKGROUND_CLICK, [ escoria.action_manager.do(escoria.action_manager.ACTION.BACKGROUND_CLICK, [
command_params[0], command_params[0],
Vector2(command_params[1], command_params[2]) Vector2(command_params[1], command_params[2]), command_params[3]
]) ])
return ESCExecution.RC_OK return ESCExecution.RC_OK

10
addons/escoria-core/game/core-scripts/esc/commands/walk_to_pos_block.gd
View File

@@ -1,14 +1,16 @@
# `walk_to_pos_block object x y` # `walk_to_pos_block object x y [walk_fast]`
# #
# Moves the specified `ESCPlayer` or movable `ESCItem` to the absolute # Moves the specified `ESCPlayer` or movable `ESCItem` to the absolute
# coordinates provided while playing the `object`'s walking animation. # coordinates provided while playing the `object`'s walking animation.
# This command is blocking. # This command is blocking.
# This command will use the normal walk speed by default.
# #
# **Parameters** # **Parameters**
# #
# - *object*: Global ID of the object to move # - *object*: Global ID of the object to move
# - *x*: X-coordinate of target position # - *x*: X-coordinate of target position
# - *y*: Y-coordinate of target position # - *y*: Y-coordinate of target position
# - *walk_fast*: Whether to walk fast (`true`) or normal speed (`false`).
# #
# @ESC # @ESC
extends ESCBaseCommand extends ESCBaseCommand
@@ -19,8 +21,8 @@ class_name WalkToPosBlockCommand
func configure() -> ESCCommandArgumentDescriptor: func configure() -> ESCCommandArgumentDescriptor:
return ESCCommandArgumentDescriptor.new( return ESCCommandArgumentDescriptor.new(
3, 3,
[TYPE_STRING, TYPE_INT, TYPE_INT], [TYPE_STRING, TYPE_INT, TYPE_INT, TYPE_BOOL],
[null, null, null] [null, null, null, false]
) )
@@ -41,7 +43,7 @@ func validate(arguments: Array):
func run(command_params: Array) -> int: func run(command_params: Array) -> int:
escoria.action_manager.do(escoria.action_manager.ACTION.BACKGROUND_CLICK, [ escoria.action_manager.do(escoria.action_manager.ACTION.BACKGROUND_CLICK, [
command_params[0], command_params[0],
Vector2(command_params[1], command_params[2]) Vector2(command_params[1], command_params[2]), command_params[3]
]) ])
yield( yield(
(escoria.object_manager.objects[command_params[0]].node as ESCItem), (escoria.object_manager.objects[command_params[0]].node as ESCItem),