Update plasma cutters

Workbench-Team · Jan 12, 2025 · a1e7397 · a1e7397
1 parent 9926269
commit a1e7397
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 41 deletions.
diff --git a/Content.Server/Starshine/PlasmaCutter/BatteryRechargeComponent.cs b/Content.Server/Starshine/PlasmaCutter/BatteryRechargeComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.AruMoon.Plasmacutter;
+namespace Content.Server.Starshine.PlasmaCutter;
 
 [RegisterComponent]
 public sealed partial class BatteryRechargeComponent : Component
@@ -11,15 +11,15 @@ public sealed partial class BatteryRechargeComponent : Component
     /// 1 plasma ore = 500 material units
     /// </summary>
     ///
-    [DataField("multiplier"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float Multiplier = 1.0f;
 
 
     /// <summary>
     /// Max material storage limit
     /// 7500 = 15 plasma ore
     /// </summary>
-    [DataField("storageMaxCapacity"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int StorageMaxCapacity = 7500;
 }
 
diff --git a/Content.Server/Starshine/PlasmaCutter/BatteryRechargeSystem.cs b/Content.Server/Starshine/PlasmaCutter/BatteryRechargeSystem.cs
@@ -1,60 +1,60 @@
 using Content.Server.Materials;
-using Content.Shared.Materials;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Materials;
 
-namespace Content.Server.AruMoon.Plasmacutter
+namespace Content.Server.Starshine.PlasmaCutter
 {
-
     /// <summary>
-    /// This CODE FULL OF SHICODE!!!
-    /// <see cref="BatteryRechargeComponent"/>
+    /// Manages battery recharging with material usage and adjusts storage capacity dynamically.
     /// </summary>
     public sealed class BatteryRechargeSystem : EntitySystem
     {
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
         [Dependency] private readonly BatterySystem _batterySystem = default!;
 
-
-
         public override void Initialize()
         {
             base.Initialize();
-
+            
             SubscribeLocalEvent<MaterialStorageComponent, MaterialEntityInsertedEvent>(OnMaterialAmountChanged);
             SubscribeLocalEvent<BatteryRechargeComponent, ChargeChangedEvent>(OnChargeChanged);
         }
 
-        private void OnMaterialAmountChanged(EntityUid uid, MaterialStorageComponent component, MaterialEntityInsertedEvent args)
+        private void OnMaterialAmountChanged(EntityUid uid,
+            MaterialStorageComponent component,
+            MaterialEntityInsertedEvent args)
         {
-            if (component.MaterialWhiteList != null)
-                foreach (var fuelType in component.MaterialWhiteList)
-                {
-                    FuelAddCharge(uid, fuelType);
-                }
+            if (component.MaterialWhiteList == null)
+                return;
+
+            foreach (var fuelType in component.MaterialWhiteList)
+            {
+                FuelAddCharge(uid, fuelType);
+            }
         }
 
         private void OnChargeChanged(EntityUid uid, BatteryRechargeComponent component, ChargeChangedEvent args)
         {
-            ChangeStorageLimit(uid, component.StorageMaxCapacity);
+            AdjustStorageCapacity(uid, component);
         }
 
-        private void ChangeStorageLimit(
-            EntityUid uid,
-            int value,
+        private void AdjustStorageCapacity(EntityUid uid,
+            BatteryRechargeComponent component,
             BatteryComponent? battery = null)
         {
             if (!Resolve(uid, ref battery))
                 return;
-            if (battery.CurrentCharge == battery.MaxCharge)
-                value = 0;
-            _materialStorage.TryChangeStorageLimit(uid, value);
+
+            // Calculate new storage limit based on current charge
+            var newCapacity = battery.CurrentCharge >= battery.MaxCharge
+                ? 0
+                : (int)(component.StorageMaxCapacity * (1 - battery.CurrentCharge / battery.MaxCharge));
+
+            _materialStorage.TryChangeStorageLimit(uid, newCapacity);
         }
 
-        private void FuelAddCharge(
-            EntityUid uid,
-            string fuelType,
-            BatteryRechargeComponent? recharge = null)
+        private void FuelAddCharge(EntityUid uid, string fuelType, BatteryRechargeComponent? recharge = null)
         {
             if (!Resolve(uid, ref recharge))
                 return;
@@ -68,5 +68,4 @@ private void FuelAddCharge(
             }
         }
     }
-
 }
diff --git a/...ru-RU/starshine/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/...ru-RU/starshine/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
@@ -2,7 +2,15 @@ ent-MiniatureEnergyCrossbow = энергетический мини арбале
     .desc = энергетический арбалет синдиката, маленький, бесшумный и смертоносный.
 ent-WeaponCutter = плазменный резак
     .desc = Инструмент шахтеров, предназначенный для расчистки горных пород.
+    .suffix = Заряженный
+ent-WeaponCutterEmpty = { ent-WeaponCutter }
+    .desc = { ent-WeaponCutter.desc }
+    .suffix = Пустой
 ent-WeaponCutterAdv = улучшенный плазменный резак
     .desc = Инструмент шахтеров, предназначенный для расчистки горных пород. Обладает усовершенствованной батареей и усиленной концентрирующей линзой.
+    .suffix = Заряженный
+ent-WeaponCutterAdvEmpty = { ent-WeaponCutterAdv }
+    .desc = { ent-WeaponCutterAdv.desc }
+    .suffix = Пустой
 ent-WeaponEmitterCannon = эмиттер-пушка
     .desc = Самодельная пушка, созданная на основе стационарного эмиттера. Довольно мощная, однако скорость зарядки оставляет желать лучшего.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -342,9 +342,9 @@
       - WeaponForceGun
       - WeaponLaserSvalinn
       - WeaponProtoKineticAccelerator
-      - WeaponCutter
+      - WeaponCutterEmpty
 # Starshine-start
-      - WeaponCutterAdv
+      - WeaponCutterAdvEmpty
       - WeaponTetherGun
       - ClothingEyesVision
 # Starshine-end

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -14,7 +14,7 @@
   - ShuttleGunKineticCircuitboard
   # These are roundstart but not replenishable for salvage
 ## Starshine-start
-  - WeaponCutter
+  - WeaponCutterEmpty
   # This is not roundstart since its a direct upgrade
 ## Starshine-end
 

diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Starshine/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -59,7 +59,18 @@
     - type: Appearance
 
 - type: entity
-  name: Advanced Cutter
+  suffix: Empty
+  parent: WeaponCutter
+  id: WeaponCutterEmpty
+  components:
+    - type: MaterialStorage
+      storageLimit: 7500
+    - type: Battery
+      startingCharge: 0
+
+- type: entity
+  name: advanced cutter
+  suffix: Charged
   parent: WeaponCutter
   id: WeaponCutterAdv
   description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
@@ -76,6 +87,16 @@
       fireCost: 75
     - type: Appearance
 
+- type: entity
+  suffix: Empty
+  parent: WeaponCutterAdv
+  id: WeaponCutterAdvEmpty
+  components:
+    - type: MaterialStorage
+      storageLimit: 7500
+    - type: Battery
+      startingCharge: 0
+
 - type: entity
   name: Emitter Cannon
   id: WeaponEmitterCannon

diff --git a/Resources/Prototypes/Starshine/Recipes/Lathes/security.yml b/Resources/Prototypes/Starshine/Recipes/Lathes/security.yml
@@ -32,24 +32,22 @@
     Plastic: 500
 
 - type: latheRecipe
-  id: WeaponCutter
-  result: WeaponCutter
+  id: WeaponCutterEmpty
+  result: WeaponCutterEmpty
   completetime: 10
   materials:
     Steel: 1000
     Glass: 200
     Silver: 100
-    Plasma: 400
 
 - type: latheRecipe
-  id: WeaponCutterAdv
-  result: WeaponCutterAdv
+  id: WeaponCutterAdvEmpty
+  result: WeaponCutterAdvEmpty
   completetime: 15
   materials:
     Steel: 1200
     Glass: 300
     Gold: 100
-    Plasma: 800
 
 - type: latheRecipe
   id: MagazinePistolSubMachineGunRubber

diff --git a/Resources/Prototypes/Starshine/Research/arsenal.yml b/Resources/Prototypes/Starshine/Research/arsenal.yml
@@ -158,7 +158,7 @@
   tier: 2
   cost: 10000
   recipeUnlocks:
-    - WeaponCutterAdv
+    - WeaponCutterAdvEmpty
   technologyPrerequisites:
     - SalvageWeapons