paddle problem

crystallpunk-14 · Nov 12, 2024 · 3249bcf · 3249bcf
1 parent c33c655
commit 3249bcf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -60,9 +60,9 @@ public sealed partial class ShuttleComponent : Component
         /// Damping applied to the shuttle's physics component when not in FTL.
         /// </summary>
         [DataField("linearDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float LinearDamping = 0.05f;
+        public float LinearDamping = 0.5f;//0.05f; //CP14 - the ocean is much denser than space, you know.
 
         [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
-        public float AngularDamping = 0.05f;
+        public float AngularDamping = 0.5f; //0.05f; //CP14 - the ocean is much denser than space, you know.
     }
 }
diff --git a/Content.Shared/_CP14/Shuttle/CP14WatershipPaddleComponent.cs b/Content.Shared/_CP14/Shuttle/CP14WatershipPaddleComponent.cs
@@ -7,5 +7,8 @@ namespace Content.Shared._CP14.Shuttle;
 public sealed partial class CP14WaterShipPaddleComponent : Component
 {
     [DataField]
-    public float Power = 10f;
+    public float Power = 5f;
+
+    [DataField]
+    public Angle ImpulseAngle = Angle.FromDegrees(90f);
 }
diff --git a/Content.Shared/_CP14/Shuttle/CP14WatershipSystem.cs b/Content.Shared/_CP14/Shuttle/CP14WatershipSystem.cs
@@ -59,7 +59,8 @@ private void Bulb(Entity<CP14WaterShipPaddleComponent> ent, TransformComponent p
         if (paddleTransform.GridUid is null)
             return;
 
-        var impulseDirection = paddleTransform.LocalRotation.ToVec();
+        var direction = _transform.GetWorldRotation(paddleTransform) + ent.Comp.ImpulseAngle;
+        var impulseDirection = direction.ToVec();
 
         _physics.ApplyLinearImpulse(paddleTransform.GridUid.Value, impulseDirection * ent.Comp.Power * modifier, paddleTransform.LocalPosition);
     }

diff --git a/Resources/Prototypes/_CP14/Entities/watershipTEST.yml b/Resources/Prototypes/_CP14/Entities/watershipTEST.yml
@@ -41,6 +41,7 @@
   - type: Anchorable
   - type: Pullable
   - type: CP14WaterShipPaddle
+    impulseAngle: 90
 
 - type: entity
   parent: CP14BaseWatershipPaddle
@@ -49,11 +50,13 @@
   components:
   - type: Sprite
     state: wooden_l
+  - type: CP14WaterShipPaddle
 
 - type: entity
   parent: CP14BaseWatershipPaddle
   id: CP14WatershipPaddleRight
   suffix: Right
   components:
   - type: Sprite
-    state: wooden_r
+    state: wooden_r
+  - type: CP14WaterShipPaddle