Miscellaneous Clothing Disassembly’s: 2 (#74675)

* fixes merge errors. * adds the uncrafts. * replaces ’ with '. * Update data/json/uncraft/armor/torso.json Co-authored-by: Karol1223 <[email protected]> * Update data/json/uncraft/armor/torso.json Co-authored-by: Karol1223 <[email protected]> --------- Co-authored-by: Karol1223 <[email protected]>
CleverRaven · Jun 25, 2024 · f0d983a · f0d983a
1 parent 6a8487d
commit f0d983a
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 2 deletions.
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
@@ -774,5 +774,20 @@
     "material": [ "canvas" ],
     "symbol": "=",
     "color": "dark_gray"
+  },
+  {
+    "id": "strap_cotton",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "fabric strap" },
+    "description": "A strip of broad, flat cotton, 42 inches in length, with a metal adjustment buckle threaded in the centre.  Normally used as a shoulder strap for bags, its ends are usually sown about a corresponding container's D-rings.",
+    "weight": "59 g",
+    "volume": "52 ml",
+    "//": "Medium weight cotton fabric with a GSM of 203",
+    "price": "0 USD",
+    "price_postapoc": "5 cent",
+    "material": [ { "type": "cotton", "portion": 6 }, { "type": "steel", "portion": 1 } ],
+    "symbol": "=",
+    "color": "dark_gray"
   }
 ]
diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json
@@ -113,14 +113,14 @@
     "type": "requirement",
     "//": "A small piece of fabric or leather to strap something firmly to the body.  Stronger than a bit of string.",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [ [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ], [ "strap_cotton", 1 ] ] ]
   },
   {
     "id": "strap_large",
     "type": "requirement",
     "//": "A long piece of fabric or leather to strap something firmly to the body.  Stronger than a bit of string.",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "cordage_short", 1, "LIST" ], [ "leather", 4 ], [ "fur", 4 ] ] ]
+    "components": [ [ [ "cordage_short", 1, "LIST" ], [ "leather", 4 ], [ "fur", 4 ], [ "strap_cotton", 1 ] ] ]
   },
   {
     "id": "dye_cloth",

diff --git a/data/json/uncraft/armor/headwear.json b/data/json/uncraft/armor/headwear.json
@@ -0,0 +1,12 @@
+[
+  {
+    "result": "cowboy_hat",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "tailor",
+    "difficulty": 1,
+    "time": "4 m",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "leather", 14 ] ], [ [ "thread", 40 ] ] ]
+  }
+]
diff --git a/data/json/uncraft/armor/legs.json b/data/json/uncraft/armor/legs.json
@@ -1,4 +1,21 @@
 [
+  {
+    "result": "pants_tactical",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "tailor",
+    "difficulty": 2,
+    "time": "5 m",
+    "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "zipper_short_plastic", 1 ] ],
+      [ [ "snapfastener_steel", 6 ] ],
+      [ [ "button_steel", 1 ] ],
+      [ [ "sheet_nylon", 10 ] ],
+      [ [ "nylon", 15 ] ],
+      [ [ "cotton_patchwork", 6 ] ]
+    ]
+  },
   {
     "result": "pants_leather",
     "type": "uncraft",

diff --git a/data/json/uncraft/armor/storage.json b/data/json/uncraft/armor/storage.json
@@ -56,5 +56,15 @@
     "time": "35 m",
     "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ],
     "components": [ [ [ "sheet_lycra_patchwork", 9 ] ], [ [ "button_plastic", 1 ] ], [ [ "plastic_sheet_small", 38 ] ] ]
+  },
+  {
+    "result": "gas_mask_pouch",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "tailor",
+    "difficulty": 1,
+    "time": "2 m 30 s",
+    "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "strap_cotton", 1 ] ], [ [ "snapfastener_steel", 2 ] ], [ [ "sheet_nylon", 3 ] ], [ [ "nylon", 11 ] ] ]
   }
 ]
diff --git a/data/json/uncraft/armor/torso.json b/data/json/uncraft/armor/torso.json
@@ -1,4 +1,43 @@
 [
+  {
+    "result": "tacjacket",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "tailor",
+    "difficulty": 2,
+    "time": "4 m 30 s",
+    "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "components": [
+      [ [ "zipper_short_plastic", 3 ] ],
+      [ [ "zipper_long_plastic", 1 ] ],
+      [ [ "snapfastener_steel", 5 ] ],
+      [ [ "sheet_nylon", 16 ] ],
+      [ [ "nylon", 18 ] ],
+      [ [ "cotton_patchwork", 4 ] ]
+    ]
+  },
+  {
+    "result": "jacket_army",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "skill_used": "tailor",
+    "difficulty": 2,
+    "time": "6 m ",
+    "qualities": [ { "id": "FABRIC_CUT", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "//": "Extra 4 plastic buttons, on top of the 4 present to cover the pockets, represent the interior buttons for securing the liner. 2 more plastic buttons represent the epaulettes. 2 additional buttons represent the sleave closures.",
+    "//2": "The short plastic zipper represents the closure for the compartment designed to retain the concealable hood.",
+    "//3": "Snap fasteners represent the pop-closure buttons present on the storm flap.",
+    "components": [
+      [ [ "button_plastic", 12 ] ],
+      [ [ "zipper_short_plastic", 1 ] ],
+      [ [ "zipper_long_plastic", 1 ] ],
+      [ [ "snapfastener_steel", 5 ] ],
+      [ [ "sheet_nylon", 20 ] ],
+      [ [ "sheet_cotton", 4 ] ],
+      [ [ "nylon", 10 ] ],
+      [ [ "cotton_patchwork", 8 ] ]
+    ]
+  },
   {
     "result": "tank_top",
     "type": "uncraft",