Installing a new power infrastructure for Saltern. (#1559)

* Removes all deprecated wires, generators and apcs

* Removes all deprecated power entities

* Updates to master

* Map g2g

* Map new power system and some materials

* Remove old power entities from stationstation

* Removes deprecated shit AGAIN

* Remove outdated wires from stationstation

Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
Co-authored-by: juliangiebel <juliangiebel@live.de>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Resources/Prototypes/Entities/Constructible/Ground/wires.yml

@@ -86,17 +86,3 @@
     wireType: Apc
   - type: Destructible
     spawnondestroy: ApcExtensionCableStack1
-
-#Depriciated, to be removed from maps
-
-- type: entity
-  id: Wire
-  name: Depriciated Wire
-  parent: ApcExtensionCable
-  components:
-  - type: NodeContainer
-    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-    - !type:AdjacentNode
-      nodeGroupID: Apc

Resources/Prototypes/Entities/Constructible/Power/debug_power.yml

@@ -0,0 +1,126 @@
+- type: entity
+  id: DebugGenerator
+  parent: BaseGenerator
+  name: Debug Generator
+
+- type: entity
+  id: DebugConsumer
+  name: Debug Consumer
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer: [MobMask, Opaque]
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    texture: Constructible/Power/wiredmachine.png
+  - type: Icon
+    texture: Constructible/Power/wiredmachine.png
+  - type: NodeContainer
+    nodes:
+    - !type:AdjacentNode
+      nodeGroupID: HVPower
+  - type: PowerConsumer
+    drawRate: 50
+  - type: Breakable
+    deadThreshold: 100
+  - type: Anchorable
+
+- type: entity
+  id: DebugBatteryStorage
+  name: Debug Battery Storage
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer: [MobMask, Opaque]
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    texture: Constructible/Power/provider.png
+  - type: Icon
+    texture: Constructible/Power/provider.png
+  - type: Battery
+  - type: NodeContainer
+    nodes:
+    - !type:AdjacentNode
+      nodeGroupID: HVPower
+  - type: PowerConsumer
+  - type: BatteryStorage
+  - type: Anchorable
+
+- type: entity
+  id: DebugBatteryDischarger
+  name: Debug Battery Discharger
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer: [MobMask, Opaque]
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    texture: Constructible/Power/provider.png
+  - type: Icon
+    texture: Constructible/Power/provider.png
+  - type: Battery
+  - type: NodeContainer
+    nodes:
+    - !type:AdjacentNode
+      nodeGroupID: HVPower
+  - type: PowerSupplier
+  - type: BatteryDischarger
+  - type: Anchorable
+
+- type: entity
+  id: DebugSmes
+  parent: BaseSmes
+  name: Debug Smes
+
+- type: entity
+  id: DebugSubstation
+  parent: BaseSubstation
+  name: Debug Substation
+
+- type: entity
+  id: DebugApc
+  parent: BaseApc
+  name: Debug Apc
+
+- type: entity
+  id: DebugPowerReceiver
+  name: Debug Power Receiver
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.5, -0.5, 0.5, 0.5"
+      layer: [MobMask, Opaque]
+  - type: SnapGrid
+    offset: Center
+  - type: Sprite
+    texture: Constructible/Power/wirelessmachine.png
+  - type: Icon
+    texture: Constructible/Power/wirelessmachine.png
+  - type: PowerReceiver
+  - type: Anchorable

Resources/Prototypes/Entities/Constructible/Power/power_base.yml

@@ -1,6 +1,7 @@
 - type: entity
-  id: DebugGenerator
-  name: Debug Generator
+  id: BaseGenerator
+  name: Base Generator
+  abstract: true
   placement:
     mode: SnapgridCenter
   components:
@@ -26,93 +27,9 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugConsumer
-  name: Debug Consumer
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    texture: Constructible/Power/wiredmachine.png
-  - type: Icon
-    texture: Constructible/Power/wiredmachine.png
-  - type: NodeContainer
-    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-  - type: PowerConsumer
-    drawRate: 50
-  - type: Breakable
-    deadThreshold: 100
-  - type: Anchorable
-
-- type: entity
-  id: DebugBatteryStorage
-  name: Debug Battery Storage
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    texture: Constructible/Power/provider.png
-  - type: Icon
-    texture: Constructible/Power/provider.png
-  - type: Battery
-  - type: NodeContainer
-    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-  - type: PowerConsumer
-  - type: BatteryStorage
-  - type: Anchorable
-
-- type: entity
-  id: DebugBatteryDischarger
-  name: Debug Battery Discharger
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    texture: Constructible/Power/provider.png
-  - type: Icon
-    texture: Constructible/Power/provider.png
-  - type: Battery
-  - type: NodeContainer
-    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-  - type: PowerSupplier
-  - type: BatteryDischarger
-  - type: Anchorable
-
-- type: entity
-  id: DebugSmes
-  name: Debug Smes
+  id: BaseSmes
+  name: Base Smes
+  abstract: true
   placement:
     mode: SnapgridCenter
   components:
@@ -155,8 +72,9 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugSubstation
-  name: Debug Substation
+  id: BaseSubstation
+  name: Base Substation
+  abstract: true
   placement:
     mode: SnapgridCenter
   components:
@@ -193,8 +111,9 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugApc
-  name: Debug Apc
+  id: BaseApc
+  name: Base Apc
+  abstract: true
   placement:
     mode: SnapgridCenter
   components:
@@ -239,28 +158,6 @@
     - key: enum.ApcUiKey.Key
       type: ApcBoundUserInterface
 
-- type: entity
-  id: DebugPowerReceiver
-  name: Debug Power Receiver
-  placement:
-    mode: SnapgridCenter
-  components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      bounds: "-0.5, -0.5, 0.5, 0.5"
-      layer: [MobMask, Opaque]
-  - type: SnapGrid
-    offset: Center
-  - type: Sprite
-    texture: Constructible/Power/wirelessmachine.png
-  - type: Icon
-    texture: Constructible/Power/wirelessmachine.png
-  - type: PowerReceiver
-  - type: Anchorable
-
 - type: entity
   id: SolarPanel
   name: solar panel
@@ -291,50 +188,3 @@
     offset: Center
   - type: Breakable
     deadThreshold: 100
-
-#Depriciated, to be removed from maps
-
-- type: entity
-  id: Generator
-  name: Depriciated Generator
-  parent: DebugGenerator
-  components:
-  - type: PowerSupplier
-    voltage: High
-    supplyRate: 100000
-
-- type: entity
-  id: APC
-  name: Depriciated Apc
-  parent: DebugApc
-  components:
-  - type: NodeContainer
-    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-    - !type:AdjacentNode
-      nodeGroupID: Apc
-  - type: PowerConsumer
-    voltage: High
-  - type: BatteryStorage
-    activeDrawRate: 10000
-
-- type: entity
-  id: SMES
-  name: Depriciated Smes
-  parent: DebugSmes
-
-- type: entity
-  id: SmesDry
-  name: Depriciated Smes
-  parent: DebugSmes
-
-- type: entity
-  id: WiredMachine
-  name: Depriciated WiredMachine
-  parent: DebugConsumer
-
-- type: entity
-  id: WirelessMachine
-  name: Depriciated WirelessMachine
-  parent: DebugPowerReceiver

Resources/Prototypes/Entities/Constructible/Power/saltern_power.yml

@@ -0,0 +1,44 @@
+- type: entity
+  id: SalternGenerator
+  parent: BaseGenerator
+  name: Generator
+  components:
+  - type: PowerSupplier
+    supplyRate: 30000
+
+- type: entity
+  id: SalternSmes
+  parent: BaseSmes
+  name: Smes
+  components:
+  - type: Battery
+    maxCharge: 10000000
+    startingCharge: 10000000
+  - type: BatteryStorage
+    activeDrawRate: 0
+  - type: BatteryDischarger
+    activeSupplyRate: 0
+
+- type: entity
+  id: SalternSubstation
+  parent: BaseSubstation
+  name: Substation
+  components:
+  - type: Battery
+    maxCharge: 4000000
+    startingCharge: 4000000
+  - type: BatteryStorage
+    activeDrawRate: 8000
+  - type: BatteryDischarger
+    activeSupplyRate: 6000
+
+- type: entity
+  id: SalternApc
+  parent: BaseApc
+  name: Apc
+  components:
+  - type: Battery
+    maxCharge: 12000
+    startingCharge: 2000
+  - type: BatteryStorage
+    activeDrawRate: 2000