Adds integration tests to construction, fixes some wrong stack prototypes in construction graphs

🆑 - fix: Fixes a bug where many constructions failed due to a recent material refactor.
2021-02-28 17:16:41 +01:00
parent c3c9f2bbc1
commit 71e6effd48
19 changed files with 144 additions and 36 deletions
--- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
+++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
@@ -3,7 +3,7 @@
  icon:
    sprite: Objects/Materials/sheets.rsi
    state: metal
-  result: SteelSheet1
+  result: SheetSteel1
  completetime: 500
  materials:
    steel: 100
@@ -13,7 +13,7 @@
  icon:
    sprite: Objects/Materials/sheets.rsi
    state: glass
-  result: GlassSheet1
+  result: SheetGlass1
  completetime: 500
  materials:
    glass: 100
--- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
@@ -41,7 +41,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
@@ -90,7 +90,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
+++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
@@ -48,7 +48,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
@@ -76,7 +76,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
@@ -107,7 +107,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
@@ -135,7 +135,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
@@ -166,7 +166,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
@@ -32,7 +32,7 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
@@ -31,7 +31,7 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 2
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
@@ -94,7 +94,7 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
@@ -39,7 +39,7 @@
      behaviors:
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -38,7 +38,7 @@
      - !type:EmptyAllContainersBehaviour
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 2
            max: 2
      - !type:DoActsBehavior
@@ -100,7 +100,7 @@
        - !type:EmptyAllContainersBehaviour
        - !type:SpawnEntitiesBehavior
          spawn:
-            SteelSheet1:
+            SheetSteel1:
              min: 1
              max: 1
        - !type:DoActsBehavior
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -144,7 +144,7 @@
        sound: /Audio/Effects/metalbreak.ogg
      - !type:SpawnEntitiesBehavior
        spawn:
-          SteelSheet1:
+          SheetSteel1:
            min: 1
            max: 1
      - !type:DoActsBehavior
--- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
@@ -35,7 +35,7 @@
              anchored: false
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 5
            - !type:DeleteEntity {}
          steps:
@@ -125,7 +125,7 @@
            - !type:EntityAnchored { }
          completed:
            - !type:SpawnPrototype
-              prototype: GlassSheet1
+              prototype: SheetGlass1
              amount: 2
          steps:
            - tool: Prying
@@ -144,8 +144,8 @@
            - !type:EntityAnchored {}
          completed:
            - !type:SpawnPrototype
-              prototype: GlassSheet1 # TODO: Replace with glass shard.
-              amount: 1
+              prototype: ShardBase
+              amount: 2
          steps:
            - tool: Prying
              doAfter: 2
--- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
@@ -37,7 +37,7 @@
  - node: start
    actions:
      - !type:SpawnPrototype
-        prototype: SteelSheet1
+        prototype: SheetSteel1
        amount: 2
      - !type:DeleteEntity {}
    edges:
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -30,7 +30,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 3
            - !type:DeleteEntity {}
          conditions:
@@ -146,7 +146,7 @@
        - to: frame4
          completed:
            - !type:SpawnPrototype
-              prototype: GlassSheet1
+              prototype: SheetGlass1
              amount: 2
          steps:
            - tool: Screwing
--- a/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
@@ -24,7 +24,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 2
            - !type:DeleteEntity {}
          conditions:
@@ -60,7 +60,7 @@
        - to: girder
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 2
          steps:
            - tool: Welding
--- a/Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml
@@ -26,7 +26,7 @@
              doAfter: 2.0
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 2
            - !type:DeleteEntity {}
    - node: bulbLight
@@ -41,6 +41,6 @@
              doAfter: 2.0
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 1
            - !type:DeleteEntity {}
--- a/Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml
@@ -9,7 +9,7 @@
          component: Window
      actions:
        - !type:SpawnPrototype
-          prototype: SteelSheet1
+          prototype: SheetSteel1
          amount: 3
        - !type:DeleteEntity { }
      edges:
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
@@ -5,7 +5,7 @@
    - node: start
      actions:
        - !type:SpawnPrototype
-          prototype: SteelSheet1
+          prototype: SheetSteel1
        - !type:DeleteEntity {}
      edges:
        - to: missingWires
@@ -35,7 +35,7 @@
              anchored: false
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 5
            - !type:DeleteEntity {}
          steps:
--- a/Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml
@@ -16,7 +16,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: SteelSheet1
+              prototype: SheetSteel1
              amount: 5
            - !type:EmptyAllContainers {}
            - !type:DeleteEntity {}
--- a/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/window.yml
@@ -33,7 +33,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: GlassSheet1
+              prototype: SheetGlass1
              amount: 2
            - !type:DeleteEntity {}
          steps:
@@ -48,7 +48,7 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: RGlassSheet1
+              prototype: SheetRGlass1
              amount: 2
            - !type:DeleteEntity {}
          steps:
@@ -67,13 +67,13 @@
        - to: start
          completed:
            - !type:SpawnPrototype
-              prototype: GlassSheet1
+              prototype: SheetGlass1
              amount: 2
            - !type:SpawnPrototype
-              prototype: MetalSheet1
+              prototype: SheetSteel1
              amount: 2
            - !type:SpawnPrototype
-              prototype: PlasmaSheet1
+              prototype: SheetPlasma1
              amount: 2
            - !type:DeleteEntity {}
          steps: