Make shivs based on construction (#23134)

* comit

* remove construnt

* 222

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index cdccac8c60e4927541181668e9a36db0ada7a37d..c5abc9d8cc06a4e1da8771c75a0ea08c0508b848 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -108,6 +108,9 @@
         reagents:
         - ReagentId: Silicon
           Quantity: 5 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
+  - type: Construction
+    graph: Shiv
+    node: start
 
 - type: entity
   parent: ShardBase
@@ -137,6 +140,9 @@
         reagents:
         - ReagentId: Silicon
           Quantity: 5 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
+  - type: Construction
+    graph: ReinforcedShiv
+    node: start
 
 - type: entity
   parent: ShardBase
@@ -168,6 +174,9 @@
           Quantity: 5
         - ReagentId: Plasma
           Quantity: 5
+  - type: Construction
+    graph: PlasmaShiv
+    node: start
 
 - type: entity
   parent: ShardBase
@@ -200,3 +209,6 @@
           Quantity: 5
         - ReagentId: Uranium
           Quantity: 5
+  - type: Construction
+    graph: UraniumShiv
+    node: start

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
index e14b539096bce939b901d702efc47948fdd4c24a..54e518fd7872f7f85f15aea5e1e7a649698f5bce 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
@@ -2,78 +2,58 @@
   id: Shiv
   start: start
   graph:
-    - node: start
-      edges:
-        - to: icon
-          steps:
-            - material: Cloth
-              amount: 1
-              doAfter: 1
-            - tag: GlassShard
-              name: Glass Shard
-              icon:
-                sprite: Objects/Materials/Shards/shard.rsi
-                state: shard1
-              doAfter: 1
-    - node: icon
-      entity: Shiv
+  - node: start
+    entity: ShardGlass
+    edges:
+    - to: icon
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: Shiv
 
 - type: constructionGraph
   id: ReinforcedShiv
   start: start
   graph:
-    - node: start
-      edges:
-        - to: icon
-          steps:
-            - material: Cloth
-              amount: 1
-              doAfter: 1
-            - tag: ReinforcedGlassShard
-              name: Reinforced Glass Shard
-              icon:
-                sprite: Objects/Materials/Shards/shard.rsi
-                state: shard1
-              doAfter: 1
-    - node: icon
-      entity: ReinforcedShiv
+  - node: start
+    entity: ShardGlassReinforced
+    edges:
+    - to: icon
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: ReinforcedShiv
 
 - type: constructionGraph
   id: PlasmaShiv
   start: start
   graph:
-    - node: start
-      edges:
-        - to: icon
-          steps:
-            - material: Cloth
-              amount: 1
-              doAfter: 1
-            - tag: PlasmaGlassShard
-              name: Plasma Glass Shard
-              icon:
-                sprite: Objects/Materials/Shards/shard.rsi
-                state: shard1
-              doAfter: 1
-    - node: icon
-      entity: PlasmaShiv
+  - node: start
+    entity: ShardGlassPlasma
+    edges:
+    - to: icon
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: PlasmaShiv
 
 - type: constructionGraph
   id: UraniumShiv
   start: start
   graph:
-    - node: start
-      edges:
-        - to: icon
-          steps:
-            - material: Cloth
-              amount: 1
-              doAfter: 1
-            - tag: UraniumGlassShard
-              name: Uranium Glass Shard
-              icon:
-                sprite: Objects/Materials/Shards/shard.rsi
-                state: shard1
-              doAfter: 1
-    - node: icon
-      entity: UraniumShiv
+  - node: start
+    entity: ShardGlassUranium
+    edges:
+    - to: icon
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: UraniumShiv

diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 24e46f3856fda166add86d5b0d8c78ec10cc6a00..865184fad0c9f06faf1cbe79d0c049674e195fbd 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,47 +1,3 @@
-- type: construction
-  name: glass shiv
-  id: Shiv
-  graph: Shiv
-  startNode: start
-  targetNode: icon
-  category: construction-category-weapons
-  description: A glass shard with a piece of cloth wrapped around it.
-  icon: { sprite: Objects/Weapons/Melee/shiv.rsi, state: icon }
-  objectType: Item
-
-- type: construction
-  name: reinforced shiv
-  id: ReinforcedShiv
-  graph: ReinforcedShiv
-  startNode: start
-  targetNode: icon
-  category: construction-category-weapons
-  description: A reinforced glass shard with a piece of cloth wrapped around it.
-  icon: { sprite: Objects/Weapons/Melee/reinforced_shiv.rsi, state: icon }
-  objectType: Item
-
-- type: construction
-  name: plasma shiv
-  id: PlasmaShiv
-  graph: PlasmaShiv
-  startNode: start
-  targetNode: icon
-  category: construction-category-weapons
-  description: A plasma shard with a piece of cloth wrapped around it.
-  icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon }
-  objectType: Item
-
-- type: construction
-  name: uranium shiv
-  id: UraniumShiv
-  graph: UraniumShiv
-  startNode: start
-  targetNode: icon
-  category: construction-category-weapons
-  description: A uranium shard with a piece of cloth wrapped around it.
-  icon: { sprite: Objects/Weapons/Melee/uranium_shiv.rsi, state: icon }
-  objectType: Item
-
 - type: construction
   name: crude spear
   id: Spear