Un-hardcode the warp drive charging duration (#299)

* Yay no more hardcoded warp drive speed * warp drive debug
ekrixi-14 · Apr 18, 2024 · 3b24624 · 3b24624
1 parent 0f4ff48
commit 3b24624
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/Content.Server/_FTL/FTLPoints/Components/WarpDriveComponent.cs b/Content.Server/_FTL/FTLPoints/Components/WarpDriveComponent.cs
@@ -19,11 +19,14 @@ public sealed partial class WarpDriveComponent : Component
     public int FuelPerJump = 30;
 
     /// <summary>
-    /// Ships at max charge (1f) will instantly begin jumping
+    /// Ships will begin warping when Charge reaches ChargeNeeded
     /// </summary>
-    [DataField, ViewVariables]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float Charge;
 
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public int ChargeNeeded = 30;
+
     /// <summary>
     /// Is this drive charging?
     /// </summary>

diff --git a/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs b/Content.Server/_FTL/FTLPoints/Systems/FtlPointsSystem.WarpDrive.cs
@@ -59,10 +59,10 @@ private void DriveUpdate(float frameTime)
             if (!TryComp<ShuttleComponent>(grid, out var shuttleComponent))
                 return;
 
-            if (component is { Charging: true, Charge: < 1 })
-                component.Charge += frameTime / 30;
+            if (component.Charging && component.Charge < component.ChargeNeeded)
+                component.Charge += frameTime;
 
-            if (!(component.Charge >= 1))
+            if (component.Charge < component.ChargeNeeded)
                 continue;
 
             if (!warpingShipComponent.TargetMap.HasValue)
@@ -90,13 +90,13 @@ private void OnDriveExamineEvent(EntityUid uid, WarpDriveComponent component, Ex
             return;
         }
 
-        if (component.Charge >= 1)
+        if (component.Charge >= component.ChargeNeeded)
         {
             args.PushMarkup(Loc.GetString("drive-examined-ready"));
             return;
         }
 
         args.PushMarkup(Loc.GetString("drive-examined", ("charging", component.Charging), ("charge",
-            $"{(component.Charge * 100):F}"), ("destination", warpingShipComponent.TargetMap != null)));
+            $"{(component.Charge / component.ChargeNeeded * 100):F}"), ("destination", warpingShipComponent.TargetMap != null)));
     }
 }
diff --git a/Resources/Prototypes/_FTL/Entities/Structures/Machines/warp-drive.yml b/Resources/Prototypes/_FTL/Entities/Structures/Machines/warp-drive.yml
@@ -27,4 +27,13 @@
           density: 100
     - type: PointLight
       radius: 2.5
-      energy: 0.5
+      energy: 0.5
+
+- type: entity
+  id: WarpDriveDebug
+  name: super warp drive
+  description: It go fast!!
+  suffix: DEBUG
+  components:
+    - type: WarpDrive
+      ChargeNeeded: 0.1