Add table deconstruction and fix table destructible spawns (#3705)

* Add table deconstruction and fix table destructible spawns

* Change table names to match and add construction recipes

* Fix reinforced table and table frame destruction not dropping metal rods

Resources/Prototypes/Recipes/Construction/Graphs/tables.yml

@@ -1,8 +1,10 @@
 - type: constructionGraph
-  id: Tables
+  id: table
   start: start
   graph:
     - node: start
+      actions:
+        - !type:DeleteEntity {}
       edges:
         - to: TableFrame
           completed:
@@ -13,9 +15,6 @@
               amount: 2
               doAfter: 1
 
-    - node: PokerTable
-      entity: TableCarpet
-
     - node: TableFrame
       entity: TableFrame
       edges:
@@ -24,60 +23,132 @@
             - !type:SpawnPrototype
                 prototype: PartRodMetal
                 amount: 2
-            - !type:DeleteEntity {}
           steps:
             - tool: Anchoring
               doAfter: 1
 
-        - to: MetalTable
+        - to: Table
           steps:
             - material: Steel
               amount: 1
               doAfter: 1
 
-        - to: ReinforcedTable
+        - to: TableReinforced
           steps:
             - material: Plasteel
               amount: 1
               doAfter: 1
 
-        - to: GlassTable
+        - to: TableGlass
           steps:
             - material: Glass
               amount: 1
               doAfter: 1
 
-        - to: WoodTable
-          steps:
-            - material: WoodPlank
-              amount: 1
-              doAfter: 1
-
-        - to: RGlassTable
+        - to: TableReinforcedGlass
           steps:
             - material: ReinforcedGlass
               amount: 1
               doAfter: 1
 
-
-
-    - node: MetalTable
-      entity: TableMetal
-
-    - node: ReinforcedTable
-      entity: TableR
-
-    - node: GlassTable
-      entity: TableGlass
-
-    - node: WoodTable
-      entity: TableWood
-      edges:
-        - to: PokerTable
+        - to: TableWood
           steps:
             - material: WoodPlank
               amount: 1
               doAfter: 1
 
-    - node: RGlassTable
-      entity: TableGlassR
+    - node: Table
+      entity: Table
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 1
+          steps:
+            - tool: Anchoring
+              doAfter: 1
+
+        - to: TableBar
+          steps:
+            - material: Cloth
+              amount: 1
+              doAfter: 1
+
+    - node: TableBar
+      entity: TableBar
+      edges:
+        - to: Table
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCloth1
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableReinforced
+      entity: TableReinforced
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetPlasteel1
+              amount: 1
+          steps:
+            - tool: Anchoring
+              doAfter: 1
+
+    - node: TableGlass
+      entity: TableGlass
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetGlass1
+              amount: 1
+          steps:
+            - tool: Anchoring
+              doAfter: 1
+
+    - node: TableReinforcedGlass
+      entity: TableReinforcedGlass
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRGlass1
+              amount: 1
+          steps:
+            - tool: Anchoring
+              doAfter: 1
+
+    - node: TableWood
+      entity: TableWood
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+        - to: TableCarpet
+          steps:
+            - material: Cloth
+              amount: 1
+              doAfter: 1
+
+    - node: TableCarpet
+      entity: TableCarpet
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCloth1
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1

Resources/Prototypes/Recipes/Construction/structures.yml

@@ -141,40 +141,6 @@
   conditions:
     - !type:TileNotBlocked {}
 
-- type: construction
-  name: Table Frame
-  id: TableFrame
-  graph: Tables
-  startNode: start
-  targetNode: TableFrame
-  category: Structures
-  description: A sturdy frame used in the construction of tables
-  icon:
-    sprite: Constructible/Structures/Tables/frame.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked {}
-
-- type: construction
-  name: Poker Table
-  id: PokerTable
-  graph: Tables
-  startNode: start
-  targetNode: PokerTable
-  category: Structures
-  description: A square piece of wood standing on four legs. (What did you expect?)
-  icon:
-    sprite: Constructible/Structures/Tables/carpet.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked {}
-
 - type: construction
   name: Catwalk
   id: Catwalk

Resources/Prototypes/Recipes/Construction/tables.yml

@@ -0,0 +1,118 @@
+- type: construction
+  name: table
+  id: Table
+  graph: table
+  startNode: start
+  targetNode: Table
+  category: Structures
+  description: A square piece of metal standing on four metal legs.
+  icon:
+    sprite: Constructible/Structures/Tables/carpet.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: bar table
+  id: TableBar
+  graph: table
+  startNode: start
+  targetNode: TableBar
+  category: Structures
+  description: A fancy table. Perfect for serving drinks.
+  icon:
+    sprite: Constructible/Structures/Tables/bar.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: reinforced table
+  id: TableReinforced
+  graph: table
+  startNode: start
+  targetNode: TableReinforced
+  category: Structures
+  description: A square piece of metal standing on four metal legs. Extra robust.
+  icon:
+    sprite: Constructible/Structures/Tables/reinforced.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: glass table
+  id: TableGlass
+  graph: table
+  startNode: start
+  targetNode: TableGlass
+  category: Structures
+  description: A square piece of glass, standing on four metal legs.
+  icon:
+    sprite: Constructible/Structures/Tables/glass.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: reinforced glass table
+  id: TableReinforcedGlass
+  graph: table
+  startNode: start
+  targetNode: TableReinforcedGlass
+  category: Structures
+  description: A square piece of glass, standing on four metal legs. Extra robust.
+  icon:
+    sprite: Constructible/Structures/Tables/r_glass.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: wood table
+  id: TableWood
+  graph: table
+  startNode: start
+  targetNode: TableWood
+  category: Structures
+  description: Do not apply fire to this. Rumour says it burns easily.
+  icon:
+    sprite: Constructible/Structures/Tables/wood.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}
+
+- type: construction
+  name: poker table
+  id: TableCarpet
+  graph: table
+  startNode: start
+  targetNode: TableCarpet
+  category: Structures
+  description: A square piece of wood standing on four legs covered by a cloth. (What did you expect?)
+  icon:
+    sprite: Constructible/Structures/Tables/carpet.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked {}