Nodes in entities are now named. (#3825)

2021-04-09 20:47:31 +02:00
parent 8a26920e4c
commit 009870116d
25 changed files with 198 additions and 168 deletions
--- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml
@@ -39,6 +39,7 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
--- a/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml
@@ -40,15 +40,18 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: West
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: East
+      inlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: West
+      filter:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
+      outlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: East
  - type: GasFilter
    inletDirection: West
    filterOutletDirection: South
--- a/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml
@@ -41,7 +41,8 @@
    - state: gasGenerator
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: Fourway
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: Fourway

--- a/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml
@@ -27,8 +27,9 @@
    - state: heaterPipe
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: East
+      inlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: East
  - type: PipeHeater
-  - type: PipeNetDevice
+  - type: PipeNetDevice
--- a/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml
@@ -29,7 +29,7 @@
  - type: Icon
    sprite: Constructible/Atmos/pipe.rsi

-#Note: The PipeDirection of the PipeNode should be the east-facing version, because the entity starts at an angle of 0 (east)
+#Note: The PipeDirection of the PipeNode should be the south-facing version, because the entity starts at an angle of 0 (east)

 - type: entity
  parent: PipeBase
@@ -38,9 +38,10 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
  - type: Icon
    state: pipeHalf

@@ -51,12 +52,13 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: Longitudinal
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: Longitudinal
  - type: Icon
    state: pipeStraight
-    
+
 - type: entity
  parent: PipeBase
  id: PipeBend
@@ -64,12 +66,13 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: SWBend
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: SWBend
  - type: Icon
    state: pipeBend
-    
+
 - type: entity
  parent: PipeBase
  id: PipeTJunction
@@ -77,12 +80,13 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: TSouth
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: TSouth
  - type: Icon
    state: pipeTJunction
-    
+
 - type: entity
  parent: PipeBase
  id: PipeFourway
@@ -90,8 +94,9 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: Fourway
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: Fourway
  - type: Icon
-    state: pipeFourway
+    state: pipeFourway
--- a/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml
@@ -39,12 +39,14 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: North
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
+      inlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: North
+      outlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
  - type: PressurePump
    initialInletDirection: North
    initialOutletDirection: South
--- a/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml
@@ -40,8 +40,9 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
  - type: PressureSiphon
    scrubberOutletDirection: South
--- a/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml
@@ -40,8 +40,9 @@
  components:
  - type: NodeContainer
    nodes:
-    - !type:PipeNode
-      nodeGroupID: Pipe
-      pipeDirection: South
+      pipe:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
  - type: PressureVent
    ventInletDirection: South
--- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
@@ -24,8 +24,9 @@
    state: wiredmachine
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerConsumer
    drawRate: 50
  - type: Damageable
@@ -62,8 +63,9 @@
  - type: Battery
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerConsumer
  - type: BatteryStorage
  - type: Anchorable
@@ -90,8 +92,9 @@
  - type: Battery
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerSupplier
  - type: BatteryDischarger
  - type: Anchorable
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -33,8 +33,9 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerSupplier
    supplyRate: 3000
  - type: Anchorable
@@ -88,8 +89,9 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      power:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerConsumer
  - type: BatteryStorage
    activeDrawRate: 1500
@@ -144,10 +146,12 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-    - !type:AdjacentNode
-      nodeGroupID: MVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
  - type: PowerConsumer
  - type: BatteryStorage
    activeDrawRate: 1500
@@ -196,10 +200,12 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: MVPower
-    - !type:AdjacentNode
-      nodeGroupID: Apc
+      input:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: Apc
  - type: PowerConsumer
    voltage: Medium
  - type: BatteryStorage
@@ -249,8 +255,9 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      output:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerSupplier
  - type: SolarPanel
    supply: 1500
--- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml
@@ -48,10 +48,12 @@
    key: hv_cables
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
-    - !type:AdjacentNode
-      nodeGroupID: WireNet
+      power:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
+      wire:
+        !type:AdjacentNode
+        nodeGroupID: WireNet
  - type: Wire
    wireDroppedOnCutPrototype: HVWireStack1
    wireType: HighVoltage
@@ -88,10 +90,12 @@
    key: mv_cables
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: MVPower
-    - !type:AdjacentNode
-      nodeGroupID: WireNet
+      power:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
+      wire:
+        !type:AdjacentNode
+        nodeGroupID: WireNet
  - type: Wire
    wireDroppedOnCutPrototype: MVWireStack1
    wireType: MediumVoltage
@@ -128,10 +132,12 @@
    key: lv_cables
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: Apc
-    - !type:AdjacentNode
-      nodeGroupID: WireNet
+      power:
+        !type:AdjacentNode
+        nodeGroupID: Apc
+      wire:
+        !type:AdjacentNode
+        nodeGroupID: WireNet
  - type: PowerProvider
    voltage: Apc
  - type: Wire
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
@@ -55,10 +55,12 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: AMEngine
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      ame:
+        !type:AdjacentNode
+        nodeGroupID: AMEngine
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: PowerReceiver
  - type: PowerSupplier
    supplyRate: 0
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
@@ -45,8 +45,9 @@
  - type: AMEShield
  - type: NodeContainer
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: AMEngine
+      ame:
+        !type:AdjacentNode
+        nodeGroupID: AMEngine
  - type: PointLight
    enabled: false
    radius: 5
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/power_box.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/PA/power_box.yml
@@ -23,7 +23,8 @@
    - type: NodeContainer
      examinable: true
      nodes:
-        - !type:AdjacentNode
+        input:
+          !type:AdjacentNode
          nodeGroupID: HVPower
    - type: Construction
      graph: particleAcceleratorPowerBox
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/collector.yml
@@ -36,8 +36,9 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: HVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: HVPower
  - type: RadiationCollector
  - type: Anchorable
  - type: Pullable
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/Singularity/emitter.yml
@@ -39,8 +39,9 @@
  - type: NodeContainer
    examinable: true
    nodes:
-    - !type:AdjacentNode
-      nodeGroupID: MVPower
+      input:
+        !type:AdjacentNode
+        nodeGroupID: MVPower
  - type: Damageable
    resistances: metallicResistances
  - type: Destructible