Make Armstuff reciepes useful again. And get rid of unnecessary sheet…

… reciepes (#810) * Arm stuff is easier to craft Crafting arm stuff now is back in line with other reciepes in Time and material * Go away sheet hush hush * Obsolete!
cataclysmbnteam · Sep 5, 2021 · 8fcd176 · 8fcd176
1 parent 99ee6a5
commit 8fcd176
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 95 deletions.
diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
@@ -19,10 +19,10 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 1,
-    "time": "90 m",
+    "time": "15 m",
     "autolearn": true,
-    "byproducts": [ [ "scrap_cotton", 79 ] ],
-    "using": [ [ "tailoring_cotton_patchwork", 1 ] ]
+    "using": [ [ "sewing_standard", 10 ] ],
+    "components": [ [ [ "rag", 4 ] ] ]
   },
   {
     "result": "armguard_chitin",
@@ -32,10 +32,9 @@
     "skill_used": "fabrication",
     "difficulty": 5,
     "skills_required": [ [ "tailor", 3 ] ],
-    "time": "390 m",
+    "time": "30 m",
     "autolearn": true,
-    "byproducts": [ [ "scrap_leather", 80 ] ],
-    "using": [ [ "armor_chitin", 3 ], [ "tailoring_leather_small", 2 ] ]
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ] ]
   },
   {
     "result": "armguard_acidchitin",
@@ -45,10 +44,10 @@
     "skill_used": "fabrication",
     "difficulty": 6,
     "skills_required": [ [ "tailor", 3 ] ],
-    "time": "390 m",
+    "time": "30 m",
     "autolearn": true,
-    "byproducts": [ [ "scrap_leather", 80 ] ],
-    "using": [ [ "armor_acidchitin", 3 ], [ "tailoring_leather_small", 2 ] ]
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
+    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 6 ] ] ]
   },
   {
     "result": "armguard_hard",
@@ -58,10 +57,10 @@
     "skill_used": "fabrication",
     "difficulty": 4,
     "skills_required": [ [ "tailor", 2 ] ],
-    "time": "260 m",
+    "time": "20 m",
     "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ],
-    "byproducts": [ [ "scrap_neoprene", 43 ] ],
-    "using": [ [ "plastic_molding", 2 ], [ "tailoring_neoprene_patchwork", 2 ] ]
+    "tools": [ [ [ "soldering_iron", 15 ], [ "welder", 15 ], [ "hotplate", 15 ], [ "toolset", 15 ] ] ],
+    "components": [ [ [ "neoprene", 6 ] ], [ [ "plastic_chunk", 8 ] ] ]
   },
   {
     "result": "armguard_larmor",
@@ -70,10 +69,10 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "720 m",
+    "time": "40 m",
     "autolearn": true,
-    "byproducts": [ [ "leather", 9 ], [ "scrap_leather", 29 ] ],
-    "using": [ [ "tailoring_leather", 2 ] ]
+    "using": [ [ "sewing_standard", 16 ] ],
+    "components": [ [ [ "leather", 12 ], [ "tanned_hide", 2 ], [ "fur", 12 ], [ "tanned_pelt", 2 ] ] ]
   },
   {
     "result": "armguard_lightplate",
@@ -83,9 +82,12 @@
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 3 ] ],
-    "time": "900 m",
+    "time": "50 m",
     "book_learn": [ [ "textbook_armwest", 6 ] ],
-    "using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 2 ], [ "tailoring_leather", 2 ] ],
+    "components": [
+      [ [ "steel_lump", 6 ], [ "steel_chunk", 24 ] ],
+      [ [ "fur", 6 ], [ "tanned_pelt", 1 ], [ "leather", 6 ], [ "tanned_hide", 1 ] ]
+    ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "swage", -1 ] ] ]
   },
@@ -109,9 +111,9 @@
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "fabrication",
-    "time": "38 m",
+    "time": "30 m",
     "autolearn": true,
-    "using": [ [ "armor_paper", 19 ] ],
+    "components": [ [ [ "paper", 60 ] ], [ [ "duct_tape", 10 ] ] ],
     "flags": [ "BLIND_HARD" ]
   },
   {
@@ -135,10 +137,11 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "280 m",
+    "time": "20 m",
     "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ],
-    "byproducts": [ [ "scrap_cotton", 43 ], [ "scrap_neoprene", 44 ] ],
-    "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "tailoring_neoprene_patchwork", 1 ] ]
+    "using": [ [ "sewing_standard", 20 ] ],
+    "tools": [ [ [ "soldering_iron", 10 ], [ "welder", 10 ], [ "hotplate", 10 ], [ "toolset", 10 ] ] ],
+    "components": [ [ [ "neoprene", 4 ] ], [ [ "rag", 2 ] ] ]
   },
   {
     "result": "elbow_pads",
@@ -148,10 +151,11 @@
     "skill_used": "fabrication",
     "difficulty": 4,
     "skills_required": [ [ "tailor", 1 ] ],
-    "time": "120 m",
+    "time": "30 m",
     "autolearn": true,
-    "byproducts": [ [ "scrap_cotton", 71 ] ],
-    "using": [ [ "plastic_molding", 1 ], [ "tailoring_cotton_patchwork", 1 ] ]
+    "using": [ [ "sewing_standard", 10 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "rag", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ]
   },
   {
     "result": "stockings_tent_arms",
@@ -160,10 +164,10 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 1,
-    "time": "360 m",
+    "time": "60 m",
     "autolearn": true,
-    "byproducts": [ [ "scrap_cotton", 52 ] ],
-    "using": [ [ "tailoring_cotton_patchwork", 4 ] ]
+    "using": [ [ "sewing_standard", 32 ] ],
+    "components": [ [ [ "rag", 40 ] ] ]
   },
   {
     "result": "stockings_tent_arms",
@@ -173,10 +177,10 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 1,
-    "time": "60 m",
+    "time": "20 m",
     "autolearn": true,
     "using": [ [ "sewing_standard", 8 ] ],
-    "components": [ [ [ "stockings", 4 ] ] ]
+    "components": [ [ [ "stockings", 4 ] ], [ [ "rag", 8 ] ] ]
   },
   {
     "result": "vambrace_larmor",
@@ -185,10 +189,10 @@
     "subcategory": "CSC_ARMOR_ARMS",
     "skill_used": "tailor",
     "difficulty": 2,
-    "time": "360 m",
+    "time": "30 m",
     "autolearn": true,
-    "byproducts": [ [ "leather", 2 ], [ "scrap_leather", 42 ] ],
-    "using": [ [ "tailoring_leather", 1 ] ]
+    "using": [ [ "sewing_standard", 8 ] ],
+    "components": [ [ [ "leather", 4 ], [ "tanned_hide", 1 ], [ "fur", 4 ], [ "tanned_pelt", 1 ] ] ]
   },
   {
     "result": "chainmail_arms",
@@ -198,9 +202,14 @@
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
-    "time": "840 m",
+    "time": "40 m",
     "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ],
-    "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ],
-    "using": [ [ "armor_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ]
+    "using": [ [ "chainmail_standard", 3 ] ],
+    "components": [
+      [ [ "link_sheet", 3 ] ],
+      [ [ "chain_link", 75 ] ],
+      [ [ "wire", 1 ] ],
+      [ [ "fur", 6 ], [ "tanned_pelt", 1 ], [ "leather", 6 ], [ "tanned_hide", 1 ] ]
+    ]
   }
 ]
diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -46,65 +46,6 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "sheet_cotton", 16 ] ] ]
   },
-  {
-    "result": "sheet_cotton",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "tailor",
-    "difficulty": 2,
-    "time": "10 m",
-    "charges": 1,
-    "autolearn": true,
-    "tools": [ [ [ "loom_frame", -1 ] ], [ [ "shed_stick", -1 ] ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "thread", 5 ] ] ]
-  },
-  {
-    "result": "sheet_cotton_patchwork",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "tailor",
-    "time": "270 m",
-    "charges": 4,
-    "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "rag", 5 ] ], [ [ "filament", 15, "LIST" ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "sheet_neoprene",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "cooking",
-    "difficulty": 5,
-    "time": "25 m",
-    "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ],
-    "charges": 120,
-    "qualities": [ { "id": "CHEM", "level": 2 } ],
-    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "sheet_metal", -1 ] ] ],
-    "components": [
-      [ [ "chem_ethanol", 50 ], [ "denat_alcohol", 50 ] ],
-      [ [ "copper_scrap_equivalent", 2, "LIST" ] ],
-      [ [ "acid", 1 ] ],
-      [ [ "bleach", 2 ] ],
-      [ [ "oxy_powder", 50 ] ],
-      [ [ "scrap", 1 ] ]
-    ]
-  },
-  {
-    "result": "sheet_neoprene_patchwork",
-    "type": "recipe",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "tailor",
-    "time": "270 m",
-    "charges": 4,
-    "autolearn": true,
-    "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "neoprene", 5 ] ], [ [ "filament", 15, "LIST" ] ] ]
-  },
   {
     "type": "recipe",
     "result": "tanned_hide",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2560,9 +2560,29 @@
     "result": "hand_axe",
     "obsolete": true
   },
+  {
+    "type": "recipe",
+    "result": "sheet_cotton_patchwork",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sheet_neoprene",
+    "obsolete": true
+  },
   {
     "type": "recipe",
     "result": "makeshift_axe",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sheet_neoprene_patchwork",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "sheet_cotton",
+    "obsolete": true
   }
 ]