Makes a whole bunch of raw materials grindable (#22113)

* makes a whole bunch of raw materials grindable

* fix tests maybe

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 898d2c37c16691d05a9a97213d4d3c6efe03292c..56d8d26319e840e390de7c9d24c6507ff0310798 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -72,6 +72,14 @@
   - type: Construction
     graph: Glass
     node: SheetGlass
+  - type: Extractable
+    grindableSolutionName: glass
+  - type: SolutionContainerManager
+    solutions:
+      glass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
 
 - type: entity
   parent: SheetGlass
@@ -168,6 +176,18 @@
   - type: Stack
     stackType: ReinforcedGlass
     count: 1
+  - type: Extractable
+    grindableSolutionName: rglass
+  - type: SolutionContainerManager
+    solutions:
+      rglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
+        - ReagentId: Iron
+          Quantity: 11
+        - ReagentId: Carbon
+          Quantity: 1
 
 - type: entity
   parent: SheetGlassBase
@@ -230,6 +250,16 @@
   - type: Stack
     stackType: PlasmaGlass
     count: 1
+  - type: Extractable
+    grindableSolutionName: pglass
+  - type: SolutionContainerManager
+    solutions:
+      pglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
+        - ReagentId: Plasma
+          Quantity: 10
 
 - type: entity
   parent: SheetPGlass
@@ -258,6 +288,20 @@
   - type: Construction
     graph: Glass
     node: SheetRPGlass
+  - type: Extractable
+    grindableSolutionName: rpglass
+  - type: SolutionContainerManager
+    solutions:
+      rpglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
+        - ReagentId: Plasma
+          Quantity: 10
+        - ReagentId: Iron
+          Quantity: 11
+        - ReagentId: Carbon
+          Quantity: 1
 
 - type: entity
   parent: SheetRPGlass
@@ -320,6 +364,16 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Extractable
+    grindableSolutionName: uglass
+  - type: SolutionContainerManager
+    solutions:
+      uglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
+        - ReagentId: Uranium
+          Quantity: 10
 
 - type: entity
   parent: SheetUGlass
@@ -359,7 +413,20 @@
   - type: Construction
     graph: Glass
     node: SheetRUGlass
-
+  - type: Extractable
+    grindableSolutionName: ruglass
+  - type: SolutionContainerManager
+    solutions:
+      ruglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 22
+        - ReagentId: Uranium
+          Quantity: 10
+        - ReagentId: Iron
+          Quantity: 11
+        - ReagentId: Carbon
+          Quantity: 1
 - type: entity
   parent: SheetRUGlass
   id: SheetRUGlass1

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 99c7ae0e117c3db5e83c4b412dd39d35a7c33106..9e5d735587ae2756316178581552a58a62212796 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -127,6 +127,20 @@
   - type: Item
     heldPrefix: plasteel
   - type: Appearance
+  - type: Extractable
+    grindableSolutionName: plasteel
+  - type: SolutionContainerManager
+    solutions:
+      plasteel:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 10
+        - ReagentId: Iron
+          Quantity: 22
+        - ReagentId: Carbon
+          Quantity: 2.5
+        - ReagentId: Lead
+          Quantity: 0.5
 
 - type: entity
   parent: SheetPlasteel

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 31fefb681efb33aca4ed796609cb66f5d5ccce88..cf347bee86002f9bb147ae996e8e8284f499d865 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -49,6 +49,18 @@
   - type: Item
     heldPrefix: paper
   - type: Appearance
+  - type: SolutionContainerManager
+#This should maybe be cellulose later on, refer to the comments in materials.yml on wood.
+    solutions:
+      wood:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 2
+        - ReagentId: Oxygen
+          Quantity: 0.5
+        - ReagentId: Hydrogen
+          Quantity: 0.5
+
 
 - type: entity
   parent: SheetPaper

diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
index d383a7266d51c2cb7e1eeb0a3b4e76e9b4959d0d..24e8ca649c9946dc8208ef6b61c28417ce18c885 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -51,7 +51,15 @@
   - type: Item
     heldPrefix: gold
   - type: Appearance
-
+  - type: Extractable
+    grindableSolutionName: gold
+  - type: SolutionContainerManager
+    solutions:
+      gold:
+        reagents:
+        - ReagentId: Gold
+          Quantity: 10
+          
 - type: entity
   parent: IngotGold
   id: IngotGold1
@@ -88,6 +96,14 @@
   - type: Item
     heldPrefix: silver
   - type: Appearance
+  - type: Extractable
+    grindableSolutionName: gold
+  - type: SolutionContainerManager
+    solutions:
+      gold:
+        reagents:
+        - ReagentId: Silver
+          Quantity: 10
 
 - type: entity
   parent: IngotSilver

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index c74bec6a061970a5b154eb59c494a1c705b49ea1..2f3a142a6e318a668115bd564c0dd0232db66ecb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -197,7 +197,14 @@
     state: durathread
   - type: Stack
     count: 1
-
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents: #Hell if I know what durathread is made out of.
+        - ReagentId: Fiber
+          Quantity: 6
+          
 - type: entity
   parent: MaterialBase
   id: MaterialWoodPlank
@@ -228,6 +235,20 @@
     - Wooden
     - DroneUsable
     - RawMaterial
+  - type: Extractable
+    grindableSolutionName: wood
+  - type: SolutionContainerManager
+#Apparently these all components of cellulose, which is what you got in /tg/ when grinding wood + a bunch of other shit.
+#Considering the frequency of it, maybe there should be a cellulose reagent instead?
+    solutions:
+      wood:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 10
+        - ReagentId: Oxygen
+          Quantity: 5
+        - ReagentId: Hydrogen
+          Quantity: 5
 
 - type: entity
   parent: MaterialWoodPlank
@@ -335,6 +356,14 @@
     state: diamond
   - type: Item
     heldPrefix: diamond
+  - type: Extractable
+    grindableSolutionName: diamond
+  - type: SolutionContainerManager
+    solutions:
+      diamond:
+        reagents:
+        - ReagentId: Carbon
+          Quantity: 20
 
 - type: entity
   parent: MaterialDiamond
@@ -372,6 +401,11 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 5
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fiber
+        Quantity: 3
   - type: Tag
     tags:
       - ClothMade
@@ -472,6 +506,11 @@
       - cobwebs
     ignoreReagents:
       - Fiber
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fiber
+        Quantity: 3
   - type: SolutionContainerManager
     solutions:
       food:

diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 7529bdee04fd8f0f43935dd0e8ba17a04db7338e..2892dc4a28aae258092f6d755c806d64a87ee5cf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -29,6 +29,9 @@
   name: metal rods
   suffix: Full
   components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50 #Half of a regular steel sheet to reflect the crafting recipe
   - type: Stack
     stackType: MetalRod
     baseLayer: base
@@ -58,6 +61,16 @@
     price: 0
   - type: StackPrice
     price: 5
+  - type: Extractable
+    grindableSolutionName: rod
+  - type: SolutionContainerManager
+    solutions:
+      rod:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 11
+        - ReagentId: Carbon #Not 1.25 (half of 2.5) because that would probably be really weird
+          Quantity: 1
 
 - type: entity
   parent: PartRodMetal

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 8129ab2116c2587dc30826744891c8563203620a..f2d2b3a63b628a096cf81bb064145a4829050c15 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -100,6 +100,14 @@
     tags:
       - GlassShard
       - Trash
+  - type: Extractable
+    grindableSolutionName: shardglass
+  - type: SolutionContainerManager
+    solutions:
+      shardglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 11 #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: entity
   parent: ShardBase
@@ -121,6 +129,14 @@
     tags:
       - ReinforcedGlassShard
       - Trash
+  - type: Extractable
+    grindableSolutionName: shardrglass
+  - type: SolutionContainerManager
+    solutions:
+      shardrglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 11 #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: entity
   parent: ShardBase
@@ -142,6 +158,16 @@
     tags:
       - PlasmaGlassShard
       - Trash
+  - type: Extractable
+    grindableSolutionName: shardpglass
+  - type: SolutionContainerManager
+    solutions:
+      shardpglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 11
+        - ReagentId: Plasma
+          Quantity: 5
 
 - type: entity
   parent: ShardBase
@@ -164,4 +190,13 @@
     tags:
       - UraniumGlassShard
       - Trash
-
+  - type: Extractable
+    grindableSolutionName: sharduglass
+  - type: SolutionContainerManager
+    solutions:
+      sharduglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 11
+        - ReagentId: Uranium
+          Quantity: 5

diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index b090b384470be78b8454796014a1a40b9cf45908..f1f300bc9ce263ef3cccf618723756377c01340e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -52,6 +52,18 @@
     cablePrototypeID: CableHV
     blockingWireType: HighVoltage
   - type: Appearance
+  - type: Extractable
+    grindableSolutionName: hvcable
+  - type: SolutionContainerManager
+    solutions:
+      hvcable:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 3
+        - ReagentId: Copper
+          Quantity: 3
+        - ReagentId: Carbon #steel-reinforced
+          Quantity: 1
 
 - type: entity
   parent: CableHVStack
@@ -107,6 +119,16 @@
     cablePrototypeID: CableMV
     blockingWireType: MediumVoltage
   - type: Appearance
+  - type: Extractable
+    grindableSolutionName: mvcable
+  - type: SolutionContainerManager
+    solutions:
+      mvcable:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 3
+        - ReagentId: Copper
+          Quantity: 3
 
 - type: entity
   parent: CableMVStack
@@ -161,6 +183,16 @@
     cablePrototypeID: CableApcExtension
     blockingWireType: Apc
   - type: Appearance
+  - type: Extractable
+    grindableSolutionName: lvcable
+  - type: SolutionContainerManager
+    solutions:
+      lvcable:
+        reagents:
+        - ReagentId: Iron
+          Quantity: 3
+        - ReagentId: Copper
+          Quantity: 3
 
 - type: entity
   parent: CableApcStack
@@ -189,4 +221,4 @@
   - type: Sprite
     state: coillv-10
   - type: Stack
-    count: 1
+    count: 1
\ No newline at end of file