From e8aa0bbbb945f56304dd97c42d9b010375ccb1cb Mon Sep 17 00:00:00 2001 From: Dustin Date: Sat, 22 Mar 2025 21:18:14 -0700 Subject: [PATCH] Change state export variable names. --- .../{state_modifier.gd => DEPR_state_modifier.gd} | 0 ...erties.gd => DEPR_state_modifier_properties.gd} | 2 +- lib/classes/movement_state_receiver.gd | 8 ++++---- lib/classes/state_animated_actor.gd | 11 +++++++---- lib/classes/state_machine.gd | 3 ++- project.godot | 14 +++++++------- src/actors/players/playerE/PlayerE.tscn | 8 ++++---- .../players/playerE/states/attack_shoot.tres | 8 ++++---- .../players/playerE/states/attack_sword.tres | 8 ++++---- src/actors/players/playerE/states/fall.tres | 8 ++++---- src/actors/players/playerE/states/idle.tres | 8 ++++---- src/actors/players/playerE/states/jump.tres | 8 ++++---- src/actors/players/playerE/states/land.tres | 8 ++++---- src/actors/players/playerE/states/roll.tres | 8 ++++---- 14 files changed, 53 insertions(+), 49 deletions(-) rename lib/classes/{state_modifier.gd => DEPR_state_modifier.gd} (100%) rename lib/classes/{state_modifier_properties.gd => DEPR_state_modifier_properties.gd} (96%) diff --git a/lib/classes/state_modifier.gd b/lib/classes/DEPR_state_modifier.gd similarity index 100% rename from lib/classes/state_modifier.gd rename to lib/classes/DEPR_state_modifier.gd diff --git a/lib/classes/state_modifier_properties.gd b/lib/classes/DEPR_state_modifier_properties.gd similarity index 96% rename from lib/classes/state_modifier_properties.gd rename to lib/classes/DEPR_state_modifier_properties.gd index f90385b..28f131c 100644 --- a/lib/classes/state_modifier_properties.gd +++ b/lib/classes/DEPR_state_modifier_properties.gd @@ -1,4 +1,4 @@ -class_name ModifierProperties +class_name DEPR_ModifierProperties extends Reference var modifier_type: int = 0 diff --git a/lib/classes/movement_state_receiver.gd b/lib/classes/movement_state_receiver.gd index 97a7a68..2426fd2 100644 --- a/lib/classes/movement_state_receiver.gd +++ b/lib/classes/movement_state_receiver.gd @@ -134,10 +134,10 @@ func _on_state_change(old_state_name:String, new_state :State): func move_actor_as_desired( x_move_direction_override: float = 0): var delta:float = physics_delta - var _move_speed = current_state.move_speed - var _move_speed_modifier = current_state.move_speed_modifier - var _move_modifier_move_acceleration = current_state.move_modifier_move_acceleration - var _move_acceleration = current_state.move_acceleration + var _move_speed = current_state.horizontal_speed + var _move_acceleration = current_state.horizontal_acceleration + var _move_speed_modifier = current_state.horizontal_speed_offset + var _move_modifier_move_acceleration = current_state.horizontal_speed_offset_acceleration var _jerk_factor = current_state.jerk_factor var _gravity = current_state.gravity diff --git a/lib/classes/state_animated_actor.gd b/lib/classes/state_animated_actor.gd index 6961f71..f073f0e 100644 --- a/lib/classes/state_animated_actor.gd +++ b/lib/classes/state_animated_actor.gd @@ -10,10 +10,13 @@ extends State ## @WIP # Movement Speed in Pixels Per Second -export var move_speed: float = 60 -export var move_acceleration: float = 0 -export var move_speed_modifier: float = 0 -export var move_modifier_move_acceleration: float = 0 +# The b +export var horizontal_speed: float = 60 +export var horizontal_acceleration: float = 0 +## Movement Speed Offsets (Positive or Negative) +export var horizontal_speed_offset: float = 0 +## Applies only if offset applies +export var horizontal_speed_offset_acceleration: float = 0 export var jerk_factor: float = 0 var gravity: int = ProjectSettings.get_setting("physics/2d/default_gravity") diff --git a/lib/classes/state_machine.gd b/lib/classes/state_machine.gd index cf01644..e9ab48d 100644 --- a/lib/classes/state_machine.gd +++ b/lib/classes/state_machine.gd @@ -11,7 +11,8 @@ signal state_changed(old_state_name, new_state) var current_state: State -#var state_modifiers: Array +var state_modifiers: Array + export var starting_state_name = 'default' export(Array,Resource) var states var states_index :Dictionary diff --git a/project.godot b/project.godot index 7c852c0..a4baa00 100644 --- a/project.godot +++ b/project.godot @@ -20,9 +20,14 @@ _global_script_classes=[ { "path": "res://lib/classes/animated_sprite_state_receiver.gd" }, { "base": "Reference", +"class": "DEPR_ModifierProperties", +"language": "GDScript", +"path": "res://lib/classes/DEPR_state_modifier_properties.gd" +}, { +"base": "Reference", "class": "DumbOldStateModifier", "language": "GDScript", -"path": "res://lib/classes/state_modifier.gd" +"path": "res://lib/classes/DEPR_state_modifier.gd" }, { "base": "", "class": "GitAPI", @@ -54,11 +59,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://src/classes/Level.gd" }, { -"base": "Reference", -"class": "ModifierProperties", -"language": "GDScript", -"path": "res://lib/classes/state_modifier_properties.gd" -}, { "base": "Node2D", "class": "Modifier_Receiver", "language": "GDScript", @@ -97,6 +97,7 @@ _global_script_classes=[ { _global_script_class_icons={ "Actor": "", "AnimatedSprite_StateReceiver": "", +"DEPR_ModifierProperties": "", "DumbOldStateModifier": "", "GitAPI": "", "HealthComponent": "", @@ -104,7 +105,6 @@ _global_script_class_icons={ "Interactable": "", "Interactable_Receiver": "", "Level": "", -"ModifierProperties": "", "Modifier_Receiver": "", "MovementComponent": "", "Movement_StateReceiver": "", diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn index 2b1f7f9..dd8ae42 100644 --- a/src/actors/players/playerE/PlayerE.tscn +++ b/src/actors/players/playerE/PlayerE.tscn @@ -20,10 +20,10 @@ script = ExtResource( 7 ) debug_state = false timeout_seconds = 0.0 name = "move" -move_speed = 90.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 90.0 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "run" ] diff --git a/src/actors/players/playerE/states/attack_shoot.tres b/src/actors/players/playerE/states/attack_shoot.tres index b0c1c27..5be0974 100644 --- a/src/actors/players/playerE/states/attack_shoot.tres +++ b/src/actors/players/playerE/states/attack_shoot.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "attack_shoot" -move_speed = 1.36422e-12 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 1.36422e-12 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "attack-shoot" ] diff --git a/src/actors/players/playerE/states/attack_sword.tres b/src/actors/players/playerE/states/attack_sword.tres index 6f6e2e0..76ff91c 100644 --- a/src/actors/players/playerE/states/attack_sword.tres +++ b/src/actors/players/playerE/states/attack_sword.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "attack_sword" -move_speed = 1.36422e-12 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 1.36422e-12 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "attack-sword" ] diff --git a/src/actors/players/playerE/states/fall.tres b/src/actors/players/playerE/states/fall.tres index 8b5b066..a4cabd1 100644 --- a/src/actors/players/playerE/states/fall.tres +++ b/src/actors/players/playerE/states/fall.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "fall" -move_speed = 90.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 90.0 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "jump" ] diff --git a/src/actors/players/playerE/states/idle.tres b/src/actors/players/playerE/states/idle.tres index 58e0461..e9e77fe 100644 --- a/src/actors/players/playerE/states/idle.tres +++ b/src/actors/players/playerE/states/idle.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "idle" -move_speed = 1.36422e-12 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 1.36422e-12 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "idle" ] diff --git a/src/actors/players/playerE/states/jump.tres b/src/actors/players/playerE/states/jump.tres index a6808a7..d1aca41 100644 --- a/src/actors/players/playerE/states/jump.tres +++ b/src/actors/players/playerE/states/jump.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "jump" -move_speed = 90.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 90.0 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "jump" ] diff --git a/src/actors/players/playerE/states/land.tres b/src/actors/players/playerE/states/land.tres index d38791c..d1b496d 100644 --- a/src/actors/players/playerE/states/land.tres +++ b/src/actors/players/playerE/states/land.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "land" -move_speed = 30.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 20.0 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "land" ] diff --git a/src/actors/players/playerE/states/roll.tres b/src/actors/players/playerE/states/roll.tres index 0554438..439cc15 100644 --- a/src/actors/players/playerE/states/roll.tres +++ b/src/actors/players/playerE/states/roll.tres @@ -9,9 +9,9 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "roll" -move_speed = 150.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 +horizontal_speed = 60.0 +horizontal_acceleration = 0.0 +horizontal_speed_offset = 0.0 +horizontal_speed_offset_acceleration = 0.0 jerk_factor = 0.0 animation_sequence = [ "roll" ]