Adds Advanced SMES, an SMES with higher capacity for mapping (#33757)

* Adds Advanced SMES machine and board to autolathe roundstart

* Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun

* fix attribution formatting

* Update smes.yml to address review

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* add new sprites and change naming scheme, testing something

* address review, tested it a bit more, works ingame

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index fd0ff475dfa7ecf2f77d4331966edc03667aff85..fde151f20e08d6b6530099aa484d7c63749ba443 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -640,6 +640,25 @@
           amount: 4
           defaultPrototype: PowerCellSmall
 
+- type: entity
+  id: SMESAdvancedMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: advanced SMES machine board
+  description: A machine printed circuit board for an Advanced SMES.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: power_mod
+  - type: MachineBoard
+    prototype: SMESAdvancedEmpty
+    stackRequirements:
+      Capacitor: 2
+      CableHV: 20
+    componentRequirements:
+      PowerCell:
+        amount: 4
+        defaultPrototype: PowerCellMedium
+
 - type: entity
   id: CellRechargerCircuitboard
   parent: BaseMachineCircuitboard

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d511f5b1af5c9ff57dd5acc2d9069848a7980e4f..55f754df3d1b742902dbf064d6f3466aed0caf9a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -520,6 +520,7 @@
       - MassMediaCircuitboard
       - ReagentGrinderIndustrialMachineCircuitboard
       - JukeboxCircuitBoard
+      - SMESAdvancedMachineCircuitboard
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ShuttleGunDusterCircuitboard

diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index a9f647ec9e74c257bf5798c35629fba2362849d9..db98b0d0f7cffa197a0610a49f08316a7fff22c0 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -111,3 +111,48 @@
   components:
   - type: Battery
     startingCharge: 0
+
+- type: entity
+  parent: BaseSMES
+  id: SMESAdvanced
+  suffix: Advanced, 16MJ
+  name: advanced SMES
+  description: An even-higher-capacity superconducting magnetic energy storage (SMES) unit.
+  components:
+  - type: Sprite
+    sprite: Structures/Power/smes.rsi
+    snapCardinals: true
+    layers:
+    - state: advancedsmes
+    - map: [ "enum.SmesVisualLayers.Charge" ]
+      state: "smes-og1" # -og0 does not exist
+      shader: unshaded
+      visible: false
+    - map: [ "enum.SmesVisualLayers.Input" ]
+      state: "smes-oc0"
+      shader: unshaded
+    - map: [ "enum.SmesVisualLayers.Output" ]
+      state: "smes-op1"
+      shader: unshaded
+    - map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      state: advancedsmes-open
+  - type: Machine
+    board: SMESAdvancedMachineCircuitboard
+  - type: Battery
+    maxCharge: 16000000
+    startingCharge: 16000000
+  - type: PowerMonitoringDevice
+    group: SMES
+    sourceNode: input
+    loadNode: output
+    collectionName: smes
+    sprite: Structures/Power/smes.rsi
+    state: advancedsmes-static
+
+- type: entity
+  parent: SMESAdvanced
+  id: SMESAdvancedEmpty
+  suffix: Empty
+  components:
+  - type: Battery
+    startingCharge: 0

diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index 99ff9f25eef1ba7a5c9e844717ea1951d2db5b43..af74e7f3c79becc823addc22682368c6598170ce 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -399,6 +399,11 @@
   id: SMESMachineCircuitboard
   result: SMESMachineCircuitboard
 
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: SMESAdvancedMachineCircuitboard
+  result: SMESAdvancedMachineCircuitboard
+
 - type: latheRecipe
   parent: BaseCircuitboardRecipe
   id: PortableGeneratorPacmanMachineCircuitboard

diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 817e50834b7044886e7cbc5b0a0ed6991abc0029..e05212bf68e527b8543f565e20bdde5188de608c 100644 (file)
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -41,6 +41,7 @@
   recipeUnlocks:
   - PowerCellHigh
   - TurboItemRechargerCircuitboard
+  - SMESAdvancedMachineCircuitboard
 
 - type: technology
   id: MechanicalCompression

diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png
new file mode 100644 (file)
index 0000000..c45b424
Binary files /dev/null and b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png differ

diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png
new file mode 100644 (file)
index 0000000..7611f14
Binary files /dev/null and b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png differ

diff --git a/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png
new file mode 100644 (file)
index 0000000..a900d83
Binary files /dev/null and b/Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png differ

diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json
index 2ca8d1fb2262d808f0c18d58e084794b9096b70f..04646fddb91c361dbe5d537357a855b169aa0fac 100644 (file)
--- a/Resources/Textures/Structures/Power/smes.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/smes.rsi/meta.json
@@ -1,16 +1,25 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept, advanced-smes, advanced-smes-static, advanced-smes-open modified from smes, smes-open, and static by august-sun (GitHub)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "advancedsmes"
+    },
+    {
+      "name": "advancedsmes-static"
+    },
+    {
+      "name": "advancedsmes-open"
+    },
     {
       "name": "smes"
     },
-               {
+    {
       "name": "static"
     },
     {