From 889b650b79c2018c32525ad4df2d67e8d341f97d Mon Sep 17 00:00:00 2001
From: KieueCaprie <kiuufaun@proton.me>
Date: Thu, 23 Jan 2025 12:35:34 +0000
Subject: [PATCH 1/6] adjust power cell requirement for advanced smes to
 require double the amount.

---
 .../Objects/Devices/Circuitboards/Machine/production.yml  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 841b10287ea..8c813ff4f84 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -679,13 +679,11 @@
     state: power_mod
   - type: MachineBoard
     prototype: SMESAdvancedEmpty
+    requirements:
+        Capacitor: 1 # Frontier stackRequirements<requirements
+        PowerCell: 8 # Frontier componentRequirements<requirements || 4 < 8
     stackRequirements:
-      Capacitor: 2
       CableHV: 20
-    componentRequirements:
-      PowerCell:
-        amount: 4
-        defaultPrototype: PowerCellMedium
 
 - type: entity
   id: CellRechargerCircuitboard

From d653b4c79dca143b2de7ea0d8769878ca57c2aa3 Mon Sep 17 00:00:00 2001
From: KieueCaprie <kiuufaun@proton.me>
Date: Thu, 23 Jan 2025 12:37:20 +0000
Subject: [PATCH 2/6] fixed contributor failure to count to 2

---
 .../Objects/Devices/Circuitboards/Machine/production.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 8c813ff4f84..702a73d6d45 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -680,7 +680,7 @@
   - type: MachineBoard
     prototype: SMESAdvancedEmpty
     requirements:
-        Capacitor: 1 # Frontier stackRequirements<requirements
+        Capacitor: 2 # Frontier stackRequirements<requirements
         PowerCell: 8 # Frontier componentRequirements<requirements || 4 < 8
     stackRequirements:
       CableHV: 20

From 51b7aaa0ae9a3d32f20afa9c4cdc387e85db9ec7 Mon Sep 17 00:00:00 2001
From: KieueCaprie <kiuufaun@proton.me>
Date: Thu, 23 Jan 2025 13:22:32 +0000
Subject: [PATCH 3/6] Add missing Frontier note, reinstate
 componentRequirements in commented out format.

---
 .../Objects/Devices/Circuitboards/Machine/production.yml   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 702a73d6d45..50dd9425c75 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -681,9 +681,14 @@
     prototype: SMESAdvancedEmpty
     requirements:
         Capacitor: 2 # Frontier stackRequirements<requirements
-        PowerCell: 8 # Frontier componentRequirements<requirements || 4 < 8
+        PowerCell: 8 # Frontier componentRequirements<requirements || Frontier 4 < 8
     stackRequirements:
       CableHV: 20
+  # Frontier: Temporarily commenting this out
+  # componentRequirements:
+  #     PowerCell:
+  #       amount: 4
+  #       defaultPrototype: PowerCellMedium
 
 - type: entity
   id: CellRechargerCircuitboard

From fcbe89c4ef2ec414803d13ca2078dc13f8506fd3 Mon Sep 17 00:00:00 2001
From: KieueCaprie <kiuufaun@proton.me>
Date: Thu, 30 Jan 2025 00:19:17 +0000
Subject: [PATCH 4/6] update production.yml

---
 .../Objects/Devices/Circuitboards/Machine/production.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 50dd9425c75..632e1b7b796 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -684,7 +684,7 @@
         PowerCell: 8 # Frontier componentRequirements<requirements || Frontier 4 < 8
     stackRequirements:
       CableHV: 20
-  # Frontier: Temporarily commenting this out
+  # Frontier
   # componentRequirements:
   #     PowerCell:
   #       amount: 4

From fb0cea42cd89e8d891055d1b91992a7c5711f406 Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Thu, 30 Jan 2025 09:47:07 -0500
Subject: [PATCH 5/6] SMES cleanup, upgradeable adv smes

---
 .../Circuitboards/Machine/production.yml      |  9 ++------
 .../Entities/Structures/Power/smes.yml        | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 632e1b7b796..0a3aade29cc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -679,16 +679,11 @@
     state: power_mod
   - type: MachineBoard
     prototype: SMESAdvancedEmpty
-    requirements:
+    requirements: # Frontier
         Capacitor: 2 # Frontier stackRequirements<requirements
-        PowerCell: 8 # Frontier componentRequirements<requirements || Frontier 4 < 8
+        PowerCell: 8 # Frontier componentRequirements<requirements, 4<8
     stackRequirements:
       CableHV: 20
-  # Frontier
-  # componentRequirements:
-  #     PowerCell:
-  #       amount: 4
-  #       defaultPrototype: PowerCellMedium
 
 - type: entity
   id: CellRechargerCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 06f0a20bd24..0d88e7b36ce 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -31,12 +31,6 @@
         - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
           state: smes-open
     - type: Smes
-    - type: UpgradeBattery
-      maxChargeMultiplier: 2
-      baseMaxCharge: 8000000
-    - type: UpgradePowerSupplyRamping
-      scaling: Linear
-      supplyRampingMultiplier: 1     
     - type: Appearance
     - type: Battery
       startingCharge: 0
@@ -97,6 +91,14 @@
       sendBroadcastAttemptEvent: true
       examinableAddress: true
     - type: WiredNetworkConnection
+    # Frontier: upgradable SMES
+    - type: UpgradeBattery
+      maxChargeMultiplier: 2
+      baseMaxCharge: 8000000
+    - type: UpgradePowerSupplyRamping
+      scaling: Linear
+      supplyRampingMultiplier: 1
+    # End Frontier: upgradable SMES
 
 # SMES' in use
 
@@ -153,6 +155,14 @@
     collectionName: smes
     sprite: Structures/Power/smes.rsi
     state: advancedsmes-static
+  # Frontier: upgradable SMES
+  - type: UpgradeBattery
+    maxChargeMultiplier: 2
+    baseMaxCharge: 16000000
+  - type: UpgradePowerSupplyRamping
+    scaling: Linear
+    supplyRampingMultiplier: 1
+  # End Frontier: upgradable SMES
 
 - type: entity
   parent: SMESAdvanced

From 85891acf4faf6ba1e3ccbe479ed9fe68ce58e7ec Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Thu, 30 Jan 2025 09:48:59 -0500
Subject: [PATCH 6/6] minimize adv. smes upgradable components

---
 Resources/Prototypes/Entities/Structures/Power/smes.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 0d88e7b36ce..adc3aeac2c0 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -157,11 +157,7 @@
     state: advancedsmes-static
   # Frontier: upgradable SMES
   - type: UpgradeBattery
-    maxChargeMultiplier: 2
     baseMaxCharge: 16000000
-  - type: UpgradePowerSupplyRamping
-    scaling: Linear
-    supplyRampingMultiplier: 1
   # End Frontier: upgradable SMES
 
 - type: entity