diff --git a/CHANGELOG.md b/CHANGELOG.md index 95013cc7..f71afb04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [4.0.0-alpha.130](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.130) (2022-03-10) + + + ## [4.0.0-alpha.129](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.129) (2022-03-10) diff --git a/addons/escoria-core/game/core-scripts/esc/commands/accept_input.gd b/addons/escoria-core/game/core-scripts/esc/commands/accept_input.gd index 7ad12d19..2b056131 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/accept_input.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/accept_input.gd @@ -13,7 +13,7 @@ # # **Warning**: `SKIP` and `NONE` also disable autosaves. # -# **Warning**: The type of user input accepted will persist even after the +# **Warning**: The type of user input accepted will persist even after the # current event has ended. Remember to reset the input type at the end of # cut-scenes! # diff --git a/addons/escoria-core/game/core-scripts/esc/commands/anim.gd b/addons/escoria-core/game/core-scripts/esc/commands/anim.gd index e125fd4b..08ce6c3d 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/anim.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/anim.gd @@ -1,7 +1,7 @@ # `anim object name [reverse]` # # Executes the animation specified in "name" on "object" without blocking. -# The next command in the event will be executed immediately after the +# The next command in the event will be executed immediately after the # animation is started. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/anim_block.gd b/addons/escoria-core/game/core-scripts/esc/commands/anim_block.gd index 7d7e9c49..0a4df639 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/anim_block.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/anim_block.gd @@ -1,8 +1,8 @@ # `anim_block object name [reverse]` # # Executes the animation specified in "name" on "object" while blocking other -# events from starting. -# The next command in the event will be executed when the animation is +# events from starting. +# The next command in the event will be executed when the animation is # finished playing. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/camera_push.gd b/addons/escoria-core/game/core-scripts/esc/commands/camera_push.gd index 9fdd7c22..79f81f06 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/camera_push.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/camera_push.gd @@ -1,8 +1,8 @@ # `camera_push target [time] [type]` # -# Pushes (moves) the camera so it points at a specific `target`. If the camera +# Pushes (moves) the camera so it points at a specific `target`. If the camera # was following a target (like the player) previously, it will no longer follow -# this target. +# this target. # # **Parameters** # diff --git a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_limits.gd b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_limits.gd index 8cdf2105..e211cd0f 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_limits.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_limits.gd @@ -1,6 +1,6 @@ # `camera_set_limits camlimits_id` # -# Limits the current camera's movement to a limit defined in the `ESCRoom`'s +# Limits the current camera's movement to a limit defined in the `ESCRoom`'s # definition. A limit is defined as an upper-left (x, y) coordinate, a width # and a height that the camera must stay within. Multiple limits can be # defined for a room, allowing for new areas to be seen once they have diff --git a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_target.gd b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_target.gd index 5a335d01..6c97203c 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_target.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_target.gd @@ -6,7 +6,7 @@ # # **Parameters** # -# - *time*: Number of seconds the transition should take to move the camera +# - *time*: Number of seconds the transition should take to move the camera # to follow `object` # - *object*: Global ID of the target object # diff --git a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_zoom.gd b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_zoom.gd index 82fa8785..285a65e9 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/camera_set_zoom.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/camera_set_zoom.gd @@ -1,8 +1,8 @@ # `camera_set_zoom magnitude [time]` # # Zooms the camera in/out to the desired `magnitude`. Values larger than '1' zoom -# the camera out while smaller values zoom in. These values are relative to the -# default zoom value of '1', not the current value. As such, while using a value +# the camera out while smaller values zoom in. These values are relative to the +# default zoom value of '1', not the current value. As such, while using a value # of '0.5' would double the size of the graphics, running the same command again # would result in no change. The zoom will happen over the given time period. # diff --git a/addons/escoria-core/game/core-scripts/esc/commands/camera_shift.gd b/addons/escoria-core/game/core-scripts/esc/commands/camera_shift.gd index 1509d6cf..db979989 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/camera_shift.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/camera_shift.gd @@ -1,6 +1,6 @@ # `camera_shift x y [time] [type]` # -# Shifts the camera by the given horizontal and vertical amounts relative to the +# Shifts the camera by the given horizontal and vertical amounts relative to the # current location. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/change_scene.gd b/addons/escoria-core/game/core-scripts/esc/commands/change_scene.gd index 87218955..4ccc47e6 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/change_scene.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/change_scene.gd @@ -1,7 +1,7 @@ # `change_scene path [enable_automatic_transition] [run_events]` # # Switches the game from the current scene to another scene. Use this to move -# the player to a new room when they walk through an unlocked door, for +# the player to a new room when they walk through an unlocked door, for # example. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/custom.gd b/addons/escoria-core/game/core-scripts/esc/commands/custom.gd index a1aa00e9..288c2a63 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/custom.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/custom.gd @@ -1,6 +1,6 @@ # `custom object node func_name [params]` # -# +# # Executes the specified Godot function. This function must be in a script # attached to a child node of a registered `ESCitem`. # diff --git a/addons/escoria-core/game/core-scripts/esc/commands/enable_terrain.gd b/addons/escoria-core/game/core-scripts/esc/commands/enable_terrain.gd index 47f0bf60..d43c2523 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/enable_terrain.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/enable_terrain.gd @@ -1,7 +1,7 @@ # `enable_terrain node_name` # -# Enables the `ESCTerrain`'s `NavigationPolygonInstance` specified by the given -# node name. It will also disable the previously-activated +# Enables the `ESCTerrain`'s `NavigationPolygonInstance` specified by the given +# node name. It will also disable the previously-activated # `NavigationPolygonInstance`. # Use this to change where the player can walk, allowing them to walk into the # next room once a door has been opened, for example. diff --git a/addons/escoria-core/game/core-scripts/esc/commands/hide_menu.gd b/addons/escoria-core/game/core-scripts/esc/commands/hide_menu.gd index 7a1662cf..792ed0b1 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/hide_menu.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/hide_menu.gd @@ -2,13 +2,13 @@ # # Hides either the main menu or the pause menu. The enable_automatic_transition # parameter can be used to specify if Escoria manages the graphical transition -# for you or not. +# for you or not. # Setting `enable_automatic_transition` to false allows you to manage the -# transition effect for your room as it transitions in and out. Place a -# `transition` command in the room's `setup` event to manage the look of the +# transition effect for your room as it transitions in and out. Place a +# `transition` command in the room's `setup` event to manage the look of the # transition in, and in the room's `exit_scene` event to manage the look of the # transition out. -# +# # **Parameters** # # - *menu_type*: Which menu to hide. Can be either `main` or `pause` (default: `main`) diff --git a/addons/escoria-core/game/core-scripts/esc/commands/inventory_add.gd b/addons/escoria-core/game/core-scripts/esc/commands/inventory_add.gd index a385eb50..070a7504 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/inventory_add.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/inventory_add.gd @@ -1,7 +1,7 @@ # `inventory_add item` # # Adds an item to the inventory. If the player is picking up an object, you may -# want to use this command in conjunction with the `set_active` command so that +# want to use this command in conjunction with the `set_active` command so that # the object 'disappears' from the scene as it's added to the inventory. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd b/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd index 7bc40486..c589fa08 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd @@ -1,9 +1,9 @@ # `show_menu menu_type [enable_automatic_transition]` # # Shows either the main menu or the pause menu. The enable_automatic_transition -# parameter can be used to specify if Escoria manages the graphical transition to -# the menu or not. If set to false, you can manage the transition yourself -# instead (if you want to change the transition type from the default for +# parameter can be used to specify if Escoria manages the graphical transition to +# the menu or not. If set to false, you can manage the transition yourself +# instead (if you want to change the transition type from the default for # example) using the `transition` command. # # **Parameters** diff --git a/addons/escoria-core/game/core-scripts/esc/commands/slide.gd b/addons/escoria-core/game/core-scripts/esc/commands/slide.gd index 54e9f1e9..f5d262fa 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/slide.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/slide.gd @@ -5,7 +5,7 @@ # # - *object*: Global ID of the object to move # - *target*: Global ID of the target object -# - *speed*: The speed at which to slide in pixels per second (will default to +# - *speed*: The speed at which to slide in pixels per second (will default to # the speed configured on the `object`) # # **Warning** This command does not respect the room's navigation polygons, so @@ -56,9 +56,9 @@ func validate(arguments: Array): # # - *source*: The item to slide # - *destination*: The destination item to slide to -# - *speed*: The speed at which to slide in pixels per second (will default to +# - *speed*: The speed at which to slide in pixels per second (will default to # the speed configured on the `object`) -# +# # # **Returns** The generated (and started) tween func _slide_object( diff --git a/addons/escoria-core/game/core-scripts/esc/commands/slide_block.gd b/addons/escoria-core/game/core-scripts/esc/commands/slide_block.gd index 5cefcdd6..980675ec 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/slide_block.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/slide_block.gd @@ -5,7 +5,7 @@ # # - *object*: Global ID of the object to move # - *target*: Global ID of the target object -# - *speed*: The speed at which to slide in pixels per second (will default to +# - *speed*: The speed at which to slide in pixels per second (will default to # the speed configured on the `object`) # # **Warning** This command does not respect the room's navigation polygons, so diff --git a/addons/escoria-core/game/core-scripts/esc/commands/teleport.gd b/addons/escoria-core/game/core-scripts/esc/commands/teleport.gd index bbb06f45..57a2b092 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/teleport.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/teleport.gd @@ -5,7 +5,7 @@ # **Parameters** # # - *object*: Global ID of the object to move -# - *target*: Global ID of the object to use as the destination coordinates +# - *target*: Global ID of the object to use as the destination coordinates # for `object` # # @ESC diff --git a/addons/escoria-core/game/core-scripts/esc/commands/turn_to.gd b/addons/escoria-core/game/core-scripts/esc/commands/turn_to.gd index 49095aaa..ce7a06e0 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/turn_to.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/turn_to.gd @@ -3,7 +3,7 @@ # Turns `object` to face another object. # # Unlike movement commands, `turn_to` will not automatically reference an -# `ESCLocation` that is a child of an `ESCItem.` +# `ESCLocation` that is a child of an `ESCItem.` # To turn towards an `ESCLocation` that is a child of an `ESCItem`, give the # `ESCLocation` a `Global ID` and use this value as the `object_to_face` # parameter. diff --git a/addons/escoria-core/game/core-scripts/esc/commands/walk.gd b/addons/escoria-core/game/core-scripts/esc/commands/walk.gd index bc4bc062..a3fd70fa 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/walk.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/walk.gd @@ -1,13 +1,13 @@ # `walk object target [speed]` # -# Moves the specified `ESCPlayer` or movable `ESCItem` to `target` +# Moves the specified `ESCPlayer` or movable `ESCItem` to `target` # while playing the `object`'s walking animation. This command is non-blocking. # # **Parameters** # # - *object*: Global ID of the object to move # - *target*: Global ID of the target object -# - *speed*: The speed the `object` will walk in pixels per second (will +# - *speed*: The speed the `object` will walk in pixels per second (will # default to the speed configured on the `object`) # # @ESC diff --git a/addons/escoria-core/game/core-scripts/esc/commands/walk_block.gd b/addons/escoria-core/game/core-scripts/esc/commands/walk_block.gd index db2eb829..c4338f5c 100644 --- a/addons/escoria-core/game/core-scripts/esc/commands/walk_block.gd +++ b/addons/escoria-core/game/core-scripts/esc/commands/walk_block.gd @@ -7,7 +7,7 @@ # # - *object*: Global ID of the object to move # - *target*: Global ID of the target object -# - *speed*: The speed the `object` will walk in pixels per second (will +# - *speed*: The speed the `object` will walk in pixels per second (will # default to the speed configured on the `object`) # # @ESC