From 682b0f7b783fd374e5030e986e5b9f82ab05e160 Mon Sep 17 00:00:00 2001
From: Psycrow <151663985+YmepIIIij-TeRorIst@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:29:02 +0100
Subject: [PATCH] Delete structures on workbench (#549)

* Transfer of crafting barrels

* Sorry, error fix

* Come on, Work!
---
 .../Entities/Structures/Furniture/barrel.yml  |  7 +++--
 .../Construction/Graphs/Furniture/Misc.yml    | 29 +++++++++++++++----
 .../_CP14/Recipes/Construction/furniture.yml  | 20 ++++++++++++-
 .../_CP14/Recipes/Workbench/workbench.yml     | 11 +------
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
index c4c55908b6..d0598f0861 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: CP14BaseBarrel
-  parent: 
+  parent:
   - BaseStructureDynamic
   - CP14BaseFlammable
   name: wooden barrel
@@ -14,6 +14,9 @@
     noRot: true
   - type: InteractionOutline
   - type: Physics
+  - type: Construction
+    graph: CP14BaseBarrel
+    node: CP14BaseBarrel
   - type: Fixtures
     fixtures:
       fix1:
@@ -223,4 +226,4 @@
       barrel:
         reagents:
         - ReagentId: CP14LumiMushroom
-          Quantity: 300
\ No newline at end of file
+          Quantity: 300
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml
index 9d425769b0..c2f9e347f4 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml
@@ -14,10 +14,30 @@
             - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
-              
+
     - node: CP14Bonfire
       entity: CP14Bonfire
 
+- type: constructionGraph
+  id: CP14BaseBarrel
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: CP14BaseBarrel
+          steps:
+            - material: CP14WoodenPlanks
+              amount: 5
+              doAfter: 3
+            - material: CP14Nail
+              amount: 2
+              doAfter: 2
+
+    - node: CP14BaseBarrel
+      entity: CP14BaseBarrel
+
 - type: constructionGraph
   id: CP14WallmountTorch
   start: start
@@ -31,7 +51,7 @@
             - material: CP14WoodenPlanks
               amount: 3
               doAfter: 3
-              
+
     - node: CP14WallmountTorch
       entity: CP14WallmountTorch
 
@@ -48,7 +68,7 @@
             - material: CP14CopperBar
               amount: 3
               doAfter: 3
-              
+
     - node: CP14WallmountLampEmpty
       entity: CP14WallmountLampEmpty
 
@@ -65,7 +85,6 @@
             - material: CP14WoodenPlanks
               amount: 3
               doAfter: 3
-              
+
     - node: CP14WallmountOrdersBorder
       entity: CP14WallmountOrdersBorder
-
diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
index fc83cef488..49416bad73 100644
--- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
@@ -16,6 +16,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  crystallPunkAllowed: true
+  name: Wooden barrel
+  description: The simplest design for storing liquids.
+  id: CP14BaseBarrel
+  graph: CP14BaseBarrel
+  startNode: start
+  targetNode: CP14BaseBarrel
+  category: construction-category-furniture
+  icon:
+    sprite: _CP14/Structures/Furniture/barrel.rsi
+    state: barrel
+  objectType: Structure
+  placementMode: PlaceFree
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   crystallPunkAllowed: true
   name: Wooden table
@@ -131,7 +149,7 @@
 - type: construction
   crystallPunkAllowed: true
   name: Crystal wall lamp
-  description: A simple wallmount magical device that converts crystal energy into bright light. 
+  description: A simple wallmount magical device that converts crystal energy into bright light.
   id: CP14WallmountLampEmpty
   graph: CP14WallmountLampEmpty
   startNode: start
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
index efc2b3a803..7799b114a4 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
@@ -8,15 +8,6 @@
     CP14WoodenPlanks: 3
   result: CP14Bucket
 
-- type: CP14Recipe
-  id: CP14BaseBarrel
-  tag: CP14RecipeWorkbench
-  craftTime: 3
-  stacks:
-    CP14WoodenPlanks: 5
-    CP14Nail: 2
-  result: CP14BaseBarrel
-
 - type: CP14Recipe
   id: CP14WoodenBeerMug
   tag: CP14RecipeWorkbench
@@ -59,4 +50,4 @@
   craftTime: 4
   stacks:
     CP14WoodenPlanks: 3
-  result: CP14BaseBattleStaff
\ No newline at end of file
+  result: CP14BaseBattleStaff