From e9740407bb3a426fcd901d57272fc3b464d4d7c1 Mon Sep 17 00:00:00 2001 From: vanx <61917534+Vaaankas@users.noreply.github.com> Date: Tue, 30 Dec 2025 17:00:31 +0300 Subject: [PATCH] Revert "[Add] Inertia 1.0 (#979)" (#988) This reverts commit 8ccefa558da8c3fde7cd5e8c98ede4f0438c5428. Co-authored-by: vanx --- .../Components/MovementSpeedModifierComponent.cs | 2 +- .../Movement/Systems/SharedMoverController.cs | 11 ----------- .../Prototypes/Entities/Mobs/Player/observer.yml | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 83f3b32953..88067f54aa 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -19,7 +19,7 @@ namespace Content.Shared.Movement.Components public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; - public const float DefaultAcceleration = 50f; // White Dream inertia; 20f -> 50f + public const float DefaultAcceleration = 20f; public const float DefaultFriction = 20f; public const float DefaultFrictionNoInput = 20f; diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 94f0645df5..9024f14865 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -383,17 +383,6 @@ public abstract partial class SharedMoverController : VirtualController return; var accelSpeed = accel * frameTime * wishSpeed; - - // White Dream edit start; Inertia/Gradual Acceleration - var progress = MathF.Max(0, currentSpeed) / wishSpeed; - - accelSpeed *= progress; - - var minAcceleration = MathF.Max(0.5f, 0.1f * wishSpeed); - - accelSpeed = MathF.Max(accelSpeed, accel * frameTime * minAcceleration); - // White Dream edit end - accelSpeed = MathF.Min(accelSpeed, addSpeed); currentVelocity += wishDir * accelSpeed; diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index e7fe81db19..c7ed53bd44 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -13,7 +13,6 @@ - type: MovementSpeedModifier baseSprintSpeed: 12 baseWalkSpeed: 8 - acceleration: 100 # White Dream - type: MovementIgnoreGravity - type: Physics bodyType: KinematicController