Tailoring recipe audit (#54256)

Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Termineitor244 <[email protected]> Co-authored-by: Kevin Granade <[email protected]>
CleverRaven · Jun 17, 2022 · e465116 · e465116
1 parent c992d94
commit e465116
Show file tree

Hide file tree

Showing 154 changed files with 2,016 additions and 1,358 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -5595,7 +5595,7 @@
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "60 m",
     "qualities": [ [ { "id": "HAMMER_SOFT", "level": 1 } ] ],
-    "components": [ [ [ "frame_wood", 1 ] ], [ [ "chunk_rubber", 16 ] ], [ [ "glass_sheet", 2 ] ], [ [ "rag", 8 ] ] ],
+    "components": [ [ [ "frame_wood", 1 ] ], [ [ "chunk_rubber", 16 ] ], [ [ "glass_sheet", 2 ] ], [ [ "cotton_patchwork", 8 ] ] ],
     "pre_note": "Must be supported on at least two sides.",
     "pre_special": "check_support",
     "post_terrain": "t_door_glass_c"

diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -107,7 +107,7 @@
         { "item": "steel_chunk", "count": [ 0, 3 ] },
         { "item": "sheet_metal_small", "count": [ 8, 12 ] },
         { "item": "sheet_metal", "count": [ 1, 2 ] },
-        { "item": "rag", "count": [ 5, 10 ] },
+        { "item": "cotton_patchwork", "count": [ 5, 10 ] },
         { "item": "pipe_fittings", "count": [ 1, 3 ] },
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "hose", "count": [ 0, 1 ] },

diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
@@ -62,7 +62,7 @@
     "deconstruct": {
       "items": [
         { "item": "2x4", "count": 12 },
-        { "item": "rag", "count": [ 30, 33 ] },
+        { "item": "cotton_patchwork", "count": [ 30, 33 ] },
         { "item": "nail", "charges": [ 8, 10 ] },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
       ]
@@ -77,7 +77,7 @@
         { "item": "2x4", "count": [ 2, 5 ] },
         { "item": "nail", "charges": [ 3, 8 ] },
         { "item": "splinter", "count": [ 1, 2 ] },
-        { "item": "rag", "count": [ 20, 30 ] }
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] }
       ]
     }
   },

diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -410,7 +410,7 @@
       "items": [
         { "item": "chain", "count": [ 1, 3 ] },
         { "item": "leather", "count": [ 4, 12 ] },
-        { "item": "rag", "count": [ 4, 18 ] }
+        { "item": "cotton_patchwork", "count": [ 4, 18 ] }
       ]
     }
   },
@@ -657,7 +657,7 @@
       "str_max": 12,
       "sound": "whish!",
       "sound_fail": "whish.",
-      "items": [ { "item": "cardboard", "count": [ 20, 80 ] }, { "item": "rag", "count": [ 50, 175 ] } ]
+      "items": [ { "item": "cardboard", "count": [ 20, 80 ] }, { "item": "cotton_patchwork", "count": [ 50, 175 ] } ]
     }
   },
   {

diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
@@ -36,7 +36,11 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 7,
     "deconstruct": {
-      "items": [ { "item": "2x4", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 6, 8 ] } ]
+      "items": [
+        { "item": "2x4", "count": 10 },
+        { "item": "cotton_patchwork", "count": [ 30, 33 ] },
+        { "item": "nail", "charges": [ 6, 8 ] }
+      ]
     },
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT", "ALIGN_WORKBENCH" ],
     "bash": {
@@ -48,7 +52,7 @@
         { "item": "2x4", "count": [ 1, 3 ] },
         { "item": "nail", "charges": [ 2, 6 ] },
         { "item": "splinter", "count": 1 },
-        { "item": "rag", "count": [ 20, 30 ] }
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] }
       ]
     }
   },
@@ -70,7 +74,7 @@
     "deconstruct": {
       "items": [
         { "item": "pipe", "count": 10 },
-        { "item": "rag", "count": [ 30, 33 ] },
+        { "item": "cotton_patchwork", "count": [ 30, 33 ] },
         { "item": "rope_6" },
         { "item": "spring", "count": [ 2, 3 ] }
       ]
@@ -84,7 +88,7 @@
       "items": [
         { "item": "pipe", "count": [ 1, 3 ] },
         { "item": "scrap", "charges": [ 2, 6 ] },
-        { "item": "rag", "count": [ 20, 30 ] },
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] },
         { "item": "rope_6" }
       ]
     }
@@ -127,7 +131,7 @@
     "deconstruct": {
       "items": [
         { "item": "2x4", "count": 12 },
-        { "item": "rag", "count": [ 30, 33 ] },
+        { "item": "cotton_patchwork", "count": [ 30, 33 ] },
         { "item": "nail", "charges": [ 8, 10 ] },
         { "item": "spring", "charges": [ 2, 3 ] }
       ]
@@ -143,7 +147,7 @@
         { "item": "nail", "charges": [ 3, 8 ] },
         { "item": "splinter", "count": [ 1, 2 ] },
         { "item": "scrap", "count": [ 0, 5 ] },
-        { "item": "rag", "count": [ 20, 30 ] }
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] }
       ]
     }
   },
@@ -237,7 +241,7 @@
     "max_volume": "750 L",
     "deconstruct": {
       "items": [
-        { "item": "rag", "count": [ 10, 20 ] },
+        { "item": "cotton_patchwork", "count": [ 10, 20 ] },
         { "item": "2x4", "count": [ 2, 4 ] },
         { "item": "nail", "charges": [ 2, 6 ] }
       ]
@@ -250,7 +254,7 @@
       "items": [
         { "item": "splinter", "count": [ 2, 6 ] },
         { "item": "nail", "charges": [ 1, 3 ] },
-        { "item": "rag", "count": [ 5, 10 ] }
+        { "item": "cotton_patchwork", "count": [ 5, 10 ] }
       ]
     }
   },

diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -22,7 +22,7 @@
         { "item": "2x4", "count": [ 5, 8 ] },
         { "item": "nail", "charges": [ 6, 8 ] },
         { "item": "splinter", "count": [ 3, 6 ] },
-        { "item": "rag", "count": [ 40, 55 ] },
+        { "item": "cotton_patchwork", "count": [ 40, 55 ] },
         { "item": "scrap", "count": [ 10, 20 ] }
       ]
     }
@@ -53,7 +53,7 @@
         { "item": "2x4", "count": [ 8, 15 ] },
         { "item": "nail", "charges": [ 15, 20 ] },
         { "item": "splinter", "count": [ 8, 15 ] },
-        { "item": "rag", "count": [ 80, 110 ] },
+        { "item": "cotton_patchwork", "count": [ 80, 110 ] },
         { "item": "scrap", "count": [ 20, 40 ] }
       ]
     }
@@ -88,7 +88,7 @@
       "items": [
         { "item": "pipe", "count": [ 8, 15 ] },
         { "item": "sheet_metal_small", "count": [ 0, 2 ] },
-        { "item": "rag", "count": [ 120, 160 ] },
+        { "item": "cotton_patchwork", "count": [ 120, 160 ] },
         { "item": "scrap", "count": [ 60, 100 ] }
       ]
     }
@@ -138,7 +138,7 @@
       "str_max": 30,
       "sound": "rrrrip!",
       "sound_fail": "whump.",
-      "items": [ { "item": "rag", "count": [ 40, 55 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] } ]
     }
   },
   {
@@ -162,7 +162,7 @@
       "str_max": 30,
       "sound": "rrrrip!",
       "sound_fail": "whump.",
-      "items": [ { "item": "rag", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
     }
   },
   {
@@ -186,7 +186,7 @@
       "sound_fail": "slap!",
       "sound_vol": 6,
       "sound_fail_vol": 3,
-      "items": [ { "item": "rag", "count": [ 20, 30 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 20, 30 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
     }
   },
   {
@@ -226,7 +226,11 @@
     "floor_bedding_warmth": 500,
     "required_str": 10,
     "deconstruct": {
-      "items": [ { "item": "2x4", "count": 4 }, { "item": "rag", "count": [ 30, 35 ] }, { "item": "nail", "charges": [ 4, 6 ] } ]
+      "items": [
+        { "item": "2x4", "count": 4 },
+        { "item": "cotton_patchwork", "count": [ 30, 35 ] },
+        { "item": "nail", "charges": [ 4, 6 ] }
+      ]
     },
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT" ],
     "bash": {
@@ -238,7 +242,7 @@
         { "item": "2x4", "count": [ 1, 3 ] },
         { "item": "nail", "charges": [ 2, 6 ] },
         { "item": "splinter", "count": [ 1, 4 ] },
-        { "item": "rag", "count": [ 20, 30 ] }
+        { "item": "cotton_patchwork", "count": [ 20, 30 ] }
       ]
     }
   },

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -84,7 +84,7 @@
         { "item": "2x4", "count": 12 },
         { "item": "nail", "charges": [ 12, 24 ] },
         { "item": "wood_panel", "count": [ 0, 1 ] },
-        { "item": "rag", "count": [ 15, 20 ] }
+        { "item": "cotton_patchwork", "count": [ 15, 20 ] }
       ]
     },
     "max_volume": "875 L",
@@ -102,7 +102,7 @@
         { "item": "2x4", "count": [ 1, 5 ] },
         { "item": "splinter", "count": [ 2, 6 ] },
         { "item": "nail", "charges": [ 2, 10 ] },
-        { "item": "rag", "count": [ 8, 12 ] }
+        { "item": "cotton_patchwork", "count": [ 8, 12 ] }
       ]
     }
   },
@@ -122,7 +122,7 @@
         { "item": "2x4", "count": 12 },
         { "item": "nail", "charges": [ 12, 24 ] },
         { "item": "wood_panel", "count": [ 0, 1 ] },
-        { "item": "rag", "count": [ 15, 20 ] }
+        { "item": "cotton_patchwork", "count": [ 15, 20 ] }
       ]
     },
     "max_volume": "875 L",
@@ -135,7 +135,7 @@
         { "item": "2x4", "count": [ 1, 5 ] },
         { "item": "splinter", "count": [ 2, 6 ] },
         { "item": "nail", "charges": [ 2, 10 ] },
-        { "item": "rag", "count": [ 8, 12 ] }
+        { "item": "cotton_patchwork", "count": [ 8, 12 ] }
       ]
     }
   },

diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -17,7 +17,7 @@
       "sound_fail": "whump.",
       "items": [
         { "item": "straw_pile", "count": [ 5, 8 ] },
-        { "item": "rag", "count": [ 2, 4 ] },
+        { "item": "cotton_patchwork", "count": [ 2, 4 ] },
         { "item": "string_36", "count": [ 1, 2 ] }
       ]
     },
@@ -109,7 +109,7 @@
         { "item": "box_large", "count": 1 },
         { "item": "box_medium", "count": 2 },
         { "item": "box_small", "count": 4 },
-        { "item": "rag", "count": 50 },
+        { "item": "cotton_patchwork", "count": 50 },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": 20 },
         { "item": "plastic_sheet", "count": 2 }
@@ -124,7 +124,7 @@
         { "item": "box_large", "count": [ 0, 1 ] },
         { "item": "box_medium", "count": [ 0, 2 ] },
         { "item": "box_small", "count": [ 0, 4 ] },
-        { "item": "rag", "count": [ 20, 50 ] },
+        { "item": "cotton_patchwork", "count": [ 20, 50 ] },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": [ 5, 20 ] },
         { "item": "plastic_sheet", "count": [ 0, 2 ] }
@@ -170,7 +170,7 @@
       "items": [
         { "item": "box_small", "count": 10 },
         { "item": "cardboard", "count": 10 },
-        { "item": "rag", "count": 10 },
+        { "item": "cotton_patchwork", "count": 10 },
         { "item": "paper", "count": 50 },
         { "item": "plastic_sheet", "count": 2 }
       ]
@@ -184,7 +184,7 @@
         { "item": "box_small", "count": [ 0, 10 ] },
         { "item": "cardboard", "count": [ 5, 9 ] },
         { "item": "paper", "count": [ 10, 40 ] },
-        { "item": "rag", "count": [ 0, 10 ] },
+        { "item": "cotton_patchwork", "count": [ 0, 10 ] },
         { "item": "plastic_sheet", "count": [ 1, 2 ] }
       ]
     }
@@ -205,7 +205,7 @@
         { "item": "box_large", "count": 1 },
         { "item": "box_medium", "count": 2 },
         { "item": "box_small", "count": 4 },
-        { "item": "rag", "count": 50 },
+        { "item": "cotton_patchwork", "count": 50 },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": 20 },
         { "item": "plastic_sheet", "count": 2 }
@@ -220,7 +220,7 @@
         { "item": "box_large", "count": [ 0, 1 ] },
         { "item": "box_medium", "count": [ 0, 2 ] },
         { "item": "box_small", "count": [ 0, 4 ] },
-        { "item": "rag", "count": [ 20, 50 ] },
+        { "item": "cotton_patchwork", "count": [ 20, 50 ] },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": [ 5, 20 ] },
         { "item": "plastic_sheet", "count": [ 0, 2 ] }
@@ -244,7 +244,7 @@
         { "item": "box_large", "count": 1 },
         { "item": "box_medium", "count": 2 },
         { "item": "box_small", "count": 4 },
-        { "item": "rag", "count": 50 },
+        { "item": "cotton_patchwork", "count": 50 },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": 20 },
         { "item": "plastic_sheet", "count": 2 }
@@ -259,7 +259,7 @@
         { "item": "box_large", "count": [ 0, 1 ] },
         { "item": "box_medium", "count": [ 0, 2 ] },
         { "item": "box_small", "count": [ 0, 4 ] },
-        { "item": "rag", "count": [ 20, 50 ] },
+        { "item": "cotton_patchwork", "count": [ 20, 50 ] },
         { "item": "paper", "count": [ 30, 80 ] },
         { "item": "plastic_chunk", "count": [ 5, 20 ] },
         { "item": "plastic_sheet", "count": [ 0, 2 ] }

diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -1638,7 +1638,7 @@
       "ter_set": "t_dirt",
       "items": [
         { "item": "sheet", "count": [ 0, 1 ] },
-        { "item": "rag", "count": [ 2, 5 ] },
+        { "item": "cotton_patchwork", "count": [ 2, 5 ] },
         { "item": "stick", "count": 1 },
         { "item": "withered", "count": [ 2, 12 ] }
       ]
@@ -1700,7 +1700,7 @@
       "ter_set": "t_dirt",
       "items": [
         { "item": "sheet", "count": [ 0, 1 ] },
-        { "item": "rag", "count": [ 2, 5 ] },
+        { "item": "cotton_patchwork", "count": [ 2, 5 ] },
         { "item": "stick", "count": 1 },
         { "item": "withered", "count": [ 2, 12 ] }
       ]

diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json
@@ -666,7 +666,7 @@
       "str_min": 5,
       "str_max": 15,
       "str_min_supported": 100,
-      "items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
     },
     "deconstruct": { "items": [ { "item": "r_carpet", "count": 1 }, { "item": "nail", "count": [ 2, 5 ] } ], "ter_set": "t_floor" }
   },
@@ -736,7 +736,7 @@
       "str_min": 5,
       "str_max": 15,
       "str_min_supported": 100,
-      "items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
     },
     "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_thconc_floor" }
   },
@@ -808,7 +808,7 @@
       "str_min": 5,
       "str_max": 15,
       "str_min_supported": 100,
-      "items": [ { "item": "rag", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
+      "items": [ { "item": "cotton_patchwork", "count": [ 10, 20 ] }, { "item": "nail", "charges": [ 1, 3 ] } ]
     },
     "deconstruct": { "items": [ { "item": "r_carpet", "charges": 1 }, { "item": "nail", "charges": 5 } ], "ter_set": "t_metal_floor" }
   },

diff --git a/data/json/itemgroups/Locations_MapExtras/Arsonist_stock.json b/data/json/itemgroups/Locations_MapExtras/Arsonist_stock.json
@@ -5,7 +5,7 @@
     "subtype": "collection",
     "items": [
       { "item": "molotov", "count": 5 },
-      { "item": "rag", "count": 25 },
+      { "item": "cotton_patchwork", "count": 25 },
       { "item": "gasoline", "count": 1 },
       { "item": "improvised_pipebomb", "count": 25 },
       { "item": "fuse", "count": 5 },