Innawoods updating 2 (CleverRaven#59772)

* Update tool_tailoring.json fibercloth patches, desc update * Update materials.json fibercloth update * Update recipe_food.json fix honeydew recipe quantity. * Update medsandchemicals.json updated makeshift bandages * Update recipe_others.json update yoke and duct tape with more coherent patch requirements. * Update recipe_deconstruction.json fibercloth uncraft * Update tailoring.json updating for fibercloth patches * Update materials.json updating for fibercloth patches * Update tools_containers.json canvas bags with fibercloth. * Update dictionary.txt add fibercloth
alef · Aug 5, 2022 · b6f362a · b6f362a
1 parent d7fb740
commit b6f362a
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 5 deletions.
diff --git a/data/mods/innawood/items/tool_tailoring.json b/data/mods/innawood/items/tool_tailoring.json
@@ -114,13 +114,36 @@
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "fibercloth sheet" },
-    "description": "A sheet of fabric woven from plant fiber, suitable for making clothing.",
+    "description": "A 12 inch by 24 inch sheet of fabric woven from plant fiber, suitable for making clothing.",
     "weight": "38 g",
     "volume": "47 ml",
     "price": 1000,
     "price_postapoc": 100,
     "material": [ "fibercloth" ],
     "symbol": "=",
     "color": "green"
+  },
+  {
+    "id": "fibercloth_patchwork",
+    "type": "TOOL",
+    "category": "spare_parts",
+    "name": { "str": "fibercloth patch", "str_pl": "fibercloth patches" },
+    "description": "A 6 inch square fibercloth patch, suitable for use in repairing and tailoring of clothing.",
+    "weight": "5 g",
+    "volume": "6 ml",
+    "price": 200,
+    "price_postapoc": 2,
+    "material": [ "fibercloth" ],
+    "symbol": ",",
+    "color": "green",
+    "use_action": [
+      {
+        "type": "heal",
+        "move_cost": 200,
+        "used_up_item": { "id": "fibercloth_patchwork", "quantity": 1, "flags": [ "FILTHY" ] }
+      },
+      "WASH_HARD_ITEMS"
+    ],
+    "flags": [ "NO_SALVAGE" ]
   }
 ]
diff --git a/data/mods/innawood/materials.json b/data/mods/innawood/materials.json
@@ -47,8 +47,8 @@
     "chip_resist": 6,
     "breathability": "AVERAGE",
     "wind_resist": 70,
-    "repaired_with": "cotton_patchwork",
-    "salvaged_into": "cotton_patchwork",
+    "repaired_with": "fibercloth_patchwork",
+    "salvaged_into": "fibercloth_patchwork",
     "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
     "bash_dmg_verb": "ripped",
     "cut_dmg_verb": "cut",

diff --git a/data/mods/innawood/recipes/medsandchemicals.json b/data/mods/innawood/recipes/medsandchemicals.json
@@ -239,5 +239,32 @@
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "DISTILL", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
     "components": [ [ [ "chem_acetic_acid", 3 ] ], [ [ "material_limestone", 54 ], [ "material_quicklime", 24 ] ] ]
+  },
+  {
+    "result": "bandages_makeshift",
+    "id_suffix": "from sheets",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MEDICAL",
+    "skill_used": "tailor",
+    "time": "1 m 2 s",
+    "autolearn": true,
+    "charges": 8,
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ] ] ]
+  },
+  {
+    "result": "bandages_makeshift",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MEDICAL",
+    "skill_used": "tailor",
+    "time": "9 s",
+    "autolearn": true,
+    "charges": 1,
+    "flags": [ "BLIND_EASY" ],
+    "components": [ [ [ "cotton_patchwork", 1 ], [ "fibercloth_patchwork", 1 ] ] ]
   }
 ]
diff --git a/data/mods/innawood/recipes/recipe_deconstruction.json b/data/mods/innawood/recipes/recipe_deconstruction.json
@@ -63,5 +63,13 @@
     "time": "5 m",
     "qualities": [ { "id": "PRY", "level": 1 } ],
     "components": [ [ [ "light_battery_shell", 1 ] ] ]
+  },
+  {
+    "result": "sheet_fibercloth",
+    "type": "uncraft",
+    "activity_level": "NO_EXERCISE",
+    "time": "30 s",
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "fibercloth_patchwork", 8 ] ] ]
   }
 ]
diff --git a/data/mods/innawood/recipes/recipe_food.json b/data/mods/innawood/recipes/recipe_food.json
@@ -1051,6 +1051,7 @@
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
     "difficulty": 1,
+    "charges": 1,
     "time": "30 m",
     "autolearn": true,
     "batch_time_factors": [ 80, 2 ],

diff --git a/data/mods/innawood/recipes/recipe_others.json b/data/mods/innawood/recipes/recipe_others.json
@@ -49,7 +49,7 @@
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "components": [
       [ [ "superglue", 1 ] ],
-      [ [ "cotton_patchwork", 6 ], [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ] ],
+      [ [ "cotton_patchwork", 8 ], [ "fibercloth_patchwork", 8 ], [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ] ],
       [ [ "plastic_chunk", 1 ] ]
     ]
   },
@@ -133,7 +133,7 @@
     "using": [ [ "sewing_standard", 100 ] ],
     "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
     "components": [
-      [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "fur", 6 ], [ "tanned_pelt", 1 ] ],
+      [ [ "leather", 8 ], [ "tanned_hide", 1 ], [ "fur", 8 ], [ "tanned_pelt", 1 ] ],
       [ [ "2x4", 4 ] ],
       [ [ "rope_superior_short", 2, "LIST" ] ]
     ]

diff --git a/data/mods/innawood/recipes/tools_containers.json b/data/mods/innawood/recipes/tools_containers.json
@@ -74,5 +74,31 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 5 ] ] ],
     "components": [ [ [ "glass_shard", 1 ], [ "flask_glass", 1 ], [ "marble", 25 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "fake",
+    "result": "bag_canvas_small",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "tailor",
+    "difficulty": 1,
+    "time": "10 m",
+    "autolearn": true,
+    "using": [ [ "filament", 50 ], [ "cordage_short", 1 ] ],
+    "components": [ [ [ "cotton_patchwork", 2 ], [ "fibercloth_patchwork", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "fake",
+    "result": "bag_canvas",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "time": "50 m",
+    "autolearn": true,
+    "using": [ [ "filament", 300 ], [ "cordage", 1 ] ],
+    "components": [ [ [ "cotton_patchwork", 12 ], [ "fibercloth_patchwork", 12 ] ] ]
   }
 ]
diff --git a/data/mods/innawood/requirements/materials.json b/data/mods/innawood/requirements/materials.json
@@ -6,6 +6,7 @@
     "components": [
       [
         [ "cotton_patchwork", 8 ],
+        [ "fibercloth_patchwork", 8 ],
         [ "sheet_cotton_patchwork", 1 ],
         [ "sheet_cotton", 1 ],
         [ "sheet_fibercloth", 1 ],
@@ -32,6 +33,7 @@
     "components": [
       [
         [ "cotton_patchwork", 8 ],
+        [ "fibercloth_patchwork", 8 ],
         [ "sheet_cotton_patchwork", 1 ],
         [ "sheet_cotton", 1 ],
         [ "sheet_fibercloth", 1 ],
@@ -53,6 +55,7 @@
     "components": [
       [
         [ "cotton_patchwork", 8 ],
+        [ "fibercloth_patchwork", 8 ],
         [ "sheet_cotton_patchwork", 1 ],
         [ "sheet_cotton", 1 ],
         [ "sheet_fibercloth", 1 ],
@@ -64,5 +67,33 @@
         [ "sheet_nomex", 1 ]
       ]
     ]
+  },
+  {
+    "id": "fabric_standard_small",
+    "type": "requirement",
+    "//": "Materials used for crafting or repairing clothing or sheeting, etc.",
+    "components": [
+      [
+        [ "cotton_patchwork", 1 ],
+        [ "fibercloth_patchwork", 1 ],
+        [ "lycra_patch", 1 ],
+        [ "nylon", 1 ],
+        [ "leather", 1 ],
+        [ "nomex", 1 ],
+        [ "neoprene", 1 ]
+      ]
+    ]
+  },
+  {
+    "id": "fabric_standard_permeable_small",
+    "type": "requirement",
+    "//": "Materials used for crafting or repairing woven fabrics",
+    "components": [ [ [ "cotton_patchwork", 1 ], [ "fibercloth_patchwork", 1 ], [ "lycra_patch", 8 ], [ "nylon", 8 ], [ "nomex", 8 ] ] ]
+  },
+  {
+    "id": "fabric_standard_nostretch_small",
+    "type": "requirement",
+    "//": "Materials used for crafting or repairing non-form fitting clothing",
+    "components": [ [ [ "cotton_patchwork", 1 ], [ "fibercloth_patchwork", 1 ], [ "nylon", 1 ], [ "nomex", 1 ] ] ]
   }
 ]
diff --git a/data/mods/innawood/requirements/tailoring.json b/data/mods/innawood/requirements/tailoring.json
@@ -27,5 +27,26 @@
     "//": "35g per unit. Crafting possibly-patchwork cotton items, adjusted for tailoring rework. Time needed is usually 30 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).  Used for simpler items where precision cutting is less important.",
     "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_fibercloth", 1 ] ], [ [ "filament", 5, "LIST" ] ] ]
+  },
+  {
+    "id": "strap_small",
+    "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 ], [ "fibercloth_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ]
+  },
+  {
+    "id": "tailoring_cotton_small",
+    "type": "requirement",
+    "//": "5g per unit. Crafting possibly-patchwork cotton items, adjusted for tailoring rework. Time needed is usually 15 minutes per unit if hand-stitching.  excessive weight of material is wasted, possibly producing cotton scraps.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ],
+    "components": [ [ [ "cotton_patchwork", 1 ], [ "fibercloth_patchwork", 1 ] ], [ [ "filament", 3, "LIST" ] ] ]
+  },
+  {
+    "id": "tailoring_cotton_small_simple",
+    "type": "requirement",
+    "//": "5g per unit. Crafting possibly-patchwork cotton items, adjusted for tailoring rework. Time needed is usually 15 minutes per unit if hand-stitching.  excessive weight of material is wasted, possibly producing cotton scraps.  Used for simpler items where precision cutting is less important.",
+    "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "cotton_patchwork", 1 ], [ "fibercloth_patchwork", 1 ] ], [ [ "filament", 3, "LIST" ] ] ]
   }
 ]
diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
@@ -605,6 +605,7 @@ fetick
 feticks
 fetlock
 ffect
+fibercloth
 fiddleheads
 filenames
 fileset
-Original file line number
+Diff line change
@@ Expand Up / @@ -605,6 +605,7 @@ fetick @@
     feticks
     fetlock
     ffect
+    fibercloth
     fiddleheads
     filenames
     fileset
@@ Expand Down @@