Refactor stacks to use prototypes (#3387)

* Refactor stacks to use prototypes * Fix not assigned warning * Add names to stacks * Make machine baords and material constructions use the name as well * Remove defaulting stacks to prototype id * Fix tests Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-02-25 06:18:29 +01:00
parent 7c32574547
commit fdcbece63d
33 changed files with 326 additions and 186 deletions
--- a/Resources/Prototypes/Recipes/Construction/Graphs/APC.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/APC.yml
@@ -6,7 +6,7 @@
      edges:
        - to: apc
          steps:
-            - material: Metal
+            - material: Steel
              amount: 3

    - node: apc
--- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
@@ -9,7 +9,7 @@
            - !type:SetAnchor
              value: false
          steps:
-            - material: Metal
+            - material: Steel
              amount: 5

    - node: frameUnsecured
--- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
@@ -45,7 +45,7 @@
        completed:
          - !type:SnapToGrid {}
        steps:
-          - material: Metal
+          - material: Steel
            amount: 2
            doAfter: 1
  - node: lever
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -8,7 +8,7 @@
          completed:
            - !type:SnapToGrid { }
          steps:
-            - material: Metal
+            - material: Steel
              amount: 3
              doAfter: 1

--- a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
@@ -9,7 +9,7 @@
            - !type:SnapToGrid
              southRotation: true
          steps:
-            - material: Metal
+            - material: Steel
              amount: 2
              doAfter: 1

@@ -41,7 +41,7 @@
          conditions:
            - !type:EntityAnchored {}
          steps:
-            - material: Metal
+            - material: Steel
              amount: 2

        - to: reinforcedGirder
--- a/Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml
@@ -6,12 +6,12 @@
      edges:
        - to: bulbLight
          steps:
-            - material: Metal
+            - material: Steel
              amount: 1
-              doAfter: 2.0      
+              doAfter: 2.0
        - to: tubeLight
          steps:
-            - material: Metal
+            - material: Steel
              amount: 2
              doAfter: 2.0
    - node: tubeLight
@@ -28,7 +28,7 @@
            - !type:SpawnPrototype
              prototype: SteelSheet1
              amount: 2
-            - !type:DeleteEntity {}         
+            - !type:DeleteEntity {}
    - node: bulbLight
      entity: PoweredSmallLightEmpty
      edges:
--- a/Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml
@@ -15,7 +15,7 @@
      edges:
        - to: lowWall
          steps:
-            - material: Metal
+            - material: Steel
              amount: 3
              doAfter: 5

--- a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
@@ -13,7 +13,7 @@
            - !type:SetAnchor
              value: false
          steps:
-            - material: Metal
+            - material: Steel
              amount: 5
              doAfter: 2.5

--- a/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/metal_rod.yml
@@ -9,7 +9,7 @@
            - !type:SetStackCount
              amount: 2
          steps:
-            - material: Metal
+            - material: Steel
              amount: 1

    - node: MetalRod
--- a/Resources/Prototypes/Recipes/Construction/Graphs/spear.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/spear.yml
@@ -6,7 +6,7 @@
      edges:
        - to: spear
          steps:
-            - material: Metal
+            - material: Steel
              amount: 2
              doAfter: 2
            - material: Glass
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml
@@ -31,7 +31,7 @@

        - to: MetalTable
          steps:
-            - material: Metal
+            - material: Steel
              amount: 1
              doAfter: 1

--- a/Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml
@@ -8,7 +8,7 @@
          completed:
            - !type:SnapToGrid { }
          steps:
-            - material: Metal
+            - material: Steel
              amount: 5
              doAfter: 1
    - node: toilet
@@ -18,12 +18,12 @@
            - !type:SpawnPrototype
              prototype: SteelSheet1
              amount: 5
-            - !type:EmptyAllContainers {}              
+            - !type:EmptyAllContainers {}
            - !type:DeleteEntity {}
          conditions:
            - !type:EntityAnchored
              anchored: false
-            - !type:ToiletLidClosed {}  
+            - !type:ToiletLidClosed {}
          steps:
            - tool: Welding
-              doAfter: 2
+              doAfter: 2
--- a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
@@ -6,7 +6,7 @@
      edges:
        - to: plasmaWindow
          steps:
-            - material: Metal
+            - material: Steel
              amount: 2
              doAfter: 2
            - material: Glass