From e7f08fd351384faf42dd8d4b62d50a75bc2a7231 Mon Sep 17 00:00:00 2001 From: Dustin Date: Sun, 25 May 2025 19:17:14 -0700 Subject: [PATCH] Busted impulse. --- lib/classes/state_animated_actor.gd | 4 ++-- src/actors/players/playerE/states/fall.tres | 6 +++--- src/actors/players/playerE/states/idle.tres | 2 +- src/actors/players/playerE/states/jump.tres | 2 +- src/actors/players/playerE/states/move.tres | 2 +- src/classes/velocity_controller.gd | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/classes/state_animated_actor.gd b/lib/classes/state_animated_actor.gd index dc29f53..2430766 100644 --- a/lib/classes/state_animated_actor.gd +++ b/lib/classes/state_animated_actor.gd @@ -10,8 +10,8 @@ extends State const RELATIVE_DIRECTION = 0 # Movement Speed in Pixels Per Second -export(Vector2) var speed_start -export(Vector2) var speed_end = Vector2(0,1000) +export(Vector2) var speed_start = Vector2(0,0) +export(Vector2) var speed_end = Vector2(0,1000) ## Terminal velocity export(Vector2) var min_acceleration = Vector2(0,0) export(Vector2) var acceleration = Vector2(0,280) export(Vector2) var max_acceleration = Vector2(0,0) diff --git a/src/actors/players/playerE/states/fall.tres b/src/actors/players/playerE/states/fall.tres index 011692d..c2b0c71 100644 --- a/src/actors/players/playerE/states/fall.tres +++ b/src/actors/players/playerE/states/fall.tres @@ -9,10 +9,10 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "fall" -speed_start = Vector2( 90, 1.36422e-12 ) -speed_end = Vector2( 90, 1000 ) +speed_start = Vector2( 60, 1.36422e-12 ) +speed_end = Vector2( 60, 1000 ) min_acceleration = Vector2( 0, 0 ) -acceleration = Vector2( 0, 280 ) +acceleration = Vector2( 1.36422e-12, 480 ) max_acceleration = Vector2( 0, 0 ) jerk_factor = Vector2( 1, 1 ) horizontal_speed = 90.0 diff --git a/src/actors/players/playerE/states/idle.tres b/src/actors/players/playerE/states/idle.tres index 468e1ad..84cb302 100644 --- a/src/actors/players/playerE/states/idle.tres +++ b/src/actors/players/playerE/states/idle.tres @@ -9,7 +9,7 @@ script = ExtResource( 1 ) debug_state = false timeout_seconds = 0.0 name = "idle" -speed_start = Vector2( 0, 0 ) +speed_start = Vector2( 1.36422e-12, 1.36422e-12 ) speed_end = Vector2( 0, 1000 ) min_acceleration = Vector2( 0, 0 ) acceleration = Vector2( 0, 280 ) diff --git a/src/actors/players/playerE/states/jump.tres b/src/actors/players/playerE/states/jump.tres index 4b0df5c..a824d03 100644 --- a/src/actors/players/playerE/states/jump.tres +++ b/src/actors/players/playerE/states/jump.tres @@ -12,7 +12,7 @@ name = "jump" speed_start = Vector2( 90, 200 ) speed_end = Vector2( 90, -8 ) min_acceleration = Vector2( 0, 0 ) -acceleration = Vector2( 0, 280 ) +acceleration = Vector2( 1.36422e-12, 320 ) max_acceleration = Vector2( 0, 0 ) jerk_factor = Vector2( 1, 1 ) horizontal_speed = 90.0 diff --git a/src/actors/players/playerE/states/move.tres b/src/actors/players/playerE/states/move.tres index d18d8fd..9993bb6 100644 --- a/src/actors/players/playerE/states/move.tres +++ b/src/actors/players/playerE/states/move.tres @@ -12,7 +12,7 @@ name = "move" speed_start = Vector2( 10, 1.36422e-12 ) speed_end = Vector2( 90, 1000 ) min_acceleration = Vector2( 0, 0 ) -acceleration = Vector2( 70, 280 ) +acceleration = Vector2( 1000, 280 ) max_acceleration = Vector2( 0, 0 ) jerk_factor = Vector2( 1, 1 ) horizontal_speed = 10.0 diff --git a/src/classes/velocity_controller.gd b/src/classes/velocity_controller.gd index e0c8640..39a6e01 100644 --- a/src/classes/velocity_controller.gd +++ b/src/classes/velocity_controller.gd @@ -283,10 +283,10 @@ func resolve_inertia(range_placement :int, elif inertia != 0.0 and delta_acceleration != 0.0: ## We still have inertia but no difference in movement var clamped_speed = speed_range.x if speed_range.x < speed_range.y: - clamped_speed.x = clamp(speed_range.x,0.0,speed_range.y) + clamped_speed = clamp(speed_range.x,0.0,speed_range.y) ## Move back towards the base speed - inertia = move_toward(inertia, clamped_speed.x, delta_acceleration) + inertia = move_toward(inertia, clamped_speed, delta_acceleration) else: ## inertia is just base speed