From 7ab45173e6bc51654d2c962434a4263a06eb28be Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:12:58 +0300 Subject: [PATCH 1/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index a0feab7052c..fab9cd89419 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -18,9 +18,9 @@ public sealed partial class MovementSpeedModifierComponent : Component public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; - public const float DefaultAcceleration = 20f; - public const float DefaultFriction = 20f; - public const float DefaultFrictionNoInput = 20f; + public const float DefaultAcceleration = 8f; + public const float DefaultFriction = 8f; + public const float DefaultFrictionNoInput = 14f; public const float DefaultBaseWalkSpeed = 2.5f; public const float DefaultBaseSprintSpeed = 4.5f; From a07ce0b9e4d1a8caa49ca0865c6dc68c1bf52d65 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:13:40 +0300 Subject: [PATCH 2/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index fab9cd89419..1cffec907a8 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -18,9 +18,9 @@ public sealed partial class MovementSpeedModifierComponent : Component public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; - public const float DefaultAcceleration = 8f; - public const float DefaultFriction = 8f; - public const float DefaultFrictionNoInput = 14f; + public const float DefaultAcceleration = 8f; #Frontier + public const float DefaultFriction = 8f; #Frontier + public const float DefaultFrictionNoInput = 14f; #Frontier public const float DefaultBaseWalkSpeed = 2.5f; public const float DefaultBaseSprintSpeed = 4.5f; @@ -100,7 +100,7 @@ private float _baseSprintSpeedVV /// The negative velocity applied for friction. /// [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite), DataField] - public float? FrictionNoInput; + public float? FrictionNoInput = DefaultFrictionNoInput; # Frontier [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public float BaseWalkSpeed { get; set; } = DefaultBaseWalkSpeed; From 1c648eea1520caba5730d45707fb2d6aaf3e77d6 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:14:46 +0300 Subject: [PATCH 3/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 1cffec907a8..5df676f80f6 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component // Weightless public const float DefaultMinimumFrictionSpeed = 0.005f; public const float DefaultWeightlessFriction = 1f; - public const float DefaultWeightlessFrictionNoInput = 0.2f; + public const float DefaultWeightlessFrictionNoInput = 0f; # Frontier public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; From 5d494bb70659a950060238849697a6442747f423 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:15:38 +0300 Subject: [PATCH 4/8] Create FrictionRemoverSystem.cs --- .../Corvax/Physics/FrictionRemoverSystem.cs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs diff --git a/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs b/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs new file mode 100644 index 00000000000..983fb987d63 --- /dev/null +++ b/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs @@ -0,0 +1,25 @@ +using Robust.Shared.Physics; +using Robust.Shared.Physics.Components; +using Robust.Shared.Physics.Systems; + +namespace Content.Shared.SimpleStation14.Physics; + +public sealed class FrictionRemoverSystem : EntitySystem +{ + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(RemoveDampening); + } + + + private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args) + { + _physics.SetAngularDamping(component, 0, false); + _physics.SetLinearDamping(component, 0); + } +} From 0205bff46fadad1f017443f9a52beb97a715aa62 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:16:14 +0300 Subject: [PATCH 5/8] Update moth.yml --- Resources/Prototypes/Entities/Mobs/Species/moth.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 9e181686410..6ec3d3f7ce4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -49,9 +49,7 @@ Female: UnisexMoth Unsexed: UnisexMoth - type: MovementSpeedModifier - weightlessAcceleration: 1.5 # Move around more easily in space. - weightlessFriction: 1 - weightlessModifier: 1 + weightlessAcceleration: 2.5 # Move around more easily in space. - type: Flammable damage: types: From 6fa0db8deaa629ad98fb3964f6e703da827b35d3 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:21:58 +0300 Subject: [PATCH 6/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 5df676f80f6..5244a14af0e 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component // Weightless public const float DefaultMinimumFrictionSpeed = 0.005f; public const float DefaultWeightlessFriction = 1f; - public const float DefaultWeightlessFrictionNoInput = 0f; # Frontier + public const float DefaultWeightlessFrictionNoInput = 0f; public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; From 8b89f618c2d1fdee0898a32cf0e4388a14bd24cc Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:22:44 +0300 Subject: [PATCH 7/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 5244a14af0e..c76e89ae65c 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -100,7 +100,7 @@ private float _baseSprintSpeedVV /// The negative velocity applied for friction. /// [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite), DataField] - public float? FrictionNoInput = DefaultFrictionNoInput; # Frontier + public float? FrictionNoInput = DefaultFrictionNoInput; # Frontier [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public float BaseWalkSpeed { get; set; } = DefaultBaseWalkSpeed; From 0c22ec8fdd4607c9b2a9afd3f2ee605866f2c78e Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Sat, 15 Jun 2024 00:26:32 +0300 Subject: [PATCH 8/8] Update MovementSpeedModifierComponent.cs --- .../Movement/Components/MovementSpeedModifierComponent.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index c76e89ae65c..24bd16d7d8f 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -18,9 +18,9 @@ public sealed partial class MovementSpeedModifierComponent : Component public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; - public const float DefaultAcceleration = 8f; #Frontier - public const float DefaultFriction = 8f; #Frontier - public const float DefaultFrictionNoInput = 14f; #Frontier + public const float DefaultAcceleration = 8f; //Frontier + public const float DefaultFriction = 8f; // Frontier + public const float DefaultFrictionNoInput = 14f; // Frontier public const float DefaultBaseWalkSpeed = 2.5f; public const float DefaultBaseSprintSpeed = 4.5f; @@ -100,7 +100,7 @@ private float _baseSprintSpeedVV /// The negative velocity applied for friction. /// [AutoNetworkedField, ViewVariables(VVAccess.ReadWrite), DataField] - public float? FrictionNoInput = DefaultFrictionNoInput; # Frontier + public float? FrictionNoInput = DefaultFrictionNoInput; // Frontier [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public float BaseWalkSpeed { get; set; } = DefaultBaseWalkSpeed;