Sheet-meister 2000 Cloth recipe (#32676)

* Sheet-meister 2000 can now make rolls of cloth

* Small Cleanup

* resolve conflicts

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 0fc716bda530e6daecc9b68d5787142d00b78a21..657b7f5f0fe992a43bdeabfe8d2c6e19e099774d 100644 (file)
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -27,6 +27,7 @@ materials-bones = bone
 materials-coal = coal
 materials-diamond = diamond
 materials-gunpowder = gunpowder
+materials-cotton = cotton
 
 # Ores
 materials-raw-iron = raw iron

diff --git a/Resources/Locale/en-US/materials/units.ftl b/Resources/Locale/en-US/materials/units.ftl
index bff854086b483593f8fe1305712f7c8012245da9..ea35ecdad3e8187f1901a6ded1a86cb865fa7a77 100644 (file)
--- a/Resources/Locale/en-US/materials/units.ftl
+++ b/Resources/Locale/en-US/materials/units.ftl
@@ -16,6 +16,8 @@ materials-unit-slab = slab
 materials-unit-web = web
 # chunks of ore
 materials-unit-chunk = chunk
+# boll of cotton
+materials-unit-boll = boll
 
 # bills of spesos... not very good but they are not (yet?) used for crafting anything
 # also the lathe/atm would need bigger denominations to output...

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index a5d097d86dfd26f247505f454e0ecc9a24324453..ea718c07440e301968c4cfea68d6390f44d7a075 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -438,9 +438,15 @@
     tags:
       - ClothMade
       - RawMaterial
+      - Boll
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Cotton: 100
   - type: Item
     heldPrefix: cotton
 
+
 - type: entity
   parent: MaterialCotton
   id: MaterialCotton1

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3b4b9cf5d2f64580aa48f94cbd90ed781aad7e5c..7d82ddf10ececdcb9992aff355b1ddd7495e4955 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -653,6 +653,7 @@
       tags:
       - Raw
       - Wooden
+      - Boll
   - type: Lathe
     idleState: base_machine
     runningState: base_machine_processing

diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 96eaf136d38cf86dccfda4dc8d0b39cc0bf31f8a..9d8484e9f0bf7929a2b47a227b5a36d95dbab175 100644 (file)
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -100,6 +100,14 @@
   color: "#eeeeee" #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
   price: 0 # Maybe better for it to be priceless, knowing how greedy cargo is.
 
+- type: material
+  id: Cotton
+  name: materials-cotton
+  unit: materials-unit-boll
+  icon: { sprite: Objects/Materials/materials.rsi, state: cotton }
+  color: "#cccccc" 
+  price: 0.01 #Who knew cotton was infinitely more valuable than silk
+
 - type: material
   id: Bones
   name: materials-bones

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/sheetifier.yml b/Resources/Prototypes/Recipes/Lathes/Packs/sheetifier.yml
index 18aaef55c6e78d97e7ce3ef91d03e9223580bca9..6406c1b211d973f0e19428616fb0ebcc32aa8eaa 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/sheetifier.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/sheetifier.yml
@@ -5,3 +5,4 @@
   recipes:
   - MaterialSheetMeat
   - SheetPaper
+  - MaterialClothCotton

diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 0712211972915bb4b2369777f0843667e8574043..82ceceee778195165cc67ef38430615ee96edd6b 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -244,3 +244,10 @@
   completetime: 1
   materials:
     Wood: 50
+
+- type: latheRecipe
+  id: MaterialClothCotton
+  result: MaterialCloth1
+  completetime: 1
+  materials:
+    Cotton: 200 #my pyrocloth keeps catching on fire whenever I make it!

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 65e02c3ea5b6103cb0672fa1f55efc182857bccb..682b561f0fc5d18cca450706c1bef96d50e6d58a 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -78,6 +78,9 @@
 - type: Tag
   id: BodyBag
 
+- type: Tag
+  id: Boll
+
 - type: Tag
   id: Book