From e465116ede572e24dd5eea4e65432c2a82f43b84 Mon Sep 17 00:00:00 2001 From: Aaron Chancey Date: Fri, 17 Jun 2022 02:00:29 -0400 Subject: [PATCH] Tailoring recipe audit (#54256) Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Termineitor244 Co-authored-by: Kevin Granade --- data/json/construction.json | 2 +- .../furniture-appliances.json | 2 +- .../furniture-medical.json | 4 +- .../furniture-recreation.json | 4 +- .../furniture-seats.json | 20 +- .../furniture-sleep.json | 20 +- .../furniture-storage.json | 8 +- .../furniture-terrains.json | 18 +- .../furniture_and_terrain/terrain-doors.json | 4 +- .../terrain-floors-indoor.json | 6 +- .../Locations_MapExtras/Arsonist_stock.json | 2 +- .../Locations_MapExtras/locations.json | 16 +- .../locations_commercial.json | 26 +- .../Locations_MapExtras/mall_item_groups.json | 4 +- .../Locations_MapExtras/mansion.json | 28 +- .../Locations_MapExtras/map_extras.json | 2 +- data/json/itemgroups/SUS/clothes_store.json | 6 +- data/json/itemgroups/SUS/domestic.json | 4 +- data/json/itemgroups/SUS/office.json | 2 +- .../json/itemgroups/collections_domestic.json | 6 +- data/json/itemgroups/defense_mode.json | 2 +- data/json/itemgroups/faction_camps.json | 2 +- data/json/itemgroups/food_service.json | 18 +- data/json/itemgroups/military.json | 2 +- .../itemgroups/oa_shared_item_groups.json | 4 +- data/json/itemgroups/science_and_tech.json | 6 +- data/json/itemgroups/supplies.json | 2 +- data/json/itemgroups/trash_and_debris.json | 8 +- data/json/items/ammo.json | 1 + data/json/items/armor/ammo_pouch.json | 58 +++ data/json/items/armor/arms_armor.json | 2 +- data/json/items/armor/belts.json | 2 +- data/json/items/armor/boots.json | 5 +- data/json/items/armor/cloaks.json | 2 +- data/json/items/armor/hats.json | 2 +- data/json/items/armor/legs_clothes.json | 8 +- data/json/items/armor/masks.json | 4 +- data/json/items/armor/scarfs.json | 4 +- data/json/items/armor/sheath.json | 2 +- data/json/items/armor/storage.json | 18 +- data/json/items/armor/suits_clothes.json | 2 +- data/json/items/armor/suits_protection.json | 14 +- data/json/items/armor/swimming.json | 4 +- data/json/items/armor/torso_clothes.json | 2 +- data/json/items/armor/undergarment.json | 20 +- data/json/items/comestibles/med.json | 9 +- data/json/items/generic.json | 6 +- data/json/items/generic/bedding.json | 8 +- data/json/items/gun/faults_gun.json | 10 +- data/json/items/migration.json | 5 + data/json/items/resources/plastic.json | 18 +- data/json/items/resources/tailoring.json | 205 +++++---- data/json/items/tool/toiletries.json | 11 +- data/json/items/tool_armor.json | 4 +- data/json/mapgen/animalshelter.json | 2 +- data/json/mapgen/cs_city_dump_small.json | 4 +- data/json/mapgen/fema/FEMA_le_03.json | 2 +- data/json/mapgen/fema/FEMA_mid_03.json | 2 +- data/json/mapgen/fort.json | 2 +- data/json/mapgen/irradiator_1.json | 2 +- data/json/mapgen/nested/fema_nested.json | 2 +- data/json/mapgen/prison_1.json | 2 +- .../mapgen/riverside/whaleys_house_river.json | 6 +- data/json/mapgen/sewage_treatment.json | 2 +- .../monsterdrops/mutant_experimental.json | 2 +- data/json/monsterdrops/zombie.json | 4 +- data/json/npcs/items_generic.json | 2 +- .../old_guard/NPC_Old_Guard_FOB_officer.json | 2 +- .../Smokes/free_merchant_shopkeep_goods.json | 2 +- .../mission_mapgen_tacoma_commune.json | 4 +- data/json/obsolete.json | 10 + data/json/recipes/ammo/cannon.json | 2 +- data/json/recipes/armor/arms.json | 149 +++---- .../recipes/armor/bespoke_armor/nomad.json | 4 +- data/json/recipes/armor/feet.json | 131 +++--- data/json/recipes/armor/hands.json | 12 +- data/json/recipes/armor/head.json | 391 +++++++++--------- data/json/recipes/armor/legs.json | 138 ++++--- data/json/recipes/armor/other.json | 30 +- data/json/recipes/armor/pets_dog.json | 13 +- data/json/recipes/armor/pets_horse.json | 33 +- data/json/recipes/armor/storage.json | 154 ++++--- data/json/recipes/armor/suit.json | 205 +++++---- data/json/recipes/armor/torso.json | 203 ++++----- data/json/recipes/chem/chemicals.json | 4 +- data/json/recipes/chem/drugs.json | 2 +- data/json/recipes/food/brewing.json | 2 +- data/json/recipes/food/canned.json | 56 ++- data/json/recipes/food/dairy_products.json | 2 +- data/json/recipes/food/drinks.json | 4 +- data/json/recipes/food/other.json | 2 +- data/json/recipes/other/cords_and_ropes.json | 8 +- data/json/recipes/other/materials.json | 52 ++- data/json/recipes/other/medical.json | 22 +- data/json/recipes/other/parts.json | 6 +- data/json/recipes/other/vehicle.json | 2 +- data/json/recipes/practice/health.json | 4 +- data/json/recipes/practice/tailoring.json | 14 +- data/json/recipes/recipe_ammo.json | 4 +- data/json/recipes/recipe_deconstruction.json | 294 +++++++++++-- data/json/recipes/recipe_food.json | 30 +- .../json/recipes/recipe_medsandchemicals.json | 14 +- data/json/recipes/recipe_obsolete.json | 5 + data/json/recipes/recipe_others.json | 90 ++-- data/json/recipes/recipe_vehicle.json | 4 +- data/json/recipes/tools/containers.json | 10 +- data/json/recipes/tools/lights.json | 30 +- data/json/recipes/tools/tool.json | 4 +- data/json/recipes/tools/tools_hand.json | 6 +- data/json/recipes/weapon/bashing.json | 4 +- data/json/recipes/weapon/cutting.json | 10 +- data/json/recipes/weapon/explosive.json | 2 +- data/json/recipes/weapon/magazines.json | 2 +- data/json/recipes/weapon/mods.json | 6 +- data/json/recipes/weapon/piercing.json | 18 +- data/json/requirements/materials.json | 98 +++-- data/json/requirements/tailoring.json | 154 +++++-- data/json/requirements/toolsets.json | 13 +- data/json/uncraft/armor.json | 4 +- data/json/uncraft/armor/boots.json | 8 +- data/json/uncraft/armor/suit.json | 6 +- data/json/uncraft/generic.json | 2 +- data/json/vehicleparts/rams.json | 2 +- data/json/vehicleparts/seats.json | 6 +- data/json/vehicleparts/vehicle_parts.json | 6 +- .../items/crafting_scrap/cloth_scrap.json | 2 +- data/mods/Aftershock/items/items.json | 2 +- data/mods/Aftershock/maps/furniture.json | 10 +- .../Aftershock/recipes/armor_recipes.json | 2 +- data/mods/CrazyCataclysm/crazy_recipes.json | 2 +- data/mods/DinoMod/mapgen/DinoLabFinale.json | 4 +- data/mods/DinoMod/recipes/pets_elephant.json | 10 +- data/mods/DinoMod/recipes/pets_ostrich.json | 10 +- data/mods/Magiclysm/recipes.json | 2 +- .../Magiclysm/recipes/deconstruction.json | 2 +- data/mods/Magiclysm/recipes/dragon_black.json | 2 +- data/mods/Magiclysm/recipes/magic_tools.json | 4 +- data/mods/Magiclysm/recipes/weapons.json | 2 +- data/mods/No_Hope/Mapgen/prison_1.json | 2 +- .../No_Hope/Mapgen/whaleys_house_river.json | 6 +- data/mods/No_Hope/item_groups.json | 2 +- data/mods/TEST_DATA/items.json | 6 +- data/mods/TEST_DATA/mapgen-test.json | 2 +- data/mods/TEST_DATA/uncraft.json | 4 +- data/mods/innawood/materials.json | 2 +- data/mods/innawood/recipes/armor_arms.json | 2 +- data/mods/innawood/recipes/other/parts.json | 2 +- data/mods/innawood/recipes/recipe_food.json | 4 +- data/mods/innawood/recipes/recipe_others.json | 2 +- data/mods/innawood/recipes/tools_lights.json | 16 +- .../mods/innawood/recipes/weapon/cutting.json | 4 +- .../mods/innawood/requirements/materials.json | 6 +- tests/crafting_test.cpp | 67 ++- tests/uncraft_test.cpp | 10 +- 154 files changed, 2016 insertions(+), 1358 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 7443fea5e3e4f..0a6da5e2facf4 100644 --- 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 index 70dfad8aca4b0..6d6c01ead3af7 100644 --- 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 index 31fc65f20f97e..e16495c0779ec 100644 --- 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 index 8bedbbc86d9ab..f33dc16f693d7 100644 --- 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 index 186d484ca02ec..e40f1fdec5f33 100644 --- 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 index 56025c33a1bb0..8724fae6c80cc 100644 --- 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 index c90fc85d6d0f1..8f6a14ba5c265 100644 --- 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 index af55be52930c6..f7e26bf4043ce 100644 --- 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 index f96e5d7ab7a4d..6eef5e121e683 100644 --- 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 index d344618796b7b..a75ae0d53ee7a 100644 --- 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 index 46a9ba74f0e51..69a8dfcb7926d 100644 --- 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 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 16a7576c602a4..e2033534c9090 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -353,7 +353,7 @@ { "group": "snacks", "prob": 820 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, [ "eyedrops", 10 ], - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], { "item": "paper", "prob": 30, "count": [ 30, 80 ] }, [ "foon", 30 ], [ "spork", 30 ], @@ -370,7 +370,7 @@ "items": [ { "group": "ammo_pocket_batteries", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, { "item": "heavy_flashlight", "prob": 10, "charges": [ 0, 300 ] }, [ "jumper_cable", 20 ], @@ -950,7 +950,7 @@ [ "mobile_memory_card", 5 ], { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] }, { "item": "smart_phone", "prob": 35, "charges-min": 0 }, - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "claw_bar", 3 ], [ "crowbar", 18 ], [ "halligan", 1 ], @@ -988,7 +988,7 @@ [ "fetus", 1 ], [ "joint", 20 ], [ "mag_porn", 20 ], - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "hairpin", 1 ], { "group": "newspaper_recent", "prob": 5 }, [ "flyer", 10 ], @@ -1653,7 +1653,7 @@ { "item": "crack", "prob": 16, "charges": [ 1, 4 ] }, { "item": "lsd", "prob": 24, "container-item": "bag_zipper", "charges": [ 1, 5 ] }, { "group": "ammo_casings", "prob": 20, "container-item": "bag_zipper", "count": [ 1, 5 ] }, - { "item": "rag", "custom-flags": [ "FILTHY" ], "prob": 20 }, + { "item": "cotton_patchwork", "custom-flags": [ "FILTHY" ], "prob": 20 }, { "item": "slime_scrap", "prob": 3, "container-item": "bag_zipper" }, { "item": "raw_hleather", "prob": 1, "container-item": "bag_zipper" } ] @@ -2622,13 +2622,13 @@ "id": "mil_base_bed_hospital", "type": "item_group", "subtype": "distribution", - "entries": [ { "item": "blanket", "prob": 50 }, { "item": "rag", "prob": 100, "custom-flags": [ "FILTHY" ] } ] + "entries": [ { "item": "blanket", "prob": 50 }, { "item": "cotton_patchwork", "prob": 100, "custom-flags": [ "FILTHY" ] } ] }, { "id": "mil_base_table_hospital", "type": "item_group", "subtype": "distribution", - "entries": [ { "item": "bandages", "prob": 25 }, { "item": "rag", "prob": 100, "custom-flags": [ "FILTHY" ] } ] + "entries": [ { "item": "bandages", "prob": 25 }, { "item": "cotton_patchwork", "prob": 100, "custom-flags": [ "FILTHY" ] } ] }, { "id": "mil_base_books", @@ -2696,7 +2696,7 @@ { "item": "bag_iv", "prob": 60 }, { "item": "bag_body_bag", "prob": 40 }, { "item": "syringe", "prob": 30 }, - { "item": "rag", "prob": 60, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 60, "custom-flags": [ "FILTHY" ] }, { "item": "coat_lab", "prob": 20 }, { "item": "blanket", "prob": 20 }, { "item": "sheet", "prob": 20 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 0635a21bc7af4..f5c11c1011a47 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -1064,7 +1064,7 @@ { "item": "can_drink", "prob": 60 }, { "item": "flyer", "prob": 30 }, { "item": "box_small", "prob": 30 }, - { "item": "rag", "prob": 20 }, + { "item": "cotton_patchwork", "prob": 20 }, { "item": "bag_plastic", "prob": 20 }, { "item": "bag_zipper", "prob": 3 }, { "item": "bag_zipper_gallon", "prob": 1 }, @@ -1305,7 +1305,7 @@ { "group": "ammo_pocket_batteries_full", "prob": 30 }, { "item": "radio", "prob": 10, "charges": [ 1, 100 ] }, { "item": "eyedrops", "prob": 10, "charges": [ 1, 10 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], { "item": "paper", "prob": 30, "count": [ 10, 30 ] }, [ "foon", 30 ], [ "spork", 30 ], @@ -1327,7 +1327,7 @@ "items": [ { "group": "ammo_pocket_batteries_full", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "dress_shoes", 20 ], [ "longshirt", 30 ], [ "polo_shirt", 30 ], @@ -1353,7 +1353,7 @@ { "group": "ammo_pocket_batteries_full", "prob": 30 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, { "item": "eyedrops", "prob": 10, "charges": [ 1, 10 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], { "item": "paper", "prob": 30, "count": [ 10, 30 ] }, [ "foon", 30 ], [ "spork", 30 ], @@ -1375,7 +1375,7 @@ "items": [ { "group": "ammo_pocket_batteries_full", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "jack", 20 ], [ "jack_small", 30 ], { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, @@ -1405,7 +1405,7 @@ "items": [ { "group": "ammo_any_batteries_full", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "jack", 20 ], [ "jack_small", 30 ], { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, @@ -1449,7 +1449,7 @@ "//": "for cs_tire_shop", "items": [ { "item": "radio", "prob": 30, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] }, [ "mag_mechanics", 20 ], [ "manual_mechanics", 10 ], @@ -1470,7 +1470,7 @@ "items": [ { "group": "ammo_pocket_batteries_full", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "jack", 20 ], [ "jack_small", 30 ], { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, @@ -1501,7 +1501,7 @@ "items": [ { "group": "ammo_any_batteries_full", "prob": 10 }, { "item": "radio", "prob": 10, "charges": [ 0, 100 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "jack", 20 ], [ "jack_small", 30 ], { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, @@ -1909,7 +1909,7 @@ [ "hacksaw", 5 ], [ "gloves_rubber", 25 ], [ "apron_plastic", 15 ], - { "item": "rag", "prob": 10, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 10, "custom-flags": [ "FILTHY" ] }, [ "bag_plastic", 20 ], [ "string_6", 5 ] ] @@ -1928,8 +1928,8 @@ [ "towel", 20 ], { "item": "soap", "prob": 10, "charges": [ 1, 10 ] }, [ "gloves_medical", 20 ], - [ "rag", 15 ], - { "item": "rag", "prob": 2, "custom-flags": [ "FILTHY" ] }, + [ "cotton_patchwork", 15 ], + { "item": "cotton_patchwork", "prob": 2, "custom-flags": [ "FILTHY" ] }, [ "bag_plastic", 20 ], [ "jerky", 40 ] ] @@ -2047,7 +2047,7 @@ [ "knitting_needles", 15 ], [ "sheet_kevlar_layered", 10 ], [ "leather", 10 ], - [ "rag", 20 ], + [ "cotton_patchwork", 20 ], [ "needle_curved", 10 ], [ "nomex", 10 ], [ "neoprene", 5 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index f867f1c3ecc5f..9c459901f6ea7 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -23,8 +23,8 @@ { "item": "glass_shard", "prob": 10, "count": [ 1, 8 ] }, [ "wire", 5 ], [ "splinter", 10 ], - [ "rag", 15 ], - { "item": "rag", "prob": 10, "custom-flags": [ "FILTHY" ] }, + [ "cotton_patchwork", 15 ], + { "item": "cotton_patchwork", "prob": 10, "custom-flags": [ "FILTHY" ] }, [ "plastic_shopping_bag", 10 ] ] }, diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index d0f0ce8bac6c5..e9dbcf293e8dd 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -723,7 +723,7 @@ "items": [ [ "sheet", 40 ], [ "towel", 30 ], - [ "rag", 20 ], + [ "cotton_patchwork", 20 ], [ "bandages", 5 ], { "item": "adhesive_bandages", "prob": 5, "count": [ 1, 20 ] } ] @@ -734,7 +734,7 @@ "items": [ { "item": "candle", "prob": 50, "charges": [ 0, 100 ] }, [ "rope_6", 50 ], - { "item": "rag", "prob": 40, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 40, "custom-flags": [ "FILTHY" ] }, [ "spike", 30 ], { "item": "blood", "prob": 10, "container-item": "jar_3l_glass_sealed", "sealed": false }, [ "bone_human", 10 ], @@ -966,14 +966,14 @@ [ "shot_hull", 40 ], [ "splinter", 40 ], [ "sinew", 40 ], - [ "rag", 40 ], + [ "cotton_patchwork", 40 ], [ "cup_plastic", 30 ], [ "can_drink", 30 ], [ "bottle_plastic", 30 ], [ "bag_plastic", 30 ], { "item": "rolling_paper", "prob": 20, "charges": [ 1, 30 ] }, { "item": "paper", "prob": 30, "count": [ 20, 50 ] }, - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] }, [ "9mm_casing", 20 ], [ "38_casing", 20 ], @@ -1000,13 +1000,13 @@ [ "shot_hull", 40 ], [ "splinter", 40 ], [ "sinew", 40 ], - [ "rag", 40 ], + [ "cotton_patchwork", 40 ], [ "cup_plastic", 30 ], [ "can_drink", 30 ], [ "bottle_plastic", 30 ], { "item": "glass_shard", "prob": 30, "count": [ 1, 8 ] }, [ "bag_plastic", 30 ], - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "9mm_casing", 20 ], [ "38_casing", 20 ], [ "45_casing", 20 ], @@ -1036,7 +1036,7 @@ [ "hat_ball", 30 ], [ "hat_newsboy", 20 ], [ "house_coat", 20 ], - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "9mm_casing", 20 ], [ "38_casing", 20 ], [ "45_casing", 20 ], @@ -1077,10 +1077,10 @@ [ "ceramic_shard", 40 ], [ "shot_hull", 40 ], [ "sinew", 40 ], - [ "rag", 40 ], + [ "cotton_patchwork", 40 ], [ "bottle_plastic", 30 ], { "item": "glass_shard", "prob": 30, "count": [ 1, 8 ] }, - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "9mm_casing", 20 ], [ "38_casing", 20 ], [ "45_casing", 20 ], @@ -1103,14 +1103,14 @@ [ "rock_large", 5 ], [ "plastic_shopping_bag", 40 ], [ "sinew", 40 ], - [ "rag", 40 ], + [ "cotton_patchwork", 40 ], [ "cup_plastic", 30 ], [ "can_drink", 30 ], [ "bottle_plastic", 30 ], [ "bag_plastic", 30 ], [ "sharp_rock", 30 ], [ "box_cigarette", 20 ], - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "9mm_casing", 20 ], [ "shot_hull", 20 ], [ "38_casing", 20 ], @@ -1160,7 +1160,7 @@ [ "wrapper_foil", 3 ], [ "dance_shoes", 20 ], [ "dress_shoes", 20 ], - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "9mm_casing", 20 ], [ "38_casing", 20 ], [ "45_casing", 20 ], @@ -1168,7 +1168,7 @@ [ "splinter", 20 ], [ "purse", 20 ], [ "heels", 20 ], - [ "rag", 20 ], + [ "cotton_patchwork", 20 ], { "group": "tinware", "prob": 20 }, [ "mask_guy_fawkes", 10 ], [ "gold_ear", 10 ], @@ -1408,7 +1408,7 @@ [ "yarn", 40 ], { "group": "bed", "prob": 30, "damage": [ 0, 2 ] }, { "item": "sewing_kit", "prob": 30, "charges": [ 0, 25 ] }, - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "lycra_patch", 15 ], [ "nylon", 10 ], { "item": "tailors_kit", "prob": 20, "charges": [ 0, 100 ] }, diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json index 68603ab040340..6bb1d08b94c7f 100644 --- a/data/json/itemgroups/Locations_MapExtras/map_extras.json +++ b/data/json/itemgroups/Locations_MapExtras/map_extras.json @@ -122,7 +122,7 @@ "subtype": "distribution", "id": "map_extra_casings", "entries": [ - { "item": "rag", "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "custom-flags": [ "FILTHY" ] }, { "item": "cigar_butt" }, { "item": "cig_butt" }, { "item": "can_drink" } diff --git a/data/json/itemgroups/SUS/clothes_store.json b/data/json/itemgroups/SUS/clothes_store.json index 1cdb63c4e0568..1b0e83728ca8c 100644 --- a/data/json/itemgroups/SUS/clothes_store.json +++ b/data/json/itemgroups/SUS/clothes_store.json @@ -105,11 +105,13 @@ "subtype": "collection", "entries": [ { "item": "thread", "count": [ 2, 7 ], "prob": 75 }, - { "item": "rag", "count": [ 10, 40 ], "prob": 75 }, + { "item": "cotton_patchwork", "count": [ 10, 40 ], "prob": 75 }, { "item": "sheet_cotton", "count": [ 10, 35 ], "prob": 70 }, { "item": "sheet_felt", "count": [ 10, 25 ], "prob": 40 }, { "item": "sheet_lycra", "count": [ 10, 35 ], "prob": 20 }, { "item": "sheet_nylon", "count": [ 10, 35 ], "prob": 20 }, + { "item": "sheet_nomex", "count": [ 10, 35 ], "prob": 5 }, + { "item": "sheet_kevlar", "count": [ 10, 35 ], "prob": 5 }, { "item": "thread_nomex", "count": [ 2, 4 ], "prob": 10 }, { "item": "thread_kevlar", "count": [ 1, 3 ], "prob": 5 } ] @@ -122,7 +124,7 @@ "subtype": "collection", "entries": [ { "item": "thread", "count": [ 2, 7 ], "prob": 75 }, - { "item": "rag", "count": [ 5, 15 ], "prob": 75 }, + { "item": "cotton_patchwork", "count": [ 5, 15 ], "prob": 75 }, { "item": "sheet_cotton", "count": [ 10, 25 ], "prob": 70 }, { "item": "tanned_pelt", "count": [ 5, 35 ], "prob": 70 } ] diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 5f464f8994e19..4343f39e98993 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -248,7 +248,7 @@ { "item": "xacto", "prob": 65 }, { "item": "yarn", "prob": 60, "charges": [ 60, 200 ] }, { "item": "razor_blade", "count": [ 1, 4 ], "prob": 50 }, - { "item": "rag", "count": [ 3, 4 ], "prob": 50 }, + { "item": "cotton_patchwork", "count": [ 3, 4 ], "prob": 50 }, { "item": "thread", "prob": 40 }, { "item": "thread", "prob": 30 }, { "item": "sewing_kit", "prob": 47, "charges": [ 50, 150 ] }, @@ -439,7 +439,7 @@ "subtype": "collection", "entries": [ { "item": "detergent", "charges": [ 1, 40 ], "container-item": "box_small" }, - { "item": "rag", "count": [ 1, 3 ] }, + { "item": "cotton_patchwork", "count": [ 1, 3 ] }, { "item": "dish_towel", "count": [ 1, 6 ] }, { "item": "brush" }, { "item": "sponge" }, diff --git a/data/json/itemgroups/SUS/office.json b/data/json/itemgroups/SUS/office.json index 84d3620fd1578..3a1c3363dc668 100644 --- a/data/json/itemgroups/SUS/office.json +++ b/data/json/itemgroups/SUS/office.json @@ -52,7 +52,7 @@ { "item": "mop", "prob": 60 }, { "item": "mop_folded", "prob": 35 }, { "item": "sponge", "prob": 90 }, - { "item": "rag", "count": [ 1, 6 ] }, + { "item": "cotton_patchwork", "count": [ 1, 6 ] }, { "item": "towel", "count": [ 1, 2 ], "prob": 80 }, { "item": "brush", "prob": 95 }, { "item": "bucket", "prob": 90 }, diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 460c3e7f1bf7c..7f45bcb40fc44 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -5,7 +5,7 @@ "type": "item_group", "subtype": "distribution", "items": [ - { "item": "rag", "prob": 40 }, + { "item": "cotton_patchwork", "prob": 40 }, { "item": "bath_toy", "count": [ 1, 4 ], "prob": 10 }, { "item": "bathroom_scale", "prob": 20 }, { "item": "liquid_soap", "count": [ 1, 4 ], "prob": 70, "charges-min": 1 }, @@ -523,7 +523,7 @@ { "group": "pantry_liquids", "prob": 160 }, { "item": "knife_butcher", "prob": 10 }, { "item": "cookbook", "prob": 35 }, - { "item": "rag", "prob": 1 }, + { "item": "cotton_patchwork", "prob": 1 }, { "item": "popcan_stove", "prob": 5, "charges": [ 0, 500 ] }, { "group": "alcohol", "prob": 101 }, { "item": "sweet_sausage", "prob": 2 }, @@ -1108,7 +1108,7 @@ { "item": "sewing_kit", "prob": 47, "charges-min": 0 }, { "item": "tailors_kit", "prob": 3, "charges-min": 0 }, { "item": "thread", "prob": 40 }, - { "item": "rag", "prob": 1 }, + { "item": "cotton_patchwork", "prob": 1 }, { "item": "scissors", "prob": 50 }, { "item": "string_36", "prob": 40 }, { "item": "vinegar", "prob": 10 }, diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json index 3916fd31dde7d..d2239132f349b 100644 --- a/data/json/itemgroups/defense_mode.json +++ b/data/json/itemgroups/defense_mode.json @@ -71,7 +71,7 @@ "id": "defense_caravan_components", "subtype": "collection", "items": [ - { "item": "rag" }, + { "item": "cotton_patchwork" }, { "item": "fur" }, { "item": "leather" }, { "item": "superglue" }, diff --git a/data/json/itemgroups/faction_camps.json b/data/json/itemgroups/faction_camps.json index 255c7cca48e78..59e12fc77cd3f 100644 --- a/data/json/itemgroups/faction_camps.json +++ b/data/json/itemgroups/faction_camps.json @@ -206,7 +206,7 @@ [ "log", 100 ], [ "stick", 300 ], [ "nail", 10 ], - [ "rag", 100 ], + [ "cotton_patchwork", 100 ], [ "sheet_metal", 20 ], [ "scrap", 30 ], [ "withered", 50 ], diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index f52a04b954b3c..bfcdb080593e4 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -291,7 +291,7 @@ { "item": "can_drink", "prob": 60 }, { "item": "flyer", "prob": 30 }, { "item": "box_small", "prob": 30 }, - { "item": "rag", "prob": 20 }, + { "item": "cotton_patchwork", "prob": 20 }, { "item": "bag_plastic", "prob": 20 }, { "item": "news_regional", "prob": 15 }, { "item": "mag_news", "prob": 15 }, @@ -381,7 +381,7 @@ [ "hat_ball", 19 ], [ "jacket_light", 15 ], [ "mbag", 10 ], - [ "rag", 6 ] + [ "cotton_patchwork", 6 ] ] }, { @@ -408,7 +408,7 @@ [ "bag_plastic", 20 ], [ "bottle_glass", 30 ], [ "can_drink", 30 ], - [ "rag", 10 ], + [ "cotton_patchwork", 10 ], [ "news_regional", 7 ], [ "mag_news", 7 ], [ "hairpin", 10 ], @@ -530,7 +530,7 @@ { "item": "towel", "prob": 10 }, { "item": "soap", "prob": 8, "charges": [ 1, 10 ] }, { "item": "detergent", "prob": 8, "charges": [ 1, 20 ] }, - { "item": "rag", "prob": 15 }, + { "item": "cotton_patchwork", "prob": 15 }, { "item": "broom", "prob": 8 }, { "item": "bleach", "prob": 8, "charges-min": 1 }, { "item": "hotplate", "prob": 1, "charges": [ 0, 500 ] }, @@ -557,7 +557,7 @@ { "item": "bag_plastic", "prob": 15 }, { "item": "bottle_glass", "prob": 10 }, { "item": "can_drink", "prob": 10 }, - { "item": "rag", "prob": 10 }, + { "item": "cotton_patchwork", "prob": 10 }, { "item": "news_regional", "prob": 20 }, { "item": "mag_news", "prob": 20 }, { "item": "hairpin", "prob": 10 }, @@ -586,7 +586,7 @@ { "item": "wrapper", "prob": 60 }, { "item": "wrapper_foil", "prob": 6 }, { "item": "bag_plastic", "prob": 45 }, - { "item": "rag", "prob": 10 }, + { "item": "cotton_patchwork", "prob": 10 }, { "item": "fries", "prob": 25 }, { "item": "cheese_fries", "prob": 15 }, { "item": "onion_rings", "prob": 20 }, @@ -630,7 +630,7 @@ { "item": "wrapper", "prob": 50 }, { "item": "wrapper_foil", "prob": 5 }, { "item": "bag_plastic", "prob": 50 }, - { "item": "rag", "prob": 50 }, + { "item": "cotton_patchwork", "prob": 50 }, { "item": "syringe", "prob": 5 }, { "item": "restaurantmap", "prob": 1 }, { "item": "hairpin", "prob": 25 }, @@ -673,7 +673,7 @@ { "item": "towel", "prob": 40 }, { "item": "soap", "prob": 30, "charges": [ 1, 10 ] }, { "item": "detergent", "prob": 30, "charges": [ 1, 20 ] }, - { "item": "rag", "prob": 30 }, + { "item": "cotton_patchwork", "prob": 30 }, { "item": "bleach", "prob": 30, "charges-min": 1 }, { "item": "vinegar", "prob": 30 }, { "item": "backpack", "prob": 5 } @@ -1029,7 +1029,7 @@ [ "wrapper_foil", 2 ], [ "bag_plastic", 35 ], [ "bottle_glass", 35 ], - [ "rag", 30 ], + [ "cotton_patchwork", 30 ], [ "flyer", 15 ], [ "mag_news", 15 ], [ "news_regional", 15 ], diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 36fbba49e10a7..6f4614f68aea4 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -880,7 +880,7 @@ { "group": "guns_rifle_milspec", "prob": 10 }, { "item": "human_flesh", "prob": 4, "count-min": 1, "count-max": 10 }, { "item": "bone_human", "prob": 10, "count-min": 1, "count-max": 5 }, - { "item": "rag", "prob": 10, "count-min": 1, "count-max": 10, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 10, "count-min": 1, "count-max": 10, "custom-flags": [ "FILTHY" ] }, { "item": "sheet_metal", "prob": 22 }, { "item": "seat", "prob": 4 }, { "item": "chain", "prob": 20 }, diff --git a/data/json/itemgroups/oa_shared_item_groups.json b/data/json/itemgroups/oa_shared_item_groups.json index 993dd5de6b029..c1f411d2c1c40 100644 --- a/data/json/itemgroups/oa_shared_item_groups.json +++ b/data/json/itemgroups/oa_shared_item_groups.json @@ -38,7 +38,7 @@ [ "bubblewrap", 20 ], [ "cig_butt", 70 ], [ "syringe", 10 ], - [ "rag", 20 ], + [ "cotton_patchwork", 20 ], [ "hairpin", 5 ], [ "leather", 5 ], [ "file", 15 ], @@ -57,7 +57,7 @@ { "group": "newspaper", "prob": 60 }, [ "news_regional", 15 ], { "item": "paper", "prob": 20, "count": [ 5, 15 ] }, - { "item": "rag", "prob": 35, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 35, "custom-flags": [ "FILTHY" ] }, [ "mask_dust", 10 ], { "item": "gum", "prob": 6, "charges": [ 1, 10 ] }, { "item": "caff_gum", "prob": 6, "charges": [ 1, 10 ] }, diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 792d0a5f16d6f..e6f9919ab8a1b 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -438,7 +438,7 @@ [ "mask_dust", 65 ], [ "towel", 40 ], [ "vacutainer", 10 ], - { "item": "rag", "prob": 1, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 1, "custom-flags": [ "FILTHY" ] }, { "item": "disinfectant", "prob": 35, "charges": [ 1, 10 ] }, [ "medical_gauze", 10 ], [ "medical_tape", 45 ], @@ -478,11 +478,11 @@ [ "pouch_autoclave", 10 ], [ "autoclave", 20 ], [ "syringe", 8 ], - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "scissors", 50 ], [ "boots_rubber", 20 ], [ "subsuit_xl", 4 ], - { "item": "rag", "prob": 1, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 1, "custom-flags": [ "FILTHY" ] }, { "item": "chem_nitric_acid", "prob": 10, "charges-min": 1 }, { "item": "chem_hydrogen_peroxide_conc", "prob": 10, "charges-min": 1 }, { "item": "denat_alcohol", "prob": 6, "charges-min": 250 }, diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index e8fb3deac02c8..d2d58c33e0939 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -115,7 +115,7 @@ [ "can_drink", 60 ], [ "flyer", 30 ], [ "box_small", 30 ], - [ "rag", 20 ], + [ "cotton_patchwork", 20 ], [ "bag_plastic", 20 ], [ "news_regional", 15 ], [ "mag_news", 15 ] diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json index 154c9cda4d652..d870013fe9370 100644 --- a/data/json/itemgroups/trash_and_debris.json +++ b/data/json/itemgroups/trash_and_debris.json @@ -40,7 +40,7 @@ [ "razor_blade", 5 ], [ "stick", 1 ], [ "can_drink", 10 ], - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "spray_can", 5 ], [ "syringe", 5 ], { "group": "tinware", "prob": 30 }, @@ -120,8 +120,8 @@ [ "jar_glass_sealed", 5 ], [ "jar_3l_glass_sealed", 5 ], [ "string_6", 5 ], - [ "rag", 5 ], - { "item": "rag", "prob": 5, "custom-flags": [ "FILTHY" ] }, + [ "cotton_patchwork", 5 ], + { "item": "cotton_patchwork", "prob": 5, "custom-flags": [ "FILTHY" ] }, { "group": "ammo_casings", "prob": 3 }, [ "box_small", 3 ], [ "box_medium", 3 ], @@ -183,7 +183,7 @@ { "item": "matches", "prob": 60, "charges-min": 0, "charges-max": 20 }, [ "syringe", 8 ], [ "tinder", 1 ], - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "hairpin", 1 ], [ "sandbox_kit", 1 ], [ "sheet_kevlar_layered", 1 ], diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index b3395b8004de4..19e763842354f 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -180,6 +180,7 @@ "flags": [ "NO_SALVAGE" ], "volume": "250 ml", "weight": "1 g", + "//": "50 weight thread - 50m per gram. Each unit is .25m or roughly 10 inches.", "ammo_type": "thread", "count": 50, "stack_size": 200 diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index 54f9f3a24104d..ef2c9dba56809 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -1216,5 +1216,63 @@ "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." }, "flags": [ "OVERSIZE", "STURDY", "OUTER" ], "armor": [ { "encumbrance": 17, "coverage": 85, "covers": [ "torso" ] } ] + }, + { + "id": "ammo_satchel_leather", + "type": "ARMOR", + "name": { "str": "leather ammo satchel" }, + "description": "A sturdy leather ammo bag worn at the waist. It is capable of holding a single large magazine close at hand.", + "weight": "590 g", + "volume": "500 ml", + "price": 2000, + "price_postapoc": 2000, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "ragpouch", + "color": "brown", + "material_thickness": 2, + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_item_length": "300 mm", + "max_contains_volume": "1500 ml", + "max_contains_weight": "2 kg", + "moves": 40, + "flag_restriction": [ "MAG_COMPACT", "MAG_BULKY" ], + "volume_encumber_modifier": 0.3 + } + ], + "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." }, + "flags": [ "WATER_FRIENDLY", "BELTED", "PALS_LARGE" ], + "armor": [ { "encumbrance": 1, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ] + }, + { + "id": "chestpouch_leather", + "type": "ARMOR", + "name": { "str": "leather chest ammo pouch", "str_pl": "leather chest ammo pouches" }, + "description": "A leather ammo pouch that can be strapped to your chest and hold a single magazine close at hand.", + "weight": "1140 g", + "volume": "250 ml", + "price": 1250, + "price_postapoc": 2000, + "material": [ "leather" ], + "symbol": "[", + "looks_like": "ragpouch", + "color": "brown", + "material_thickness": 2, + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "max_item_length": "240 mm", + "max_contains_volume": "750 ml", + "max_contains_weight": "2 kg", + "moves": 40, + "flag_restriction": [ "MAG_COMPACT" ], + "volume_encumber_modifier": 0.3 + } + ], + "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." }, + "flags": [ "WATER_FRIENDLY", "BELTED", "PALS_SMALL" ], + "armor": [ { "coverage": 25, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] } ] } ] diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index 81c5232016797..397fcef97e62f 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -595,7 +595,7 @@ "category": "armor", "name": { "str": "pair of Kevlar gambeson sleeves", "str_pl": "pairs of Kevlar gambeson sleeves" }, "description": "A pair sleeves made from aramid with strips of soft body armor sewn on top to simulate quilting.", - "weight": "920 g", + "weight": "986 g", "volume": "840 ml", "price": 1200, "price_postapoc": 400, diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json index d1c53559eea73..6b0be746f6f6e 100644 --- a/data/json/items/armor/belts.json +++ b/data/json/items/armor/belts.json @@ -234,7 +234,7 @@ "type": "ARMOR", "name": { "str": "tool belt" }, "description": "A common belt with pockets, loops and sheaths to store up to six tools or blades. Widely used by handymen and electricians.", - "weight": "2000 g", + "weight": "4480 g", "volume": "2250 ml", "price": 4500, "price_postapoc": 1500, diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index dd756484dfcc2..9cf821bceab68 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1527,7 +1527,8 @@ "type": "ARMOR", "name": { "str": "pair of leather sandals", "str_pl": "pairs of leather sandals" }, "description": "Sturdy leather hiking sandals with a heel strap. Offers little in the way of protection, but keeps you cool during warmer months.", - "weight": "94 g", + "weight": "675 g", + "//": "weight is based on an average of between 1 and 2 lbs for various hiking sandals IRL.", "volume": "250 ml", "price": 4000, "price_postapoc": 250, @@ -2774,7 +2775,7 @@ "type": "ARMOR", "name": { "str": "pair of tentacle stockings", "str_pl": "pairs of tentacle stockings" }, "description": "Six long cotton tubes sized to fit over tentacles and help protect them from the cold.", - "weight": "270 g", + "weight": "300 g", "volume": "1500 ml", "price": 1200, "price_postapoc": 250, diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json index c6573c2ef712b..fc91f761a5342 100644 --- a/data/json/items/armor/cloaks.json +++ b/data/json/items/armor/cloaks.json @@ -192,7 +192,7 @@ "type": "ARMOR", "name": { "str": "wool cloak" }, "description": "A heavy woolen cloak meant to be thrown over your body.", - "weight": "1525 g", + "weight": "900 g", "volume": "3750 ml", "price": 24500, "price_postapoc": 750, diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json index 3b68b32ca7913..dc6e0a2c68d17 100644 --- a/data/json/items/armor/hats.json +++ b/data/json/items/armor/hats.json @@ -960,7 +960,7 @@ "type": "ARMOR", "name": { "str": "turban" }, "description": "Rags worn around the head.", - "weight": "110 g", + "weight": "105 g", "volume": "250 ml", "price": 85, "price_postapoc": 10, diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json index e90af2d9bf832..802e3cd767b41 100644 --- a/data/json/items/armor/legs_clothes.json +++ b/data/json/items/armor/legs_clothes.json @@ -377,7 +377,7 @@ "type": "ARMOR", "name": { "str": "kilt" }, "description": "No true Scotsman would leave home without his kilt.", - "weight": "1814 g", + "weight": "500 g", "volume": "1500 ml", "price": 6500, "price_postapoc": 50, @@ -455,7 +455,7 @@ "type": "ARMOR", "name": { "str": "loincloth" }, "description": "Rags stitched together and tied into a makeshift loincloth. Covers your modesty, but not much else.", - "weight": "32 g", + "weight": "75 g", "volume": "250 ml", "price": 900, "price_postapoc": 10, @@ -472,7 +472,7 @@ "type": "ARMOR", "name": { "str": "fur loincloth" }, "description": "A fur pelt tied into a loincloth. Covers your modesty, but not much else. Now you are a true barbarian warrior.", - "weight": "64 g", + "weight": "250 g", "volume": "250 ml", "price": 7500, "price_postapoc": 10, @@ -490,7 +490,7 @@ "type": "ARMOR", "name": { "str": "leather loincloth" }, "description": "Leather patches stitched together and tied into a makeshift loincloth. Covers your modesty, but not much else.", - "weight": "64 g", + "weight": "550 g", "volume": "250 ml", "price": 7500, "price_postapoc": 10, diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json index 916eb549f9bfd..e353cba52a83c 100644 --- a/data/json/items/armor/masks.json +++ b/data/json/items/armor/masks.json @@ -4,7 +4,7 @@ "type": "ARMOR", "name": { "str": "balaclava" }, "description": "A warm covering that protects the head and face from the cold.", - "weight": "40 g", + "weight": "70 g", "volume": "250 ml", "price": 3500, "price_postapoc": 50, @@ -43,7 +43,7 @@ "category": "clothing", "name": { "str": "bandana" }, "description": "A cotton bandana, worn over the mouth for warmth and minor protection from dust and other contaminants.", - "weight": "42 g", + "weight": "35 g", "volume": "250 ml", "price": 600, "price_postapoc": 10, diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 4d11b6e0fbe1d..3be14a5da1a5b 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -45,8 +45,8 @@ "type": "ARMOR", "name": { "str": "keffiyeh" }, "description": "A type of headdress traditionally used in the Middle East. It can be used in different ways to protect the head and mouth from the elements.", - "weight": "152 g", - "volume": "1250 ml", + "weight": "425 g", + "volume": "564 ml", "price": 250, "price_postapoc": 50, "to_hit": -1, diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index 271e3138449a2..4f655b07d1324 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -4,7 +4,7 @@ "type": "ARMOR", "name": { "str": "axe ring holster" }, "description": "A combination of leather and a metal ring to hold an axe on your waist.", - "weight": "130 g", + "weight": "180 g", "volume": "600 ml", "price": 3000, "price_postapoc": 250, diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index 15eb73c2965b2..444a6818026cc 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -1857,7 +1857,7 @@ "type": "ARMOR", "name": { "str": "pouch", "str_pl": "pouches" }, "description": "A makeshift bag, cobbled together from rags. Really gets in the way, but provides a decent amount of storage.", - "weight": "560 g", + "weight": "35 g", "volume": "500 ml", "price": 1000, "price_postapoc": 100, @@ -2474,7 +2474,7 @@ "type": "ARMOR", "name": { "str": "leather rifle case" }, "description": "A long soft leather rifle case. Provides storage for long arms and rifles. Includes a small pocket, strap and handle.", - "weight": "454 g", + "weight": "1104 g", "volume": "2 L", "price": 18000, "price_postapoc": 800, @@ -2560,7 +2560,7 @@ "type": "ARMOR", "name": { "str": "leather double rifle case" }, "description": "A long soft leather rifle case. Provides storage for 2 long arms and rifles. Includes 3 accessory pockets and a strap.", - "weight": "600 g", + "weight": "1104 g", "volume": "2 L", "price": 18000, "price_postapoc": 800, @@ -2611,7 +2611,7 @@ "type": "ARMOR", "name": { "str": "long leather rifle case" }, "description": "An extra long soft leather rifle case. Provides storage for long arms and rifles. Includes a small pocket, strap and handle.", - "weight": "600 g", + "weight": "1104 g", "volume": "2 L", "price": 18000, "price_postapoc": 800, @@ -2641,16 +2641,6 @@ "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ], "armor": [ { "encumbrance": [ 2, 6 ], "coverage": 30, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ] }, - { - "id": "rifle_case_xs_soft_leather", - "type": "ARMOR", - "copy-from": "rifle_case_soft_leather", - "looks_like": "rifle_case_soft_leather", - "name": { "str": "XS leather rifle case" }, - "description": "A long soft leather rifle case. Provides storage for long arms and rifles. Includes a small pocket, strap and handle. The strap on this one has been shortened to fit someone of small stature.", - "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE", "UNDERSIZE" ] - }, { "id": "camera_bag", "repairs_like": "backpack", diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index e91cd18307b8c..071c8a842d60e 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -549,7 +549,7 @@ "type": "ARMOR", "name": { "str": "zentai" }, "description": "Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and spandex garment. Though it covers your face, you can see through the integrated hood. With a couple of these and some friends and you could put on some kabuki.", - "weight": "300 g", + "weight": "600 g", "volume": "500 ml", "price": 2500, "price_postapoc": 50, diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 01d0d36dff35d..24075b48ca0e1 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -179,7 +179,7 @@ "category": "armor", "name": { "str": "leather body armor" }, "description": "Thick leather body armor. Light and comfortable.", - "weight": "1498 g", + "weight": "4400 g", "volume": "7 L", "price": 12000, "price_postapoc": 2500, @@ -1751,7 +1751,7 @@ "type": "ARMOR", "name": { "str": "gambeson" }, "description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. Or worn on its own, if you can't afford proper armor. Use it to loosen it if you want to wear it over your clothes.", - "weight": "4140 g", + "weight": "2800 g", "volume": "3 L", "price": 20000, "price_postapoc": 750, @@ -1775,7 +1775,7 @@ "type": "ARMOR", "name": { "str": "gambeson vest" }, "description": "A thick vest of quilted fabric, designed to be worn underneath mail or other armor. This one has had its sleeves removed. Use it to loosen it if you want to wear it over your clothes.", - "weight": "2760 g", + "weight": "1400 g", "volume": "2 L", "price": 20000, "price_postapoc": 600, @@ -1826,7 +1826,7 @@ "type": "ARMOR", "name": { "str_sp": "arming pants" }, "description": "Thick pants made of quilted fabric, meant to be worn alongside a gambeson under or without armor.", - "weight": "2760 g", + "weight": "2100 g", "volume": "2 L", "price": 14000, "price_postapoc": 600, @@ -1846,7 +1846,7 @@ "type": "ARMOR", "name": { "str": "Kevlar gambeson" }, "description": "Designed to mimic a thick jacket of quilted fabric that would be worn underneath mail or other armor. A base layer of aramid fabric has had strips of soft body armor sewn into it to mimic quilting. Use it to loosen it if you want to wear it over your clothes.", - "weight": "2760 g", + "weight": "11556 g", "volume": "2520 ml", "price": 20000, "price_postapoc": 750, @@ -1899,7 +1899,7 @@ "type": "ARMOR", "name": { "str": "Kevlar gambeson vest" }, "description": "Designed to mimic a thick vest of quilted fabric that would be worn underneath mail or other armor. A base layer of aramid fabric has had strips of soft body armor sewn into it to mimic quilting. Use it to loosen it if you want to wear it over your clothes.", - "weight": "1840 g", + "weight": "6200 g", "volume": "1670 ml", "price": 20000, "price_postapoc": 600, @@ -1960,7 +1960,7 @@ "type": "ARMOR", "name": { "str": "Kevlar arming pants", "str_pl": "pairs of Kevlar arming pants" }, "description": "Thick pants made of quilted fabric, meant to be worn alongside a gambeson under or without armor. This one incorporates Kevlar layers added for better protection.", - "weight": "1840 g", + "weight": "9300 g", "volume": "2000 ml", "price": 14000, "price_postapoc": 600, diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json index 2c5204c9536ca..0378674d3ae08 100644 --- a/data/json/items/armor/swimming.json +++ b/data/json/items/armor/swimming.json @@ -665,7 +665,7 @@ "type": "ARMOR", "name": { "str": "wetsuit" }, "description": "A full-body neoprene wetsuit.", - "weight": "1360 g", + "weight": "825 g", "volume": "5 L", "price": 12000, "price_postapoc": 500, @@ -902,7 +902,7 @@ "type": "ARMOR", "name": { "str": "spring suit" }, "description": "A long-sleeved spring wetsuit with pink color details and cleavage-enhancing, hip-accentuating construction. Not as protective as a full-body suit, but also less restrictive.", - "weight": "360 g", + "weight": "550 g", "volume": "4 L", "price": 10000, "price_postapoc": 500, diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json index a716c629de1ef..29c0a6f1c6393 100644 --- a/data/json/items/armor/torso_clothes.json +++ b/data/json/items/armor/torso_clothes.json @@ -310,7 +310,7 @@ "type": "ARMOR", "name": { "str": "leather apron" }, "description": "An apron made of leather.", - "weight": "680 g", + "weight": "1925 g", "volume": "2250 ml", "price": 1500, "price_postapoc": 50, diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json index b705a5309d384..c5518a380b9eb 100644 --- a/data/json/items/armor/undergarment.json +++ b/data/json/items/armor/undergarment.json @@ -104,7 +104,7 @@ "name": { "str": "fur belly wrap" }, "description": "Fur pelts wrapped around the belly. Usually worn in combination with a chestwrap. Provides a negligible protection against punches on your stomach.", "copy-from": "bellywrap", - "weight": "300 g", + "weight": "1104 g", "volume": "750 ml", "price": 700, "material": [ "fur" ], @@ -119,7 +119,7 @@ "name": { "str": "leather belly wrap" }, "description": "Leather patches wrapped around the belly. Usually worn in combination with a chestwrap. Provides a weak protection against punches on your stomach.", "copy-from": "bellywrap", - "weight": "240 g", + "weight": "888 g", "volume": "750 ml", "price": 525, "material": [ "leather" ], @@ -146,7 +146,7 @@ "type": "ARMOR", "name": { "str": "fur bikini top" }, "description": "A simple fur bikini top.", - "weight": "118 g", + "weight": "200 g", "volume": "250 ml", "price": 4900, "price_postapoc": 100, @@ -164,7 +164,7 @@ "type": "ARMOR", "name": { "str": "leather bikini top" }, "description": "A simple leather bikini top.", - "weight": "115 g", + "weight": "200 g", "volume": "250 ml", "price": 3500, "price_postapoc": 50, @@ -375,7 +375,7 @@ "type": "ARMOR", "name": { "str": "fur chestwrap" }, "description": "Fur pelts wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.", - "weight": "154 g", + "weight": "372 g", "volume": "750 ml", "price": 700, "price_postapoc": 10, @@ -393,7 +393,7 @@ "type": "ARMOR", "name": { "str": "leather chestwrap" }, "description": "Leather patches wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.", - "weight": "137 g", + "weight": "296 g", "volume": "750 ml", "price": 525, "price_postapoc": 10, @@ -511,7 +511,7 @@ "type": "ARMOR", "name": { "str": "pair of leg warmers", "str_pl": "pairs of leg warmers" }, "description": "Snug, soft cloth sleeves to keep your legs warm.", - "weight": "46 g", + "weight": "70 g", "volume": "500 ml", "price": 1000, "price_postapoc": 50, @@ -536,7 +536,7 @@ "type": "ARMOR", "name": { "str": "pair of fur leggings", "str_pl": "pairs of fur leggings" }, "description": "Snug fur sleeves to keep your legs warm. Simple yet effective since prehistoric times.", - "weight": "694 g", + "weight": "700 g", "volume": "1500 ml", "price": 1500, "price_postapoc": 250, @@ -561,7 +561,7 @@ "type": "ARMOR", "name": { "str": "pair of fetlock furs", "str_pl": "pairs of fetlock furs" }, "description": "Snug fur sleeves to keep your fetlocks warm.", - "weight": "66 g", + "weight": "500 g", "volume": "750 ml", "price": 25000, "price_postapoc": 250, @@ -589,7 +589,7 @@ "type": "ARMOR", "name": { "str": "pair of XL leg warmers", "str_pl": "pairs of XL leg warmers" }, "description": "Large, soft, snug cloth sleeves to keep your exotic anatomy warm.", - "weight": "50 g", + "weight": "90 g", "volume": "750 ml", "price": 20000, "price_postapoc": 50, diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index c2a1a3a8d291a..9e38b35e47420 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -372,7 +372,12 @@ "symbol": "!", "color": "red", "flags": [ "NO_INGEST" ], - "use_action": { "type": "consume_drug", "moves": 100, "effects": [ { "id": "sleep", "duration": 1000 } ], "used_up_item": "rag" } + "use_action": { + "type": "consume_drug", + "moves": 100, + "effects": [ { "id": "sleep", "duration": 1000 } ], + "used_up_item": "cotton_patchwork" + } }, { "id": "codeine", @@ -1643,7 +1648,7 @@ "disinfectant_power": 2, "bite": 0.5, "move_cost": 6000, - "used_up_item": { "id": "rag", "quantity": 1, "flags": [ "FILTHY" ] } + "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] } } }, { diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 3318ad38ecb1a..09ea6ca993362 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -3071,13 +3071,13 @@ "symbol": ",", "color": "dark_gray", "name": { "str": "neoprene patch", "str_pl": "neoprene patches" }, - "description": "A moderately sized sheet of neoprene. Can be used to craft light and stretchable clothing.", + "description": "A small neoprene patch. Can be used to repair neoprene clothing.", "price": 1000, "price_postapoc": 100, "material": [ "neoprene" ], "flags": [ "NO_SALVAGE" ], - "weight": "80 g", - "volume": "250 ml", + "weight": "3 g", + "volume": "23 ml", "category": "spare_parts" }, { diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json index 43009fd453c02..757f584887d57 100644 --- a/data/json/items/generic/bedding.json +++ b/data/json/items/generic/bedding.json @@ -49,10 +49,10 @@ "id": "sheet", "type": "ARMOR", "name": { "str": "sheet" }, - "description": "A large fabric sheet, could be used as a curtain or bedsheets; or cut up for a bunch of rags.", - "//density": "1.55 grams per mL", - "weight": "800 g", - "volume": "520 ml", + "description": "A 72 inch by 24 inch, two layer thick fabric sheet, could be used as a curtain or bedsheets; or cut up for a bunch of rags.", + "//density": "1.6 grams per mL", + "weight": "420 g", + "volume": "564 ml", "price": 2000, "price_postapoc": 50, "to_hit": -1, diff --git a/data/json/items/gun/faults_gun.json b/data/json/items/gun/faults_gun.json index 7bd9b9818fd22..ffc72bbd4b28f 100644 --- a/data/json/items/gun/faults_gun.json +++ b/data/json/items/gun/faults_gun.json @@ -32,7 +32,7 @@ [ "bleach", 1 ], [ "soapy_water", 1 ] ], - [ [ "rag", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] + [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] ] } }, @@ -63,7 +63,7 @@ [ "bleach", 1 ], [ "soapy_water", 1 ] ], - [ [ "rag", 2 ], [ "fur", 2 ], [ "faux_fur", 2 ], [ "felt_patch", 2 ], [ "cotton_ball", 4 ] ], + [ [ "cotton_patchwork", 2 ], [ "fur", 2 ], [ "faux_fur", 2 ], [ "felt_patch", 2 ], [ "cotton_ball", 4 ] ], [ [ "lamp_oil", 5 ], [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ], [ "motor_oil", 5 ] ] ] } @@ -105,7 +105,7 @@ "tools": [ [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], "components": [ [ [ "lamp_oil", 5 ], [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ], [ "motor_oil", 5 ] ], - [ [ "rag", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] + [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] ] } } @@ -145,7 +145,7 @@ [ "bleach", 1 ], [ "soapy_water", 1 ] ], - [ [ "rag", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] + [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] ] } }, @@ -176,7 +176,7 @@ [ "bleach", 1 ], [ "soapy_water", 1 ] ], - [ [ "rag", 2 ], [ "fur", 2 ], [ "faux_fur", 2 ], [ "felt_patch", 2 ], [ "cotton_ball", 4 ] ], + [ [ "cotton_patchwork", 2 ], [ "fur", 2 ], [ "faux_fur", 2 ], [ "felt_patch", 2 ], [ "cotton_ball", 4 ] ], [ [ "lamp_oil", 5 ], [ "cooking_oil", 1 ], [ "cooking_oil2", 1 ], [ "motor_oil", 5 ] ] ] } diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 3b246ad3db3fd..cdc8e1ab9e57f 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -1775,5 +1775,10 @@ "id": "rabbit_foot", "type": "MIGRATION", "replace": "rabbit_sample" + }, + { + "id": "rag", + "type": "MIGRATION", + "replace": "cotton_patchwork" } ] diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 956c1684094da..83eb98ac29af7 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -49,11 +49,11 @@ "id": "nylon", "type": "TOOL", "category": "spare_parts", - "name": { "str_sp": "synthetic fabric" }, - "description": "This is small bolt of synthetic fabric. Unlike you and other natural materials, it won't degrade much with age. Maybe that's less of a bad thing now.", - "weight": "55 g", - "volume": "50 ml", - "//": "Density of 1.15 grams per mL", + "name": { "str_sp": "synthetic fabric patch" }, + "description": "This a 6 inch square patch of synthetic fabric. Unlike you and other natural materials, it won't degrade much with age. Maybe that's less of a bad thing now.", + "weight": "9 g", + "volume": "12 ml", + "//": ".5mm thick, 250GSM", "price": 0, "price_postapoc": 10, "material": [ "nylon" ], @@ -66,10 +66,10 @@ "type": "TOOL", "category": "spare_parts", "name": { "str": "Lycra patch", "str_pl": "Lycra patches" }, - "description": "This is a small bolt of a synthetic fabric blended with stretchy Lycra fibers. It could be used to make flexible yet strong clothing. Stylish, but bad for the environment; at least you're recycling it.", - "weight": "87 g", - "volume": "70 ml", - "//": "Density of 1.21-1.35 grams per mL, using 1.28", + "description": "This is a 6 inch square patch of synthetic fabric blended with stretchy Lycra fibers. It could be used to make flexible yet strong clothing. Stylish, but bad for the environment; at least you're recycling it.", + "weight": "4 g", + "volume": "15 ml", + "//": "180GSM, .63mm thick", "price": 0, "price_postapoc": 10, "material": [ "lycra" ], diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 40398d3d6c5d7..34c0f0917c3f8 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -33,6 +33,8 @@ "type": "GENERIC", "name": { "str_sp": "faux fur scraps" }, "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects. Not useful for much and usually disposed of.", + "weight": "3 g", + "volume": "7 ml", "price": 0, "price_postapoc": 5, "material": [ "faux_fur" ] @@ -43,6 +45,7 @@ "type": "GENERIC", "name": { "str_sp": "felt scraps" }, "description": "Oddly-shaped smallish bits of felt, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some wool fiber if you really want.", + "volume": "5 ml", "material": [ "wool" ] }, { @@ -52,6 +55,8 @@ "name": { "str_sp": "fur scraps" }, "description": "Oddly-shaped smallish bits of fur, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "weight": "3 g", + "volume": "15 ml", "material": [ "fur" ] }, { @@ -60,6 +65,7 @@ "type": "GENERIC", "name": { "str_sp": "Kevlar scraps" }, "description": "Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring projects. Normally it's disposed of, but since Kevlar would be very difficult to make in a post-apocalyptic world, it might be worth recycling it for Kevlar thread.", + "volume": "2 ml", "price": 1, "price_postapoc": 10, "material": [ "kevlar" ] @@ -71,6 +77,7 @@ "name": { "str_sp": "leather scraps" }, "description": "Oddly-shaped smallish bits of leather, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "volume": "6 ml", "material": [ "leather" ] }, { @@ -80,6 +87,7 @@ "name": { "str_sp": "Lycra scraps" }, "description": "Oddly-shaped smallish bits of Lycra, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "volume": "4 ml", "material": [ "lycra" ] }, { @@ -89,6 +97,7 @@ "name": { "str_sp": "neoprene scraps" }, "description": "Oddly-shaped smallish bits of neoprene, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "volume": "6 ml", "material": [ "neoprene" ] }, { @@ -98,6 +107,7 @@ "name": { "str_sp": "synthetic fabric scraps" }, "description": "Oddly-shaped smallish bits of synthetic fabric, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "volume": "3 ml", "material": [ "nylon" ] }, { @@ -107,6 +117,7 @@ "name": { "str_sp": "Nomex scraps" }, "description": "Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material from tailoring projects. Normally it's disposed of, but since Nomex would be very difficult to make in a post-apocalyptic world, it might be worth recycling it.", "price": 5, + "volume": "2 ml", "price_postapoc": 8, "material": [ "nomex" ] }, @@ -115,14 +126,14 @@ "id": "fur", "symbol": ",", "color": "brown", - "name": { "str": "fur pelt" }, - "description": "A small bolt of fur from an animal. Can be made into warm clothing.", + "name": { "str": "fur patch", "str_pl": "fur patches" }, + "description": "A small bolt of fur from an animal, roughly 6 inches square. Can be made into patchwork fur sheets or used to repair fur fabric.", "price": 1000, "price_postapoc": 10, "material": [ "fur", "leather" ], "flags": [ "NO_SALVAGE" ], - "weight": "114 g", - "volume": "250 ml", + "weight": "46 g", + "volume": "58 ml", "category": "spare_parts" }, { @@ -130,9 +141,9 @@ "id": "faux_fur", "copy-from": "fur", "color": "pink", - "name": { "str": "faux fur pelt" }, + "name": { "str": "faux fur patch", "str_pl": "faux fur patches" }, "price_postapoc": 10, - "description": "A small bolt of garishly colored faux fur. Can be made into clothing.", + "description": "A small bolt of garishly colored faux fur, roughly 6 inches square. Can be made into patchwork faux fur sheets or used to repair faux fur fabric.", "flags": [ "NO_SALVAGE" ], "material": [ "faux_fur" ] }, @@ -142,13 +153,13 @@ "symbol": ",", "color": "brown", "name": { "str": "leather patch", "str_pl": "leather patches" }, - "description": "A smallish patch of leather, could be used to make tough clothing.", + "description": "A roughly 6 inch square patch of leather, could be used to repair clothing and make smaller leather crafts.", "price": 2000, "price_postapoc": 25, "material": [ "leather", "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "100 g", - "volume": "250 ml", + "weight": "37 g", + "volume": "23 ml", "category": "spare_parts" }, { @@ -157,13 +168,13 @@ "symbol": ",", "color": "white", "name": { "str": "felt patch", "str_pl": "felt patches" }, - "description": "A smallish patch of felt, could be disassembled for wool fiber.", + "description": "A small, 6 inch square patch of felt, could be disassembled for wool fiber.", "price": 2000, "price_postapoc": 10, "material": [ "wool" ], "flags": [ "NO_SALVAGE" ], - "weight": "100 g", - "volume": "250 ml", + "weight": "3 g", + "volume": "18 ml", "category": "spare_parts" }, { @@ -173,13 +184,13 @@ "symbol": ",", "color": "light_gray", "name": { "str": "Nomex patch", "str_pl": "Nomex patches" }, - "description": "A small bolt of Nomex fire-resistant fabric.", + "description": "A 6 inch square patch of Nomex fire-resistant fabric.", "price": 4000, "price_postapoc": 20, "material": [ "nomex" ], "flags": [ "NO_SALVAGE" ], - "weight": "42 g", - "volume": "250 ml" + "weight": "4 g", + "volume": "9 ml" }, { "type": "GENERIC", @@ -192,7 +203,7 @@ "price_postapoc": 150, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "100 g", + "weight": "40 g", "volume": "125 ml", "category": "spare_parts", "to_hit": -1 @@ -203,12 +214,26 @@ "symbol": ",", "color": "brown", "name": { "str": "tanned hide" }, - "description": "A folded sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.", + "description": "A folded 12 inch by 24 inch sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.", "price": 5000, "price_postapoc": 500, "material": [ "leather" ], - "weight": "600 g", - "volume": "1500 ml", + "weight": "296 g", + "volume": "186 ml", + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "sheet_leather_patchwork", + "symbol": ",", + "color": "brown", + "name": { "str": "patchwork leather sheet" }, + "description": "A folded 12 inch by 24 inch sheet of leather sewn together from various patches. Can be cut up or used as is.", + "price": 2500, + "price_postapoc": 250, + "material": [ "leather" ], + "weight": "296 g", + "volume": "186 ml", "category": "spare_parts" }, { @@ -222,8 +247,8 @@ "price_postapoc": 150, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "114 g", - "volume": "170 ml", + "weight": "372 g", + "volume": "465 ml", "category": "spare_parts", "to_hit": -1 }, @@ -233,12 +258,26 @@ "symbol": ",", "color": "brown", "name": { "str": "tanned pelt" }, - "description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.", + "description": "A folded sheet of fur made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.", "price": 5000, "price_postapoc": 500, "material": [ "fur" ], - "weight": "684 g", - "volume": "1500 ml", + "weight": "372 g", + "volume": "465 ml", + "category": "spare_parts" + }, + { + "type": "GENERIC", + "id": "sheet_fur_patchwork", + "symbol": ",", + "color": "brown", + "name": { "str": "patchwork fur sheet" }, + "description": "A 12 inch by 24 inch sheet made of patches of fur pelts. Can be cut up or used as is.", + "price": 2500, + "price_postapoc": 250, + "material": [ "fur" ], + "weight": "372 g", + "volume": "465 ml", "category": "spare_parts" }, { @@ -246,10 +285,10 @@ "type": "GENERIC", "category": "spare_parts", "name": { "str": "cotton sheet" }, - "description": "A sheet of cotton fabric, suitable for making clothing.", - "weight": "5 g", - "volume": "3 ml", - "//": "Density of 1.55 grams per mL", + "description": "A 12 inch by 24 inch sheet of cotton fabric, suitable for making clothing.", + "weight": "38 g", + "volume": "47 ml", + "//": "Medium weight cotton fabric with a GSM of 203", "price": 1000, "price_postapoc": 10, "material": [ "cotton" ], @@ -262,9 +301,7 @@ "type": "GENERIC", "name": { "str_sp": "patchwork cotton sheet" }, "description": "A selection of various clothing parts, sewn together from cotton patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "100 g", - "volume": "65 ml", - "//density": "1.55 grams per mL", + "//density": ".80 grams per mL, 203 GSM", "price": 200, "price_postapoc": 20 }, @@ -273,10 +310,10 @@ "type": "GENERIC", "category": "spare_parts", "name": { "str": "faux fur sheet" }, - "description": "A sheet of fake synthetic colorful fur, suitable for making clothing.", - "weight": "10 g", - "volume": "25 ml", - "//": "Guesstimated density of 0.44 grams per mL based on felt", + "description": "A 12 inch by 24 inch sheet of fake synthetic colorful fur, suitable for making clothing.", + "weight": "372 g", + "volume": "465 ml", + "//": "Based on 2000gsm faux fur", "price": 5000, "price_postapoc": 20, "material": [ "faux_fur" ], @@ -287,11 +324,9 @@ "id": "sheet_faux_fur_patchwork", "copy-from": "sheet_faux_fur", "type": "GENERIC", - "name": { "str_sp": "patchwork faux fur clothing parts" }, - "description": "A selection of various clothing parts, sewn together from faux fur patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "200 g", - "volume": "450 ml", - "//": "Guesstimated density of 0.44 grams per mL based on felt", + "name": { "str_sp": "patchwork faux fur sheet" }, + "description": "A sheet of mismatched faux fur patches, sewn together in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", + "//": "12 inches by 24 inches with GSM of 2000", "price": 1000, "price_postapoc": 50 }, @@ -301,9 +336,9 @@ "category": "spare_parts", "name": { "str": "felt sheet" }, "description": "A sheet of felt, suitable for making clothing.", - "weight": "8 g", - "volume": "20 ml", - "//": "Density of 0.44 grams per mL", + "weight": "28 g", + "volume": "145 ml", + "//": "based on 150GSM felt", "price": 2500, "price_postapoc": 20, "material": [ "wool" ], @@ -314,11 +349,9 @@ "id": "sheet_felt_patchwork", "copy-from": "sheet_felt", "type": "GENERIC", - "name": { "str_sp": "patchwork felt clothing parts" }, - "description": "A selection of various clothing parts, sewn together from felt patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "160 g", - "volume": "360 ml", - "//": "Density of 0.44 grams per mL", + "name": { "str_sp": "patchwork felt sheets" }, + "description": "A patchwork felt sheet, sewn together in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", + "//": "150GSM felt", "price": 500, "price_postapoc": 50 }, @@ -327,10 +360,10 @@ "type": "GENERIC", "category": "spare_parts", "name": { "str": "Kevlar sheet" }, - "description": "A sheet of Kevlar synthetic fabric, suitable for making cut-resistant, durable clothing. In this form, unlike rigid plates, it can be stitched.", - "weight": "5 g", - "volume": "4 ml", - "//": "Density of 1.4 grams per mL", + "description": "A 12 inch by 24 inch sheet of Kevlar synthetic fabric, suitable for making cut-resistant, durable clothing. In this form, unlike rigid plates, it can be stitched.", + "weight": "26 g", + "volume": "51 ml", + "//": "values taken from Duponts chemical reference. 144 GSM", "price": 900, "price_postapoc": 50, "material": [ "kevlar" ], @@ -343,9 +376,9 @@ "category": "spare_parts", "name": { "str": "Lycra sheet" }, "description": "A sheet of synthetic fabric blended with stretchy Lycra fibers, suitable for making flexible yet strong clothing.", - "weight": "3 g", - "volume": "2 ml", - "//": "Density of 1.21-1.35 grams per mL, using 1.28", + "weight": "33 g", + "volume": "117 ml", + "//": "180 GSM fabric", "price": 5000, "price_postapoc": 25, "material": [ "lycra" ], @@ -357,10 +390,10 @@ "type": "TOOL", "category": "spare_parts", "name": { "str": "layered Kevlar panel" }, - "description": "This is a small 16-layer thick Kevlar panel. It could be used to repair armor made of Kevlar.", - "weight": "80 g", - "volume": "65 ml", - "//": "Density of 1.4 grams per mL; volume increased ~5% to account for some rigidity", + "description": "This is a small 16-layer thick Kevlar panel. It could be used to craft or repair armor made of Kevlar.", + "weight": "428 g", + "volume": "818 ml", + "//": "12 inch by 24 inch sheets, 16 layers thick. Values actually nearly identically matched panels available for purchase. ", "price": 15000, "price_postapoc": 150, "material": [ "kevlar_layered" ], @@ -374,9 +407,9 @@ "category": "spare_parts", "name": { "str": "rigid Kevlar plate" }, "description": "This is a compressed panel of Kevlar treated with epoxy or other adhesive. It could be used to repair items made of Kevlar.", - "weight": "300 g", - "volume": "235 ml", - "//": "Density of 1.4 grams per mL + 10% for being rigid and possibly oddly-shaped", + "weight": "429 g", + "volume": "818 ml", + "//": "same as above but adding superglue. IRL this is how they are made, though using 2 part resin instead.", "price": 1000, "price_postapoc": 250, "material": [ "kevlar_rigid" ], @@ -388,11 +421,9 @@ "id": "sheet_lycra_patchwork", "copy-from": "sheet_lycra", "type": "GENERIC", - "name": { "str_sp": "patchwork Lycra clothing parts" }, - "description": "A selection of various clothing parts, sewn together from Lycra patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "60 g", - "volume": "45 ml", - "//": "Density of 1.21-1.35 grams per mL, using 1.28", + "name": { "str_sp": "patchwork Lycra sheet" }, + "description": "A sheet of fabric, sewn together from Lycra patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", + "//": "180GSM", "price": 1000, "price_postapoc": 50 }, @@ -402,9 +433,9 @@ "category": "spare_parts", "name": { "str": "neoprene sheet" }, "description": "A sheet of neoprene, a synthetic rubber, suitable for making underwater gear.", - "weight": "6 g", - "volume": "5 ml", - "//": "Density of 1.23 grams per mL", + "weight": "26 g", + "volume": "186 ml", + "//": "110GSM, 1mm thick neoprene", "price": 5000, "price_postapoc": 35, "material": [ "neoprene" ], @@ -415,10 +446,8 @@ "id": "sheet_neoprene_patchwork", "copy-from": "sheet_neoprene", "type": "GENERIC", - "name": { "str_sp": "patchwork neoprene clothing parts" }, - "description": "A selection of various clothing parts, sewn together from neoprene patches in a patchwork fashion, with waterproofed seams. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "120 g", - "volume": "100 ml", + "name": { "str_sp": "patchwork neoprene sheet" }, + "description": "A sheet of fabric, sewn together from neoprene patches in a patchwork fashion, with waterproofed seams. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "//": "Density of 1.23 grams per mL", "price": 1000, "price_postapoc": 60 @@ -429,9 +458,9 @@ "category": "spare_parts", "name": { "str": "Nomex sheet" }, "description": "A sheet of Nomex synthetic fabric, suitable for making heat-resistant clothing.", - "weight": "5 g", - "volume": "7 ml", - "//": "Density of 0.72-1.1 grams per mL, using ~0.72 to account for possible unwieldiness", + "weight": "32 g", + "volume": "75 ml", + "//": "Taken from duponts chemical reference sheets. 170GSM", "price": 15000, "price_postapoc": 40, "material": [ "nomex" ], @@ -442,11 +471,9 @@ "id": "sheet_nomex_patchwork", "copy-from": "sheet_nomex", "type": "GENERIC", - "name": { "str_sp": "patchwork Nomex clothing parts" }, - "description": "A selection of various clothing parts, sewn together with Nomex thread from Nomex patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "100 g", - "volume": "110 ml", - "//": "Density of 0.72-1.1 grams per mL, using 0.91", + "name": { "str_sp": "patchwork Nomex sheet" }, + "description": "A sheet of fabric, sewn together with Nomex thread from Nomex patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", + "//": "Taken from duponts chemical reference sheets. 170GSM", "price": 3000, "price_postapoc": 80 }, @@ -456,9 +483,9 @@ "category": "spare_parts", "name": { "str": "synthetic fabric sheet" }, "description": "A sheet of synthetic fabric, suitable for making clothing.", - "weight": "3 g", - "volume": "3 ml", - "//": "Density of 1.15 grams per mL", + "weight": "46 g", + "volume": "93 ml", + "//": ".5mm thick, 250 GSM", "price": 5000, "price_postapoc": 20, "material": [ "nylon" ], @@ -470,10 +497,8 @@ "copy-from": "sheet_nylon", "type": "GENERIC", "name": { "str_sp": "patchwork synthetic fabric clothing parts" }, - "description": "A selection of various clothing parts, sewn together from synthetic fabric patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "60 g", - "volume": "50 ml", - "//": "Density of 1.15 grams per mL", + "description": "A sheet of fabric, sewn together from synthetic fabric patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", + "//": ".5mm thick, 250gsm", "price": 1000, "price_postapoc": 40 }, @@ -492,6 +517,7 @@ "flags": [ "NO_SALVAGE" ], "volume": "200 ml", "weight": "1 g", + "//": "30 meters of thread per 1g, roughly 6 inches of thread per unit.", "ammo_type": "thread", "count": 50, "stack_size": 200 @@ -511,6 +537,7 @@ "flags": [ "NO_SALVAGE" ], "volume": "200 ml", "weight": "1 g", + "//": "30 meters of thread per 1g, roughly 6 inches of thread per unit.", "ammo_type": "thread", "count": 50, "stack_size": 200 diff --git a/data/json/items/tool/toiletries.json b/data/json/items/tool/toiletries.json index 28caccad89009..4fea555ba76ee 100644 --- a/data/json/items/tool/toiletries.json +++ b/data/json/items/tool/toiletries.json @@ -137,6 +137,7 @@ "//": "This is much, much bigger than it should be.", "//2": "Based on the density used for cotton patchwork, which disassembles into rags, it should be 52ml.", "//3": "But I don't want to touch the tests that are insistent it should take longer to manipulate, so here we are.", + "//4": "Rags will be going away soonish. I need to finish the other recipe changes first.", "price": 0, "price_postapoc": 0, "material": [ "cotton" ], @@ -152,11 +153,11 @@ "id": "cotton_patchwork", "type": "TOOL", "category": "spare_parts", - "name": { "str_sp": "patchwork cotton clothing parts" }, - "description": "A selection of various clothing parts, could be sewn together in a patchwork fashion.", - "weight": "100 g", - "volume": "65 ml", - "//": "Density of 1.55 grams per mL", + "name": { "str_sp": "cotton patch" }, + "description": "A 6 inch square cotton patch, suitable for use in repairing and tailoring of clothing.", + "weight": "5 g", + "volume": "6 ml", + "//": "This is calculated from medium weight cotton at 203 GSM, with a size of 6 inches square", "price": 200, "price_postapoc": 50, "material": [ "cotton" ], diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index b534a96fd8037..6207573262a24 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -577,7 +577,7 @@ "price": 15000, "price_postapoc": 500, "material": [ "cotton" ], - "weight": "864 g", + "weight": "3972 g", "volume": "2 L", "charges_per_use": 1, "ammo": "battery", @@ -2273,7 +2273,7 @@ "price": 30000, "price_postapoc": 750, "material": [ "cotton" ], - "weight": "1452 g", + "weight": "5748 g", "volume": "4500 ml", "charges_per_use": 1, "ammo": "battery", diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json index 547eb3748e48f..d22042a0e2967 100644 --- a/data/json/mapgen/animalshelter.json +++ b/data/json/mapgen/animalshelter.json @@ -46,7 +46,7 @@ { "item": "towel", "prob": 20 }, { "item": "soap", "prob": 10 }, { "item": "gloves_medical", "prob": 20 }, - { "item": "rag", "prob": 15 }, + { "item": "cotton_patchwork", "prob": 15 }, { "item": "bag_plastic", "prob": 20 }, { "item": "jerky", "prob": 40 }, { "item": "rope_6", "prob": 15 } diff --git a/data/json/mapgen/cs_city_dump_small.json b/data/json/mapgen/cs_city_dump_small.json index d1cff83ce8c49..4646db028720b 100644 --- a/data/json/mapgen/cs_city_dump_small.json +++ b/data/json/mapgen/cs_city_dump_small.json @@ -8,8 +8,8 @@ [ "television", 20 ], [ "two_way_radio", 10 ], [ "eyedrops", 10 ], - [ "rag", 20 ], - { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] }, + [ "cotton_patchwork", 20 ], + { "item": "cotton_patchwork", "prob": 20, "custom-flags": [ "FILTHY" ] }, [ "microwave", 20 ] ] }, diff --git a/data/json/mapgen/fema/FEMA_le_03.json b/data/json/mapgen/fema/FEMA_le_03.json index f727943762f4a..d2bd3450f3658 100644 --- a/data/json/mapgen/fema/FEMA_le_03.json +++ b/data/json/mapgen/fema/FEMA_le_03.json @@ -46,7 +46,7 @@ { "item": "id_science_visitor_1", "x": 7, "y": [ 12, 17 ], "chance": 100 }, { "item": "id_science_visitor_1", "x": 14, "y": [ 14, 17 ], "chance": 30 } ], - "item": { "B": { "item": "rag", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } }, + "item": { "B": { "item": "cotton_patchwork", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } }, "monster": { "Z": { "monster": "mon_zombie_brute" }, "z": { "monster": "mon_zombie_scientist" } } } } diff --git a/data/json/mapgen/fema/FEMA_mid_03.json b/data/json/mapgen/fema/FEMA_mid_03.json index e623c17174c94..cb3abad9c9c4d 100644 --- a/data/json/mapgen/fema/FEMA_mid_03.json +++ b/data/json/mapgen/fema/FEMA_mid_03.json @@ -40,7 +40,7 @@ "r": { "item": "drugs_emergency", "chance": 30 }, "X": { "item": "hospital_lab", "chance": 80 } }, - "item": { "B": { "item": "rag", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } } + "item": { "B": { "item": "cotton_patchwork", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } } } } ] diff --git a/data/json/mapgen/fort.json b/data/json/mapgen/fort.json index e7df45688a684..bd562ce0a4079 100644 --- a/data/json/mapgen/fort.json +++ b/data/json/mapgen/fort.json @@ -156,7 +156,7 @@ "id": "fort_crate", "type": "item_group", "subtype": "collection", - "entries": [ { "item": "cannonball_4lb", "prob": 100 }, { "item": "rag", "prob": 50 } ] + "entries": [ { "item": "cannonball_4lb", "prob": 100 }, { "item": "cotton_patchwork", "prob": 50 } ] }, { "id": "fort_powderbarrel", diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 575921f1ee01d..83fbaef0c5898 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -32,7 +32,7 @@ { "item": "prussian_blue", "prob": 75 }, { "group": "full_1st_aid", "prob": 50 }, { "item": "gloves_medical", "prob": 20 }, - { "item": "rag", "prob": 30, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 30, "custom-flags": [ "FILTHY" ] }, { "group": "drugs_emergency", "prob": 30 }, { "group": "drugs_heal_simple", "prob": 20 }, { "group": "drugs_analgesic", "prob": 10 } diff --git a/data/json/mapgen/nested/fema_nested.json b/data/json/mapgen/nested/fema_nested.json index 6880b7793ef74..34f6a1b921a5b 100644 --- a/data/json/mapgen/nested/fema_nested.json +++ b/data/json/mapgen/nested/fema_nested.json @@ -196,7 +196,7 @@ "r": { "item": "drugs_emergency", "chance": 30, "repeat": [ 1, 3 ] }, "X": { "item": "hospital_lab", "chance": 80, "repeat": [ 1, 3 ] } }, - "item": { "B": { "item": "rag", "chance": 80, "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } } + "item": { "B": { "item": "cotton_patchwork", "chance": 80, "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } } } }, { diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json index 8aa8d47a94e11..39073bdc69285 100644 --- a/data/json/mapgen/prison_1.json +++ b/data/json/mapgen/prison_1.json @@ -1565,7 +1565,7 @@ [ "towel", 20 ], [ "soap", 10 ], [ "gloves_medical", 20 ], - [ "rag", 15 ], + [ "cotton_patchwork", 15 ], [ "bag_plastic", 20 ], [ "jerky", 40 ], [ "rope_6", 15 ] diff --git a/data/json/mapgen/riverside/whaleys_house_river.json b/data/json/mapgen/riverside/whaleys_house_river.json index 43b171a4cde40..fd3e82874b27a 100644 --- a/data/json/mapgen/riverside/whaleys_house_river.json +++ b/data/json/mapgen/riverside/whaleys_house_river.json @@ -392,7 +392,7 @@ { "item": "splinter", "repeat": 1, "x": 16, "y": 4 }, { "item": "corpse", "repeat": 1, "x": 17, "y": 11 }, { "item": "splinter", "repeat": 1, "x": 4, "y": 13 }, - { "item": "rag", "repeat": 1, "x": 16, "y": 15, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "repeat": 1, "x": 16, "y": 15, "custom-flags": [ "FILTHY" ] }, { "item": "log", "repeat": 1, "x": 20, "y": 16 }, { "item": "splinter", "repeat": 1, "x": 11, "y": 19 } ], @@ -1336,12 +1336,12 @@ "object": { "place_item": [ { "item": "corpse", "repeat": 1, "x": 19, "y": 7 }, - { "item": "rag", "repeat": 1, "x": 13, "y": 12, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "repeat": 1, "x": 13, "y": 12, "custom-flags": [ "FILTHY" ] }, { "item": "human_flesh", "repeat": 1, "x": 19, "y": 12 }, { "item": "corpse", "repeat": 1, "x": 13, "y": 14 }, { "item": "corpse", "repeat": 1, "x": 19, "y": 14 }, { "item": "corpse", "repeat": 1, "x": 13, "y": 15 }, - { "item": "rag", "repeat": 1, "x": 14, "y": 15, "custom-flags": [ "FILTHY" ] } + { "item": "cotton_patchwork", "repeat": 1, "x": 14, "y": 15, "custom-flags": [ "FILTHY" ] } ], "furniture": { "#": "f_null", diff --git a/data/json/mapgen/sewage_treatment.json b/data/json/mapgen/sewage_treatment.json index eec352f50ad41..046ef93cb1fe3 100644 --- a/data/json/mapgen/sewage_treatment.json +++ b/data/json/mapgen/sewage_treatment.json @@ -601,7 +601,7 @@ { "item": "hstomach_large", "prob": 60 }, { "item": "hstomach", "prob": 60 }, { "item": "bone_human", "prob": 90, "count-min": 1, "count-max": 5 }, - { "item": "rag", "prob": 90, "count-min": 1, "count-max": 4, "custom-flags": [ "FILTHY" ] } + { "item": "cotton_patchwork", "prob": 90, "count-min": 1, "count-max": 4, "custom-flags": [ "FILTHY" ] } ] } ] diff --git a/data/json/monsterdrops/mutant_experimental.json b/data/json/monsterdrops/mutant_experimental.json index 8b864e16b67e5..c6b5deebaad8e 100644 --- a/data/json/monsterdrops/mutant_experimental.json +++ b/data/json/monsterdrops/mutant_experimental.json @@ -9,7 +9,7 @@ "type": "item_group", "subtype": "collection", "id": "mon_mutant_evolved_death_drops", - "entries": [ { "item": "rag", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, { "item": "pants", "damage": [ 2, 3 ] } ] + "entries": [ { "item": "cotton_patchwork", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, { "item": "pants", "damage": [ 2, 3 ] } ] }, { "type": "item_group", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 1231c544f12e0..a78634582bfc4 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -45,7 +45,7 @@ "subtype": "collection", "id": "mon_zombie_hulk_death_drops", "entries": [ - { "item": "rag", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, + { "item": "cotton_patchwork", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, { "group": "pants", "damage": [ 1, 4 ] }, { "group": "default_zombie_items" }, { "group": "wallets", "damage": [ 1, 4 ] } @@ -110,7 +110,7 @@ "id": "mon_zombie_thorny_death_drops", "subtype": "collection", "entries": [ - { "item": "rag", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, + { "item": "cotton_patchwork", "damage": [ 1, 4 ], "count": [ 1, 4 ] }, { "group": "pants", "damage": [ 1, 4 ] }, { "group": "shoes", "damage": [ 1, 4 ] }, { "group": "default_zombie_items" }, diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 6b3e978fd5e7d..bb7caca3d520a 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -923,7 +923,7 @@ [ "RAM", 2 ], [ "radio", 8 ], [ "radio_book", 2 ], - [ "rag", 5 ], + [ "cotton_patchwork", 5 ], [ "rail_laser_sight", 1 ], [ "raspberries", 4 ], [ "ravioli", 1 ], diff --git a/data/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json b/data/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json index 563a23e208eb6..01e0c29344186 100644 --- a/data/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json +++ b/data/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json @@ -59,7 +59,7 @@ { "item": "p320mag_17rd_9x19mm", "prob": 45 }, { "item": "pencil", "count": 2 }, { "item": "pen" }, - { "item": "rag" }, + { "item": "cotton_patchwork" }, { "item": "red_pen" } ] }, diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json index 5fbf0c0258d18..50836a449fc1d 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json @@ -53,7 +53,7 @@ "id": "FREE_MERCHANTS_Shop_Parts_Tailoring", "subtype": "distribution", "items": [ - { "item": "rag", "count": [ 5, 10 ], "prob": 40 }, + { "item": "cotton_patchwork", "count": [ 5, 10 ], "prob": 40 }, { "group": "SUS_tailoring_materials", "count": [ 1, 2 ] }, { "group": "SUS_tailoring_fasteners", "count": [ 2, 3 ] } ] diff --git a/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json b/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json index 57ba4a557c278..0e921e64ed3ff 100644 --- a/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json +++ b/data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json @@ -43,7 +43,7 @@ [ "mask_dust", 65 ], [ "towel", 40 ], [ "vacutainer", 10 ], - { "item": "rag", "prob": 1 }, + { "item": "cotton_patchwork", "prob": 1 }, { "item": "disinfectant", "prob": 35, "charges": [ 1, 10 ] }, [ "medical_gauze", 10 ], [ "medical_tape", 45 ], @@ -265,7 +265,7 @@ { "item": "tacoma_drink_token", "x": 6, "y": 11, "faction": "tacoma_commune" }, { "item": "bucket_wood", "x": 13, "y": 15, "faction": "tacoma_commune" }, { "item": "sponge", "x": 13, "y": 15, "faction": "tacoma_commune" }, - { "item": "rag", "x": 13, "y": 15, "faction": "tacoma_commune", "repeat": [ 2, 4 ] }, + { "item": "cotton_patchwork", "x": 13, "y": 15, "faction": "tacoma_commune", "repeat": [ 2, 4 ] }, { "item": "glass", "x": 13, "y": 14, "faction": "tacoma_commune", "repeat": [ 15, 30 ] }, { "item": "shot_glass", "x": 13, "y": 14, "faction": "tacoma_commune", "repeat": [ 10, 20 ] } ] diff --git a/data/json/obsolete.json b/data/json/obsolete.json index 889dd1d3675fc..6289d973d8d61 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -615,5 +615,15 @@ "volume": "250 ml", "price": 0, "flags": [ "OBSOLETE" ] + }, + { + "id": "rifle_case_xs_soft_leather", + "type": "ARMOR", + "copy-from": "rifle_case_soft_leather", + "looks_like": "rifle_case_soft_leather", + "name": { "str": "long leather rifle case" }, + "description": "A long soft leather rifle case. Provides storage for long arms and rifles. Includes a small pocket, strap and handle.", + "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE", "UNDERSIZE", "OBSOLETE" ], + "price": 0 } ] diff --git a/data/json/recipes/ammo/cannon.json b/data/json/recipes/ammo/cannon.json index 23df7887f152a..fd1a3e1b27461 100644 --- a/data/json/recipes/ammo/cannon.json +++ b/data/json/recipes/ammo/cannon.json @@ -14,7 +14,7 @@ "charges": 1, "reversible": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "cannonball_4lb", 1 ] ], [ [ "rag", 1 ] ], [ [ "chem_black_powder", 3000 ] ], [ [ "fuse", 1 ] ] ], + "components": [ [ [ "cannonball_4lb", 1 ] ], [ [ "cotton_patchwork", 1 ] ], [ [ "chem_black_powder", 3000 ] ], [ [ "fuse", 1 ] ] ], "//": "Powder load for round shot was roughly 1/4 to 1/3 the weight of the cannonball" } ] diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json index 438f656ae74e9..9b389f9ee60bb 100644 --- a/data/json/recipes/armor/arms.json +++ b/data/json/recipes/armor/arms.json @@ -12,7 +12,7 @@ "reversible": true, "using": [ [ "cordage_short", 2 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "2x4", 1 ] ], [ [ "rag", 1 ] ] ] + "components": [ [ [ "2x4", 1 ] ], [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "arm_warmers", @@ -22,25 +22,26 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 1, - "time": "90 m", + "time": "60 m", + "//": "Time has gotten shorter but is double requirement time due to making a pair", "autolearn": true, - "byproducts": [ [ "scrap_cotton", 79 ] ], + "byproducts": [ [ "scrap_cotton", 3 ] ], "using": [ [ "tailoring_cotton_patchwork", 1 ] ] }, { "result": "xs_arm_warmers", "type": "recipe", "copy-from": "arm_warmers", - "time": "90 m", - "byproducts": [ [ "scrap_cotton", 59 ] ], + "time": "50 m", + "byproducts": [ [ "scrap_cotton", 11 ] ], "using": [ [ "tailoring_cotton_patchwork", 1 ] ] }, { "result": "xl_arm_warmers", "type": "recipe", "copy-from": "arm_warmers", - "time": "100 m", - "byproducts": [ [ "scrap_cotton", 109 ] ], + "time": "70 m", + "byproducts": [ [ "scrap_cotton", 21 ] ], "using": [ [ "tailoring_cotton_patchwork", 2 ] ] }, { @@ -55,7 +56,7 @@ "time": "390 m", "autolearn": true, "book_learn": [ [ "textbook_arthropod", 4 ] ], - "byproducts": [ [ "scrap_leather", 80 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -69,7 +70,7 @@ "type": "recipe", "copy-from": "armguard_chitin", "time": "390 m", - "byproducts": [ [ "scrap_leather", 60 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "using": [ [ "armor_chitin", 2 ], [ "tailoring_leather_small", 1 ] ] }, { @@ -77,7 +78,7 @@ "type": "recipe", "copy-from": "armguard_chitin", "time": "440 m", - "byproducts": [ [ "scrap_leather", 100 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "using": [ [ "armor_chitin", 4 ], [ "tailoring_leather_small", 3 ] ] }, { @@ -92,7 +93,7 @@ "time": "390 m", "autolearn": true, "book_learn": [ [ "textbook_arthropod", 5 ] ], - "byproducts": [ [ "scrap_leather", 80 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "using": [ [ "armor_acidchitin", 3 ], [ "tailoring_leather_small", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -106,7 +107,7 @@ "type": "recipe", "copy-from": "armguard_acidchitin", "time": "390 m", - "byproducts": [ [ "scrap_leather", 60 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "using": [ [ "armor_acidchitin", 2 ], [ "tailoring_leather_small", 1 ] ] }, { @@ -114,7 +115,7 @@ "type": "recipe", "copy-from": "armguard_acidchitin", "time": "440 m", - "byproducts": [ [ "scrap_leather", 100 ] ], + "byproducts": [ [ "scrap_leather", 4 ] ], "using": [ [ "armor_acidchitin", 4 ], [ "tailoring_leather_small", 3 ] ] }, { @@ -128,7 +129,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "260 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], - "byproducts": [ [ "scrap_neoprene", 43 ] ], + "byproducts": [ [ "scrap_neoprene", 4 ] ], "using": [ [ "plastic_molding", 2 ], [ "tailoring_neoprene_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_plasticworking" } ] }, @@ -137,7 +138,7 @@ "type": "recipe", "copy-from": "armguard_hard", "time": "260 m", - "byproducts": [ [ "scrap_neoprene", 32 ] ], + "byproducts": [ [ "scrap_neoprene", 2 ] ], "using": [ [ "plastic_molding", 1 ], [ "tailoring_neoprene_patchwork", 1 ] ] }, { @@ -146,7 +147,7 @@ "copy-from": "armguard_hard", "time": "290 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], - "byproducts": [ [ "scrap_neoprene", 67 ] ], + "byproducts": [ [ "scrap_neoprene", 6 ] ], "using": [ [ "plastic_molding", 3 ], [ "tailoring_neoprene_patchwork", 3 ] ] }, { @@ -157,27 +158,27 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 3, - "time": "720 m", + "time": "120 m", "autolearn": true, - "byproducts": [ [ "leather", 9 ], [ "scrap_leather", 29 ] ], - "using": [ [ "tailoring_leather", 2 ] ], + "byproducts": [ [ "leather", 2 ], [ "scrap_leather", 5 ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, { "result": "xs_armguard_larmor", "type": "recipe", "copy-from": "armguard_larmor", - "time": "720 m", - "byproducts": [ [ "leather", 6 ], [ "scrap_leather", 21 ] ], - "using": [ [ "tailoring_leather", 1 ] ] + "time": "120 m", + "byproducts": [ [ "leather", 6 ], [ "scrap_leather", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ] ] }, { "result": "xl_armguard_larmor", "type": "recipe", "copy-from": "armguard_larmor", - "time": "810 m", - "byproducts": [ [ "leather", 12 ], [ "scrap_leather", 36 ] ], - "using": [ [ "tailoring_leather", 4 ] ] + "time": "180 m", + "byproducts": [ [ "leather", 2 ], [ "scrap_leather", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 3 ] ] }, { "result": "armguard_lightplate", @@ -190,7 +191,7 @@ "skills_required": [ [ "tailor", 3 ] ], "time": "900 m", "book_learn": [ [ "textbook_armwest", 6 ] ], - "using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 2 ], [ "tailoring_leather", 2 ] ], + "using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 2 ], [ "tailoring_leather_patchwork", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -206,7 +207,7 @@ "type": "recipe", "copy-from": "armguard_lightplate", "time": "900 m", - "using": [ [ "blacksmithing_standard", 18 ], [ "steel_standard", 1 ], [ "tailoring_leather", 1 ] ], + "using": [ [ "blacksmithing_standard", 18 ], [ "steel_standard", 1 ], [ "tailoring_leather_patchwork", 1 ] ], "tools": [ [ [ "swage", -1 ] ] ] }, { @@ -214,7 +215,7 @@ "type": "recipe", "copy-from": "armguard_lightplate", "time": "1010 m", - "using": [ [ "blacksmithing_standard", 28 ], [ "steel_standard", 3 ], [ "tailoring_leather", 3 ] ] + "using": [ [ "blacksmithing_standard", 28 ], [ "steel_standard", 3 ], [ "tailoring_leather_patchwork", 3 ] ] }, { "result": "armguard_metal", @@ -288,7 +289,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 6 ] ] ], + "components": [ [ [ "cotton_patchwork", 6 ] ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_armorsmithing", "fail_multiplier": 1 }, { "proficiency": "prof_articulation" } ] }, @@ -298,7 +299,7 @@ "copy-from": "armguard_scrap", "time": "30 m", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "xl_armguard_scrap", @@ -306,7 +307,7 @@ "copy-from": "armguard_scrap", "time": "35 m", "using": [ [ "cordage", 2 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 8 ] ] ] + "components": [ [ [ "cotton_patchwork", 8 ] ] ] }, { "result": "armguard_tire", @@ -354,8 +355,8 @@ "difficulty": 3, "time": "280 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 ] ], + "byproducts": [ [ "scrap_cotton", 11 ], [ "scrap_neoprene", 3 ] ], + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "tailoring_neoprene_patchwork", 3 ] ], "proficiencies": [ { "proficiency": "prof_polymerworking" } ] }, { @@ -363,16 +364,16 @@ "type": "recipe", "copy-from": "armguard_soft", "time": "280 m", - "byproducts": [ [ "scrap_cotton", 32 ], [ "scrap_neoprene", 33 ] ], - "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "tailoring_neoprene_patchwork", 1 ] ] + "byproducts": [ [ "scrap_cotton", 8 ], [ "scrap_neoprene", 5 ] ], + "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "tailoring_neoprene_patchwork", 3 ] ] }, { "result": "xl_armguard_soft", "type": "recipe", "copy-from": "armguard_soft", "time": "315 m", - "byproducts": [ [ "scrap_cotton", 58 ], [ "scrap_neoprene", 59 ] ], - "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "tailoring_neoprene_patchwork", 2 ] ] + "byproducts": [ [ "scrap_cotton", 10 ], [ "scrap_neoprene", 1 ], [ "neoprene", 2 ] ], + "using": [ [ "tailoring_cotton_patchwork", 5 ], [ "tailoring_neoprene_patchwork", 4 ] ] }, { "result": "elbow_pads", @@ -385,8 +386,8 @@ "skills_required": [ [ "tailor", 1 ] ], "time": "120 m", "autolearn": true, - "byproducts": [ [ "scrap_cotton", 71 ] ], - "using": [ [ "plastic_molding", 1 ], [ "tailoring_cotton_patchwork", 1 ] ], + "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 2 ] ], + "using": [ [ "plastic_molding", 1 ], [ "tailoring_cotton_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ] }, { @@ -397,10 +398,10 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 1, - "time": "360 m", + "time": "330 m", "autolearn": true, - "byproducts": [ [ "scrap_cotton", 52 ] ], - "using": [ [ "tailoring_cotton_patchwork", 4 ] ] + "byproducts": [ [ "scrap_cotton", 25 ] ], + "using": [ [ "tailoring_cotton_patchwork", 11 ] ] }, { "result": "stockings_tent_arms", @@ -425,26 +426,26 @@ "subcategory": "CSC_ARMOR_ARMS", "skill_used": "tailor", "difficulty": 2, - "time": "360 m", + "time": "180 m", "autolearn": true, - "byproducts": [ [ "leather", 2 ], [ "scrap_leather", 42 ] ], - "using": [ [ "tailoring_leather", 1 ] ], + "byproducts": [ [ "leather", 2 ], [ "scrap_leather", 2 ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, { "result": "xs_vambrace_larmor", "type": "recipe", "copy-from": "vambrace_larmor", - "time": "360 m", - "byproducts": [ [ "leather", 1 ], [ "scrap_leather", 31 ] ], + "time": "90 m", + "byproducts": [ [ "scrap_leather", 1 ] ], "using": [ [ "tailoring_leather", 1 ] ] }, { "result": "xl_vambrace_larmor", "type": "recipe", "copy-from": "vambrace_larmor", - "time": "405 m", - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 24 ] ], + "time": "180 m", + "byproducts": [ [ "scrap_leather", 2 ] ], "using": [ [ "tailoring_leather", 2 ] ] }, { @@ -458,7 +459,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "840 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 66 ] ], "using": [ [ "armor_lc_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_chain_armour", "required": false, "time_multiplier": 3 }, @@ -470,7 +471,7 @@ "type": "recipe", "copy-from": "lc_chainmail_arms", "time": "840 m", - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 49 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 49 ] ], "using": [ [ "armor_lc_chainmail_assembling", 1 ], [ "tailoring_cotton_patchwork", 6 ] ] }, { @@ -478,7 +479,7 @@ "type": "recipe", "copy-from": "lc_chainmail_arms", "time": "945 m", - "byproducts": [ [ "rag", 3 ], [ "scrap_cotton", 86 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ], [ "scrap_cotton", 86 ] ], "using": [ [ "armor_lc_chainmail_assembling", 3 ], [ "tailoring_cotton_patchwork", 11 ] ] }, { @@ -492,7 +493,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "840 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 66 ] ], "using": [ [ "armor_mc_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_chain_armour", "required": false, "time_multiplier": 3 }, @@ -504,7 +505,7 @@ "type": "recipe", "copy-from": "mc_chainmail_arms", "time": "840 m", - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 49 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 49 ] ], "using": [ [ "armor_mc_chainmail_assembling", 1 ], [ "tailoring_cotton_patchwork", 6 ] ] }, { @@ -512,7 +513,7 @@ "type": "recipe", "copy-from": "mc_chainmail_arms", "time": "945 m", - "byproducts": [ [ "rag", 3 ], [ "scrap_cotton", 86 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ], [ "scrap_cotton", 86 ] ], "using": [ [ "armor_mc_chainmail_assembling", 3 ], [ "tailoring_cotton_patchwork", 11 ] ] }, { @@ -526,7 +527,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "840 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 66 ] ], "using": [ [ "armor_hc_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_chain_armour", "required": false, "time_multiplier": 3 }, @@ -538,7 +539,7 @@ "type": "recipe", "copy-from": "hc_chainmail_arms", "time": "840 m", - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 49 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 49 ] ], "using": [ [ "armor_hc_chainmail_assembling", 1 ], [ "tailoring_cotton_patchwork", 6 ] ] }, { @@ -546,7 +547,7 @@ "type": "recipe", "copy-from": "hc_chainmail_arms", "time": "945 m", - "byproducts": [ [ "rag", 3 ], [ "scrap_cotton", 86 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ], [ "scrap_cotton", 86 ] ], "using": [ [ "armor_hc_chainmail_assembling", 3 ], [ "tailoring_cotton_patchwork", 11 ] ] }, { @@ -560,7 +561,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "840 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 66 ] ], "using": [ [ "armor_ch_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_chain_armour", "required": false, "time_multiplier": 3 }, @@ -572,7 +573,7 @@ "type": "recipe", "copy-from": "ch_chainmail_arms", "time": "840 m", - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 49 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 49 ] ], "using": [ [ "armor_ch_chainmail_assembling", 1 ], [ "tailoring_cotton_patchwork", 6 ] ] }, { @@ -580,7 +581,7 @@ "type": "recipe", "copy-from": "ch_chainmail_arms", "time": "945 m", - "byproducts": [ [ "rag", 3 ], [ "scrap_cotton", 86 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ], [ "scrap_cotton", 86 ] ], "using": [ [ "armor_ch_chainmail_assembling", 3 ], [ "tailoring_cotton_patchwork", 11 ] ] }, { @@ -594,7 +595,7 @@ "skills_required": [ [ "tailor", 2 ] ], "time": "840 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 66 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 66 ] ], "using": [ [ "armor_qt_chainmail_assembling", 2 ], [ "tailoring_cotton_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_chain_armour", "required": false, "time_multiplier": 3 }, @@ -606,7 +607,7 @@ "type": "recipe", "copy-from": "qt_chainmail_arms", "time": "840 m", - "byproducts": [ [ "rag", 1 ], [ "scrap_cotton", 49 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ], [ "scrap_cotton", 49 ] ], "using": [ [ "armor_qt_chainmail_assembling", 1 ], [ "tailoring_cotton_patchwork", 6 ] ] }, { @@ -614,7 +615,7 @@ "type": "recipe", "copy-from": "qt_chainmail_arms", "time": "945 m", - "byproducts": [ [ "rag", 3 ], [ "scrap_cotton", 86 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ], [ "scrap_cotton", 86 ] ], "using": [ [ "armor_qt_chainmail_assembling", 3 ], [ "tailoring_cotton_patchwork", 11 ] ] }, { @@ -664,7 +665,8 @@ "time": "2 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 12 ], [ "fabric_standard_nostretch", 9 ], [ "fastener_small", 1 ] ] + "using": [ [ "sewing_standard", 4 ], [ "tailoring_cotton_patchwork", 40 ], [ "fastener_small", 2 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ], [ "scrap_cotton", 10 ] ] }, { "result": "xl_gambeson_sleeve", @@ -677,7 +679,8 @@ "time": "2 h 30 m", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 17 ], [ "fastener_small", 1 ] ] + "using": [ [ "sewing_standard", 6 ], [ "tailoring_cotton_patchwork", 45 ], [ "fastener_small", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ], [ "scrap_cotton", 3 ] ] }, { "result": "xs_gambeson_sleeve", @@ -690,7 +693,8 @@ "time": "1 h 30 m", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 9 ], [ "fabric_standard_nostretch", 7 ], [ "fastener_small", 1 ] ] + "using": [ [ "sewing_standard", 2 ], [ "tailoring_cotton_patchwork", 30 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ], [ "scrap_cotton", 5 ] ] }, { "result": "k_gambeson_sleeve", @@ -704,24 +708,23 @@ "time": "4 h 45 m", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 11 ], [ "tailoring_kevlar_fabric", 4 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 6 ] ] ] + "using": [ [ "sewing_aramids", 2 ], [ "armor_kevlar_layered", 2 ], [ "tailoring_kevlar_fabric", 5 ], [ "fastener_small", 2 ] ] }, { "result": "xl_k_gambeson_sleeve", "type": "recipe", "copy-from": "k_gambeson_sleeve", "time": "6 h", - "using": [ [ "sewing_standard", 17 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 2 ] ], - "components": [ [ [ "sheet_kevlar_layered", 12 ] ] ] + "//": "By weight will use 2.4 layered sheets, so lots of scraps", + "using": [ [ "sewing_standard", 4 ], [ "armor_kevlar_layered", 3 ], [ "tailoring_kevlar_fabric", 4 ], [ "fastener_small", 2 ] ], + "byproducts": [ [ "scrap_kevlar", 279 ] ] }, { "result": "xs_k_gambeson_sleeve", "type": "recipe", "copy-from": "k_gambeson_sleeve", "time": "4 h", - "using": [ [ "sewing_standard", 8 ], [ "tailoring_kevlar_fabric", 3 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 4 ] ] ] + "using": [ [ "sewing_aramids", 2 ], [ "armor_kevlar_layered", 1 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_small", 2 ] ] }, { "result": "armor_lc_lightarmguard", diff --git a/data/json/recipes/armor/bespoke_armor/nomad.json b/data/json/recipes/armor/bespoke_armor/nomad.json index f578760c5a19d..35ecb30742c64 100644 --- a/data/json/recipes/armor/bespoke_armor/nomad.json +++ b/data/json/recipes/armor/bespoke_armor/nomad.json @@ -83,7 +83,7 @@ "difficulty": 5, "time": "2 h 20 m", "book_learn": [ [ "bp_nomad_jumpsuit", 4 ] ], - "using": [ [ "sewing_standard", 90 ], [ "fabric_lycra", 24 ], [ "tailoring_cotton_patchwork", 2 ] ], + "using": [ [ "tailoring_lycra_patchwork", 24 ], [ "tailoring_cotton_patchwork", 2 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_elastics" }, @@ -102,7 +102,7 @@ "difficulty": 4, "time": "2 h 20 m", "book_learn": [ [ "bp_nomad_jumpsuit", 3 ] ], - "using": [ [ "sewing_standard", 90 ], [ "tailoring_cotton_patchwork", 2 ] ], + "using": [ [ "tailoring_cotton_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "shorts_cargo", 1 ], [ "pants_cargo", 1 ] ], diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 1c5cd66bbecab..a890572bdc498 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -24,7 +24,7 @@ "time": "10 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 12 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], + "using": [ [ "tailoring_leather_small", 22 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_leatherworking_basic" }, @@ -36,14 +36,14 @@ "type": "recipe", "copy-from": "boots", "time": "10 h", - "using": [ [ "tailoring_leather_small", 9 ], [ "fastener_shoes", 1 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ] + "using": [ [ "tailoring_leather_small", 15 ], [ "fastener_shoes", 1 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ] }, { "result": "xl_boots", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "copy-from": "boots", - "using": [ [ "tailoring_leather_small", 15 ], [ "fastener_shoes", 3 ], [ "shoe_rubber", 2 ], [ "adhesive_rubber", 2 ] ], + "using": [ [ "tailoring_leather_small", 30 ], [ "fastener_shoes", 3 ], [ "shoe_rubber", 2 ], [ "adhesive_rubber", 2 ] ], "time": "11 h 15 m" }, { @@ -131,7 +131,8 @@ "skills_required": [ "fabrication", 6 ], "time": "20 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "tailoring_nomex_patchwork", 8 ], [ "fastener_small", 2 ] ], + "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "tailoring_nomex_patchwork", 4 ], [ "fastener_small", 2 ] ], + "byproducts": [ [ "scrap_kevlar", 20 ], [ "scrap_nomex", 20 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_leatherworking_basic" }, @@ -145,7 +146,8 @@ "type": "recipe", "copy-from": "boots_fsurvivor", "time": "20 h", - "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "tailoring_nomex_patchwork", 6 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "tailoring_nomex_patchwork", 3 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_kevlar", 10 ], [ "scrap_nomex", 10 ] ], "components": [ [ [ "duct_tape", 38 ] ], [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_bunker", 1 ] ] ] }, { @@ -154,7 +156,8 @@ "activity_level": "LIGHT_EXERCISE", "copy-from": "boots_fsurvivor", "time": "22 h 30 m", - "using": [ [ "tailoring_kevlar_fabric", 6 ], [ "tailoring_nomex_patchwork", 11 ], [ "fastener_small", 2 ] ] + "byproducts": [ [ "scrap_kevlar", 20 ], [ "scrap_nomex", 20 ] ], + "using": [ [ "tailoring_kevlar_fabric", 6 ], [ "tailoring_nomex_patchwork", 6 ], [ "fastener_small", 2 ] ] }, { "result": "boots_fur", @@ -167,12 +170,11 @@ "skills_required": [ "survival", 1 ], "time": "12 h", "autolearn": true, - "reversible": true, "book_learn": [ [ "textbook_survival", 1 ] ], "using": [ [ "sewing_standard", 13 ], - [ "tailoring_leather_small", 7 ], - [ "tailoring_fur_small", 7 ], + [ "tailoring_leather_patchwork", 3 ], + [ "tailoring_fur_patchwork", 2 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] @@ -191,8 +193,8 @@ "time": "12 h", "using": [ [ "sewing_standard", 9 ], - [ "tailoring_leather_small", 5 ], - [ "tailoring_fur_small", 5 ], + [ "tailoring_leather_patchwork", 2 ], + [ "tailoring_fur_patchwork", 3 ], [ "fastener_shoes", 1 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] @@ -205,8 +207,8 @@ "copy-from": "boots_fur", "using": [ [ "sewing_standard", 16 ], - [ "tailoring_leather_small", 8 ], - [ "tailoring_fur_small", 8 ], + [ "tailoring_leather_patchwork", 4 ], + [ "tailoring_fur_patchwork", 4 ], [ "fastener_shoes", 3 ], [ "shoe_rubber", 2 ], [ "adhesive_rubber", 2 ] @@ -347,7 +349,7 @@ "difficulty": 2, "time": "12 h", "autolearn": true, - "using": [ [ "fastener_small", 2 ], [ "tailoring_leather_small", 18 ] ], + "using": [ [ "fastener_small", 2 ], [ "tailoring_leather_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_leatherworking_basic" }, @@ -359,14 +361,14 @@ "type": "recipe", "copy-from": "boots_larmor", "time": "12 h", - "using": [ [ "fastener_small", 1 ], [ "tailoring_leather_small", 13 ] ] + "using": [ [ "fastener_small", 1 ], [ "tailoring_leather_patchwork", 3 ] ] }, { "result": "xl_boots_larmor", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "copy-from": "boots_larmor", - "using": [ [ "fastener_small", 2 ], [ "tailoring_leather_small", 24 ] ], + "using": [ [ "fastener_small", 2 ], [ "tailoring_leather_patchwork", 5 ] ], "time": "13 h 30 m" }, { @@ -468,7 +470,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 4 ] ] ], + "components": [ [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_metalworking" }, { "proficiency": "prof_articulation" } ], "qualities": [ { "id": "HAMMER", "level": 1 } ] }, @@ -478,7 +480,7 @@ "copy-from": "boots_scrap", "time": "30 m", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 2 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "xl_boots_scrap", @@ -487,7 +489,7 @@ "copy-from": "boots_scrap", "time": "35 m", "using": [ [ "cordage", 2 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 6 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "boots_survivor", @@ -539,7 +541,7 @@ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "using": [ [ "tailoring_leather_small", 14 ] ] + "using": [ [ "tailoring_leather_patchwork", 5 ] ] }, { "result": "boots_winter", @@ -700,7 +702,8 @@ "difficulty": 1, "time": "20 m", "book_learn": [ [ "tailor_japanese", 2 ] ], - "using": [ [ "tailoring_cotton", 1 ] ] + "byproducts": [ [ "scrap_cotton", 4 ] ], + "using": [ [ "tailoring_cotton", 2 ] ] }, { "result": "footrags", @@ -712,7 +715,7 @@ "time": "1 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "tailoring_cotton_patchwork", 2 ] ], "flags": [ "BLIND_HARD" ] }, { @@ -725,7 +728,7 @@ "time": "1 m 30 s", "reversible": true, "autolearn": true, - "components": [ [ [ "fur", 2 ] ] ], + "components": [ [ [ "sheet_fur_patchwork", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -738,7 +741,7 @@ "time": "1 m 30 s", "reversible": true, "autolearn": true, - "components": [ [ [ "leather", 2 ] ] ], + "components": [ [ [ "sheet_leather_patchwork", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -751,7 +754,7 @@ "time": "1 m", "reversible": true, "autolearn": true, - "components": [ [ [ "felt_patch", 2 ] ] ], + "components": [ [ [ "sheet_felt_patchwork", 2 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -769,7 +772,7 @@ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "using": [ [ "tailoring_leather_small", 3 ] ] + "using": [ [ "tailoring_leather_patchwork", 3 ] ] }, { "result": "mocassins", @@ -787,7 +790,7 @@ { "proficiency": "prof_furriery" } ], "book_learn": [ [ "textbook_survival", 0 ], [ "pocket_survival", 0 ] ], - "using": [ [ "tailoring_fur_small", 2 ] ] + "using": [ [ "tailoring_fur_patchwork", 1 ] ] }, { "result": "nomex_socks", @@ -800,14 +803,15 @@ "time": "24 m", "proficiencies": [ { "proficiency": "prof_polymerworking" } ], "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], - "using": [ [ "tailoring_nomex_patchwork", 2 ] ] + "using": [ [ "tailoring_nomex_patchwork", 7 ] ], + "byproducts": [ [ "nomex", 1 ] ] }, { "result": "xsnomex_socks", "type": "recipe", "copy-from": "nomex_socks", "time": "24 m", - "using": [ [ "tailoring_nomex_patchwork", 1 ] ] + "using": [ [ "tailoring_nomex_patchwork", 5 ] ] }, { "result": "xlnomex_socks", @@ -820,7 +824,7 @@ "time": "37 m", "proficiencies": [ { "proficiency": "prof_polymerworking" } ], "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], - "using": [ [ "tailoring_nomex_patchwork", 4 ] ] + "using": [ [ "tailoring_nomex_patchwork", 10 ] ] }, { "result": "shoes_birchbark", @@ -846,14 +850,16 @@ "skill_used": "tailor", "time": "1 h", "autolearn": true, - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 1 ] ], + "byproducts": [ [ "scrap_cotton", 3 ] ] }, { "result": "xssocks", "type": "recipe", "copy-from": "socks", "time": "1 h", - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 1 ] ], + "byproducts": [ [ "scrap_cotton", 1 ], [ "cotton_patchwork", 2 ] ] }, { "result": "xlsocks", @@ -864,7 +870,8 @@ "skill_used": "tailor", "time": "1 h 12 m", "autolearn": true, - "using": [ [ "tailoring_cotton", 2 ] ] + "using": [ [ "tailoring_cotton_patchwork", 2 ] ], + "byproducts": [ [ "scrap_cotton", 2 ], [ "cotton_patchwork", 2 ] ] }, { "result": "socks_bag", @@ -914,7 +921,8 @@ "skill_used": "tailor", "time": "1 h", "autolearn": true, - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ] ] }, { "result": "stockings", @@ -926,7 +934,8 @@ "difficulty": 1, "time": "2 h", "autolearn": true, - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ] ] }, { "result": "straw_sandals", @@ -968,7 +977,7 @@ "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 6 ], [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" } ], - "components": [ [ [ "rag", 2 ], [ "socks", 1 ], [ "socks_wool", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 4 ] ] ] + "components": [ [ [ "socks", 1 ], [ "socks_wool", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 4 ] ] ] }, { "result": "wetsuit_booties", @@ -981,8 +990,7 @@ "time": "3 h", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_elastics" } ], - "//": "Should use fabric_neoprene when the tailoring recipe audit is done.", - "using": [ [ "tailoring_neoprene_patchwork", 2 ], [ "sewing_standard", 15 ] ] + "using": [ [ "tailoring_neoprene_patchwork", 7 ] ] }, { "result": "lc_chainmail_feet", @@ -1166,13 +1174,13 @@ "difficulty": 6, "time": "14 h", "autolearn": false, - "reversible": true, "using": [ - [ "tailoring_leather_small", 9 ], - [ "tailoring_kevlar_fabric", 3 ], + [ "tailoring_leather_small", 11 ], + [ "tailoring_kevlar_fabric", 15 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], - [ "adhesive_rubber", 1 ] + [ "adhesive_rubber", 1 ], + [ "sewing_aramids", 3 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, @@ -1180,8 +1188,7 @@ { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } - ], - "components": [ [ [ "thread_kevlar", 6 ] ] ] + ] }, { "result": "motorbike_boots", @@ -1193,16 +1200,16 @@ "difficulty": 5, "time": "12 h", "autolearn": false, - "reversible": true, "using": [ - [ "tailoring_cotton_patchwork", 8 ], - [ "tailoring_kevlar_fabric", 6 ], + [ "tailoring_cotton_patchwork", 27 ], + [ "tailoring_kevlar_fabric", 36 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], - [ "adhesive_rubber", 1 ] + [ "adhesive_rubber", 1 ], + [ "sewing_aramids", 5 ] ], - "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } ], - "components": [ [ [ "thread_kevlar", 7 ] ] ] + "byproducts": [ [ "cotton_patchwork", 4 ], [ "scrap_cotton", 3 ], [ "scrap_kevlar", 14 ] ], + "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "motor_police_boots", @@ -1214,14 +1221,14 @@ "difficulty": 5, "time": "12 h", "autolearn": false, - "reversible": true, - "using": [ [ "tailoring_leather_small", 16 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], + "using": [ [ "tailoring_leather_small", 36 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_closures" } - ] + ], + "byproducts": [ [ "scrap_leather", 2 ] ] }, { "result": "boots_bunker", @@ -1233,8 +1240,7 @@ "difficulty": 7, "time": "14 h", "autolearn": false, - "reversible": true, - "using": [ [ "tailoring_nomex_patchwork", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], + "using": [ [ "tailoring_nomex_patchwork", 43 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_leatherworking_basic" }, @@ -1242,7 +1248,8 @@ { "proficiency": "prof_closures" }, { "proficiency": "prof_polymerworking" } ], - "components": [ [ [ "thread_nomex", 10 ] ], [ [ "chunk_rubber", 10 ] ] ] + "components": [ [ [ "thread_nomex", 10 ] ], [ [ "chunk_rubber", 10 ] ] ], + "byproducts": [ [ "nomex", 3 ] ] }, { "result": "sneakers", @@ -1254,10 +1261,14 @@ "difficulty": 2, "time": "5 h", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 6 ], [ "fastener_shoes", 2 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ] ], - "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" } ], - "components": [ [ [ "rag", 6 ], [ "cotton_patchwork", 6 ] ] ] + "using": [ + [ "sewing_standard", 6 ], + [ "fastener_shoes", 2 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_cotton_patchwork", 16 ] + ], + "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" } ] }, { "result": "lc_sabaton", diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json index f4e9dfffaea22..c68ad49f55686 100644 --- a/data/json/recipes/armor/hands.json +++ b/data/json/recipes/armor/hands.json @@ -713,7 +713,7 @@ "time": "1 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "tailoring_cotton_small", 6 ] ], "flags": [ "BLIND_HARD" ] }, { @@ -752,7 +752,7 @@ "time": "1 m", "reversible": true, "autolearn": true, - "components": [ [ [ "felt_patch", 4 ] ] ], + "components": [ [ [ "felt_patch", 6 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -838,7 +838,7 @@ { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_articulation" } ], - "components": [ [ [ "rag", 6 ] ], [ [ "scrap", 2 ] ], [ [ "duct_tape", 160 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ], [ [ "scrap", 2 ] ], [ [ "duct_tape", 160 ] ] ] }, { "result": "mittens", @@ -907,7 +907,11 @@ "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 8 ], [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" } ], - "components": [ [ [ "rag", 4 ], [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 2 ] ] ] + "components": [ + [ [ "cotton_patchwork", 4 ], [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], + [ [ "element", 2 ] ], + [ [ "cable", 2 ] ] + ] }, { "result": "wetsuit_gloves", diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 6e144234138cf..0817c42ab2456 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -11,8 +11,7 @@ "time": "1 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 3 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 2 ] ] }, { "result": "bandana", @@ -21,11 +20,10 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", - "time": "45 m", + "time": "30 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 2 ] ], - "components": [ [ [ "rag", 2 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 1 ] ] }, { "result": "beret_wool", @@ -35,11 +33,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": "2 h", + "time": "90 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "felt_patch", 4 ] ] ] + "using": [ [ "tailoring_felt_small", 6 ] ] }, { "result": "makeshift_blindfold", @@ -100,7 +97,9 @@ [ "bandages", 2 ], [ "bandages_makeshift", 2 ], [ "bandages_makeshift_bleached", 2 ], - [ "bandages_makeshift_boiled", 2 ] + [ "bandages_makeshift_boiled", 2 ], + [ "sheet_cotton_patchwork", 1 ], + [ "sheet_cotton", 1 ] ] ], "flags": [ "BLIND_EASY", "NO_RESIZE" ] @@ -126,10 +125,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": "4 h", + "time": "2 h", "autolearn": true, - "using": [ [ "sewing_standard", 16 ] ], - "components": [ [ [ "leather", 8 ], [ "tanned_hide", 1 ] ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ] ], + "byproducts": [ [ "leather", 4 ], [ "scrap_leather", 1 ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_leatherworking_basic" }, @@ -144,11 +143,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": "2 h", + "time": "5 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 80 ] ], - "components": [ [ [ "felt_patch", 8 ] ] ] + "using": [ [ "tailoring_felt_patchwork", 11 ] ] }, { "result": "crown_golden_survivor", @@ -269,7 +267,8 @@ "difficulty": 3, "time": "1 h 30 m", "autolearn": true, - "using": [ [ "sewing_standard", 10 ], [ "fabric_standard_nostretch", 8 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 15 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ] ] }, { "result": "xl_gambeson_hood", @@ -278,7 +277,8 @@ "difficulty": 4, "time": "2 h", "autolearn": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 12 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 19 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 5 ], [ "scrap_cotton", 2 ] ] }, { "result": "xs_gambeson_hood", @@ -290,7 +290,8 @@ "difficulty": 3, "time": "1 h", "autolearn": true, - "using": [ [ "sewing_standard", 7 ], [ "fabric_standard_nostretch", 6 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 10 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ] ] }, { "result": "k_gambeson_hood", @@ -300,11 +301,11 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, - "time": "2 h 30 m", + "time": "1 h 30 m", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 12 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 5 ] ] ] + "using": [ [ "sewing_aramids", 4 ], [ "armor_kevlar_layered", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_kevlar", 88 ] ] }, { "result": "xl_k_gambeson_hood", @@ -314,11 +315,11 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, - "time": "3 h", + "time": "1 h 30 m", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 18 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 7 ] ] ] + "using": [ [ "sewing_aramids", 4 ], [ "armor_kevlar_layered", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_kevlar", 8 ] ] }, { "result": "xs_k_gambeson_hood", @@ -328,11 +329,11 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, - "time": "2 h 30 m", + "time": "1 h 30 m", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 9 ], [ "tailoring_kevlar_fabric", 6 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 4 ] ] ] + "using": [ [ "sewing_aramids", 4 ], [ "armor_kevlar_layered", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_kevlar", 173 ] ] }, { "result": "glasses_safety", @@ -412,11 +413,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 3, - "time": "2 h", + "time": "1 h 30 m", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 10 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ], [ "scrap_cotton", 2 ] ] }, { "result": "hat_cotton", @@ -426,11 +426,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 2, - "time": "2 h", + "time": "1 h 30m", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 8 ] ], - "components": [ [ [ "rag", 3 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 5 ], [ "scrap_cotton", 2 ] ] }, { "result": "maid_hat", @@ -442,8 +441,7 @@ "time": "3 h", "reversible": true, "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 8 ] ], - "components": [ [ [ "rag", 3 ] ] ] + "using": [ [ "tailoring_cotton_small", 2 ] ] }, { "result": "hat_fur", @@ -454,11 +452,9 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": "3 h", + "time": "2 h", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 8 ] ], - "components": [ [ [ "fur", 3 ] ] ], + "using": [ [ "tailoring_fur_patchwork", 1 ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_leatherworking_basic" }, @@ -475,9 +471,7 @@ "difficulty": 2, "time": "3 h", "book_learn": [ [ "textbook_tailor", 2 ], [ "recipe_fauxfur", 1 ] ], - "reversible": true, - "using": [ [ "sewing_standard", 8 ] ], - "components": [ [ [ "faux_fur", 3 ] ] ], + "using": [ [ "tailoring_faux_fur_patchwork", 1 ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_leatherworking_basic" }, @@ -507,7 +501,7 @@ "time": "5 m", "reversible": true, "autolearn": true, - "components": [ [ [ "rag", 2 ], [ "bandana", 1 ] ], [ [ "hat_hard", 1 ] ] ] + "components": [ [ [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], [ "bandana", 1 ] ], [ [ "hat_hard", 1 ] ] ] }, { "result": "hat_hunting", @@ -519,9 +513,8 @@ "difficulty": 2, "time": "2 h 30 m", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 50 ] ], - "components": [ [ [ "felt_patch", 10 ] ] ], + "using": [ [ "tailoring_felt_patchwork", 9 ] ], + "byproducts": [ [ "felt_patch", 7 ] ], "proficiencies": [ { "proficiency": "prof_millinery" } ] }, { @@ -549,8 +542,7 @@ "time": "30 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 8 ], [ "cordage", 2 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "using": [ [ "tailoring_cotton_small", 16 ], [ "cordage", 2 ] ] }, { "result": "helmet_barbute", @@ -638,7 +630,7 @@ "using": [ [ "sewing_standard", 18 ], [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ], + "components": [ [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, @@ -653,7 +645,7 @@ "time": "12 h 12 m", "using": [ [ "sewing_standard", 13 ], [ "blacksmithing_standard", 6 ], [ "steel_standard", 1 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 5 ], [ "tanned_pelt", 1 ] ] ] + "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] }, { "result": "xl_helmet_conical", @@ -663,7 +655,7 @@ "using": [ [ "sewing_standard", 23 ], [ "blacksmithing_standard", 11 ], [ "steel_standard", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] + "components": [ [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ] ] }, { "result": "helmet_acidchitin", @@ -753,7 +745,7 @@ "using": [ [ "blacksmithing_standard", 48 ], [ "steel_standard", 12 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 14 ], [ "tanned_pelt", 2 ], [ "leather", 14 ], [ "tanned_hide", 2 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "fur", 16 ], [ "tanned_pelt", 2 ], [ "leather", 16 ], [ "tanned_hide", 2 ] ], [ [ "cotton_patchwork", 16 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, @@ -768,7 +760,7 @@ "time": "10 h", "using": [ [ "blacksmithing_standard", 36 ], [ "steel_standard", 9 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 11 ], [ "tanned_pelt", 2 ], [ "leather", 11 ], [ "tanned_hide", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "fur", 11 ], [ "tanned_pelt", 2 ], [ "leather", 11 ], [ "tanned_hide", 2 ] ], [ [ "cotton_patchwork", 11 ] ] ] }, { "result": "xl_helmet_kabuto", @@ -778,7 +770,7 @@ "using": [ [ "blacksmithing_standard", 63 ], [ "steel_standard", 16 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 20 ], [ "tanned_pelt", 3 ], [ "leather", 20 ], [ "tanned_hide", 3 ] ], [ [ "rag", 7 ] ] ] + "components": [ [ [ "fur", 20 ], [ "tanned_pelt", 3 ], [ "leather", 20 ], [ "tanned_hide", 3 ] ], [ [ "cotton_patchwork", 20 ] ] ] }, { "result": "helmet_larmor", @@ -788,10 +780,10 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 4, - "time": "30 m", + "time": "2 h", "autolearn": true, - "using": [ [ "sewing_standard", 18 ] ], - "components": [ [ [ "leather", 16 ], [ "tanned_hide", 3 ], [ "fur", 16 ], [ "tanned_pelt", 3 ] ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ] ], + "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" }, @@ -803,16 +795,15 @@ "type": "recipe", "copy-from": "helmet_larmor", "time": "30 m", - "using": [ [ "sewing_standard", 13 ] ], - "components": [ [ [ "leather", 12 ], [ "tanned_hide", 2 ], [ "fur", 12 ], [ "tanned_pelt", 2 ] ] ] + "using": [ [ "tailoring_leather_patchwork", 2 ] ], + "byproducts": [ [ "leather", 6 ] ] }, { "result": "xl_helmet_larmor", "type": "recipe", "copy-from": "helmet_larmor", "time": "35 m", - "using": [ [ "sewing_standard", 23 ] ], - "components": [ [ [ "leather", 21 ], [ "tanned_hide", 4 ], [ "fur", 21 ], [ "tanned_pelt", 4 ] ] ] + "using": [ [ "tailoring_leather_patchwork", 2 ] ] }, { "result": "helmet_nasal", @@ -827,7 +818,7 @@ "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 3 ], [ "leather", 3 ] ] ], + "components": [ [ [ "fur", 4 ], [ "leather", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, @@ -842,7 +833,7 @@ "time": "7 h 12 m", "using": [ [ "blacksmithing_standard", 3 ], [ "steel_standard", 1 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 2 ], [ "leather", 2 ] ] ] + "components": [ [ [ "fur", 3 ], [ "leather", 3 ] ] ] }, { "result": "xl_helmet_nasal", @@ -852,7 +843,7 @@ "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], - "components": [ [ [ "fur", 5 ], [ "leather", 5 ] ] ] + "components": [ [ [ "fur", 6 ], [ "leather", 6 ] ] ] }, { "result": "helmet_plate", @@ -905,12 +896,12 @@ "skills_required": [ "fabrication", 3 ], "time": "3 h", "autolearn": true, - "using": [ [ "sewing_standard", 65 ], [ "soldering_standard", 8 ] ], + "using": [ [ "sewing_aramids", 32 ], [ "soldering_standard", 8 ] ], "components": [ [ [ "hat_ball", 1 ], [ "hat_boonie", 1 ] ], [ [ "mask_filter", 1 ] ], [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ] ], - [ [ "sheet_kevlar_layered", 8 ] ] + [ [ "sheet_kevlar_layered", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, @@ -919,12 +910,12 @@ "type": "recipe", "copy-from": "helmet_scavenger", "time": "3 h", - "using": [ [ "sewing_standard", 48 ], [ "soldering_standard", 6 ] ], + "using": [ [ "sewing_aramids", 24 ], [ "soldering_standard", 6 ] ], "components": [ [ [ "hat_ball", 1 ], [ "hat_boonie", 1 ] ], [ [ "mask_filter", 1 ] ], [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ] ], - [ [ "sheet_kevlar_layered", 6 ] ] + [ [ "sheet_kevlar_layered", 1 ] ] ] }, { @@ -932,12 +923,12 @@ "type": "recipe", "copy-from": "helmet_scavenger", "time": "3 h 20 m", - "using": [ [ "sewing_standard", 85 ], [ "soldering_standard", 11 ] ], + "using": [ [ "sewing_aramids", 42 ], [ "soldering_standard", 11 ] ], "components": [ [ [ "hat_ball", 1 ], [ "hat_boonie", 1 ] ], [ [ "mask_filter", 1 ] ], [ [ "glasses_bal", 1 ], [ "goggles_ski", 1 ] ], - [ [ "sheet_kevlar_layered", 12 ] ] + [ [ "sheet_kevlar_layered", 2 ] ] ] }, { @@ -952,7 +943,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 4 ] ] ], + "components": [ [ [ "cotton_patchwork", 4 ] ] ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_armorsmithing", "fail_multiplier": 1 } ] }, @@ -962,7 +953,7 @@ "copy-from": "helmet_scrap", "time": "1 h 30 m", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 2 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "xl_helmet_scrap", @@ -970,7 +961,7 @@ "copy-from": "helmet_scrap", "time": "1 h 40 m", "using": [ [ "cordage", 2 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 6 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "hood_fsurvivor", @@ -984,9 +975,14 @@ "time": "6 h", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ] ], - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_aramids", 20 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "nomex", 8 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ], + "components": [ + [ [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], + [ [ "sheet_kevlar_layered", 4 ] ], + [ [ "nomex_hood", 1 ] ], + [ [ "duct_tape", 100 ] ] + ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { @@ -994,18 +990,28 @@ "type": "recipe", "copy-from": "hood_fsurvivor", "time": "6 h", - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "nomex", 6 ] ], [ [ "sheet_kevlar_layered", 3 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 75 ] ] ] + "components": [ + [ [ "sheet_nomex", 3 ], [ "sheet_nomex_patchwork", 3 ] ], + [ [ "sheet_kevlar_layered", 3 ] ], + [ [ "nomex_hood", 1 ] ], + [ [ "duct_tape", 75 ] ] + ] }, { "result": "xl_hood_fsurvivor", "type": "recipe", "copy-from": "hood_fsurvivor", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 55 ] ], + "using": [ [ "sewing_aramids", 30 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "nomex", 10 ] ], [ [ "sheet_kevlar_layered", 6 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 150 ] ] ] + "components": [ + [ [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], + [ [ "sheet_kevlar_layered", 6 ] ], + [ [ "nomex_hood", 1 ] ], + [ [ "duct_tape", 150 ] ] + ] }, { "result": "hood_h20survivor", @@ -1018,9 +1024,9 @@ "skills_required": [ "fabrication", 6 ], "time": "7 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ], [ "plastic_molding", 4 ] ], + "using": [ [ "sewing_aramids", 20 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "sheet_kevlar_layered", 4 ] ], [ [ "wetsuit_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ], + "components": [ [ [ "sheet_kevlar_layered", 2 ] ], [ [ "wetsuit_hood", 1 ] ], [ [ "duct_tape", 100 ] ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_plasticworking" }, @@ -1038,10 +1044,10 @@ "skills_required": [ "fabrication", 4 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_aramids", 20 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "rag", 8 ] ], + [ [ "cotton_patchwork", 8 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 100 ] ] @@ -1057,10 +1063,10 @@ "type": "recipe", "copy-from": "hood_lsurvivor", "time": "6 h", - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "rag", 6 ] ], + [ [ "cotton_patchwork", 6 ] ], [ [ "sheet_kevlar_layered", 3 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 75 ] ] @@ -1071,10 +1077,10 @@ "type": "recipe", "copy-from": "hood_lsurvivor", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 60 ] ], + "using": [ [ "sewing_aramids", 30 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "rag", 10 ] ], + [ [ "cotton_patchwork", 10 ] ], [ [ "sheet_kevlar_layered", 6 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 150 ] ] @@ -1091,11 +1097,11 @@ "skills_required": [ "fabrication", 5 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_aramids", 20 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "faux_fur", 8 ] ], - [ [ "rag", 2 ] ], + [ [ "cotton_patchwork", 6 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 100 ] ] @@ -1112,11 +1118,11 @@ "type": "recipe", "copy-from": "hood_wsurvivor_nofur", "time": "6 h", - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "faux_fur", 6 ] ], - [ [ "rag", 2 ] ], + [ [ "cotton_patchwork", 4 ] ], [ [ "sheet_kevlar_layered", 3 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 75 ] ] @@ -1127,11 +1133,11 @@ "type": "recipe", "copy-from": "hood_wsurvivor_nofur", "time": "8 h", - "using": [ [ "sewing_standard", 60 ] ], + "using": [ [ "sewing_aramids", 30 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "faux_fur", 10 ] ], - [ [ "rag", 4 ] ], + [ [ "cotton_patchwork", 8 ] ], [ [ "sheet_kevlar_layered", 6 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 150 ] ] @@ -1147,9 +1153,8 @@ "difficulty": 1, "time": "20 m", "autolearn": true, - "tools": [ ], "using": [ [ "waterproofing_plastic_sheets", 2 ] ], - "components": [ [ [ "rag", 2 ] ] ], + "components": [ [ [ "cotton_patchwork", 2 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -1163,11 +1168,11 @@ "skills_required": [ "fabrication", 4 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_aramids", 20 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], - [ [ "rag", 2 ] ], + [ [ "leather", 8 ], [ "tanned_hide", 1 ] ], + [ [ "cotton_patchwork", 4 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 100 ] ] @@ -1184,12 +1189,12 @@ "type": "recipe", "copy-from": "hood_survivor", "time": "6 h", - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "leather", 5 ], [ "tanned_hide", 1 ] ], - [ [ "rag", 2 ] ], - [ [ "sheet_kevlar_layered", 3 ] ], + [ [ "leather", 6 ], [ "tanned_hide", 1 ] ], + [ [ "cotton_patchwork", 2 ] ], + [ [ "sheet_kevlar_layered", 2 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 75 ] ] ] @@ -1205,11 +1210,11 @@ "skills_required": [ "fabrication", 5 ], "time": "6 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_aramids", 20 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ], - [ [ "rag", 2 ] ], + [ [ "cotton_patchwork", 4 ] ], [ [ "sheet_kevlar_layered", 4 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 100 ] ] @@ -1227,11 +1232,11 @@ "type": "recipe", "copy-from": "hood_wsurvivor", "time": "6 h", - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ - [ [ "fur", 6 ], [ "tanned_pelt", 2 ] ], - [ [ "rag", 2 ] ], + [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ], + [ [ "cotton_patchwork", 2 ] ], [ [ "sheet_kevlar_layered", 3 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 75 ] ] @@ -1242,12 +1247,12 @@ "type": "recipe", "copy-from": "hood_wsurvivor", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 60 ] ], + "using": [ [ "sewing_aramids", 60 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "fur", 10 ], [ "tanned_pelt", 2 ] ], - [ [ "rag", 4 ] ], - [ [ "sheet_kevlar_layered", 6 ] ], + [ [ "cotton_patchwork", 6 ] ], + [ [ "sheet_kevlar_layered", 5 ] ], [ [ "hood_rain", 1 ], [ "plastic_sheet_small", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 150 ] ] ] @@ -1263,13 +1268,13 @@ "skills_required": [ "fabrication", 4 ], "time": "6 h 45 m", "autolearn": true, - "using": [ [ "sewing_standard", 80 ] ], + "using": [ [ "sewing_aramids", 40 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "leather", 14 ], [ "tanned_hide", 3 ] ], - [ [ "rag", 4 ] ], + [ [ "cotton_patchwork", 6 ] ], [ [ "scrap", 2 ] ], - [ [ "sheet_kevlar_layered", 6 ] ], + [ [ "sheet_kevlar_layered", 5 ] ], [ [ "hood_rain", 2 ], [ "plastic_sheet_small", 4 ], [ "hood_gut", 2 ] ], [ [ "duct_tape", 200 ] ] ], @@ -1374,9 +1379,9 @@ "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "time": "1 h", - "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 9 ], [ "fabric_standard_nostretch", 12 ] ] + "using": [ [ "tailoring_cotton_patchwork", 4 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ] }, { "result": "mask_filter", @@ -1400,7 +1405,7 @@ ], "components": [ [ [ "plastic_sheet_small", 2 ], [ "bottle_plastic", 1 ], [ "bottle_bathroom", 1 ], [ "bottle_plastic_small", 2 ] ], - [ [ "rag", 2 ], [ "bandana", 2 ], [ "paper", 10 ] ], + [ [ "cotton_patchwork", 2 ], [ "bandana", 2 ], [ "paper", 10 ] ], [ [ "charcoal", 10 ] ] ], "//": "Airtight takes some skills.", @@ -1418,7 +1423,8 @@ "time": "2 h", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], - "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], + "using": [ [ "adhesive", 2 ], [ "sewing_aramids", 10 ] ], + "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 4 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ] @@ -1428,7 +1434,7 @@ "type": "recipe", "copy-from": "mask_fsurvivor", "time": "2 h", - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 15 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 7 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 3 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 3 ] ] ] }, @@ -1444,7 +1450,7 @@ "time": "2 h 15 m", "autolearn": true, "book_learn": [ [ "textbook_fireman", 7 ], [ "atomic_survival", 8 ], [ "textbook_gaswarfare", 9 ] ], - "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], + "using": [ [ "adhesive", 2 ], [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_bunker", 1 ] ], [ [ "nomex", 8 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 6 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ] @@ -1576,8 +1582,8 @@ "time": "1 h", "autolearn": true, "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_plasticworking" } ], + "using": [ [ "adhesive", 2 ], [ "sewing_aramids", 10 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ], [ "plastic_molding", 4 ] ], "components": [ [ [ "rebreather", 1 ] ], [ [ "goggles_swim", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] ] }, { @@ -1585,7 +1591,7 @@ "type": "recipe", "copy-from": "mask_h20survivor", "time": "1 h", - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 15 ], [ "plastic_molding", 3 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 7 ], [ "plastic_molding", 3 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "rebreather", 1 ] ], [ [ "goggles_swim", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 3 ] ] ] }, @@ -1601,7 +1607,7 @@ "time": "1 h 10 m", "autolearn": true, "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_plasticworking" } ], - "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ], [ "plastic_molding", 4 ] ], + "using": [ [ "adhesive", 2 ], [ "sewing_aramids", 15 ], [ "plastic_molding", 4 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "rebreather", 1 ] ], @@ -1628,7 +1634,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "scrap", 3 ] ], - [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 2 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, @@ -1652,8 +1658,8 @@ "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], - [ [ "rag", 3 ] ], - [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ] + [ [ "cotton_patchwork", 3 ] ], + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 2 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, @@ -1677,8 +1683,8 @@ "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], - [ [ "rag", 6 ] ], - [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 6 ] ] + [ [ "cotton_patchwork", 6 ] ], + [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 3 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, @@ -1709,8 +1715,8 @@ "difficulty": 6, "time": "3 h 30 m", "autolearn": true, - "using": [ [ "sewing_standard", 80 ] ], - "components": [ [ [ "felt_patch", 8 ] ] ] + "using": [ [ "tailoring_felt_patchwork", 4 ] ], + "byproducts": [ [ "felt_patch", 4 ] ] }, { "result": "mask_survivor", @@ -1723,7 +1729,7 @@ "skills_required": [ "tailor", 6 ], "time": "4 h", "autolearn": true, - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 10 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], @@ -1742,7 +1748,7 @@ "type": "recipe", "copy-from": "mask_survivor", "time": "4 h", - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 7 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 7 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], @@ -1762,7 +1768,7 @@ "skills_required": [ "tailor", 5 ], "time": "4 h 30 m", "autolearn": true, - "using": [ [ "adhesive", 2 ], [ "sewing_standard", 20 ] ], + "using": [ [ "adhesive", 2 ], [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], @@ -1787,13 +1793,13 @@ "skills_required": [ "tailor", 7 ], "time": "4 h", "autolearn": true, - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 10 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ], - [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] + [ [ "fur", 8 ], [ "tanned_pelt", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" }, @@ -1808,7 +1814,7 @@ "type": "recipe", "copy-from": "mask_wsurvivor", "time": "4 h", - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 7 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 7 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], @@ -1828,7 +1834,7 @@ "skills_required": [ "tailor", 7 ], "time": "4 h 30 m", "autolearn": true, - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 20 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 15 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], @@ -1857,7 +1863,13 @@ "components": [ [ [ "hat_hard", 1 ], [ "helmet_bike", 1 ] ], [ [ "flashlight", 1 ] ], - [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ] + [ + [ "cotton_patchwork", 2 ], + [ "leather", 2 ], + [ "cordage", 1, "LIST" ], + [ "duct_tape", 10 ], + [ "medical_tape", 20 ] + ] ] }, { @@ -1871,8 +1883,7 @@ "time": "3 h", "reversible": true, "book_learn": [ [ "textbook_fireman", 6 ], [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ], - "using": [ [ "sewing_standard", 8 ] ], - "components": [ [ [ "nomex", 6 ] ] ], + "using": [ [ "tailoring_nomex_patchwork", 7 ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { @@ -1885,7 +1896,7 @@ "time": "1 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 3 ], [ "fabric_standard_nostretch", 4 ] ] + "using": [ [ "tailoring_cotton_patchwork", 2 ] ] }, { "result": "pot_helmet", @@ -1897,7 +1908,7 @@ "time": "30 m", "reversible": { "time": "6 s" }, "autolearn": true, - "components": [ [ [ "rag", 4 ] ], [ [ "pot", 1 ] ] ], + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "pot", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -1905,7 +1916,7 @@ "type": "recipe", "copy-from": "pot_helmet", "time": "30 m", - "components": [ [ [ "rag", 3 ] ], [ [ "pot", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 3 ] ], [ [ "pot", 1 ] ] ] }, { "result": "rebreather", @@ -2048,11 +2059,10 @@ "skill_used": "tailor", "difficulty": 1, "skills_required": [ "survival", 1 ], - "time": "2 h", + "time": "1 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 3 ] ], - "components": [ [ [ "fur", 4 ], [ "tanned_pelt", 1 ] ] ], + "using": [ [ "tailoring_fur_patchwork", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { @@ -2065,11 +2075,11 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": "3 h", + "time": "30 m", "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 3 ] ], - "components": [ [ [ "scarf_fur", 3 ] ] ], + "components": [ [ [ "scarf_fur", 2 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { @@ -2082,11 +2092,10 @@ "skill_used": "tailor", "difficulty": 2, "skills_required": [ "survival", 1 ], - "time": "3 h", + "time": "2 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 9 ] ], - "components": [ [ [ "fur", 12 ], [ "tanned_pelt", 2 ] ] ], + "using": [ [ "tailoring_fur_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { @@ -2139,7 +2148,7 @@ "skills_required": [ "tailor", 4 ], "time": "1 h", "autolearn": true, - "using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ], + "using": [ [ "adhesive", 1 ], [ "sewing_aramids", 10 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ @@ -2172,7 +2181,11 @@ "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], "using": [ [ "sewing_standard", 8 ], [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" } ], - "components": [ [ [ "rag", 4 ], [ "scarf", 2 ], [ "scarf_long", 1 ], [ "balclava", 1 ] ], [ [ "element", 2 ] ], [ [ "cable", 6 ] ] ] + "components": [ + [ [ "cotton_patchwork", 4 ], [ "scarf", 2 ], [ "scarf_long", 1 ], [ "balclava", 1 ] ], + [ [ "element", 2 ] ], + [ [ "cable", 6 ] ] + ] }, { "result": "tinfoil_hat", @@ -2196,16 +2209,9 @@ "difficulty": 5, "time": "1 h 5 m", "autolearn": true, - "using": [ [ "sewing_standard", 20 ] ], + "using": [ [ "tailoring_leather_patchwork", 1 ] ], "components": [ - [ [ "leather", 8 ], [ "tanned_hide", 1 ] ], - [ - [ "any_tallow", 1, "LIST" ], - [ "cooking_oil", 8 ], - [ "cooking_oil2", 8 ], - [ "lamp_oil", 200 ], - [ "motor_oil", 200 ] - ] + [ [ "any_tallow", 1, "LIST" ], [ "cooking_oil", 8 ], [ "cooking_oil2", 8 ], [ "lamp_oil", 200 ], [ "motor_oil", 200 ] ] ], "proficiencies": [ { "proficiency": "prof_millinery" }, @@ -2223,7 +2229,7 @@ "time": "5 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_standard_nostretch", 8 ] ], + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], "flags": [ "BLIND_HARD" ] }, { @@ -2251,8 +2257,9 @@ "difficulty": 4, "time": "2 h", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 10 ], [ "tailoring_neoprene_patchwork", 2 ] ], - "//": "Should use fabric_neoprene when the tailoring recipe audit is done.", + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "tailoring_neoprene_patchwork", 3 ] ], + "qualities": [ { "id": "SEW_CURVED", "level": 1 } ], + "components": [ [ [ "neoprene", 2 ] ], [ [ "cotton_patchwork", 2 ] ] ], "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -2267,7 +2274,7 @@ "reversible": true, "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], - "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 1 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" } ] }, { @@ -2277,7 +2284,7 @@ "copy-from": "lc_chainmail_hood", "time": "3 h", "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 38 ] ], [ [ "lc_wire", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 38 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "xl_lc_chainmail_hood", @@ -2286,14 +2293,14 @@ "copy-from": "lc_chainmail_hood", "time": "3 h 20 m", "using": [ [ "chainmail_standard", 4 ] ], - "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_lc_chainmail_hood", "type": "recipe", "id_suffix": "standard_charges", "copy-from": "lc_chainmail_hood", - "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xs_lc_chainmail_hood", @@ -2301,7 +2308,7 @@ "id_suffix": "standard_charges", "copy-from": "lc_chainmail_hood", "time": "3 h 20 m", - "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 2 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "mc_chainmail_hood", @@ -2315,7 +2322,7 @@ "reversible": true, "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], - "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 1 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" } ] }, { @@ -2325,7 +2332,7 @@ "copy-from": "mc_chainmail_hood", "time": "3 h", "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 38 ] ], [ [ "mc_wire", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 38 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "xl_mc_chainmail_hood", @@ -2334,14 +2341,14 @@ "copy-from": "mc_chainmail_hood", "time": "3 h 20 m", "using": [ [ "chainmail_standard", 4 ] ], - "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_mc_chainmail_hood", "type": "recipe", "id_suffix": "standard_charges", "copy-from": "mc_chainmail_hood", - "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xs_mc_chainmail_hood", @@ -2349,7 +2356,7 @@ "id_suffix": "standard_charges", "copy-from": "mc_chainmail_hood", "time": "3 h 20 m", - "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 2 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "hc_chainmail_hood", @@ -2363,7 +2370,7 @@ "reversible": true, "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], - "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 1 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" } ] }, { @@ -2373,7 +2380,7 @@ "copy-from": "hc_chainmail_hood", "time": "3 h", "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 38 ] ], [ [ "hc_wire", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 38 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "xl_hc_chainmail_hood", @@ -2382,14 +2389,14 @@ "copy-from": "hc_chainmail_hood", "time": "3 h 20 m", "using": [ [ "chainmail_standard", 4 ] ], - "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_hc_chainmail_hood", "type": "recipe", "id_suffix": "standard_charges", "copy-from": "hc_chainmail_hood", - "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xs_hc_chainmail_hood", @@ -2397,7 +2404,7 @@ "id_suffix": "standard_charges", "copy-from": "hc_chainmail_hood", "time": "3 h 20 m", - "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 2 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "ch_chainmail_hood", @@ -2411,7 +2418,7 @@ "reversible": true, "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], - "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 50 ] ], [ [ "ch_wire", 1 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 50 ] ], [ [ "ch_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" } ] }, { @@ -2421,7 +2428,7 @@ "copy-from": "ch_chainmail_hood", "time": "3 h", "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 38 ] ], [ [ "ch_wire", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 38 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "xl_ch_chainmail_hood", @@ -2430,14 +2437,14 @@ "copy-from": "ch_chainmail_hood", "time": "3 h 20 m", "using": [ [ "chainmail_standard", 4 ] ], - "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_ch_chainmail_hood", "type": "recipe", "id_suffix": "standard_charges", "copy-from": "ch_chainmail_hood", - "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xs_ch_chainmail_hood", @@ -2445,7 +2452,7 @@ "id_suffix": "standard_charges", "copy-from": "ch_chainmail_hood", "time": "3 h 20 m", - "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 50 ] ], [ [ "ch_wire", 2 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 50 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "qt_chainmail_hood", @@ -2459,7 +2466,7 @@ "reversible": true, "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], "using": [ [ "chainmail_standard", 2 ] ], - "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 50 ] ], [ [ "qt_wire", 1 ] ], [ [ "rag", 4 ] ] ], + "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 50 ] ], [ [ "qt_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" } ] }, { @@ -2469,7 +2476,7 @@ "copy-from": "qt_chainmail_hood", "time": "3 h", "using": [ [ "chainmail_standard", 1 ] ], - "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 38 ] ], [ [ "qt_wire", 2 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 38 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "xl_qt_chainmail_hood", @@ -2478,14 +2485,14 @@ "copy-from": "qt_chainmail_hood", "time": "3 h 20 m", "using": [ [ "chainmail_standard", 4 ] ], - "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_qt_chainmail_hood", "id_suffix": "standard_charges", "type": "recipe", "copy-from": "qt_chainmail_hood", - "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xs_qt_chainmail_hood", @@ -2493,7 +2500,7 @@ "id_suffix": "standard_charges", "copy-from": "qt_chainmail_hood", "time": "3 h 20 m", - "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 50 ] ], [ [ "qt_wire", 2 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 50 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "pot_xlhelmet", @@ -2505,7 +2512,7 @@ "time": "2 m", "reversible": true, "autolearn": true, - "components": [ [ [ "rag", 10 ] ], [ [ "pot_canning", 1 ] ] ], + "components": [ [ [ "cotton_patchwork", 10 ] ], [ [ "pot_canning", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 33a6c0e222e2b..a5c9a0a7f1cd3 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -12,7 +12,7 @@ "autolearn": true, "using": [ [ "cordage", 2 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "2x4", 1 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "2x4", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "legguard_chitin", @@ -68,7 +68,7 @@ "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], "proficiencies": [ { "proficiency": "prof_elastics", "time_multiplier": 1.25, "fail_multiplier": 1.15 } ], - "using": [ [ "tailoring_lycra_patchwork", 1 ], [ "sewing_standard", 4 ] ] + "using": [ [ "tailoring_lycra_patchwork", 1 ] ] }, { "result": "boy_shorts", @@ -81,13 +81,14 @@ "time": "2 h", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "using": [ [ "tailoring_cotton", 1 ], [ "filament", 10 ] ] + "using": [ [ "tailoring_cotton_patchwork", 2 ] ], + "byproducts": [ [ "scrap_cotton", 28 ] ] }, { "result": "xsboy_shorts", "type": "recipe", "copy-from": "boy_shorts", - "time": "2 h", + "time": "1 h 30 m", "using": [ [ "tailoring_cotton", 1 ], [ "filament", 7 ] ] }, { @@ -98,9 +99,10 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": "2 h 15 m", + "time": "1 h 30 m", "autolearn": true, - "using": [ [ "tailoring_cotton", 3 ], [ "filament", 20 ] ] + "using": [ [ "tailoring_cotton", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 6 ], [ "scrap_cotton", 3 ] ] }, { "result": "boxer_briefs", @@ -140,10 +142,10 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 3, - "time": "4 h", - "reversible": true, + "time": "6 h", "book_learn": [ [ "textbook_tailor", 2 ], [ "tailor_portfolio", 2 ] ], - "using": [ [ "tailoring_cotton", 6 ] ] + "using": [ [ "tailoring_cotton_patchwork", 15 ] ], + "byproducts": [ [ "scrap_cotton", 5 ] ] }, { "result": "briefs", @@ -156,7 +158,8 @@ "time": "2 h", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton", 1 ] ], + "byproducts": [ [ "scrap_cotton", 5 ] ] }, { "result": "chaps_leather", @@ -173,7 +176,8 @@ { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_leather", 4 ], [ "button", 5 ] ] + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "button", 5 ] ], + "byproducts": [ [ "leather", 6 ], [ "scrap_leather", 1 ] ] }, { "result": "hakama", @@ -185,7 +189,8 @@ "difficulty": 3, "time": "3 h", "book_learn": [ [ "tailor_japanese", 3 ] ], - "using": [ [ "tailoring_cotton", 6 ] ] + "using": [ [ "tailoring_cotton_patchwork", 15 ] ], + "byproducts": [ [ "cotton_patchwork", 5 ] ] }, { "result": "hot_pants", @@ -199,13 +204,15 @@ "time": "3 h", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_lycra", 2 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_lycra_patchwork", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "lycra_patch", 2 ] ] }, { "result": "hot_pants_fur", "type": "recipe", "copy-from": "hot_pants", - "using": [ [ "tailoring_lycra", 1 ], [ "tailoring_faux_fur", 1 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_lycra_patchwork", 1 ], [ "tailoring_fur", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "fur", 1 ] ] }, { "result": "hot_pants_leather", @@ -216,7 +223,8 @@ { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_leather", 1 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_leather", 1 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "leather", 5 ] ] }, { "result": "jeans", @@ -229,7 +237,8 @@ "time": "6 h", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 5 ], [ "manual_tailor", 3 ], [ "survival_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_cotton", 3 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_cotton", 15 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_cotton", 5 ], [ "cotton_patchwork", 4 ] ] }, { "result": "skirt", @@ -242,7 +251,8 @@ "time": "6 h", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 5 ], [ "manual_tailor", 3 ], [ "survival_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_cotton", 1 ], [ "fastener_small", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 7 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "scrap_cotton", 10 ], [ "cotton_patchwork", 2 ] ] }, { "result": "skirt_leather", @@ -256,8 +266,8 @@ "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 5 ], [ "manual_tailor", 4 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "using": [ [ "fastener_small", 1 ], [ "sewing_standard", 15 ] ], - "components": [ [ [ "leather", 6 ] ] ] + "using": [ [ "fastener_small", 1 ], [ "sewing_standard", 15 ], [ "tailoring_leather_patchwork", 1 ] ], + "byproducts": [ [ "leather", 1 ] ] }, { "result": "kilt_leather", @@ -271,7 +281,8 @@ "book_learn": [ [ "scots_tailor", 5 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "using": [ [ "fabric_leather_hide", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ] + "using": [ [ "fabric_leather_hide", 7 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "byproducts": [ [ "leather", 2 ] ] }, { "result": "kilt", @@ -284,7 +295,7 @@ "time": "6 h", "book_learn": [ [ "scots_tailor", 4 ], [ "scots_cookbook", 7 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], - "using": [ [ "tailoring_felt", 11 ], [ "strap_small", 1 ], [ "clasps", 1 ] ] + "using": [ [ "tailoring_felt_patchwork", 20 ], [ "strap_small", 1 ], [ "clasps", 1 ] ] }, { "result": "knee_pads", @@ -310,12 +321,13 @@ "time": "1 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 2 ] ] }, { "result": "leg_warmers_xs", "type": "recipe", "copy-from": "leg_warmers", + "reversible": false, "time": "1 h 30 m", "using": [ [ "tailoring_cotton", 1 ] ] }, @@ -329,8 +341,8 @@ "difficulty": 1, "time": "1 h 40 m", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_cotton", 2 ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ] ] }, { "result": "leg_warmers_xlf", @@ -343,7 +355,7 @@ "time": "3 h 20 m", "reversible": true, "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 3 ] ], - "using": [ [ "tailoring_fur", 2 ] ], + "using": [ [ "tailoring_fur_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { @@ -356,9 +368,9 @@ "difficulty": 3, "time": "3 h", "autolearn": true, - "reversible": true, "book_learn": [ [ "mag_tailor", 2 ], [ "manual_tailor", 2 ] ], - "using": [ [ "tailoring_lycra", 3 ] ], + "using": [ [ "tailoring_lycra_patchwork", 6 ] ], + "byproducts": [ [ "lycra_patch", 5 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -523,7 +535,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 6 ] ] ], + "components": [ [ [ "cotton_patchwork", 6 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_articulation" } ], "qualities": [ { "id": "HAMMER", "level": 1 } ] }, @@ -533,7 +545,7 @@ "copy-from": "legguard_scrap", "time": "40 m", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "xl_legguard_scrap", @@ -541,7 +553,7 @@ "copy-from": "legguard_scrap", "time": "45 m", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 8 ] ] ] + "components": [ [ [ "cotton_patchwork", 8 ] ] ] }, { "result": "legguard_tire", @@ -588,25 +600,25 @@ "time": "15 m", "autolearn": true, "reversible": true, - "using": [ [ "cordage_short", 1 ], [ "fabric_standard_nostretch", 2 ] ] + "using": [ [ "cordage_short", 1 ], [ "tailoring_cotton_patchwork", 2 ] ] }, { "result": "loincloth_fur", "type": "recipe", "copy-from": "loincloth", - "using": [ [ "fabric_fur", 2 ] ] + "using": [ [ "cordage_short", 1 ], [ "tailoring_fur_patchwork", 2 ] ] }, { "result": "loincloth_leather", "type": "recipe", "copy-from": "loincloth", - "components": [ [ [ "leather", 2 ] ] ] + "using": [ [ "cordage_short", 1 ], [ "tailoring_leather_patchwork", 2 ] ] }, { "result": "loincloth_wool", "type": "recipe", "copy-from": "loincloth", - "using": [ [ "fabric_felt", 2 ] ] + "using": [ [ "cordage_short", 1 ], [ "tailoring_felt_patchwork", 2 ] ] }, { "result": "long_underpants", @@ -616,10 +628,11 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 2, - "time": "3 h", + "time": "1 h 30m", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "using": [ [ "tailoring_cotton_patchwork", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 1 ] ] }, { "result": "armor_mercenary_bottom", @@ -731,7 +744,7 @@ "time": "1 h", "autolearn": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "using": [ [ "tailoring_cotton", 5 ] ] + "using": [ [ "tailoring_cotton_patchwork", 1 ] ] }, { "result": "pants_cargo", @@ -742,10 +755,10 @@ "skill_used": "tailor", "difficulty": 3, "time": "8 h", - "reversible": true, "decomp_learn": 2, "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 2 ] ], - "using": [ [ "tailoring_cotton", 7 ], [ "fastener_small", 3 ] ], + "using": [ [ "tailoring_cotton_patchwork", 20 ], [ "fastener_small", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 5 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -759,7 +772,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_fur", 2 ] ], + "using": [ [ "tailoring_fur_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, { @@ -767,7 +780,9 @@ "type": "recipe", "copy-from": "leg_warmers_f", "time": "3 h", - "using": [ [ "tailoring_fur", 1 ] ] + "reversible": false, + "using": [ [ "tailoring_fur_patchwork", 2 ] ], + "byproducts": [ [ "fur", 4 ] ] }, { "result": "pants_fur", @@ -780,8 +795,8 @@ "skills_required": [ "survival", 1 ], "time": "8 h", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_fur", 3 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_fur_patchwork", 4 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "fur", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -798,7 +813,8 @@ "difficulty": 3, "time": "6 h", "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], - "using": [ [ "tailoring_faux_fur", 3 ], [ "tailoring_cotton", 5 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_faux_fur_patchwork", 2 ], [ "tailoring_cotton", 14 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "faux_fur", 6 ], [ "cotton_patchwork", 5 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -815,8 +831,8 @@ "difficulty": 4, "time": "8 h", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_leather", 5 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "leather", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -836,7 +852,7 @@ "autolearn": true, "using": [ [ "tailoring_kevlar_fabric", 4 ], - [ "tailoring_cotton", 4 ], + [ "tailoring_cotton", 5 ], [ "waterproofing_plastic_sheets", 8 ], [ "fastener_small", 1 ] ], @@ -893,7 +909,7 @@ "time": "15 h 45 m", "using": [ [ "tailoring_kevlar_fabric", 6 ], - [ "tailoring_cotton", 6 ], + [ "tailoring_cotton", 7 ], [ "waterproofing_plastic_sheets", 10 ], [ "fastener_small", 1 ] ], @@ -920,10 +936,10 @@ "subcategory": "CSC_ARMOR_LEGS", "skill_used": "tailor", "difficulty": 1, - "time": "4 h", + "time": "3 h 30m", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 7 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -936,9 +952,9 @@ "difficulty": 2, "time": "4 h 30 m", "autolearn": true, - "reversible": true, "book_learn": [ [ "manual_tailor", 1 ] ], - "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "fastener_small", 3 ] ], + "using": [ [ "tailoring_cotton_patchwork", 10 ], [ "fastener_small", 3 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -952,7 +968,7 @@ "time": "30 m", "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], - "byproducts": [ [ "rag", 4 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "components": [ [ [ "pants_cargo", 1 ] ] ] }, { @@ -966,8 +982,8 @@ "difficulty": 2, "time": "20 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], - "reversible": true, - "using": [ [ "tailoring_cotton", 1 ], [ "fastener_small", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 8 ], [ "fastener_small", 1 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -981,7 +997,7 @@ "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "flags": [ "NO_RESIZE" ], - "byproducts": [ [ "rag", 4 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "components": [ [ [ "jeans", 1 ] ] ] }, { @@ -1009,7 +1025,7 @@ "time": "15 m", "autolearn": true, "using": [ [ "sewing_standard", 6 ] ], - "components": [ [ [ "stockings", 3 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "stockings", 3 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "stockings_tent_legs", @@ -1021,8 +1037,8 @@ "difficulty": 1, "time": "3 h", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 24 ] ] + "using": [ [ "tailoring_cotton_patchwork", 9 ] ], + "byproducts": [ [ "cotton_patchwork", 3 ] ] }, { "result": "under_armor_shorts", @@ -1036,7 +1052,7 @@ "autolearn": true, "book_learn": [ [ "mag_tailor", 2 ], [ "manual_tailor", 2 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ], - "using": [ [ "tailoring_lycra", 3 ] ] + "using": [ [ "tailoring_lycra_patchwork", 3 ] ] }, { "result": "lc_chainmail_legs", diff --git a/data/json/recipes/armor/other.json b/data/json/recipes/armor/other.json index f9be483722e45..2b193688b4ebd 100644 --- a/data/json/recipes/armor/other.json +++ b/data/json/recipes/armor/other.json @@ -48,8 +48,8 @@ "skill_used": "tailor", "time": "80 m", "autolearn": true, - "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "rag", 60 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 33 ] ], + "byproducts": [ [ "cotton_patchwork", 6 ], [ "scrap_cotton", 2 ] ] }, { "result": "electric_blanket", @@ -62,9 +62,10 @@ "skills_required": [ "electronics", 2 ], "time": "120 m", "book_learn": [ [ "textbook_tailor", 2 ], [ "manual_tailor", 2 ] ], - "using": [ [ "sewing_standard", 20 ], [ "soldering_standard", 20 ] ], + "using": [ [ "tailoring_cotton_patchwork", 33 ], [ "soldering_standard", 20 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" } ], - "components": [ [ [ "rag", 35 ] ], [ [ "plastic_chunk", 4 ] ], [ [ "element", 8 ] ], [ [ "cable", 10 ] ], [ [ "amplifier", 1 ] ] ] + "components": [ [ [ "plastic_chunk", 4 ] ], [ [ "element", 8 ] ], [ [ "cable", 10 ] ], [ [ "amplifier", 1 ] ] ], + "byproducts": [ [ "cotton_patchwork", 6 ], [ "scrap_cotton", 2 ] ] }, { "result": "gold_ring", @@ -164,8 +165,9 @@ "difficulty": 1, "time": "85 m", "autolearn": true, - "using": [ [ "sewing_standard", 20 ] ], - "components": [ [ [ "rag", 60 ] ], [ [ "down_feather", 160 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 33 ] ], + "components": [ [ [ "cotton_patchwork", 54 ] ], [ [ "down_feather", 160 ] ] ], + "byproducts": [ [ "scrap_cotton", 2 ] ] }, { "result": "fur_blanket", @@ -177,12 +179,11 @@ "difficulty": 1, "skills_required": [ "survival", 1 ], "time": "80 m", - "reversible": true, "decomp_learn": 0, "autolearn": true, - "using": [ [ "sewing_standard", 24 ] ], + "using": [ [ "tailoring_cotton_patchwork", 33 ], [ "tailoring_fur_patchwork", 10 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], - "components": [ [ [ "rag", 30 ] ], [ [ "fur", 10 ], [ "tanned_pelt", 2 ] ] ] + "byproducts": [ [ "cotton_patchwork", 6 ], [ "scrap_cotton", 2 ], [ "fur", 3 ] ] }, { "result": "fur_cat_tail", @@ -410,8 +411,7 @@ "time": "75 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "rag", 30 ] ] ] + "using": [ [ "tailoring_cotton_patchwork", 28 ] ] }, { "result": "sleeping_bag_fur_roll", @@ -423,13 +423,13 @@ "difficulty": 5, "skills_required": [ "survival", 1 ], "time": "75 m", - "reversible": true, "decomp_learn": 4, "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "trappers_companion", 3 ], [ "survival_book", 2 ], [ "pocket_survival", 1 ] ], - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "tailoring_cotton_patchwork", 17 ], [ "sewing_standard", 10 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ], - "components": [ [ [ "rag", 10 ] ], [ [ "fur", 18 ], [ "tanned_pelt", 3 ], [ "wool_staple", 9 ] ] ] + "components": [ [ [ "sheet_fur_patchwork", 3 ], [ "tanned_pelt", 3 ], [ "wool_staple", 9 ] ] ], + "byproducts": [ [ "cotton_patchwork", 1 ] ] }, { "result": "survivor_belt_notools", @@ -463,7 +463,7 @@ "time": "6 m", "autolearn": true, "using": [ [ "sewing_standard", 7 ] ], - "components": [ [ [ "rag", 5 ] ] ] + "components": [ [ [ "cotton_patchwork", 11 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/armor/pets_dog.json b/data/json/recipes/armor/pets_dog.json index c0e792311a3c6..0dc2e85b09775 100644 --- a/data/json/recipes/armor/pets_dog.json +++ b/data/json/recipes/armor/pets_dog.json @@ -48,7 +48,7 @@ [ [ "lc_link_sheet", 5 ] ], [ [ "lc_chain_link", 131 ] ], [ [ "lc_wire", 1 ] ], - [ [ "fur", 6 ], [ "tanned_pelt", 1 ], [ "leather", 6 ], [ "tanned_hide", 1 ] ] + [ [ "fur", 8 ], [ "tanned_pelt", 1 ], [ "leather", 8 ], [ "tanned_hide", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_chain_armour" }, @@ -81,10 +81,8 @@ "difficulty": 4, "time": "4 h", "autolearn": true, - "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], - "using": [ [ "sewing_standard", 15 ], [ "clasps", 3 ] ], - "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ] ], + "using": [ [ "tailoring_leather_patchwork", 8 ], [ "clasps", 3 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, @@ -138,10 +136,9 @@ "difficulty": 4, "time": "6 h", "autolearn": true, - "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], - "using": [ [ "sewing_standard", 20 ], [ "clasps", 3 ] ], - "components": [ [ [ "bone_sturdy", 13, "LIST" ] ], [ [ "leather", 6 ], [ "tanned_hide", 1 ] ] ], + "using": [ [ "tailoring_leather_patchwork", 8 ], [ "clasps", 3 ] ], + "components": [ [ [ "bone_sturdy", 13, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, @@ -178,7 +175,7 @@ "autolearn": true, "using": [ [ "clasps", 3 ], [ "waterproofing_plastic_sheets", 10 ] ], "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 10 ] ] ], + "components": [ [ [ "cotton_patchwork", 10 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] } ] diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json index 3efb3b43a9f10..e7609321ad8d3 100644 --- a/data/json/recipes/armor/pets_horse.json +++ b/data/json/recipes/armor/pets_horse.json @@ -65,11 +65,15 @@ "skill_used": "tailor", "difficulty": 6, "time": "12 h 30 m", - "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 190 ], [ "clasps", 4 ] ], - "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ], - "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_closures" } ] + "using": [ + [ "tailoring_leather_patchwork", 55 ], + [ "armor_kevlar_layered", 24 ], + [ "tailoring_cotton_patchwork", 143 ], + [ "clasps", 4 ] + ], + "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_closures" } ], + "//": "recipe composition is off of the item composition due to not wanting to require 280 cotton sheets for this." }, { "result": "leather_armor_horse", @@ -82,7 +86,7 @@ "time": "4 h 30 m", "byproducts": [ [ "leather", 21 ] ], "using": [ [ "sewing_standard", 30 ], [ "clasps", 4 ] ], - "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "rag", 18 ] ] ], + "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "cotton_patchwork", 18 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, @@ -100,7 +104,7 @@ "skills_required": [ "tailor", 6 ], "time": "10 h 30 m", "reversible": true, - "using": [ [ "sewing_standard", 190 ], [ "surface_heat", 60 ], [ "clasps", 4 ] ], + "using": [ [ "tailoring_leather_patchwork", 55 ], [ "tailoring_cotton_patchwork", 55 ], [ "surface_heat", 60 ], [ "clasps", 4 ] ], "components": [ [ [ "water", 30 ], [ "water_clean", 30 ] ], [ @@ -113,9 +117,7 @@ [ "vinegar", 30 ], [ "pine_bough", 60 ] ], - [ [ "salt", 150 ] ], - [ [ "leather", 105 ], [ "tanned_hide", 17 ] ], - [ [ "rag", 18 ] ] + [ [ "salt", 150 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -145,7 +147,7 @@ "difficulty": 4, "time": "6 h 30 m", "autolearn": true, - "byproducts": [ [ "rag", 6 ] ], + "byproducts": [ [ "leather", 6 ] ], "using": [ [ "sewing_standard", 35 ], [ "clasps", 4 ] ], "components": [ [ [ "bone_sturdy", 39, "LIST" ] ], [ [ "leather_armor_horse", 1 ] ] ], "proficiencies": [ @@ -175,14 +177,13 @@ [ "textbook_armwest", 6 ], [ "textbook_armschina", 6 ] ], - "using": [ [ "sewing_standard", 225 ], [ "clasps", 4 ] ], + "using": [ [ "tailoring_leather_patchwork", 29 ], [ "clasps", 4 ] ], "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ], "components": [ [ [ "water", 30 ], [ "water_clean", 30 ] ], [ [ "wax", 6 ], [ "any_tallow", 24, "LIST" ], [ "vinegar", 30 ], [ "pine_bough", 60 ] ], [ [ "salt", 150 ] ], - [ [ "bone_sturdy", 39, "LIST" ] ], - [ [ "leather", 105 ], [ "tanned_hide", 17 ] ] + [ [ "bone_sturdy", 39, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -221,7 +222,7 @@ "autolearn": true, "using": [ [ "clasps", 4 ] ], "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "duct_tape", 350 ] ], [ [ "plastic_sheet", 9 ] ], [ [ "rag", 70 ] ] ], + "components": [ [ [ "duct_tape", 350 ] ], [ [ "plastic_sheet", 9 ] ], [ [ "cotton_patchwork", 70 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_closures" } ] }, { @@ -296,9 +297,7 @@ "skills_required": [ "tailor", 4 ], "time": "6 h", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 40 ], [ "clasps", 2 ] ], - "components": [ [ [ "leather", 12 ], [ "tanned_hide", 3 ] ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "clasps", 2 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 26ce121cdbc21..3572f1bf38ef9 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -10,7 +10,7 @@ "skills_required": [ "gun", 1 ], "time": "11 h", "autolearn": true, - "using": [ [ "strap_small", 1 ], [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], + "using": [ [ "strap_small", 1 ], [ "tailoring_leather_small", 9 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -29,17 +29,16 @@ "time": "1 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "strap_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "strap_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "fastener_small", 2, "LIST" ] ] ] }, { - "result": "ammo_satchel", - "id_suffix": "from leather", + "result": "ammo_satchel_leather", "copy-from": "ammo_satchel", "type": "recipe", "time": "5 h", - "using": [ [ "tailoring_leather_small", 2 ], [ "strap_large", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ], [ "strap_large", 1 ] ], "extend": { "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, "components": [ [ [ "fastener_small", 2, "LIST" ] ] ] }, @@ -74,7 +73,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "strap_large", 1 ], [ "tailoring_cotton_patchwork", 2 ], [ "fastener_small", 2 ] ], + "using": [ [ "strap_large", 1 ], [ "tailoring_cotton_patchwork", 5 ], [ "fastener_small", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -103,7 +102,7 @@ "time": "2 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "strap_small", 1 ], [ "clasps", 4 ] ], + "using": [ [ "tailoring_cotton_small", 4 ], [ "strap_small", 1 ], [ "clasps", 4 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ] ] }, @@ -112,7 +111,7 @@ "type": "recipe", "copy-from": "chestrig", "time": "1 h", - "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "strap_small", 1 ], [ "clasps", 4 ] ], + "using": [ [ "tailoring_cotton_small", 3 ], [ "strap_small", 1 ], [ "clasps", 4 ] ], "components": [ [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ] ] }, { @@ -120,7 +119,7 @@ "type": "recipe", "copy-from": "chestrig", "time": "4 h 30 m", - "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "strap_large", 1 ], [ "clasps", 4 ] ], + "using": [ [ "tailoring_cotton_small", 6 ], [ "strap_large", 1 ], [ "clasps", 4 ] ], "components": [ [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ] ] }, { @@ -134,7 +133,7 @@ "time": "20 m", "autolearn": true, "reversible": true, - "using": [ [ "adhesive", 1 ], [ "tailoring_leather_small", 1 ], [ "clasps", 1 ] ], + "using": [ [ "adhesive", 1 ], [ "tailoring_leather_small", 5 ], [ "clasps", 1 ] ], "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], [ [ "nail", 4 ] ] ] }, @@ -149,7 +148,7 @@ "skills_required": [ "gun", 1 ], "time": "11 h", "autolearn": true, - "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 7 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -166,8 +165,8 @@ "difficulty": 3, "time": "10 h", "autolearn": true, - "reversible": true, - "using": [ [ "tailoring_nylon_patchwork", 3 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 16 ], [ "fastener_large", 2 ] ], + "byproducts": [ [ "nylon", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -181,7 +180,7 @@ "time": "14 h", "autolearn": true, "reversible": true, - "using": [ [ "strap_large", 2 ], [ "tailoring_leather_small", 10 ], [ "fastener_large", 2 ] ], + "using": [ [ "strap_large", 2 ], [ "tailoring_leather_patchwork", 3 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -221,7 +220,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 2 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -236,7 +235,7 @@ "time": "3 h 20 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 2 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -251,7 +250,7 @@ "time": "3 h 20 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 2 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -266,7 +265,7 @@ "time": "3 h 40 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 3 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 5 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -303,7 +302,7 @@ "skills_required": [ [ "gun", 1 ], [ "pistol", 1 ] ], "time": "1 h", "autolearn": true, - "using": [ [ "tailoring_lycra", 1 ] ], + "using": [ [ "tailoring_lycra_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -317,7 +316,7 @@ "skills_required": [ [ "gun", 1 ], [ "pistol", 1 ] ], "time": "1 h 30 m", "autolearn": true, - "using": [ [ "tailoring_lycra", 2 ] ], + "using": [ [ "tailoring_lycra_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -331,7 +330,14 @@ "reversible": true, "autolearn": true, "components": [ - [ [ "rag", 6 ], [ "fur", 2 ], [ "leather", 1 ] ], + [ + [ "sheet_cotton_patchwork", 1 ], + [ "sheet_cotton", 1 ], + [ "sheet_fur_patchwork", 1 ], + [ "tanned_pelt", 1 ], + [ "tanned_hide", 1 ], + [ "sheet_leather_patchwork", 6 ] + ], [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "pointy_stick", 1 ], [ "mop", 1 ] ] ], "flags": [ "BLIND_HARD" ] @@ -347,7 +353,7 @@ "skills_required": [ "melee", 1 ], "time": "2 h", "autolearn": true, - "using": [ [ "tailoring_leather_small", 2 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -381,7 +387,7 @@ "skills_required": [ "pistol", 1 ], "time": "2 h", "autolearn": true, - "using": [ [ "tailoring_leather_small", 3 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_small", 5 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -414,7 +420,7 @@ "time": "45 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_nylon", 1 ], [ "clasps", 3 ] ] + "using": [ [ "tailoring_nylon_patchwork", 1 ], [ "clasps", 3 ] ] }, { "result": "bscabbard", @@ -443,7 +449,7 @@ "time": "1 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton", 2 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 3 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -472,16 +478,15 @@ "time": "2 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { - "result": "chestpouch", + "result": "chestpouch_leather", "type": "recipe", - "id_suffix": "from leather", "time": "5 h 30 m", "copy-from": "chestpouch", - "using": [ [ "tailoring_leather_small", 2 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_small", 1 ], [ "strap_small", 1 ], [ "clasps", 1 ] ], "extend": { "proficiencies": [ { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_leatherworking_basic" } ] } }, { @@ -495,7 +500,7 @@ "skills_required": [ "fabrication", 2 ], "time": "10 h", "autolearn": true, - "using": [ [ "tailoring_nylon", 5 ], [ "plastic_molding", 2 ], [ "fastener_small", 6 ] ], + "using": [ [ "tailoring_nylon_patchwork", 5 ], [ "plastic_molding", 2 ], [ "fastener_small", 6 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -508,7 +513,7 @@ "type": "recipe", "copy-from": "tacvest", "time": "6 h", - "using": [ [ "tailoring_nylon", 3 ], [ "plastic_molding", 2 ], [ "fastener_small", 6 ] ], + "using": [ [ "tailoring_nylon_patchwork", 3 ], [ "plastic_molding", 2 ], [ "fastener_small", 6 ] ], "components": [ [ [ "ragpouch", 2 ], [ "leather_pouch", 2 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ], [ "chestrig", 1 ] ] ] }, { @@ -516,7 +521,7 @@ "type": "recipe", "copy-from": "tacvest", "time": "13 h 30 m", - "using": [ [ "tailoring_nylon", 7 ], [ "plastic_molding", 3 ], [ "fastener_small", 6 ] ], + "using": [ [ "tailoring_nylon_patchwork", 7 ], [ "plastic_molding", 3 ], [ "fastener_small", 6 ] ], "components": [ [ [ "ragpouch", 2 ], [ "leather_pouch", 2 ] ], [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ], [ "chestrig", 1 ] ] ] }, { @@ -530,7 +535,7 @@ "time": "14 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 10 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_cotton_patchwork", 26 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -613,7 +618,7 @@ "skills_required": [ "pistol", 1 ], "time": "8 h", "autolearn": true, - "using": [ [ "tailoring_leather_small", 3 ] ], + "using": [ [ "tailoring_leather_small", 6 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking" }, @@ -634,7 +639,7 @@ "type": "recipe", "copy-from": "holster", "time": "11 h", - "using": [ [ "tailoring_leather_small", 4 ] ], + "using": [ [ "tailoring_leather_small", 7 ] ], "components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ], [ [ "fastener_small", 2, "LIST" ] ] ] }, { @@ -674,9 +679,9 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "tailor", "time": "1 h", - "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 2 ], [ "clasps", 1 ] ], + "autolearn": true, + "using": [ [ "tailoring_leather_small", 3 ], [ "clasps", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -1046,7 +1051,7 @@ "decomp_learn": 3, "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ] ], - "using": [ [ "tailoring_leather_small", 3 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_leather_small", 8 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1074,7 +1079,7 @@ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], - "components": [ [ [ "birchbark", 3 ] ], [ [ "filament", 3, "LIST" ] ], [ [ "cordage", 1, "LIST" ] ] ] + "components": [ [ [ "birchbark", 6 ] ], [ [ "filament", 3, "LIST" ] ], [ [ "cordage", 1, "LIST" ] ] ] }, { "result": "quiver_large", @@ -1090,7 +1095,7 @@ "decomp_learn": 3, "autolearn": true, "book_learn": [ [ "recipe_arrows", 2 ] ], - "using": [ [ "tailoring_leather_small", 11 ], [ "strap_large", 2 ] ], + "using": [ [ "tailoring_leather_patchwork", 3 ], [ "strap_large", 2 ] ], "qualities": [ { "id": "HAMMER", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_closures" }, @@ -1119,7 +1124,7 @@ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], - "components": [ [ [ "birchbark", 10 ] ], [ [ "filament", 10, "LIST" ] ], [ [ "strap_large", 1, "LIST" ] ] ] + "components": [ [ [ "birchbark", 18 ] ], [ [ "filament", 10, "LIST" ] ], [ [ "strap_large", 1, "LIST" ] ] ] }, { "result": "ragpouch", @@ -1222,7 +1227,7 @@ "autolearn": true, "proficiencies": [ { "proficiency": "prof_basketweaving" } ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "birchbark", 1 ] ], [ [ "cordage_short", 1, "LIST" ] ] ] + "components": [ [ [ "birchbark", 2 ] ], [ [ "cordage_short", 1, "LIST" ] ] ] }, { "result": "sholster", @@ -1294,7 +1299,7 @@ { "proficiency": "prof_leatherworking" } ], "components": [ - [ [ "rag", 18 ] ], + [ [ "cotton_patchwork", 18 ] ], [ [ "plastic_sheet", 2 ] ], [ [ "duffelbag", 1 ], [ "rucksack", 1 ] ], [ @@ -1322,7 +1327,7 @@ "time": "13 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_nylon_patchwork", 8 ], [ "strap_small", 3 ], [ "filament", 3 ] ] + "using": [ [ "tailoring_nylon_patchwork", 12 ], [ "strap_small", 3 ], [ "filament", 3 ] ] }, { "result": "load_bearing_vest", @@ -1336,7 +1341,7 @@ "time": "38 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_nylon_patchwork", 23 ], [ "strap_small", 6 ], [ "filament", 6 ] ] + "using": [ [ "tailoring_nylon_patchwork", 30 ], [ "strap_small", 6 ], [ "filament", 6 ] ] }, { "result": "heavy_load_bearing_vest", @@ -1350,7 +1355,7 @@ "time": "59 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_nylon_patchwork", 36 ], [ "strap_small", 10 ], [ "filament", 10 ] ] + "using": [ [ "tailoring_nylon_patchwork", 45 ], [ "strap_small", 10 ], [ "filament", 10 ] ] }, { "result": "survivor_pack", @@ -1371,7 +1376,7 @@ { "proficiency": "prof_leatherworking" } ], "components": [ - [ [ "rag", 10 ] ], + [ [ "cotton_patchwork", 10 ] ], [ [ "backpack", 1 ], [ "backpack_leather", 1 ], [ "molle_pack", 1 ] ], [ [ "plastic_sheet", 1 ] ], [ @@ -1407,7 +1412,7 @@ { "proficiency": "prof_leatherworking" } ], "components": [ - [ [ "rag", 14 ] ], + [ [ "cotton_patchwork", 14 ] ], [ [ "backpack", 1 ], [ "backpack_leather", 1 ], @@ -1450,7 +1455,7 @@ { "proficiency": "prof_elastics" } ], "components": [ - [ [ "rag", 6 ] ], + [ [ "cotton_patchwork", 6 ] ], [ [ "runner_bag", 1 ], [ "backpack", 1 ], [ "backpack_leather", 1 ] ], [ [ "plastic_sheet", 1 ] ], [ @@ -1485,7 +1490,12 @@ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "components": [ [ [ "rag", 6 ] ], [ [ "holster", 1 ], [ "sholster", 1 ] ], [ [ "leather_pouch", 3 ] ], [ [ "duct_tape", 50 ] ] ] + "components": [ + [ [ "cotton_patchwork", 6 ] ], + [ [ "holster", 1 ], [ "sholster", 1 ] ], + [ [ "leather_pouch", 3 ] ], + [ [ "duct_tape", 50 ] ] + ] }, { "result": "xs_survivor_vest", @@ -1493,7 +1503,12 @@ "copy-from": "survivor_vest", "time": "12 h", "using": [ [ "sewing_standard", 75 ], [ "tailoring_leather_small", 4 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "rag", 5 ] ], [ [ "holster", 1 ], [ "sholster", 1 ] ], [ [ "leather_pouch", 2 ] ], [ [ "duct_tape", 38 ] ] ] + "components": [ + [ [ "cotton_patchwork", 5 ] ], + [ [ "holster", 1 ], [ "sholster", 1 ] ], + [ [ "leather_pouch", 2 ] ], + [ [ "duct_tape", 38 ] ] + ] }, { "result": "xl_survivor_vest", @@ -1501,7 +1516,12 @@ "copy-from": "survivor_vest", "time": "13 h 30 m", "using": [ [ "sewing_standard", 150 ], [ "tailoring_leather_small", 9 ], [ "fastener_large", 2 ] ], - "components": [ [ [ "rag", 8 ] ], [ [ "holster", 1 ], [ "sholster", 1 ] ], [ [ "leather_pouch", 3 ] ], [ [ "duct_tape", 80 ] ] ] + "components": [ + [ [ "cotton_patchwork", 8 ] ], + [ [ "holster", 1 ], [ "sholster", 1 ] ], + [ [ "leather_pouch", 3 ] ], + [ [ "duct_tape", 80 ] ] + ] }, { "result": "swag_bag", @@ -1547,7 +1567,7 @@ "time": "30 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 11 ], [ "fastener_large", 6 ] ], + "using": [ [ "tailoring_leather_small", 26 ], [ "fastener_large", 6 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1568,7 +1588,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 1 ] ], + "using": [ [ "strap_large", 2 ], [ "tailoring_nylon_patchwork", 14 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -1582,7 +1602,7 @@ "time": "18 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 30 ], [ "fastener_large", 3 ] ], + "using": [ [ "tailoring_leather_small", 44 ], [ "fastener_large", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1603,7 +1623,7 @@ "time": "7 h 30 m", "reversible": true, "autolearn": true, - "using": [ [ "tailoring_nylon_patchwork", 5 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_sheets", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 15 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_sheets", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ], "components": [ [ [ "strap_large", 1, "LIST" ] ] ] }, @@ -1618,7 +1638,7 @@ "time": "6 h 40 m", "reversible": true, "book_learn": [ [ "plastics_book", 1 ] ], - "using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_sheets", 2 ] ], + "using": [ [ "tailoring_nylon_patchwork", 22 ], [ "fastener_large", 1 ], [ "waterproofing_plastic_sheets", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1650,7 +1670,7 @@ "time": "18 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 25 ], [ "fastener_large", 3 ] ], + "using": [ [ "tailoring_leather_small", 28 ], [ "fastener_large", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1670,7 +1690,7 @@ "time": "14 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 25 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1689,7 +1709,7 @@ "time": "10 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 10 ], [ "fastener_large", 2 ], [ "waterproofing_plastic_sheets", 4 ] ], + "using": [ [ "tailoring_cotton_patchwork", 32 ], [ "fastener_large", 2 ], [ "waterproofing_plastic_sheets", 4 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -1702,7 +1722,7 @@ "time": "4 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 5 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_cotton_patchwork", 13 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -1715,7 +1735,7 @@ "time": "5 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 5 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking" }, @@ -1727,9 +1747,7 @@ "result": "rifle_case_xs_soft_leather", "type": "recipe", "copy-from": "rifle_case_soft_leather", - "time": "5 h", - "using": [ [ "tailoring_leather_small", 3 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "strap_large", 1, "LIST" ] ] ] + "time": "5 h" }, { "result": "rifle_case_soft_2", @@ -1741,7 +1759,7 @@ "time": "4h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton_patchwork", 7 ], [ "fastener_large", 3 ] ], + "using": [ [ "tailoring_cotton_patchwork", 13 ], [ "fastener_large", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ], "components": [ [ [ "strap_large", 1, "LIST" ] ] ] }, @@ -1755,7 +1773,7 @@ "time": "5 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 7 ], [ "fastener_large", 3 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_large", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking" }, @@ -1773,7 +1791,7 @@ "time": "5 h 40 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 7 ], [ "fastener_large", 2 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_large", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking" }, diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index 0c2414fafd36e..af8701a067bb7 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -123,24 +123,25 @@ "difficulty": 5, "time": "8 h", "autolearn": true, - "using": [ [ "sewing_standard", 68 ], [ "fabric_fur_pelt", 8 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] + "using": [ [ "tailoring_fur_patchwork", 14 ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ], + "byproducts": [ [ "fur", 2 ] ] }, { "result": "armor_farmor_xs", "type": "recipe", "copy-from": "armor_farmor", "time": "8 h", - "using": [ [ "sewing_standard", 51 ], [ "fabric_fur_pelt", 6 ] ] + "using": [ [ "tailoring_fur_patchwork", 11 ] ], + "byproducts": [ [ "fur", 5 ] ] }, { "result": "xl_armor_farmor", "type": "recipe", "copy-from": "armor_farmor", "time": "9 h", - "using": [ [ "sewing_standard", 96 ], [ "fabric_fur_pelt", 12 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] + "using": [ [ "tailoring_fur_patchwork", 16 ] ], + "byproducts": [ [ "fur", 6 ] ] }, { "result": "armor_larmor", @@ -152,26 +153,23 @@ "difficulty": 5, "time": "8 h", "autolearn": true, - "using": [ [ "sewing_standard", 52 ] ], + "using": [ [ "tailoring_leather_patchwork", 16 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], - "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], - "components": [ [ [ "leather", 30 ], [ "tanned_hide", 5 ], [ "fur", 30 ], [ "tanned_pelt", 5 ] ] ] + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, { "result": "armor_larmor_xs", "type": "recipe", "copy-from": "armor_larmor", "time": "8 h", - "using": [ [ "sewing_standard", 39 ] ], - "components": [ [ [ "leather", 23 ], [ "tanned_hide", 3 ], [ "fur", 23 ], [ "tanned_pelt", 3 ] ] ] + "using": [ [ "tailoring_leather_patchwork", 12 ] ] }, { "result": "xl_armor_larmor", "type": "recipe", "copy-from": "armor_larmor", "time": "9 h", - "using": [ [ "sewing_standard", 76 ], [ "fabric_leather_fur_hide", 7 ] ], - "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] + "using": [ [ "tailoring_leather_patchwork", 18 ] ] }, { "result": "armor_lightplate", @@ -183,7 +181,7 @@ "difficulty": 8, "time": "9 h 20 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "steel_standard", 20 ], [ "tailoring_leather_patchwork", 8 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -200,7 +198,7 @@ "type": "recipe", "copy-from": "armor_lightplate", "time": "9 h 20 m", - "using": [ [ "blacksmithing_standard", 60 ], [ "steel_standard", 15 ], [ "fabric_leather_fur_hide", 2 ] ], + "using": [ [ "blacksmithing_standard", 60 ], [ "steel_standard", 15 ], [ "tailoring_leather_patchwork", 6 ] ], "tools": [ [ [ "swage", -1 ] ] ] }, { @@ -208,7 +206,7 @@ "type": "recipe", "copy-from": "armor_lightplate", "time": "10 h 30 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ], [ "tailoring_leather_patchwork", 10 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -272,7 +270,7 @@ "difficulty": 7, "time": "7 h 28 m", "book_learn": [ [ "textbook_armwest", 8 ] ], - "using": [ [ "forging_standard", 5 ], [ "steel_standard", 5 ], [ "fabric_leather_fur_hide", 2 ] ], + "using": [ [ "forging_standard", 5 ], [ "steel_standard", 5 ], [ "tailoring_leather_patchwork", 2 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -289,7 +287,7 @@ "type": "recipe", "copy-from": "armor_lorica", "time": "7 h 28 m", - "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "fabric_leather_fur_hide", 1 ] ], + "using": [ [ "forging_standard", 3 ], [ "steel_standard", 3 ], [ "tailoring_leather_patchwork", 1 ] ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ] }, { @@ -297,7 +295,7 @@ "type": "recipe", "copy-from": "armor_lorica", "time": "8 h 30 m", - "using": [ [ "forging_standard", 7 ], [ "steel_standard", 7 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "forging_standard", 7 ], [ "steel_standard", 7 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ] }, @@ -349,7 +347,7 @@ "difficulty": 9, "time": "10 h", "book_learn": [ [ "textbook_armwest", 8 ] ], - "using": [ [ "blacksmithing_standard", 120 ], [ "steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 120 ], [ "steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -366,7 +364,7 @@ "type": "recipe", "copy-from": "armor_plate", "time": "10 h", - "using": [ [ "blacksmithing_standard", 90 ], [ "steel_standard", 22 ], [ "fabric_leather_fur_hide", 2 ] ], + "using": [ [ "blacksmithing_standard", 90 ], [ "steel_standard", 22 ], [ "tailoring_leather_patchwork", 2 ] ], "tools": [ [ [ "swage", -1 ] ] ] }, { @@ -374,7 +372,7 @@ "type": "recipe", "copy-from": "armor_plate", "time": "11 h 15 m", - "using": [ [ "blacksmithing_standard", 160 ], [ "steel_standard", 45 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 160 ], [ "steel_standard", 45 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -392,7 +390,7 @@ [ "blacksmithing_standard", 64 ], [ "steel_standard", 16 ], [ "fabric_standard_nostretch", 10 ], - [ "fabric_leather_fur_hide", 6 ] + [ "tailoring_leather_patchwork", 6 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], @@ -441,7 +439,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 6 ], [ "mixed_steel", 5 ] ], - "components": [ [ [ "rag", 28 ] ] ], + "components": [ [ [ "cotton_patchwork", 28 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_articulation" } ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ] }, @@ -1102,6 +1100,7 @@ "result": "xl_chainmail_suit_faraday", "type": "recipe", "copy-from": "chainmail_suit_faraday", + "using": [ [ "chainmail_standard", 20 ], [ "fabric_standard_nostretch", 30 ] ], "components": [ [ [ "link_sheet", 3 ], [ "xl_chainmail_hood", 1 ] ], [ [ "link_sheet", 10 ], [ "xl_chainmail_vest", 1 ] ], @@ -1137,7 +1136,7 @@ "time": "3 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ], [ "fabric_standard_nostretch", 20 ] ] + "using": [ [ "tailoring_cotton_patchwork", 34 ] ] }, { "result": "cloak_fur", @@ -1152,7 +1151,7 @@ "reversible": true, "autolearn": true, "book_learn": [ [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], - "using": [ [ "sewing_standard", 18 ], [ "fabric_fur_pelt", 3 ] ], + "using": [ [ "tailoring_fur_patchwork", 7 ] ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ] }, @@ -1167,7 +1166,7 @@ "time": "5 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ], [ "fabric_leather_hide", 3 ] ], + "using": [ [ "tailoring_leather_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ] }, @@ -1182,7 +1181,7 @@ "time": "25 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 18 ], [ "fabric_felt", 18 ] ] + "using": [ [ "tailoring_felt_patchwork", 36 ] ] }, { "result": "entry_suit", @@ -1195,7 +1194,7 @@ "skills_required": [ "tailor", 6 ], "time": "6 h", "book_learn": [ [ "textbook_fireman", 8 ], [ "tailor_portfolio", 8 ] ], - "using": [ [ "sewing_standard", 200 ], [ "fabric_nomex", 40 ] ], + "using": [ [ "sewing_standard", 200 ], [ "tailoring_nomex_patchwork", 40 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_closures" }, @@ -1218,7 +1217,7 @@ "type": "recipe", "copy-from": "entry_suit", "time": "6 h", - "using": [ [ "sewing_standard", 150 ], [ "fabric_nomex", 30 ] ], + "using": [ [ "sewing_standard", 150 ], [ "tailoring_nomex_patchwork", 30 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "sheet_kevlar_layered", 6 ] ], @@ -1236,7 +1235,7 @@ "type": "recipe", "copy-from": "entry_suit", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 300 ], [ "fabric_nomex", 60 ] ], + "using": [ [ "sewing_standard", 300 ], [ "tailoring_nomex_patchwork", 50 ] ], "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "sheet_kevlar_layered", 12 ] ], @@ -1245,7 +1244,7 @@ [ "kevlar", 2 ], [ "ballistic_vest_light", 2 ], [ "ballistic_vest_esapi", 2 ], - [ "sheet_kevlar_layered", 48 ] + [ "sheet_kevlar_layered", 30 ] ] ] }, @@ -1266,7 +1265,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ], - [ [ "faux_fur", 6 ], [ "tanned_pelt", 1 ] ] + [ [ "faux_fur", 6 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" }, @@ -1286,7 +1285,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 3 ] ], - [ [ "faux_fur", 4 ], [ "tanned_pelt", 1 ] ] + [ [ "faux_fur", 4 ] ] ] }, { @@ -1306,7 +1305,7 @@ [ [ "mask_filter", 2 ], [ "mask_gas", 1 ], [ "mask_bunker", 1 ] ], [ [ "glasses_safety", 2 ], [ "glasses_bal", 1 ] ], [ [ "mask_bal", 1 ], [ "sheet_kevlar_layered", 4 ] ], - [ [ "faux_fur", 12 ], [ "tanned_pelt", 2 ] ] + [ [ "faux_fur", 12 ] ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" }, @@ -1327,14 +1326,14 @@ "time": "6 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 35 ], [ "fabric_standard_nostretch", 26 ], [ "fastener_large", 1 ] ] + "using": [ [ "sewing_standard", 35 ], [ "tailoring_cotton_patchwork", 80 ], [ "fastener_large", 1 ] ] }, { "result": "gambeson_xs", "type": "recipe", "copy-from": "gambeson", "time": "6 h", - "using": [ [ "sewing_standard", 26 ], [ "fabric_standard_nostretch", 19 ], [ "fastener_large", 1 ] ] + "using": [ [ "sewing_standard", 26 ], [ "tailoring_cotton_patchwork", 60 ], [ "fastener_large", 1 ] ] }, { "result": "gambeson_pants", @@ -1348,7 +1347,7 @@ "time": "4 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 24 ], [ "fabric_standard_nostretch", 18 ], [ "fastener_small", 1 ] ] + "using": [ [ "sewing_standard", 24 ], [ "tailoring_cotton_patchwork", 60 ], [ "fastener_small", 1 ] ] }, { "result": "gambeson_vest", @@ -1362,7 +1361,7 @@ "time": "4 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 23 ], [ "fabric_standard_nostretch", 18 ], [ "fastener_large", 1 ] ] + "using": [ [ "sewing_standard", 23 ], [ "tailoring_cotton_patchwork", 40 ], [ "fastener_large", 1 ] ] }, { "result": "gambeson_vest", @@ -1390,7 +1389,7 @@ "time": "4 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 17 ], [ "fabric_standard_nostretch", 13 ], [ "fastener_large", 1 ] ] + "using": [ [ "sewing_standard", 17 ], [ "tailoring_cotton_patchwork", 30 ], [ "fastener_large", 1 ] ] }, { "result": "gambeson_vest_xs", @@ -1418,16 +1417,14 @@ "time": "8 h", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 35 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 18 ] ] ] + "using": [ [ "armor_kevlar_layered", 27 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson_xs", "type": "recipe", "copy-from": "k_gambeson", "time": "8 h", - "using": [ [ "sewing_standard", 26 ], [ "tailoring_kevlar_fabric", 9 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 14 ] ] ] + "using": [ [ "armor_kevlar_layered", 20 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson_pants", @@ -1441,8 +1438,7 @@ "time": "5 h", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 24 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 12 ] ] ] + "using": [ [ "armor_kevlar_layered", 21 ], [ "tailoring_kevlar_fabric", 12 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson_vest", @@ -1456,8 +1452,7 @@ "time": "6 h", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 23 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 12 ] ] ] + "using": [ [ "armor_kevlar_layered", 14 ], [ "tailoring_kevlar_fabric", 8 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson_vest", @@ -1485,8 +1480,7 @@ "time": "5 h", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 17 ], [ "tailoring_kevlar_fabric", 6 ], [ "fastener_large", 1 ] ], - "components": [ [ [ "sheet_kevlar_layered", 9 ] ] ] + "using": [ [ "armor_kevlar_layered", 11 ], [ "tailoring_kevlar_fabric", 6 ], [ "fastener_large", 1 ] ] }, { "result": "k_gambeson_vest_xs", @@ -1507,7 +1501,7 @@ "type": "recipe", "copy-from": "gambeson", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 45 ], [ "fabric_standard_nostretch", 52 ], [ "fastener_large", 2 ] ] + "using": [ [ "sewing_standard", 45 ], [ "tailoring_cotton_patchwork", 90 ], [ "fastener_large", 2 ] ] }, { "result": "xl_gambeson_vest", @@ -1521,7 +1515,7 @@ "time": "4 h", "autolearn": true, "book_learn": [ [ "textbook_armwest", 3 ] ], - "using": [ [ "sewing_standard", 30 ], [ "fabric_standard_nostretch", 35 ], [ "fastener_large", 2 ] ] + "using": [ [ "sewing_standard", 30 ], [ "tailoring_cotton_patchwork", 23 ], [ "fastener_large", 2 ] ] }, { "result": "xl_gambeson_vest", @@ -1542,8 +1536,7 @@ "type": "recipe", "copy-from": "k_gambeson", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 50 ], [ "tailoring_kevlar_fabric", 24 ], [ "fastener_large", 2 ] ], - "components": [ [ [ "sheet_kevlar_layered", 36 ] ] ] + "using": [ [ "armor_kevlar_layered", 31 ], [ "tailoring_kevlar_fabric", 14 ], [ "fastener_large", 1 ] ] }, { "result": "xl_k_gambeson_vest", @@ -1557,8 +1550,7 @@ "time": "6 h", "autolearn": [ [ "tailor", 8 ] ], "book_learn": [ [ "textbook_armwest", 4 ] ], - "using": [ [ "sewing_standard", 33 ], [ "tailoring_kevlar_fabric", 16 ], [ "fastener_large", 2 ] ], - "components": [ [ [ "sheet_kevlar_layered", 24 ] ] ] + "using": [ [ "armor_kevlar_layered", 16 ], [ "tailoring_kevlar_fabric", 10 ], [ "fastener_large", 1 ] ] }, { "result": "xl_k_gambeson_vest", @@ -1579,15 +1571,14 @@ "type": "recipe", "copy-from": "gambeson_pants", "time": "5 h", - "using": [ [ "sewing_standard", 32 ], [ "fabric_standard_nostretch", 32 ], [ "fastener_small", 2 ] ] + "using": [ [ "sewing_standard", 27 ], [ "tailoring_cotton_patchwork", 36 ], [ "fastener_small", 2 ] ] }, { "result": "xl_k_gambeson_pants", "type": "recipe", "copy-from": "k_gambeson_pants", "time": "5 h", - "using": [ [ "sewing_standard", 28 ], [ "tailoring_kevlar_fabric", 16 ], [ "fastener_small", 2 ] ], - "components": [ [ [ "sheet_kevlar_layered", 25 ] ] ] + "using": [ [ "armor_kevlar_layered", 24 ], [ "tailoring_kevlar_fabric", 14 ], [ "fastener_large", 1 ] ] }, { "result": "hsurvivor_jumpsuit", @@ -1674,14 +1665,14 @@ "difficulty": 2, "time": "48 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 20 ] ] + "using": [ [ "sewing_standard", 20 ], [ "tailoring_cotton_patchwork", 20 ] ] }, { "result": "jumpsuit_xs", "type": "recipe", "copy-from": "jumpsuit", "time": "48 m", - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 15 ] ] + "using": [ [ "sewing_standard", 15 ], [ "tailoring_cotton_patchwork", 15 ] ] }, { "result": "jumpsuit_xl", @@ -1693,7 +1684,7 @@ "difficulty": 2, "time": "54 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 40 ], [ "fabric_standard_nostretch", 30 ] ] + "using": [ [ "sewing_standard", 40 ], [ "tailoring_cotton_patchwork", 30 ] ] }, { "result": "jumpsuit_xl", @@ -1706,7 +1697,7 @@ "difficulty": 2, "time": "38 m", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 10 ] ], + "using": [ [ "sewing_standard", 20 ], [ "tailoring_cotton_patchwork", 10 ] ], "components": [ [ [ "jumpsuit", 1 ] ] ] }, { @@ -1719,7 +1710,8 @@ "difficulty": 4, "time": "2 h 30 m", "book_learn": [ [ "tailor_japanese", 4 ] ], - "using": [ [ "sewing_standard", 35 ], [ "fabric_standard_nostretch", 25 ] ] + "using": [ [ "tailoring_cotton_patchwork", 35 ] ], + "byproducts": [ [ "cotton_patchwork", 5 ] ] }, { "result": "nomex_suit", @@ -1731,7 +1723,7 @@ "difficulty": 6, "time": "6 h", "book_learn": [ [ "textbook_fireman", 6 ], [ "tailor_portfolio", 7 ] ], - "using": [ [ "sewing_standard", 40 ], [ "fabric_nomex", 18 ] ], + "using": [ [ "tailoring_nomex_patchwork", 45 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1743,14 +1735,14 @@ "type": "recipe", "copy-from": "nomex_suit", "time": "6 h", - "using": [ [ "sewing_standard", 30 ], [ "fabric_nomex", 13 ] ] + "using": [ [ "tailoring_nomex_patchwork", 34 ] ] }, { "result": "xl_nomex_suit", "copy-from": "nomex_suit", "type": "recipe", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 80 ], [ "fabric_nomex", 36 ] ] + "using": [ [ "tailoring_nomex_patchwork", 52 ] ] }, { "result": "shark_suit_faraday", @@ -1778,7 +1770,7 @@ "skills_required": [ "tailor", 2 ], "time": "7 h", "book_learn": [ [ "textbook_fabrication", 3 ], [ "tailor_portfolio", 4 ], [ "textbook_tailor", 3 ], [ "atomic_survival", 3 ] ], - "using": [ [ "sewing_standard", 52 ], [ "fabric_standard_nostretch", 40 ], [ "soldering_standard", 100 ] ], + "using": [ [ "sewing_standard", 52 ], [ "tailoring_cotton_patchwork", 48 ], [ "soldering_standard", 100 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_closures" } ], "components": [ [ [ "element", 18 ] ], [ [ "cable", 37 ] ] ] }, @@ -1818,7 +1810,7 @@ "using": [ [ "sewing_standard", 30 ], [ "soldering_standard", 60 ] ], "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_closures" } ], "components": [ - [ [ "rag", 30 ], [ "sheet_cotton", 30 ], [ "sheet_cotton_patchwork", 30 ], [ "union_suit", 1 ] ], + [ [ "sheet_cotton", 36 ], [ "sheet_cotton_patchwork", 36 ], [ "union_suit", 1 ] ], [ [ "element", 12 ] ], [ [ "cable", 20 ] ] ] @@ -1863,7 +1855,8 @@ "difficulty": 4, "time": "10 h", "book_learn": [ [ "textbook_tailor", 4 ], [ "manual_tailor", 5 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 50 ], [ "tailoring_neoprene_patchwork", 12 ] ], + "using": [ [ "tailoring_neoprene_patchwork", 33 ] ], + "components": [ [ [ "zipper_long_plastic", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -1876,8 +1869,10 @@ "difficulty": 3, "time": "6 h 30 m", "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ], - "using": [ [ "sewing_standard", 30 ], [ "tailoring_neoprene_patchwork", 3 ] ], - "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ] + "using": [ [ "tailoring_neoprene_patchwork", 22 ] ], + "proficiencies": [ { "proficiency": "prof_elastics" }, { "proficiency": "prof_closures_waterproofing" } ], + "components": [ [ [ "zipper_long_plastic", 1 ] ] ], + "qualities": [ { "id": "SEW_CURVED", "level": 1 } ] }, { "result": "wool_suit", @@ -1889,7 +1884,7 @@ "difficulty": 3, "time": "10 h", "autolearn": true, - "using": [ [ "sewing_standard", 150 ], [ "fabric_felt", 24 ] ] + "using": [ [ "tailoring_felt_patchwork", 14 ] ] }, { "result": "yukata", @@ -1901,7 +1896,7 @@ "difficulty": 3, "time": "1 h 30 m", "book_learn": [ [ "tailor_japanese", 3 ] ], - "using": [ [ "sewing_standard", 18 ], [ "fabric_standard_nostretch", 16 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ] ] }, { "result": "zentai", @@ -1913,7 +1908,7 @@ "difficulty": 4, "time": "2 h", "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 36 ], [ "fabric_lycra", 34 ] ], + "using": [ [ "tailoring_lycra_patchwork", 20 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1938,7 +1933,7 @@ "difficulty": 5, "time": "37 d", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "lc_steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "lc_steel_standard", 20 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -1955,7 +1950,7 @@ "type": "recipe", "copy-from": "armor_lc_lightplate", "time": "40 d 16 h 19 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 32 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2013,7 +2008,7 @@ "difficulty": 5, "time": "37 d", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "mc_steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "mc_steel_standard", 20 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2030,7 +2025,7 @@ "type": "recipe", "copy-from": "armor_mc_lightplate", "time": "40 d 16 h 19 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 32 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2088,7 +2083,7 @@ "difficulty": 5, "time": "37 d", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "hc_steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "hc_steel_standard", 20 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2105,7 +2100,7 @@ "type": "recipe", "copy-from": "armor_hc_lightplate", "time": "40 d 16 h 19 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 32 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2163,7 +2158,7 @@ "difficulty": 6, "time": "39 d 14 h 24 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "lc_steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "lc_steel_standard", 20 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2180,7 +2175,7 @@ "type": "recipe", "copy-from": "armor_ch_lightplate", "time": "44 d 17 h 57 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 32 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "charcoal", 150 ] ] ] }, @@ -2238,7 +2233,7 @@ "difficulty": 7, "time": "41 d 9 h 36 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 80 ], [ "mc_steel_standard", 20 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 80 ], [ "mc_steel_standard", 20 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2256,7 +2251,7 @@ "type": "recipe", "copy-from": "armor_qt_lightplate", "time": "46 d 18 h 46 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 32 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 32 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -240 ] ] ] }, @@ -2314,7 +2309,7 @@ "difficulty": 6, "time": "39 d 14 h 24 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 96 ], [ "lc_steel_standard", 25 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 96 ], [ "lc_steel_standard", 25 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2331,7 +2326,7 @@ "type": "recipe", "copy-from": "armor_lc_plate", "time": "44 d 17 h 57 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2385,7 +2380,7 @@ "difficulty": 6, "time": "39 d 14 h 24 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 96 ], [ "mc_steel_standard", 25 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 96 ], [ "mc_steel_standard", 25 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2402,7 +2397,7 @@ "type": "recipe", "copy-from": "armor_mc_plate", "time": "44 d 17 h 57 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2456,7 +2451,7 @@ "difficulty": 6, "time": "39 d 14 h 24 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 96 ], [ "hc_steel_standard", 25 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 96 ], [ "hc_steel_standard", 25 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2473,7 +2468,7 @@ "type": "recipe", "copy-from": "armor_hc_plate", "time": "44 d 17 h 57 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2527,7 +2522,7 @@ "difficulty": 7, "time": "43 d 13 h", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 96 ], [ "lc_steel_standard", 25 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 96 ], [ "lc_steel_standard", 25 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2544,7 +2539,7 @@ "type": "recipe", "copy-from": "armor_ch_plate", "time": "49 d 5 h 20 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2598,7 +2593,7 @@ "difficulty": 8, "time": "45 d 12 h 57 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 96 ], [ "mc_steel_standard", 25 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 96 ], [ "mc_steel_standard", 25 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2615,7 +2610,7 @@ "type": "recipe", "copy-from": "armor_qt_plate", "time": "51 d 11 h 2 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2669,7 +2664,7 @@ "difficulty": 7, "time": "43 d ", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 115 ], [ "lc_steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 115 ], [ "lc_steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2686,7 +2681,7 @@ "type": "recipe", "copy-from": "armor_lc_heavyplate", "time": "48 d 19 h 35 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2744,7 +2739,7 @@ "difficulty": 7, "time": "43 d", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 115 ], [ "mc_steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 115 ], [ "mc_steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2761,7 +2756,7 @@ "type": "recipe", "copy-from": "armor_mc_heavyplate", "time": "43 d", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2819,7 +2814,7 @@ "difficulty": 7, "time": "43 d", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 115 ], [ "hc_steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 115 ], [ "hc_steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2836,7 +2831,7 @@ "type": "recipe", "copy-from": "armor_hc_heavyplate", "time": "48 d 19 h 35 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "hc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -2894,7 +2889,7 @@ "difficulty": 8, "time": "47 d 12 h 28 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 115 ], [ "lc_steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 115 ], [ "lc_steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2911,7 +2906,7 @@ "type": "recipe", "copy-from": "armor_ch_heavyplate", "time": "53 d 16 h 44 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "lc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "charcoal", 150 ] ] ] }, @@ -2969,7 +2964,7 @@ "difficulty": 9, "time": "49 d 16 h 19 m", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "blacksmithing_standard", 115 ], [ "mc_steel_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "blacksmithing_standard", 115 ], [ "mc_steel_standard", 30 ], [ "tailoring_leather_patchwork", 3 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15, "time_multiplier": 1.1 }, @@ -2987,7 +2982,7 @@ "type": "recipe", "copy-from": "armor_qt_heavyplate", "time": "56 d 3 h 19 m", - "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "blacksmithing_standard", 110 ], [ "mc_steel_standard", 39 ], [ "tailoring_leather_patchwork", 5 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -240 ] ] ] }, diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 0d8dbc4265078..8015f72af0425 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -7,10 +7,10 @@ "subcategory": "CSC_ARMOR_TORSO", "skill_used": "tailor", "difficulty": 3, - "time": "9 h", + "time": "7 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 30 ], [ "fabric_leather_fur_hide", 3 ] ], + "using": [ [ "tailoring_leather_patchwork", 7 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ] }, { @@ -24,7 +24,7 @@ "time": "12 h", "book_learn": [ [ "textbook_armschina", 2 ] ], "reversible": true, - "using": [ [ "sewing_standard", 68 ], [ "fabric_standard_nostretch", 4 ], [ "fabric_leather_fur_hide", 7 ] ], + "using": [ [ "tailoring_cotton_small", 4 ], [ "tailoring_leather_patchwork", 8 ] ], "components": [ [ [ "cordage_superior", 4, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -37,7 +37,7 @@ "type": "recipe", "copy-from": "armor_lamellar", "time": "12 h", - "using": [ [ "sewing_standard", 51 ], [ "fabric_standard_nostretch", 3 ], [ "fabric_leather_fur_hide", 5 ] ], + "using": [ [ "tailoring_cotton_small", 3 ], [ "tailoring_leather_patchwork", 6 ] ], "components": [ [ [ "cordage_superior", 3, "LIST" ] ] ] }, { @@ -45,7 +45,7 @@ "type": "recipe", "copy-from": "armor_lamellar", "time": "13 h 30 m", - "using": [ [ "sewing_standard", 96 ], [ "fabric_standard_nostretch", 6 ], [ "fabric_leather_fur_hide", 9 ] ], + "using": [ [ "tailoring_cotton_small", 5 ], [ "tailoring_leather_patchwork", 9 ] ], "components": [ [ [ "cordage_superior", 6, "LIST" ] ] ] }, { @@ -72,8 +72,9 @@ "difficulty": 2, "time": "1 h", "autolearn": true, + "using": [ [ "tailoring_fur_patchwork", 1 ] ], + "byproducts": [ [ "scrap_fur", 2 ] ], "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 12 ], [ "tailoring_fur_small", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic", "time_multiplier": 1.25, "fail_multiplier": 1.25 }, { "proficiency": "prof_furriery", "time_multiplier": 1.5, "fail_multiplier": 1.15 } @@ -89,8 +90,8 @@ "difficulty": 2, "time": "1 h", "autolearn": true, + "using": [ [ "tailoring_leather_patchwork", 1 ] ], "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 12 ], [ "tailoring_leather_small", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -103,8 +104,7 @@ "difficulty": 5, "time": "7 h", "autolearn": true, - "reversible": true, - "using": [ [ "sewing_standard", 100 ], [ "fabric_felt", 25 ], [ "button", 2 ] ], + "using": [ [ "tailoring_felt_patchwork", 27 ], [ "button", 2 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -131,7 +131,7 @@ "difficulty": 2, "time": "2 h", "autolearn": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 2 ], [ "fastener_small", 3 ] ], + "using": [ [ "tailoring_cotton_patchwork", 1 ], [ "fastener_small", 3 ] ], "components": [ [ [ "wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, @@ -159,26 +159,26 @@ "time": "30 m", "reversible": true, "autolearn": true, - "components": [ [ [ "rag", 18 ] ] ], + "components": [ [ [ "cotton_patchwork", 24 ] ] ], "flags": [ "BLIND_HARD" ] }, { "result": "bellywrap_fur", "type": "recipe", "copy-from": "bellywrap", - "components": [ [ [ "fur", 20 ] ] ] + "components": [ [ [ "fur", 24 ] ] ] }, { "result": "bellywrap_leather", "type": "recipe", "copy-from": "bellywrap", - "components": [ [ [ "leather", 20 ] ] ] + "components": [ [ [ "leather", 24 ] ] ] }, { "result": "bellywrap_wool", "type": "recipe", "copy-from": "bellywrap", - "components": [ [ [ "felt_patch", 18 ] ] ] + "components": [ [ [ "felt_patch", 40 ] ] ] }, { "result": "chestwrap", @@ -190,7 +190,7 @@ "time": "20 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_standard_nostretch", 9 ] ], + "components": [ [ [ "sheet_cotton", 3 ], [ "sheet_cotton_patchwork", 3 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -203,7 +203,7 @@ "time": "20 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_fur", 12 ] ], + "components": [ [ [ "tanned_pelt", 1 ], [ "sheet_fur_patchwork", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -216,7 +216,7 @@ "time": "20 m", "reversible": true, "autolearn": true, - "using": [ [ "fabric_leather_hide", 2 ] ], + "components": [ [ [ "tanned_hide", 1 ], [ "sheet_leather_patchwork", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -229,6 +229,7 @@ "time": "20 m", "reversible": true, "autolearn": true, + "components": [ [ [ "sheet_felt_patchwork", 4 ], [ "sheet_felt", 4 ] ] ], "using": [ [ "fabric_felt", 9 ] ], "flags": [ "BLIND_HARD" ] }, @@ -245,7 +246,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "textbook_survival", 1 ], [ "trappers_companion", 3 ], [ "survival_book", 2 ] ], - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 11 ], [ "fabric_fur_pelt", 2 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 6 ], [ "tailoring_fur_patchwork", 6 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -257,14 +258,14 @@ "type": "recipe", "copy-from": "coat_fur", "time": "6 h", - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 8 ], [ "fabric_fur_pelt", 1 ], [ "fastener_large", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "tailoring_fur_patchwork", 4 ], [ "fastener_large", 1 ] ] }, { "result": "xl_coat_fur", "type": "recipe", "copy-from": "coat_fur", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 40 ], [ "fabric_standard_nostretch", 17 ], [ "fabric_fur_pelt", 3 ], [ "fastener_large", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ], [ "tailoring_fur_patchwork", 8 ], [ "fastener_large", 1 ] ] }, { "result": "coat_faux_fur", @@ -277,7 +278,7 @@ "time": "6 h", "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 3 ] ], "reversible": true, - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 17 ], [ "fabric_fauxfur", 12 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 6 ], [ "tailoring_faux_fur_patchwork", 6 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" }, @@ -289,14 +290,14 @@ "type": "recipe", "copy-from": "coat_faux_fur", "time": "6 h", - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 12 ], [ "fabric_fauxfur", 9 ], [ "fastener_large", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 4 ], [ "tailoring_faux_fur_patchwork", 4 ], [ "fastener_large", 1 ] ] }, { "result": "xl_coat_faux_fur", "type": "recipe", "copy-from": "coat_faux_fur", "time": "6 h 45 m", - "using": [ [ "sewing_standard", 40 ], [ "fabric_standard_nostretch", 17 ], [ "fabric_fauxfur", 18 ], [ "fastener_large", 1 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ], [ "tailoring_faux_fur_patchwork", 8 ], [ "fastener_large", 1 ] ] }, { "result": "coat_gut", @@ -352,7 +353,7 @@ "difficulty": 8, "time": "9 h", "book_learn": [ [ "textbook_armwest", 7 ] ], - "using": [ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ], + "using": [ [ "tailoring_leather_patchwork", 1 ], [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "proficiencies": [ @@ -368,7 +369,7 @@ "type": "recipe", "copy-from": "cuirass_lightplate", "time": "9 h", - "using": [ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 24 ], [ "steel_standard", 6 ] ], + "using": [ [ "tailoring_leather_patchwork", 1 ], [ "blacksmithing_standard", 24 ], [ "steel_standard", 6 ] ], "tools": [ [ [ "swage", -1 ] ] ] }, { @@ -376,7 +377,7 @@ "type": "recipe", "copy-from": "cuirass_lightplate", "time": "10 h 10 m", - "using": [ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 44 ], [ "steel_standard", 10 ] ], + "using": [ [ "tailoring_leather_small", 6 ], [ "blacksmithing_standard", 44 ], [ "steel_standard", 10 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ] }, @@ -392,7 +393,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 2 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 8 ] ] ], + "components": [ [ [ "cotton_patchwork", 8 ] ] ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 }, @@ -405,7 +406,7 @@ "copy-from": "cuirass_scrap", "time": "3 h", "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 6 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "xl_cuirass_scrap", @@ -413,7 +414,7 @@ "copy-from": "cuirass_scrap", "time": "3 h 20 m", "using": [ [ "cordage", 3 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 10 ] ] ] + "components": [ [ [ "cotton_patchwork", 10 ] ] ] }, { "result": "cuirass_tire", @@ -730,7 +731,7 @@ "time": "3 h", "reversible": true, "book_learn": [ [ "tailor_japanese", 5 ] ], - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 20 ] ] + "using": [ [ "tailoring_cotton_patchwork", 24 ] ] }, { "result": "hoodie", @@ -743,7 +744,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 14 ], [ "fabric_standard_nostretch", 12 ] ] + "using": [ [ "tailoring_cotton_patchwork", 40 ] ] }, { "result": "house_coat", @@ -756,7 +757,7 @@ "time": "2 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 15 ] ] + "using": [ [ "tailoring_cotton_patchwork", 36 ] ] }, { "result": "jacket_leather", @@ -850,7 +851,7 @@ "time": "1 h 45 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 10 ] ] + "using": [ [ "tailoring_cotton_patchwork", 16 ] ] }, { "result": "long_undertop_sleeveless", @@ -863,7 +864,7 @@ "time": "1 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 13 ], [ "fabric_standard_nostretch", 8 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ] ] }, { "result": "long_undertop_sleeveless", @@ -875,7 +876,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 2 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "long_undertop", 1 ] ] ] @@ -891,7 +892,7 @@ "time": "2 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 8 ], [ "fabric_standard_nostretch", 7 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ] ] }, { "result": "lsurvivor_armor", @@ -1026,7 +1027,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 3 ] ] ], + "components": [ [ [ "cotton_patchwork", 3 ] ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ] }, { @@ -1041,7 +1042,7 @@ "autolearn": true, "book_learn": [ [ "recipe_melee", 2 ] ], "using": [ [ "cordage", 1 ], [ "mixed_steel", 1 ] ], - "components": [ [ [ "rag", 2 ] ] ], + "components": [ [ [ "cotton_patchwork", 2 ] ] ], "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ] }, { @@ -1055,7 +1056,7 @@ "time": "9 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 120 ], [ "fabric_felt", 30 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_felt_patchwork", 36 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -1084,7 +1085,7 @@ "time": "2 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 80 ], [ "fabric_felt", 30 ] ] + "using": [ [ "tailoring_felt_patchwork", 18 ] ] }, { "result": "poncho", @@ -1112,7 +1113,7 @@ "time": "6 h 48 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 27 ], [ "fabric_standard_nostretch", 19 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 16 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -1126,7 +1127,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 5 ] ], + "byproducts": [ [ "cotton_patchwork", 8 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "duster", 1 ] ] ] @@ -1144,7 +1145,7 @@ "time": "8 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 50 ], [ "fabric_fur_pelt", 6 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_fur_patchwork", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1164,7 +1165,7 @@ "time": "8 h 30 m", "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], - "using": [ [ "sewing_standard", 50 ], [ "fabric_standard_nostretch", 20 ], [ "fabric_fauxfur", 12 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_faux_fur_patchwork", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1183,7 +1184,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "fur", 6 ] ], + "byproducts": [ [ "fur", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "duster_fur", 1 ] ] ] @@ -1199,7 +1200,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "faux_fur", 6 ] ], + "byproducts": [ [ "faux_fur", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "duster_faux_fur", 1 ] ] ] @@ -1217,7 +1218,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 50 ], [ "fabric_leather_hide", 4 ], [ "fastener_large", 1 ] ], + "using": [ [ "fabric_leather_hide", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1252,7 +1253,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 4 ] ], + "byproducts": [ [ "cotton_patchwork", 8 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "duster_survivor", 1 ] ] ] @@ -1269,7 +1270,7 @@ "skills_required": [ "fabrication", 5 ], "time": "10 h 20 m", "autolearn": true, - "using": [ [ "sewing_standard", 115 ], [ "fabric_standard_nostretch", 14 ] ], + "using": [ [ "tailoring_cotton_patchwork", 12 ] ], "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ], [ "sleeveless_duster", 1 ] ], @@ -1309,7 +1310,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 2 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "trenchcoat", 1 ] ] ] @@ -1326,7 +1327,7 @@ "time": "6 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 16 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 24 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ] }, { @@ -1340,7 +1341,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "fur", 2 ] ], + "byproducts": [ [ "fur", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "trenchcoat_fur", 1 ] ] ] @@ -1356,7 +1357,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "faux_fur", 2 ] ], + "byproducts": [ [ "faux_fur", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "trenchcoat_faux_fur", 1 ] ] ] @@ -1374,7 +1375,7 @@ "time": "7 h 45 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 38 ], [ "fabric_fur_pelt", 5 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_fur_patchwork", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1394,7 +1395,7 @@ "time": "7 h 45 m", "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], - "using": [ [ "sewing_standard", 38 ], [ "fabric_standard_nostretch", 10 ], [ "fabric_fauxfur", 10 ], [ "fastener_large", 1 ] ], + "using": [ [ "fabric_fauxfur", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1431,7 +1432,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 38 ], [ "fabric_leather_hide", 3 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 8 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" }, @@ -1451,7 +1452,7 @@ "skills_required": [ "fabrication", 5 ], "time": "11 h 45 m", "autolearn": true, - "using": [ [ "sewing_standard", 85 ], [ "fabric_standard_nostretch", 11 ] ], + "using": [ [ "tailoring_cotton_patchwork", 12 ] ], "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ], [ "sleeveless_trenchcoat", 1 ] ], @@ -1491,7 +1492,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 4 ] ], + "byproducts": [ [ "cotton_patchwork", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "trenchcoat_survivor", 1 ] ] ] @@ -1506,7 +1507,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "rag", 2 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "tunic", 1 ] ] ] @@ -1522,7 +1523,7 @@ "time": "1 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 8 ], [ "fabric_standard_nostretch", 8 ] ] + "using": [ [ "sewing_standard", 8 ], [ "tailoring_cotton_patchwork", 8 ] ] }, { "result": "sports_bra", @@ -1535,7 +1536,7 @@ "time": "1 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_lycra", 2 ] ], + "using": [ [ "tailoring_lycra_patchwork", 2 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1543,7 +1544,7 @@ "type": "recipe", "copy-from": "sports_bra", "time": "1 h 30 m", - "using": [ [ "sewing_standard", 11 ], [ "fabric_lycra", 1 ] ] + "using": [ [ "tailoring_lycra_patchwork", 1 ] ] }, { "result": "xlsports_bra", @@ -1556,7 +1557,7 @@ "time": "1 h 40 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 25 ], [ "fabric_lycra", 4 ] ], + "using": [ [ "tailoring_lycra_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1571,7 +1572,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ], - "using": [ [ "sewing_standard", 12 ], [ "fabric_standard_nostretch", 6 ] ] + "using": [ [ "tailoring_cotton_patchwork", 6 ] ] }, { "result": "maid_dress", @@ -1583,7 +1584,7 @@ "time": "3 h 30 m", "reversible": true, "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 10 ] ] + "using": [ [ "tailoring_cotton", 8 ] ] }, { "result": "maid_dress_short", @@ -1595,7 +1596,7 @@ "time": "3 h", "reversible": true, "book_learn": [ [ "mag_animecon", 1 ] ], - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 6 ] ] + "using": [ [ "tailoring_cotton", 6 ] ] }, { "result": "sweater", @@ -1638,7 +1639,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ], - "using": [ [ "sewing_standard", 20 ], [ "fabric_standard_nostretch", 14 ] ] + "using": [ [ "tailoring_cotton_patchwork", 14 ] ] }, { "result": "tank_top", @@ -1651,7 +1652,7 @@ "time": "38 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 4 ], [ "fabric_standard_nostretch", 4 ] ] + "using": [ [ "tailoring_cotton_patchwork", 4 ] ] }, { "result": "tireplate", @@ -1677,7 +1678,7 @@ "time": "2 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 8 ], [ "fabric_lycra", 7 ] ], + "using": [ [ "tailoring_lycra_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1691,7 +1692,7 @@ "time": "6 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 23 ], [ "fabric_standard_nostretch", 18 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_cotton_patchwork", 36 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_closures" } ] }, { @@ -1706,7 +1707,7 @@ "time": "8 h 20 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 45 ], [ "fabric_fur_pelt", 5 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_fur_patchwork", 12 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1725,7 +1726,7 @@ "time": "8 h 20 m", "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ], [ "recipe_fauxfur", 2 ] ], - "using": [ [ "sewing_standard", 45 ], [ "fabric_standard_nostretch", 14 ], [ "fabric_fauxfur", 12 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_faux_fur_patchwork", 12 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -1745,7 +1746,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ], - "using": [ [ "sewing_standard", 45 ], [ "fabric_leather_hide", 4 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 12 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" }, @@ -1764,7 +1765,7 @@ "skills_required": [ "fabrication", 5 ], "time": "10 h 30 m", "autolearn": true, - "using": [ [ "sewing_standard", 100 ], [ "fabric_standard_nostretch", 14 ] ], + "using": [ [ "tailoring_cotton_patchwork", 16 ] ], "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army_modern", 1 ], [ "jacket_army", 1 ], [ "jacket_army_modern", 1 ] ], @@ -1804,7 +1805,7 @@ "time": "1 h", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 4 ], [ "fabric_standard_nostretch", 5 ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ] }, { "result": "tshirt", @@ -1816,7 +1817,7 @@ "skill_used": "tailor", "time": "2 m", "autolearn": true, - "byproducts": [ [ "rag", 2 ] ], + "byproducts": [ [ "cotton_patchwork", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "longshirt", 1 ] ] ] @@ -1832,7 +1833,7 @@ "time": "45 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 10 ], [ "fabric_standard_nostretch", 10 ] ] + "using": [ [ "tailoring_cotton_patchwork", 8 ] ] }, { "result": "under_armor", @@ -1845,7 +1846,7 @@ "time": "55 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_lycra", 4 ] ], + "using": [ [ "tailoring_lycra_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1859,7 +1860,7 @@ "time": "45 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 4 ] ] + "using": [ [ "tailoring_cotton_patchwork", 3 ] ] }, { "result": "unitard", @@ -1872,7 +1873,7 @@ "time": "3 h", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 15 ], [ "fabric_lycra", 10 ] ], + "using": [ [ "tailoring_lycra_patchwork", 10 ] ], "proficiencies": [ { "proficiency": "prof_elastics" } ] }, { @@ -1889,7 +1890,7 @@ "decomp_learn": 6, "autolearn": true, "qualities": [ { "id": "SEW", "level": 2 } ], - "using": [ [ "armor_kevlar_layered", 64 ] ], + "using": [ [ "armor_kevlar_layered", 24 ] ], "proficiencies": [ { "proficiency": "prof_polymerworking", "required": false, "time_multiplier": 1.25 } ] }, { @@ -1905,7 +1906,7 @@ "autolearn": true, "reversible": true, "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 3 ] ], - "using": [ [ "sewing_standard", 20 ], [ "fabric_leather_hide", 2 ], [ "fastener_large", 1 ] ], + "using": [ [ "tailoring_leather_patchwork", 4 ], [ "fastener_large", 1 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] }, { @@ -1917,7 +1918,7 @@ "skill_used": "tailor", "time": "6 m", "autolearn": true, - "byproducts": [ [ "leather", 5 ] ], + "byproducts": [ [ "leather", 4 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "flags": [ "NO_RESIZE" ], "components": [ [ [ "jacket_leather", 1 ] ] ] @@ -1952,7 +1953,7 @@ "time": "3 h 30 m", "autolearn": true, "reversible": true, - "using": [ [ "sewing_standard", 100 ], [ "fabric_felt", 13 ] ] + "using": [ [ "tailoring_felt_patchwork", 20 ] ] }, { "result": "lc_chainmail_vest", @@ -1964,7 +1965,7 @@ "difficulty": 7, "time": "7 h 10 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "using": [ [ "chainmail_standard", 7 ], [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "chainmail_standard", 7 ], [ "tailoring_cotton_patchwork", 6 ] ], "components": [ [ [ "lc_link_sheet", 7 ] ], [ [ "lc_chain_link", 175 ] ], [ [ "lc_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" } ] }, @@ -1973,7 +1974,7 @@ "type": "recipe", "copy-from": "lc_chainmail_vest", "time": "7 h 10 m", - "using": [ [ "chainmail_standard", 5 ], [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "chainmail_standard", 5 ], [ "tailoring_cotton_patchwork", 4 ] ], "components": [ [ [ "lc_link_sheet", 5 ] ], [ [ "lc_chain_link", 131 ] ], [ [ "lc_wire", 1 ] ] ] }, { @@ -1981,7 +1982,7 @@ "type": "recipe", "copy-from": "lc_chainmail_vest", "time": "8 h 5 m", - "using": [ [ "chainmail_standard", 10 ], [ "fabric_standard_nostretch", 9 ] ], + "using": [ [ "chainmail_standard", 10 ], [ "tailoring_cotton_patchwork", 9 ] ], "components": [ [ [ "lc_link_sheet", 10 ] ], [ [ "lc_chain_link", 210 ] ], [ [ "lc_wire", 2 ] ] ] }, { @@ -1994,7 +1995,7 @@ "difficulty": 7, "time": "7 h 10 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "using": [ [ "chainmail_standard", 7 ], [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "chainmail_standard", 7 ], [ "tailoring_cotton_patchwork", 6 ] ], "components": [ [ [ "mc_link_sheet", 7 ] ], [ [ "mc_chain_link", 175 ] ], [ [ "mc_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" } ] }, @@ -2003,7 +2004,7 @@ "type": "recipe", "copy-from": "mc_chainmail_vest", "time": "7 h 10 m", - "using": [ [ "chainmail_standard", 5 ], [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "chainmail_standard", 5 ], [ "tailoring_cotton_patchwork", 4 ] ], "components": [ [ [ "mc_link_sheet", 5 ] ], [ [ "mc_chain_link", 131 ] ], [ [ "mc_wire", 1 ] ] ] }, { @@ -2011,7 +2012,7 @@ "type": "recipe", "copy-from": "mc_chainmail_vest", "time": "8 h 5 m", - "using": [ [ "chainmail_standard", 10 ], [ "fabric_standard_nostretch", 9 ] ], + "using": [ [ "chainmail_standard", 10 ], [ "tailoring_cotton_patchwork", 9 ] ], "components": [ [ [ "mc_link_sheet", 10 ] ], [ [ "mc_chain_link", 210 ] ], [ [ "mc_wire", 2 ] ] ] }, { @@ -2024,7 +2025,7 @@ "difficulty": 7, "time": "7 h 10 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "using": [ [ "chainmail_standard", 7 ], [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "chainmail_standard", 7 ], [ "tailoring_cotton_patchwork", 6 ] ], "components": [ [ [ "hc_link_sheet", 7 ] ], [ [ "hc_chain_link", 175 ] ], [ [ "hc_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" } ] }, @@ -2033,7 +2034,7 @@ "type": "recipe", "copy-from": "hc_chainmail_vest", "time": "7 h 10 m", - "using": [ [ "chainmail_standard", 5 ], [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "chainmail_standard", 5 ], [ "tailoring_cotton_patchwork", 4 ] ], "components": [ [ [ "hc_link_sheet", 5 ] ], [ [ "hc_chain_link", 131 ] ], [ [ "hc_wire", 1 ] ] ] }, { @@ -2041,7 +2042,7 @@ "type": "recipe", "copy-from": "hc_chainmail_vest", "time": "8 h 5 m", - "using": [ [ "chainmail_standard", 10 ], [ "fabric_standard_nostretch", 9 ] ], + "using": [ [ "chainmail_standard", 10 ], [ "tailoring_cotton_patchwork", 9 ] ], "components": [ [ [ "hc_link_sheet", 10 ] ], [ [ "hc_chain_link", 210 ] ], [ [ "hc_wire", 2 ] ] ] }, { @@ -2054,7 +2055,7 @@ "difficulty": 7, "time": "7 h 10 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "using": [ [ "chainmail_standard", 7 ], [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "chainmail_standard", 7 ], [ "tailoring_cotton_patchwork", 6 ] ], "components": [ [ [ "ch_link_sheet", 7 ] ], [ [ "ch_chain_link", 175 ] ], [ [ "ch_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" } ] }, @@ -2063,7 +2064,7 @@ "type": "recipe", "copy-from": "ch_chainmail_vest", "time": "7 h 10 m", - "using": [ [ "chainmail_standard", 5 ], [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "chainmail_standard", 5 ], [ "tailoring_cotton_patchwork", 4 ] ], "components": [ [ [ "ch_link_sheet", 5 ] ], [ [ "ch_chain_link", 131 ] ], [ [ "ch_wire", 1 ] ] ] }, { @@ -2071,7 +2072,7 @@ "type": "recipe", "copy-from": "ch_chainmail_vest", "time": "8 h 5 m", - "using": [ [ "chainmail_standard", 10 ], [ "fabric_standard_nostretch", 9 ] ], + "using": [ [ "chainmail_standard", 10 ], [ "tailoring_cotton_patchwork", 9 ] ], "components": [ [ [ "ch_link_sheet", 10 ] ], [ [ "ch_chain_link", 210 ] ], [ [ "ch_wire", 2 ] ] ] }, { @@ -2084,7 +2085,7 @@ "difficulty": 7, "time": "7 h 10 m", "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ], - "using": [ [ "chainmail_standard", 7 ], [ "fabric_standard_nostretch", 6 ] ], + "using": [ [ "chainmail_standard", 7 ], [ "tailoring_cotton_patchwork", 6 ] ], "components": [ [ [ "qt_link_sheet", 7 ] ], [ [ "qt_chain_link", 175 ] ], [ [ "qt_wire", 1 ] ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_chain_armour" } ] }, @@ -2093,7 +2094,7 @@ "type": "recipe", "copy-from": "qt_chainmail_vest", "time": "7 h 10 m", - "using": [ [ "chainmail_standard", 5 ], [ "fabric_standard_nostretch", 4 ] ], + "using": [ [ "chainmail_standard", 5 ], [ "tailoring_cotton_patchwork", 4 ] ], "components": [ [ [ "qt_link_sheet", 5 ] ], [ [ "qt_chain_link", 131 ] ], [ [ "qt_wire", 1 ] ] ] }, { @@ -2101,7 +2102,7 @@ "type": "recipe", "copy-from": "qt_chainmail_vest", "time": "8 h 5 m", - "using": [ [ "chainmail_standard", 10 ], [ "fabric_standard_nostretch", 9 ] ], + "using": [ [ "chainmail_standard", 10 ], [ "tailoring_cotton_patchwork", 9 ] ], "components": [ [ [ "qt_link_sheet", 10 ] ], [ [ "qt_chain_link", 210 ] ], [ [ "qt_wire", 2 ] ] ] }, { @@ -2678,7 +2679,7 @@ "time": "1 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton", 1 ], [ "clasps", 3 ], [ "fabric_standard_nostretch", 5 ] ], + "using": [ [ "tailoring_cotton_patchwork", 2 ], [ "clasps", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" } ] }, { @@ -2692,7 +2693,7 @@ "time": "2 h", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_leather_small", 4 ], [ "clasps", 3 ] ], + "using": [ [ "tailoring_leather_patchwork", 2 ], [ "clasps", 3 ] ], "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_leatherworking_basic" } ] } ] diff --git a/data/json/recipes/chem/chemicals.json b/data/json/recipes/chem/chemicals.json index 25c06c74e8e4f..35f923e184cc3 100644 --- a/data/json/recipes/chem/chemicals.json +++ b/data/json/recipes/chem/chemicals.json @@ -13,7 +13,7 @@ "autolearn": true, "charges": 1, "qualities": [ { "id": "BOIL", "level": 1 } ], - "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ], [ [ "rag", -1 ], [ "felt_patch", -1 ] ] ], + "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ], "components": [ [ [ "feces_bird", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { @@ -89,7 +89,7 @@ { "id": "CONTAIN", "level": 1 }, { "id": "SEPARATE", "level": 1 } ], - "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "lemon", 8 ], diff --git a/data/json/recipes/chem/drugs.json b/data/json/recipes/chem/drugs.json index e798c5c5ea0d3..00fd39813b9cd 100644 --- a/data/json/recipes/chem/drugs.json +++ b/data/json/recipes/chem/drugs.json @@ -12,7 +12,7 @@ "book_learn": [ [ "adv_chemistry", 7 ], [ "recipe_labchem", 7 ] ], "charges": 1941, "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SEPARATE", "level": 1 }, { "id": "ANALYSIS", "level": 1 } ], - "tools": [ [ [ "surface_heat", 60, "LIST" ] ], [ [ "rag", -1 ], [ "felt_patch", -1 ] ] ], + "tools": [ [ [ "surface_heat", 60, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ], "components": [ [ [ "feces_bird", 17 ] ], [ [ "formic_acid", 23 ] ], diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 52c90e7d4b8e8..32e581da1707b 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -127,7 +127,7 @@ "batch_time_factors": [ 50, 4 ], "autolearn": true, "book_learn": [ [ "brewing_cookbook", 6 ] ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "sake_unfiltered", 1 ] ] ] }, { diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index a2884eee25883..42ae8f502a02c 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1505,7 +1505,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ], @@ -1529,7 +1533,7 @@ "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ] ] }, { @@ -1549,7 +1553,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "irradiated_apple", 24 ], [ "apple", 24 ] ], @@ -1573,7 +1581,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ], @@ -1597,7 +1609,7 @@ "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ] ] }, { @@ -1617,7 +1629,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "irradiated_orange", 24 ], [ "orange", 24 ] ], @@ -1641,7 +1657,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ], @@ -1665,7 +1685,7 @@ "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ] ] }, { @@ -1685,7 +1705,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "irradiated_cranberries", 36 ], [ "cranberries", 36 ] ], @@ -1709,7 +1733,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], @@ -1734,7 +1762,7 @@ "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water_clean", 2 ] ] ] }, { @@ -1754,7 +1782,11 @@ "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], [ [ "rag", -1 ] ] ], + "tools": [ + [ [ "surface_heat", 200, "LIST" ] ], + [ [ "pot_canning", -1 ], [ "pot_canning_clay", -1 ] ], + [ [ "cotton_patchwork", -1 ] ] + ], "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ], diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json index 60572ff6f9646..13d670f1bcc01 100644 --- a/data/json/recipes/food/dairy_products.json +++ b/data/json/recipes/food/dairy_products.json @@ -89,7 +89,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ], - [ [ "colander_steel", -1 ], [ "sieve_steel", -1 ], [ "sieve_primitive", -1 ], [ "rag", -1 ] ] + [ [ "colander_steel", -1 ], [ "sieve_steel", -1 ], [ "sieve_primitive", -1 ], [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "raw_butter", 8 ], [ "butter", 8 ] ] ] } diff --git a/data/json/recipes/food/drinks.json b/data/json/recipes/food/drinks.json index 32ef2486d17f9..0ca0febe32ed4 100644 --- a/data/json/recipes/food/drinks.json +++ b/data/json/recipes/food/drinks.json @@ -34,7 +34,7 @@ "time": "3 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "pineapple", 1 ], [ "irradiated_pineapple", 1 ] ] ] }, { @@ -51,7 +51,7 @@ "batch_time_factors": [ 50, 4 ], "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "BOIL", "level": 2 } ], - "tools": [ [ [ "rag", -1 ] ], [ [ "water_boiling_heat", 3, "LIST" ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ], [ [ "water_boiling_heat", 3, "LIST" ] ] ], "components": [ [ [ "pomegranate", 1 ], [ "irradiated_pomegranate", 1 ] ], [ [ "sugar", 10 ] ] ] }, { diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index cb03ff1083f4d..f96ccc6879d81 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -93,7 +93,7 @@ "autolearn": true, "book_learn": [ [ "cookbook_sushi", 3 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], - "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 20, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "soy_sauce_unstrained", 1 ] ] ] }, { diff --git a/data/json/recipes/other/cords_and_ropes.json b/data/json/recipes/other/cords_and_ropes.json index bd5cd5f7d2a82..798c1b169d60c 100644 --- a/data/json/recipes/other/cords_and_ropes.json +++ b/data/json/recipes/other/cords_and_ropes.json @@ -130,7 +130,7 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_fibers" }, { "proficiency": "prof_fibers_rope" } ], - "components": [ [ [ "rag", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ] + "components": [ [ [ "cotton_patchwork", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ] }, { "type": "recipe", @@ -147,7 +147,7 @@ "tools": [ [ [ "spinwheelitem", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_fibers" }, { "proficiency": "prof_fibers_rope" } ], - "components": [ [ [ "rag", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ] + "components": [ [ [ "cotton_patchwork", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ] }, { "type": "recipe", @@ -191,7 +191,7 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_fibers" }, { "proficiency": "prof_fibers_rope" } ], - "components": [ [ [ "rag", 150 ], [ "leather", 150 ], [ "felt_patch", 150 ], [ "tanned_hide", 25 ] ] ] + "components": [ [ [ "cotton_patchwork", 150 ], [ "leather", 150 ], [ "felt_patch", 150 ], [ "tanned_hide", 25 ] ] ] }, { "type": "recipe", @@ -208,7 +208,7 @@ "tools": [ [ [ "spinwheelitem", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_fibers" }, { "proficiency": "prof_fibers_rope" } ], - "components": [ [ [ "rag", 150 ], [ "leather", 150 ], [ "felt_patch", 150 ], [ "tanned_hide", 25 ] ] ] + "components": [ [ [ "cotton_patchwork", 150 ], [ "leather", 150 ], [ "felt_patch", 150 ], [ "tanned_hide", 25 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 42f22a7a90dc8..35af4deeccf77 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -326,6 +326,7 @@ "skills_required": [ "survival", 3 ], "difficulty": 1, "time": "15 m", + "result_mult": 27, "autolearn": true, "components": [ [ [ "soap", 5 ] ], [ [ "water_clean", 3 ] ], [ [ "wool_staple", 1 ] ] ] }, @@ -384,14 +385,14 @@ "type": "recipe", "activity_level": "NO_EXERCISE", "result": "rag", - "id_suffix": "from_sheet", + "id_suffix": "from_patches", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", - "time": "1 m", + "time": "0 s", + "//": "This should be obsoleted once we're sure nobody has any rags left and they're removed from any recipes i missed. Can be removed during feature freeze for 0.H", "autolearn": true, - "qualities": [ { "id": "SEW", "level": 1 } ], - "components": [ [ [ "sheet_cotton", 16 ] ], [ [ "filament", 2, "LIST" ] ] ] + "components": [ [ [ "cotton_patchwork", 1 ] ] ] }, { "type": "recipe", @@ -519,6 +520,7 @@ "result": "rag", "id_suffix": "knitting", "category": "CC_OTHER", + "//": "This should be obsoleted once we're sure nobody has any rags left and they're removed from any recipes i missed.", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", "difficulty": 2, @@ -537,6 +539,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", "batch_time_factors": [ 70, 1 ], + "//": "This should be obsoleted once we're sure nobody has any rags left and they're removed from any recipes i missed.", "time": "18 s", "autolearn": true, "tools": [ [ [ "spinwheelitem", -1 ] ] ], @@ -553,7 +556,7 @@ "time": "60 m", "autolearn": true, "reversible": true, - "using": [ [ "tailoring_cotton", 7 ] ] + "using": [ [ "tailoring_cotton_patchwork", 12 ] ] }, { "type": "recipe", @@ -573,14 +576,14 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "nylon", - "id_suffix": "from_sheet", + "id_suffix": "from_scraps", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "tailor", "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "sheet_nylon", 4 ] ], [ [ "thread", 10 ] ] ] + "components": [ [ [ "scrap_nylon", 4 ] ], [ [ "thread", 10 ] ] ] }, { "type": "recipe", @@ -648,7 +651,19 @@ "time": "60 m", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "filament", 15, "LIST" ] ] ] + "components": [ [ [ "cotton_patchwork", 8 ] ], [ [ "filament", 15, "LIST" ] ] ] + }, + { + "result": "cotton_patchwork", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "tailor", + "time": "20 m", + "autolearn": true, + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], + "components": [ [ [ "scrap_cotton", 4 ] ], [ [ "filament", 15, "LIST" ] ] ] }, { "result": "sheet_neoprene_patchwork", @@ -660,7 +675,7 @@ "time": "60 m", "autolearn": true, "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "neoprene", 5 ] ], [ [ "filament", 15, "LIST" ] ] ] + "components": [ [ [ "neoprene", 8 ] ], [ [ "filament", 15, "LIST" ] ] ] }, { "result": "sheet_nomex_patchwork", @@ -672,7 +687,7 @@ "time": "60 m", "autolearn": true, "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "nomex", 5 ] ], [ [ "thread_nomex", 15 ] ] ] + "components": [ [ [ "nomex", 8 ] ], [ [ "thread_nomex", 15 ] ] ] }, { "type": "recipe", @@ -1080,6 +1095,19 @@ "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "budget_steel_chunk", 4 ] ] ] }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "cotton_patchwork", + "id_suffix": "from_rags", + "//": "This should be obsoleted once we're sure nobody has any rags left and they're removed from any recipes i missed.", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "tailor", + "time": "0 s", + "autolearn": true, + "components": [ [ [ "rag", 1 ] ] ] + }, { "result": "plastic_sheet", "type": "recipe", @@ -1103,7 +1131,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "bag_plastic", 1 ] ] ] }, { @@ -1117,7 +1145,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "plastic_sheet_small", 8 ] ] ] } ] diff --git a/data/json/recipes/other/medical.json b/data/json/recipes/other/medical.json index 13aa6e44730bd..092245ad177ff 100644 --- a/data/json/recipes/other/medical.json +++ b/data/json/recipes/other/medical.json @@ -10,7 +10,7 @@ "time": "30 s", "autolearn": true, "components": [ - [ [ "rag", 3 ], [ "medical_gauze", 1 ] ], + [ [ "cotton_patchwork", 3 ], [ "medical_gauze", 1 ] ], [ [ "duct_tape", 20 ], [ "medical_tape", 5 ] ], [ [ "disinfectant", 5 ], @@ -32,7 +32,7 @@ "autolearn": true, "charges": 1, "flags": [ "BLIND_EASY" ], - "components": [ [ [ "rag", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 1 ] ] ] }, { "result": "bandages_makeshift_bleached", @@ -204,7 +204,7 @@ "autolearn": true, "charges": 2, "flags": [ "BLIND_EASY" ], - "components": [ [ [ "rag", 2 ] ], [ [ "disinfectant", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ], [ [ "disinfectant", 1 ] ] ] }, { "type": "recipe", @@ -307,7 +307,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 } ], - "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "rag", 2 ] ] ] + "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "cotton_patchwork", 2 ] ] ] }, { "type": "recipe", @@ -334,7 +334,7 @@ "time": "5 m", "autolearn": true, "components": [ - [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], + [ [ "cotton_patchwork", 10 ], [ "medical_gauze", 4 ] ], [ [ "cordage", 2, "LIST" ], [ "duct_tape", 100 ], [ "medical_tape", 50 ] ], [ [ "stick", 2 ], [ "broom", 2 ], [ "2x4", 2 ], [ "pool_cue", 2 ], [ "mop", 2 ] ] ] @@ -351,7 +351,7 @@ "time": "2 m", "autolearn": true, "components": [ - [ [ "rag", 5 ], [ "medical_gauze", 2 ] ], + [ [ "cotton_patchwork", 5 ], [ "medical_gauze", 2 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ], [ "medical_tape", 25 ] ], [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "mop", 1 ] ] ] @@ -368,7 +368,7 @@ "time": "2 m", "autolearn": true, "components": [ - [ [ "rag", 2 ], [ "medical_gauze", 1 ] ], + [ [ "cotton_patchwork", 2 ], [ "medical_gauze", 1 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 25 ], [ "medical_tape", 10 ] ], [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ] ] @@ -385,7 +385,7 @@ "time": "2 m", "autolearn": true, "components": [ - [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], + [ [ "cotton_patchwork", 10 ], [ "medical_gauze", 4 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 100 ], [ "medical_tape", 50 ] ], [ [ "stick", 2 ], [ "broom", 2 ], [ "2x4", 2 ], [ "pool_cue", 2 ], [ "mop", 2 ] ] ] @@ -402,7 +402,7 @@ "time": "2 m", "autolearn": true, "components": [ - [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], + [ [ "cotton_patchwork", 10 ], [ "medical_gauze", 4 ] ], [ [ "cordage", 2, "LIST" ], [ "duct_tape", 100 ], [ "medical_tape", 50 ] ], [ [ "stick", 4 ], [ "broom", 4 ], [ "2x4", 4 ], [ "pool_cue", 4 ], [ "mop", 4 ] ] ] @@ -419,7 +419,7 @@ "time": "2 m", "autolearn": true, "components": [ - [ [ "rag", 5 ], [ "medical_gauze", 2 ] ], + [ [ "cotton_patchwork", 5 ], [ "medical_gauze", 2 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 100 ], [ "medical_tape", 50 ] ], [ [ "stick", 1 ], [ "broom", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ] ] ] @@ -449,7 +449,7 @@ "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_carving" }, { "proficiency": "prof_carpentry_basic" } ], "components": [ - [ [ "rag", 10 ], [ "medical_gauze", 4 ] ], + [ [ "cotton_patchwork", 10 ], [ "medical_gauze", 4 ] ], [ [ "cordage", 2, "LIST" ], [ "duct_tape", 100 ], [ "medical_tape", 50 ] ], [ [ "stick", 2 ], [ "broom", 2 ], [ "2x4", 2 ], [ "pool_cue", 2 ] ] ] diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index f288ab9c58eff..7ca8606d99b1d 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -769,7 +769,7 @@ { "proficiency": "prof_welding_basic", "fail_multiplier": 1.5 }, { "proficiency": "prof_welding" } ], - "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "rag", 20 ], [ "sheet", 1 ] ], [ [ "pipe_fittings", 4 ] ] ] + "components": [ [ [ "pipe", 4 ] ], [ [ "spring", 2 ] ], [ [ "cotton_patchwork", 20 ], [ "sheet", 1 ] ], [ [ "pipe_fittings", 4 ] ] ] }, { "type": "recipe", @@ -795,7 +795,7 @@ [ [ "spring", 2 ] ], [ [ "leather", 12 ], [ "fur", 12 ], [ "tanned_hide", 3 ], [ "tanned_pelt", 3 ] ], [ [ "pipe_fittings", 4 ] ], - [ [ "rag", 8 ] ] + [ [ "cotton_patchwork", 8 ] ] ] }, { @@ -905,6 +905,6 @@ "time": "1 s", "autolearn": true, "components": [ [ [ "cotton_patchwork", 1 ] ] ], - "//": "This is intended to be an interim measure until all recipes can be moved away from using or creating rags. Once that's done this can be considered obsolete" + "//": "This is intended to be an interim measure until all recipes can be moved away from using or creating rags. Once we're sure rags are gone, this can be obsolete." } ] diff --git a/data/json/recipes/other/vehicle.json b/data/json/recipes/other/vehicle.json index 1092002de37fb..52705ccd6b4c6 100644 --- a/data/json/recipes/other/vehicle.json +++ b/data/json/recipes/other/vehicle.json @@ -55,7 +55,7 @@ "time": "2 m", "book_learn": [ [ "mag_fieldrepair", 1 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 4 ], [ "leather_belt", 1 ], [ "rope_superior_short", 1, "LIST" ] ], [ [ "duct_tape", 20 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ], [ "leather_belt", 1 ], [ "rope_superior_short", 1, "LIST" ] ], [ [ "duct_tape", 20 ] ] ] }, { "result": "filter_air_makeshift", diff --git a/data/json/recipes/practice/health.json b/data/json/recipes/practice/health.json index a8b69e061781d..3299caa287d65 100644 --- a/data/json/recipes/practice/health.json +++ b/data/json/recipes/practice/health.json @@ -21,7 +21,7 @@ [ "bandages_makeshift_boiled", 1 ] ] ], - "byproducts": [ [ "rag", 1 ] ] + "byproducts": [ [ "cotton_patchwork", 1 ] ] }, { "id": "prac_health_care_int", @@ -49,6 +49,6 @@ [ "bandages_makeshift_boiled", 2 ] ] ], - "byproducts": [ [ "rag", 2 ] ] + "byproducts": [ [ "cotton_patchwork", 2 ] ] } ] diff --git a/data/json/recipes/practice/tailoring.json b/data/json/recipes/practice/tailoring.json index 520dd7faea9a7..6cd46f2296933 100644 --- a/data/json/recipes/practice/tailoring.json +++ b/data/json/recipes/practice/tailoring.json @@ -32,7 +32,7 @@ "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 }, "autolearn": [ [ "tailor", 2 ] ], "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "components": [ [ [ "sheet_cotton", 10 ], [ "sheet_cotton_patchwork", 1 ], [ "rag", 1 ] ] ], + "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ], [ "cotton_patchwork", 1 ], [ "scrap_cotton", 2 ] ] ], "using": [ [ "sewing_standard", 10 ], [ "fastener_small", 2 ] ] }, { @@ -49,8 +49,8 @@ "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 }, "autolearn": [ [ "tailor", 2 ] ], "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "rag", 1 ] ] ], - "byproducts": [ [ "water", 2 ], [ "rag", 1 ] ], + "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "cotton_patchwork", 1 ] ] ], + "byproducts": [ [ "water", 2 ], [ "cotton_patchwork", 1 ] ], "using": [ [ "waterproofing_plastic_sheets", 4 ] ] }, { @@ -67,8 +67,10 @@ "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 }, "autolearn": [ [ "tailor", 2 ] ], "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "components": [ [ [ "sheet_kevlar", 22 ], [ "sheet_nomex", 22 ], [ "sheet_nomex_patchwork", 1 ], [ "nomex", 2 ] ] ], - "using": [ [ "sewing_standard", 20 ] ] + "components": [ + [ [ "sheet_kevlar", 1 ], [ "sheet_nomex", 1 ], [ "sheet_nomex_patchwork", 1 ], [ "nomex", 8 ], [ "scrap_nomex", 12 ] ] + ], + "using": [ [ "sewing_aramids", 20 ] ] }, { "id": "prac_elastics", @@ -84,7 +86,7 @@ "practice_data": { "min_difficulty": 1, "max_difficulty": 2, "skill_limit": 3 }, "autolearn": [ [ "tailor", 2 ] ], "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ], - "components": [ [ [ "sheet_lycra", 22 ], [ "sheet_lycra_patchwork", 1 ], [ "lycra_patch", 2 ] ] ], + "components": [ [ [ "sheet_lycra", 1 ], [ "sheet_lycra_patchwork", 1 ], [ "lycra_patch", 2 ] ] ], "using": [ [ "sewing_standard", 20 ] ] }, { diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 207fdc33cd1ed..4059269b46194 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -447,7 +447,7 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "arrow_field_point_fletched", 1 ] ], - [ [ "rag", 1, "NO_RECOVER" ] ], + [ [ "cotton_patchwork", 1, "NO_RECOVER" ] ], [ [ "lamp_oil", 50, "NO_RECOVER" ], [ "motor_oil", 50, "NO_RECOVER" ], @@ -908,7 +908,7 @@ [ "2x4", 1 ], [ "splinter", 2 ], [ "pine_bough", 1 ], - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "paper", 5 ], [ "cardboard", 1 ], [ "rolling_paper", 30 ], diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 5816807ec32be..158e9d4889f10 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -606,7 +606,7 @@ "type": "uncraft", "activity_level": "LIGHT_EXERCISE", "time": "6 s", - "components": [ [ [ "rag", 4 ] ], [ [ "stick", 1 ] ] ], + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "stick", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -2295,14 +2295,14 @@ "type": "uncraft", "time": "5 m", "activity_level": "LIGHT_EXERCISE", - "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "jug_plastic", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "char_purifier_clay", "type": "uncraft", "time": "5 m", "activity_level": "LIGHT_EXERCISE", - "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "clay_hydria", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "result": "clock", @@ -2342,7 +2342,13 @@ "activity_level": "LIGHT_EXERCISE", "time": "3 m", "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "rag", 2 ] ], [ [ "RAM", 1 ] ], [ [ "e_scrap", 2 ] ] ] + "components": [ + [ [ "scrap", 1 ] ], + [ [ "plastic_chunk", 2 ] ], + [ [ "cotton_patchwork", 2 ] ], + [ [ "RAM", 1 ] ], + [ [ "e_scrap", 2 ] ] + ] }, { "result": "crown_golden", @@ -2485,31 +2491,39 @@ "activity_level": "NO_EXERCISE", "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 6 ] ], [ [ "down_feather", 40 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ], [ [ "down_feather", 40 ] ] ] }, { "result": "sheet", "type": "uncraft", "activity_level": "NO_EXERCISE", "time": "8 s", - "components": [ [ [ "sheet_cotton_patchwork", 8 ] ] ], + "components": [ [ [ "sheet_cotton_patchwork", 12 ] ] ], "flags": [ "BLIND_EASY" ] }, { "result": "sheet_cotton_patchwork", "type": "uncraft", "activity_level": "NO_EXERCISE", - "time": "1 s", + "time": "10 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "cotton_patchwork", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 8 ] ] ] }, { "result": "cotton_patchwork", "type": "uncraft", "activity_level": "NO_EXERCISE", - "time": "1 s", - "components": [ [ [ "rag", 1 ] ] ], - "//": "This is intended to be an interim measure until all recipes can be moved away from using or creating rags. Once that's done this can be considered obsolete" + "time": "1 m", + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ [ [ "scrap_cotton", 4 ] ] ] + }, + { + "result": "scrap_cotton", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "1 m", + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ [ [ "thread", 10 ] ] ] }, { "result": "sheet_neoprene_patchwork", @@ -2517,15 +2531,32 @@ "activity_level": "NO_EXERCISE", "time": "1 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "neoprene", 1 ] ], [ [ "scrap_neoprene", 20 ] ] ] + "components": [ [ [ "neoprene", 8 ] ] ] }, { "result": "sheet_nomex_patchwork", "type": "uncraft", "activity_level": "NO_EXERCISE", "time": "1 m", + "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], + "components": [ [ [ "nomex", 8 ] ] ] + }, + { + "result": "nomex", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "1 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "nomex", 1 ] ], [ [ "scrap_nomex", 20 ] ] ] + "components": [ [ [ "scrap_nomex", 4 ] ] ] + }, + { + "result": "scrap_nomex", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "35 m", + "qualities": [ { "id": "CUT_FINE", "level": 1 } ], + "components": [ [ [ "thread_nomex", 40 ] ] ], + "//": "Thread is odd so we're just kind of giving you some whole pieces of thread, when it shouldn't be near that, but we need a source." }, { "result": "tanned_hide", @@ -2533,7 +2564,7 @@ "time": "2 m", "activity_level": "LIGHT_EXERCISE", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "leather", 6 ] ] ] + "components": [ [ [ "leather", 8 ] ] ] }, { "result": "tanned_pelt", @@ -2541,7 +2572,7 @@ "time": "2 m", "activity_level": "LIGHT_EXERCISE", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "fur", 6 ] ] ] + "components": [ [ [ "fur", 8 ] ] ] }, { "result": "eink_tablet_pc", @@ -3446,7 +3477,13 @@ "difficulty": 2, "time": "5 m", "qualities": [ { "id": "WRENCH", "level": 1 } ], - "components": [ [ [ "scrap", 5 ] ], [ [ "cu_pipe", 1 ] ], [ [ "pilot_light", 1 ] ], [ [ "rag", 5 ] ], [ [ "metal_tank_little", 2 ] ] ] + "components": [ + [ [ "scrap", 5 ] ], + [ [ "cu_pipe", 1 ] ], + [ [ "pilot_light", 1 ] ], + [ [ "cotton_patchwork", 5 ] ], + [ [ "metal_tank_little", 2 ] ] + ] }, { "result": "oxygen_tank", @@ -3488,7 +3525,7 @@ "activity_level": "NO_EXERCISE", "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 4 ] ], [ [ "cotton_ball", 8 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "cotton_ball", 8 ] ] ] }, { "result": "makeshift_pillow", @@ -3496,7 +3533,7 @@ "activity_level": "NO_EXERCISE", "time": "1 m", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 4 ] ], [ [ "withered", 12 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "withered", 12 ] ] ] }, { "result": "pipe", @@ -3643,7 +3680,8 @@ "activity_level": "LIGHT_EXERCISE", "time": "1 h", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "thread", 80 ] ] ] + "components": [ [ [ "scrap_cotton", 4 ] ] ], + "//": "This should be obsoleted once we're sure nobody has any rags left and they're removed from any recipes i missed." }, { "result": "stick_fiber", @@ -4279,7 +4317,13 @@ "activity_level": "LIGHT_EXERCISE", "time": "30 s", "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "rag", 2 ] ], [ [ "RAM", 1 ] ], [ [ "e_scrap", 2 ] ] ] + "components": [ + [ [ "scrap", 1 ] ], + [ [ "plastic_chunk", 2 ] ], + [ [ "cotton_patchwork", 2 ] ], + [ [ "RAM", 1 ] ], + [ [ "e_scrap", 2 ] ] + ] }, { "result": "tank_top", @@ -4287,7 +4331,7 @@ "activity_level": "NO_EXERCISE", "skill_used": "tailor", "time": "1 m", - "components": [ [ [ "rag", 4 ] ] ], + "components": [ [ [ "cotton_patchwork", 4 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -4472,7 +4516,7 @@ "activity_level": "NO_EXERCISE", "skill_used": "tailor", "time": "1 m", - "components": [ [ [ "rag", 5 ] ] ], + "components": [ [ [ "cotton_patchwork", 5 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -4481,7 +4525,7 @@ "activity_level": "LIGHT_EXERCISE", "skill_used": "tailor", "time": "1 m", - "components": [ [ [ "rag", 5 ] ] ], + "components": [ [ [ "cotton_patchwork", 5 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -4489,7 +4533,7 @@ "type": "uncraft", "activity_level": "LIGHT_EXERCISE", "time": "6 s", - "components": [ [ [ "rag", 1 ] ] ], + "components": [ [ [ "cotton_patchwork", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, { @@ -4918,7 +4962,7 @@ "activity_level": "NO_EXERCISE", "skill_used": "fabrication", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 10 ] ] ], + "components": [ [ [ "cotton_patchwork", 10 ] ] ], "flags": [ "BLIND_EASY" ] }, { @@ -5181,7 +5225,7 @@ "time": "30 m", "difficulty": 1, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 25 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ] + "components": [ [ [ "cotton_patchwork", 25 ] ], [ [ "element", 5 ] ], [ [ "cable", 5 ] ] ] }, { "result": "wearable_light", @@ -5190,7 +5234,7 @@ "skill_used": "fabrication", "time": "30 s", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "flashlight", 1 ] ], [ [ "rag", 2 ] ] ] + "components": [ [ [ "flashlight", 1 ] ], [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "miner_hat", @@ -5202,7 +5246,13 @@ "components": [ [ [ "hat_hard", 1 ], [ "helmet_bike", 1 ] ], [ [ "flashlight", 1 ] ], - [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ] + [ + [ "cotton_patchwork", 2 ], + [ "leather", 2 ], + [ "cordage", 1, "LIST" ], + [ "duct_tape", 10 ], + [ "medical_tape", 20 ] + ] ] }, { @@ -6018,7 +6068,7 @@ "type": "uncraft", "activity_level": "LIGHT_EXERCISE", "time": "12 s", - "components": [ [ [ "string_6", 1 ] ], [ [ "rag", 1 ] ] ] + "components": [ [ [ "string_6", 1 ] ], [ [ "cotton_patchwork", 1 ] ] ] }, { "result": "horn_bicycle", @@ -6098,7 +6148,7 @@ "activity_level": "LIGHT_EXERCISE", "time": "5 m", "qualities": [ { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "thread", 7 ] ], [ [ "rag", 5 ] ] ] + "components": [ [ [ "thread", 7 ] ], [ [ "cotton_patchwork", 5 ] ] ] }, { "result": "heavy_crowbar", @@ -6115,8 +6165,26 @@ "time": "10 m", "skill_used": "tailor", "difficulty": 3, - "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "thread_kevlar", 2 ] ] ] + "qualities": [ { "id": "CUT_FINE", "level": 2 } ], + "components": [ [ [ "thread_kevlar", 40 ] ] ], + "//": "Realistically, this may be out of the question (though I have not found info to the contrary), and a full sheet would give way more thread, but this is to keep the time down" + }, + { + "result": "scrap_kevlar", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "1 m", + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ [ [ "thread_kevlar", 10 ] ] ] + }, + { + "result": "sheet_kevlar_layered", + "type": "uncraft", + "activity_level": "NO_EXERCISE", + "time": "10 m", + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ [ [ "sheet_kevlar", 16 ] ] ], + "//": "just ripping the seams to separate the 16 layers" }, { "result": "office_letter_opener", @@ -6126,6 +6194,16 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "silver_small", 8 ] ] ] }, + { + "result": "leather_tarp", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "10 m", + "skill_used": "tailor", + "difficulty": 1, + "qualities": [ { "id": "CUT", "level": 2 } ], + "components": [ [ [ "leather", 6 ] ] ] + }, { "result": "bag_garbage", "type": "uncraft", @@ -6164,5 +6242,157 @@ [ [ "e_scrap", 3 ] ], [ [ "lock", 1 ] ] ] + }, + { + "result": "boots_combat", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "leather", 4 ], [ "scrap_kevlar", 4 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "motorbike_boots", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "leather", 16 ], [ "scrap_kevlar", 16 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "motor_police_boots", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "leather", 16 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "boots_bunker", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "nomex", 24 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "boots_fur", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "fur", 8 ], [ "leather", 10 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "xs_boots_fur", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "fur", 6 ], [ "leather", 8 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "xl_boots_fur", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "fur", 10 ], [ "leather", 12 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "sneakers", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "sole_rubber", 1 ], [ "cotton_patchwork", 8 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "hat_boonie", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "cotton_patchwork", 16 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "hat_cotton", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "cotton_patchwork", 12 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "hat_fur", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "fur", 3 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "hat_faux_fur", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "faux_fur", 3 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "hat_hunting", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "felt_patch", 32 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "breeches", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "60 s", + "components": [ [ [ "cotton_patchwork", 32 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "pants_cargo", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "10 m", + "components": [ [ [ "cotton_patchwork", 80 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "pants_leather", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "24 s", + "components": [ [ [ "leather", 12 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "sleeping_bag_fur_roll", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "20 m", + "components": [ [ [ "cotton_patchwork", 60 ], [ "fur", 8 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "backpack", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "10 m", + "components": [ [ [ "nylon", 64 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] + }, + { + "result": "blazer", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "time": "10 m", + "components": [ [ [ "felt_patch", 150 ] ] ], + "qualities": [ { "id": "CUT", "level": 1 } ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 3323e3ad557c6..1d477a12ddec8 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -1028,7 +1028,7 @@ "book_learn": [ [ "cookbook_sushi", 3 ], [ "cookbook_eatyrway", 4 ] ], "time": "45 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], "batch_time_factors": [ 50, 2 ], "components": [ [ [ "soy_milk", 5 ] ], [ [ "water_clean", 1 ] ], [ [ "lemon", 1 ], [ "vinegar", 1 ] ] ] @@ -2520,7 +2520,7 @@ "difficulty": 1, "time": "15 m", "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "FINE_GRIND", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "autolearn": true, "batch_time_factors": [ 30, 1 ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], @@ -2538,7 +2538,7 @@ "difficulty": 1, "time": "9 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "food_processor", 20 ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "food_processor", 20 ] ], [ [ "cotton_patchwork", -1 ] ] ], "autolearn": true, "batch_time_factors": [ 80, 1 ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], @@ -2554,7 +2554,7 @@ "difficulty": 1, "time": "13 m", "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "food_processor", 20 ] ], [ [ "rag", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], + "tools": [ [ [ "food_processor", 20 ] ], [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ], "autolearn": true, "batch_time_factors": [ 25, 2 ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], @@ -2627,7 +2627,7 @@ "time": "15 m", "book_learn": [ [ "manual_sealing", 1 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 2 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_knife_skills" }, @@ -2693,7 +2693,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ] ] }, { @@ -2708,7 +2708,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "cranberries", 3 ], [ "irradiated_cranberries", 3 ] ], [ [ "water_clean", 1 ] ] ] }, { @@ -2723,7 +2723,7 @@ "time": "7 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "irradiated_apple", 2 ], [ "apple", 2 ] ] ] }, { @@ -3064,7 +3064,7 @@ { "id": "BOIL", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 4, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "milk_curdled", 2 ] ], [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ] }, { @@ -3494,7 +3494,7 @@ "autolearn": true, "batch_time_factors": [ 60, 3 ], "qualities": [ { "id": "BOIL", "level": 2 } ], - "tools": [ [ [ "surface_heat", 12, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 12, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "maple_sap", 40 ] ] ] }, { @@ -6915,7 +6915,7 @@ "time": "3 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "water_clean", 1 ] ] ] }, { @@ -6931,7 +6931,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "sweet_fruit", 2, "LIST" ] ] ] }, { @@ -7762,7 +7762,7 @@ "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "honeycomb", 1 ] ] ] }, { @@ -7779,7 +7779,7 @@ "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "honey_glassed", 5 ] ] ] }, { @@ -9068,7 +9068,7 @@ "time": "5 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "rag", -1 ] ] ], + "tools": [ [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "mycus_fruit", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index c332637c5e50e..edbec654d3643 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -579,7 +579,11 @@ "using": [ [ "sewing_standard", 1 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "rag", 1 ], [ "bag_plastic", 1 ], [ "heatpack_used", 1 ] ], [ [ "oxy_powder", 5 ] ], [ [ "scrap", 1 ] ] ] + "components": [ + [ [ "cotton_patchwork", 1 ], [ "bag_plastic", 1 ], [ "heatpack_used", 1 ] ], + [ [ "oxy_powder", 5 ] ], + [ [ "scrap", 1 ] ] + ] }, { "type": "recipe", @@ -1447,7 +1451,7 @@ "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "flask_glass", -1 ] ], - [ [ "rag", -1 ] ], + [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ], [ [ "closed_loop_extractor_small", 50 ] ], [ [ "vac_pump", 300 ] ], @@ -1480,7 +1484,7 @@ "tools": [ [ [ "pipe", -1 ] ], [ [ "flask_glass", -1 ] ], - [ [ "rag", -1 ] ], + [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ], [ [ "butane_tank", 1 ], [ "butane_can", 1 ] ], [ [ "vac_pump", 300 ] ], @@ -1512,7 +1516,7 @@ "tools": [ [ [ "pointy_stick", -1 ], [ "pipe", -1 ] ], [ [ "flask_glass", -1 ] ], - [ [ "rag", -1 ] ], + [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ], [ [ "closed_loop_extractor_large", 100 ] ], [ [ "vac_pump", 300 ] ], @@ -1553,7 +1557,7 @@ [ "metal_funnel", -1 ] ], [ [ "flask_glass", -1 ] ], - [ [ "rag", -1 ] ], + [ [ "cotton_patchwork", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ], [ [ "butane_tank", 1 ], [ "butane_can", 1 ] ], [ [ "vac_pump", 300 ] ], diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 6d49cf4bf67bb..7f20360e10fd7 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -610,6 +610,11 @@ "result": "armor_scavenger", "obsolete": true }, + { + "type": "recipe", + "result": "rifle_case_xs_soft_leather", + "obsolete": true + }, { "type": "recipe", "result": "vac_oven_small_full", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 23957f4989975..a01fb2a54c327 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -24,7 +24,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], - "components": [ [ [ "rag", 6 ] ], [ [ "down_feather", 40 ] ] ] + "components": [ [ [ "cotton_patchwork", 6 ] ], [ [ "down_feather", 40 ] ] ] }, { "type": "recipe", @@ -38,7 +38,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], - "components": [ [ [ "rag", 60 ] ], [ [ "down_feather", 1160 ] ] ] + "components": [ [ [ "cotton_patchwork", 60 ] ], [ [ "down_feather", 1160 ] ] ] }, { "type": "recipe", @@ -51,7 +51,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], - "components": [ [ [ "rag", 4 ] ], [ [ "cotton_ball", 8 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "cotton_ball", 8 ] ] ] }, { "type": "recipe", @@ -64,7 +64,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 12 ] ], - "components": [ [ [ "rag", 4 ] ], [ [ "straw_pile", 3 ], [ "withered", 15 ], [ "pine_bough", 10 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "straw_pile", 3 ], [ "withered", 15 ], [ "pine_bough", 10 ] ] ] }, { "type": "recipe", @@ -373,7 +373,7 @@ "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "steel_chunk", 1 ], [ "steel_lump", 1 ] ], - [ [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ] + [ [ "cordage_short", 2, "LIST" ], [ "filament", 20, "LIST" ] ] ] }, { @@ -500,7 +500,11 @@ { "proficiency": "prof_closures", "required": false, "time_multiplier": 1.5 }, { "proficiency": "prof_closures_waterproofing" } ], - "components": [ [ [ "stick", 10 ], [ "2x4", 5 ] ], [ [ "leather", 20 ], [ "tanned_hide", 4 ] ], [ [ "filament", 40, "LIST" ] ] ] + "components": [ + [ [ "stick", 10 ], [ "2x4", 5 ] ], + [ [ "leather", 64 ], [ "sheet_leather_patchwork", 8 ], [ "tanned_hide", 8 ] ], + [ [ "filament", 40, "LIST" ] ] + ] }, { "type": "recipe", @@ -545,7 +549,7 @@ { "proficiency": "prof_leatherworking_basic", "required": false, "time_multiplier": 2, "fail_multiplier": 1.5 }, { "proficiency": "prof_furriery" } ], - "components": [ [ [ "fur", 24 ], [ "tanned_pelt", 4 ] ], [ [ "filament", 10, "LIST" ] ] ] + "components": [ [ [ "fur", 24 ], [ "tanned_pelt", 4 ], [ "sheet_fur_patchwork", 4 ] ], [ [ "filament", 20, "LIST" ] ] ] }, { "type": "recipe", @@ -767,7 +771,7 @@ "using": [ [ "filament", 50 ] ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "superglue", 1 ] ], [ [ "rag", 6 ] ], [ [ "plastic_chunk", 1 ] ] ] + "components": [ [ [ "superglue", 1 ] ], [ [ "cotton_patchwork", 6 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", @@ -875,7 +879,7 @@ "components": [ [ [ "xacto", 1 ] ], [ [ "saw", 1 ], [ "bow_saw", 1 ] ], - [ [ "rag", 1 ], [ "leather", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ] ] + [ [ "leather", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_patchwork", 1 ] ] ] }, { @@ -1354,7 +1358,7 @@ "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "jug_plastic", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 75 ] ] ], + "components": [ [ [ "jug_plastic", 1 ] ], [ [ "cotton_patchwork", 4 ] ], [ [ "charcoal", 75 ] ] ], "flags": [ "FULL_MAGAZINE" ] }, { @@ -1368,7 +1372,7 @@ "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "clay_hydria", 1 ] ], [ [ "rag", 4 ] ], [ [ "charcoal", 300 ] ] ], + "components": [ [ [ "clay_hydria", 1 ] ], [ [ "cotton_patchwork", 4 ] ], [ [ "charcoal", 300 ] ] ], "flags": [ "FULL_MAGAZINE" ] }, { @@ -1384,7 +1388,7 @@ "using": [ [ "cordage", 1 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_carving" } ], - "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rag", 4 ] ] ] + "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ] }, { "type": "recipe", @@ -1510,7 +1514,13 @@ "book_learn": [ [ "recipe_caseless", 5 ] ], "components": [ [ [ "rx12_injector", 1 ] ], - [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ] + [ + [ "cotton_patchwork", 2 ], + [ "leather", 2 ], + [ "cordage", 1, "LIST" ], + [ "duct_tape", 10 ], + [ "medical_tape", 20 ] + ] ] }, { @@ -1799,9 +1809,25 @@ "difficulty": 2, "time": "30 m", "autolearn": true, - "using": [ [ "sewing_standard", 60 ] ], + "using": [ [ "sewing_standard", 10 ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], + "components": [ [ [ "leather", 4 ], [ "fur", 4 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "leather_funnel", + "id_suffix": "from_sheets", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "tailor", + "skills_required": [ "survival", 1 ], + "difficulty": 2, + "time": "30 m", + "autolearn": true, + "using": [ [ "sewing_standard", 10 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], - "components": [ [ [ "leather", 4 ], [ "tanned_hide", 1 ], [ "fur", 4 ], [ "tanned_pelt", 1 ] ] ] + "components": [ [ [ "sheet_leather_patchwork", 1 ], [ "tanned_hide", 1 ], [ "sheet_fur_patchwork", 1 ], [ "tanned_pelt", 1 ] ] ] }, { "type": "recipe", @@ -2028,9 +2054,9 @@ "book_learn": [ [ "scots_tailor", 3 ], [ "scots_cookbook", 7 ] ], "using": [ [ "sewing_standard", 20 ] ], "components": [ - [ [ "large_stomach_sealed", 1 ], [ "tanned_hide", 2 ], [ "leather", 10 ], [ "tanned_pelt", 2 ], [ "fur", 10 ] ], + [ [ "large_stomach_sealed", 1 ], [ "tanned_hide", 2 ], [ "leather", 16 ], [ "tanned_pelt", 2 ], [ "fur", 16 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ], - [ [ "rag", 3 ] ], + [ [ "cotton_patchwork", 3 ] ], [ [ "adhesive", 1, "LIST" ], [ "medical_tape", 50 ] ] ] }, @@ -2048,7 +2074,7 @@ "using": [ [ "cordage_short", 2 ] ], "components": [ [ [ "leather", 1 ], [ "fur", 1 ] ], - [ [ "rag", 1 ] ], + [ [ "cotton_patchwork", 1 ] ], [ [ "razor_shaving", 1 ] ], [ [ "mirror", 1 ] ], [ [ "plastic_chunk", 1 ], [ "skewer_bone", 4 ], [ "splinter", 4 ] ] @@ -2066,7 +2092,7 @@ "reversible": true, "autolearn": true, "using": [ [ "cordage_short", 4 ] ], - "components": [ [ [ "leather", 1 ], [ "fur", 1 ] ], [ [ "rag", 1 ] ], [ [ "scissors", 1 ] ], [ [ "mirror", 1 ] ] ] + "components": [ [ [ "leather", 1 ], [ "fur", 1 ] ], [ [ "cotton_patchwork", 1 ] ], [ [ "scissors", 1 ] ], [ [ "mirror", 1 ] ] ] }, { "type": "recipe", @@ -2106,7 +2132,7 @@ "reversible": true, "time": "1 s", "autolearn": true, - "components": [ [ [ "washboard", 1 ] ], [ [ "sponge", 1 ], [ "rag", 1 ], [ "brush", 1 ], [ "dish_towel", 1 ] ] ] + "components": [ [ [ "washboard", 1 ] ], [ [ "sponge", 1 ], [ "cotton_patchwork", 1 ], [ "brush", 1 ], [ "dish_towel", 1 ] ] ] }, { "type": "recipe", @@ -2293,7 +2319,7 @@ "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ { "id": "SEW", "level": 1 } ], - "components": [ [ [ "rag", 10 ] ] ], + "components": [ [ [ "cotton_patchwork", 10 ] ] ], "flags": [ "BLIND_HARD" ] }, { @@ -2479,12 +2505,28 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "tailor", "difficulty": 1, - "time": "10 m", + "time": "60 m", + "autolearn": true, + "using": [ [ "tailoring_leather_patchwork", 8 ] ], + "byproducts": [ [ "leather", 2 ] ], + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], + "//": "The quantity of leather is accurate to the weight, but keeping it below requirements guideline time. Split to two recipes due to mixed materials" + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "leather_tarp", + "id_suffix": "from_pelts", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_OTHER", + "skill_used": "tailor", + "difficulty": 1, + "time": "120 m", "reversible": true, "autolearn": true, - "using": [ [ "sewing_standard", 30 ] ], + "using": [ [ "tailoring_fur_patchwork", 8 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], - "components": [ [ [ "leather", 12 ], [ "fur", 12 ], [ "tanned_hide", 3 ], [ "tanned_pelt", 3 ] ] ] + "//": "making from pelts takes longer due to extra processing time to scrape the fur off" }, { "type": "recipe", diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index f63fffb9fb7cd..c9a3582968360 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -239,7 +239,7 @@ "using": [ [ "sewing_standard", 100 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ], "components": [ - [ [ "leather", 12 ], [ "tanned_hide", 2 ], [ "fur", 12 ], [ "tanned_pelt", 2 ] ], + [ [ "leather", 16 ], [ "tanned_hide", 2 ], [ "fur", 16 ], [ "tanned_pelt", 2 ] ], [ [ "cordage_superior", 2, "LIST" ] ] ] }, @@ -257,7 +257,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/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json index 83b54aeb7492e..836b70d9cf865 100644 --- a/data/json/recipes/tools/containers.json +++ b/data/json/recipes/tools/containers.json @@ -492,7 +492,7 @@ "time": "10 m", "autolearn": true, "using": [ [ "filament", 50 ], [ "cordage_short", 1 ] ], - "components": [ [ [ "rag", 2 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ] ] }, { "type": "recipe", @@ -505,7 +505,7 @@ "time": "50 m", "autolearn": true, "using": [ [ "filament", 300 ], [ "cordage", 1 ] ], - "components": [ [ [ "rag", 12 ] ] ] + "components": [ [ [ "cotton_patchwork", 12 ] ] ] }, { "type": "recipe", @@ -649,7 +649,7 @@ "book_learn": [ [ "plastics_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "plastic_chunk", 6 ] ], [ [ "rag", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] + "components": [ [ [ "plastic_chunk", 6 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] }, { "type": "recipe", @@ -665,7 +665,7 @@ "book_learn": [ [ "plastics_book", 3 ] ], "proficiencies": [ { "proficiency": "prof_plasticworking" } ], "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ], - "components": [ [ [ "plastic_chunk", 10 ] ], [ [ "rag", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] + "components": [ [ [ "plastic_chunk", 10 ] ], [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] }, { "type": "recipe", @@ -873,7 +873,7 @@ "components": [ [ [ "2x4", 2 ] ], [ [ "wire", 1 ], [ "scrap", 2 ], [ "copper_scrap_equivalent", 1, "LIST" ] ], - [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] + [ [ "cotton_patchwork", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, { diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json index c738ba6c9a3bb..0193bdfd1eb2b 100644 --- a/data/json/recipes/tools/lights.json +++ b/data/json/recipes/tools/lights.json @@ -222,7 +222,13 @@ "book_learn": [ [ "textbook_fabrication", 0 ], [ "manual_fabrication", 0 ], [ "mag_electronics", 0 ] ], "components": [ [ [ "flashlight", 1 ] ], - [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ] + [ + [ "cotton_patchwork", 2 ], + [ "leather", 2 ], + [ "cordage", 1, "LIST" ], + [ "duct_tape", 10 ], + [ "medical_tape", 20 ] + ] ] }, { @@ -245,7 +251,13 @@ [ [ "amplifier", 1 ] ], [ [ "scrap", 2 ] ], [ [ "wire", 2 ] ], - [ [ "rag", 4 ], [ "leather", 4 ], [ "duct_tape", 20 ], [ "medical_tape", 40 ], [ "cordage", 1, "LIST" ] ] + [ + [ "cotton_patchwork", 4 ], + [ "leather", 4 ], + [ "duct_tape", 20 ], + [ "medical_tape", 40 ], + [ "cordage", 1, "LIST" ] + ] ] }, { @@ -269,7 +281,13 @@ [ [ "scrap", 2 ] ], [ [ "wire", 2 ] ], [ [ "lens", 1 ], [ "lens_small", 1 ] ], - [ [ "rag", 4 ], [ "leather", 4 ], [ "duct_tape", 20 ], [ "medical_tape", 40 ], [ "cordage", 1, "LIST" ] ] + [ + [ "cotton_patchwork", 4 ], + [ "leather", 4 ], + [ "duct_tape", 20 ], + [ "medical_tape", 40 ], + [ "cordage", 1, "LIST" ] + ] ] }, { @@ -285,7 +303,7 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], - [ [ "rag", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], + [ [ "cotton_patchwork", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "jar_glass_sealed", 1 ] ], [ [ "clay_teapot", 1 ], [ "jug_clay", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ] ] @@ -306,7 +324,7 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 3 ] ], - [ [ "rag", 1 ], [ "cordage_superior_short", 1, "LIST" ] ] + [ [ "cotton_patchwork", 1 ], [ "cordage_superior_short", 1, "LIST" ] ] ] }, { @@ -322,7 +340,7 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "scrap", 1 ] ], - [ [ "rag", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], + [ [ "cotton_patchwork", 1 ], [ "cordage_superior_short", 1, "LIST" ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "jar_glass_sealed", 1 ] ], [ [ "clay_teapot", 1 ], [ "jug_clay", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ] ] diff --git a/data/json/recipes/tools/tool.json b/data/json/recipes/tools/tool.json index d385872edde25..e95efa8542761 100644 --- a/data/json/recipes/tools/tool.json +++ b/data/json/recipes/tools/tool.json @@ -185,7 +185,7 @@ [ [ "knife_butcher", 1 ] ], [ [ "knife_carving", 1 ] ], [ [ "knife_meat_cleaver", 1 ] ], - [ [ "leather", 2 ], [ "rag", 2 ] ], + [ [ "leather", 2 ], [ "cotton_patchwork", 2 ] ], [ [ "cordage_short", 2, "LIST" ] ] ] }, @@ -939,7 +939,7 @@ "time": "2 m", "autolearn": true, "using": [ [ "flammable_liquid", 100 ] ], - "components": [ [ [ "rag", 1 ] ], [ [ "stick", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "torch_done", 1 ] ] ], + "components": [ [ [ "cotton_patchwork", 1 ] ], [ [ "stick", 1 ], [ "2x4", 1 ], [ "pool_cue", 1 ], [ "torch_done", 1 ] ] ], "flags": [ "BLIND_HARD" ] }, { diff --git a/data/json/recipes/tools/tools_hand.json b/data/json/recipes/tools/tools_hand.json index caeb7f4d823be..fc651144bad60 100644 --- a/data/json/recipes/tools/tools_hand.json +++ b/data/json/recipes/tools/tools_hand.json @@ -346,7 +346,7 @@ "time": "8 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ], [ "broom", 1 ], [ "mop", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 1 ] ], [ [ "2x4", 1 ], [ "stick", 1 ], [ "broom", 1 ], [ "mop", 1 ] ] ] }, { "type": "recipe", @@ -801,7 +801,7 @@ ], "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "GRIND", "level": 2 } ], - "components": [ [ [ "filament", 100, "LIST" ] ], [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] + "components": [ [ [ "filament", 100, "LIST" ] ], [ [ "cotton_patchwork", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, { "type": "recipe", @@ -1252,7 +1252,7 @@ "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 20 ] ], [ [ "filament", 100, "LIST" ] ], - [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] + [ [ "cotton_patchwork", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, { diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index 420b09632054a..a335efa5ecd20 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -283,7 +283,7 @@ "time": "30 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ], - "components": [ [ [ "rag", 4 ] ], [ [ "scrap", 4 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "scrap", 4 ] ] ] }, { "type": "recipe", @@ -494,7 +494,7 @@ "components": [ [ [ "stick", 1 ] ], [ [ "steel_chunk", 1 ], [ "steel_lump", 1 ], [ "pipe_fittings", 1 ] ], - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ] ] ] }, diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json index 8156abf6e51d4..d205a40511202 100644 --- a/data/json/recipes/weapon/cutting.json +++ b/data/json/recipes/weapon/cutting.json @@ -35,7 +35,7 @@ "tools": [ [ [ "casting_mold", -1 ] ] ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], @@ -73,7 +73,7 @@ "tools": [ [ [ "casting_mold", -1 ] ] ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], @@ -99,7 +99,7 @@ "tools": [ [ [ "casting_mold", -1 ] ] ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], @@ -125,7 +125,7 @@ "tools": [ [ [ "casting_mold", -1 ] ] ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], @@ -376,7 +376,7 @@ "time": "1 m", "reversible": true, "autolearn": true, - "components": [ [ [ "glass_shard", 1 ] ], [ [ "rag", 1 ], [ "duct_tape", 10 ] ] ] + "components": [ [ [ "glass_shard", 1 ] ], [ [ "cotton_patchwork", 1 ], [ "duct_tape", 10 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index 7fabe482e9b06..70f5d2319e756 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -180,7 +180,7 @@ "reversible": true, "autolearn": true, "using": [ [ "accelerant_liquid", 500 ] ], - "components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 2 ], [ "clay_canister", 2 ] ] ] + "components": [ [ [ "cotton_patchwork", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 2 ], [ "clay_canister", 2 ] ] ] }, { "result": "dynamite_bomb", diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 45a80e49fbe9f..6297b27915bd1 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -302,7 +302,7 @@ "time": "60 m", "autolearn": true, "using": [ [ "sewing_standard", 40 ] ], - "components": [ [ [ "rag", 2 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "smg_40_mag", diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json index 295d2303b2b12..b36c0d81570f9 100644 --- a/data/json/recipes/weapon/mods.json +++ b/data/json/recipes/weapon/mods.json @@ -679,7 +679,7 @@ "time": "1 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rope_natural_short", 1, "LIST" ], [ "rag", 3 ], [ "cordage", 6, "LIST" ] ] ] + "components": [ [ [ "rope_natural_short", 1, "LIST" ], [ "cotton_patchwork", 3 ], [ "cordage", 6, "LIST" ] ] ] }, { "type": "recipe", @@ -721,7 +721,7 @@ "time": "39 s", "autolearn": true, "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ], - "components": [ [ [ "rag", 4 ], [ "plastic_chunk", 4 ], [ "felt_patch", 4 ], [ "leather", 4 ] ], [ [ "pipe", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ], [ "plastic_chunk", 4 ], [ "felt_patch", 4 ], [ "leather", 4 ] ], [ [ "pipe", 1 ] ] ] }, { "type": "recipe", @@ -750,7 +750,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], - "components": [ [ [ "rag", 4 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index 233e1e41fbc99..7bd39e15d346d 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -292,7 +292,7 @@ "components": [ [ [ "scrap_bronze", 4 ] ], [ [ "stick_long", 1 ] ], - [ [ "rag", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] + [ [ "cotton_patchwork", 2 ], [ "felt_patch", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ] }, { @@ -428,7 +428,13 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_redsmithing" } ], "components": [ - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "duct_tape", 50 ], [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ], + [ + [ "cotton_patchwork", 1 ], + [ "felt_patch", 1 ], + [ "duct_tape", 50 ], + [ "cordage_short", 2, "LIST" ], + [ "filament", 100, "LIST" ] + ], [ [ "copper_scrap_equivalent", 12, "LIST" ] ] ] }, @@ -444,7 +450,7 @@ "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ - [ [ "rag", 1 ], [ "duct_tape", 50 ], [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ], + [ [ "cotton_patchwork", 1 ], [ "duct_tape", 50 ], [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ], [ [ "spike", 1 ] ] ] }, @@ -549,7 +555,7 @@ "proficiencies": [ { "proficiency": "prof_carving", "fail_multiplier": 1 } ], "components": [ [ [ "long_pole", 1 ] ], - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ] ] }, @@ -573,7 +579,7 @@ ], "components": [ [ [ "long_pole", 1 ] ], - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ], [ [ "copper_scrap_equivalent", 15, "LIST" ] ] ] @@ -730,7 +736,7 @@ [ "tanto", 1 ], [ "kirpan", 1 ] ], - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "cordage", 1, "LIST" ], [ "duct_tape", 50 ] ] ] }, diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json index e3948fae0a56b..958f82afa670c 100644 --- a/data/json/requirements/materials.json +++ b/data/json/requirements/materials.json @@ -101,133 +101,171 @@ "//": "Materials used for crafting or repairing clothing or sheeting, etc.", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 8 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], [ "sheet_lycra", 1 ], - [ "lycra_patch", 1 ], + [ "sheet_lycra_patchwork", 1 ], + [ "lycra_patch", 8 ], [ "nylon", 1 ], [ "sheet_nylon_patchwork", 1 ], [ "sheet_nylon", 1 ], - [ "leather", 1 ], - [ "nomex", 1 ], + [ "leather", 8 ], + [ "nomex", 8 ], [ "sheet_nomex_patchwork", 1 ], [ "sheet_nomex", 1 ], - [ "neoprene", 1 ], - [ "sheet_neoprene", 1 ] + [ "neoprene", 8 ], + [ "sheet_neoprene", 1 ], + [ "sheet_neoprene_patchwork", 1 ] ] ] }, + { + "id": "fabric_standard_small", + "type": "requirement", + "//": "Materials used for crafting or repairing clothing or sheeting, etc.", + "components": [ + [ [ "cotton_patchwork", 1 ], [ "lycra_patch", 1 ], [ "nylon", 1 ], [ "leather", 1 ], [ "nomex", 1 ], [ "neoprene", 1 ] ] + ] + }, { "id": "fabric_standard_permeable", "type": "requirement", "//": "Materials used for crafting or repairing woven fabrics", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 8 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], - [ "lycra_patch", 1 ], + [ "lycra_patch", 8 ], + [ "sheet_lycra_patchwork", 1 ], [ "sheet_lycra", 1 ], - [ "nylon", 1 ], + [ "nylon", 8 ], [ "sheet_nylon_patchwork", 1 ], [ "sheet_nylon", 1 ], - [ "nomex", 1 ], + [ "nomex", 8 ], [ "sheet_nomex_patchwork", 1 ], [ "sheet_nomex", 1 ] ] ] }, + { + "id": "fabric_standard_permeable_small", + "type": "requirement", + "//": "Materials used for crafting or repairing woven fabrics", + "components": [ [ [ "cotton_patchwork", 1 ], [ "lycra_patch", 8 ], [ "nylon", 8 ], [ "nomex", 8 ] ] ] + }, { "id": "fabric_standard_nostretch", "type": "requirement", "//": "Materials used for crafting or repairing non-form fitting clothing", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 8 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], - [ "nylon", 1 ], + [ "nylon", 8 ], [ "sheet_nylon_patchwork", 1 ], [ "sheet_nylon", 1 ], - [ "nomex", 1 ], + [ "nomex", 8 ], [ "sheet_nomex_patchwork", 1 ], [ "sheet_nomex", 1 ] ] ] }, + { + "id": "fabric_standard_nostretch_small", + "type": "requirement", + "//": "Materials used for crafting or repairing non-form fitting clothing", + "components": [ [ [ "cotton_patchwork", 1 ], [ "nylon", 1 ], [ "nomex", 1 ] ] ] + }, { "id": "fabric_felt", "type": "requirement", "//": "Materials used for crafting felt clothing", - "components": [ [ [ "felt_patch", 1 ], [ "sheet_felt_patchwork", 1 ], [ "sheet_felt", 1 ] ] ] + "components": [ [ [ "felt_patch", 8 ], [ "sheet_felt_patchwork", 1 ], [ "sheet_felt", 1 ] ] ] }, { "id": "fabric_fauxfur", "type": "requirement", "//": "Materials used for faux fur clothing", - "components": [ [ [ "faux_fur", 1 ], [ "sheet_faux_fur_patchwork", 1 ], [ "sheet_faux_fur", 1 ] ] ] + "components": [ [ [ "faux_fur", 8 ], [ "sheet_faux_fur_patchwork", 1 ], [ "sheet_faux_fur", 1 ] ] ] }, { "id": "fabric_fur", "type": "requirement", "//": "Materials used for crafting fur clothing", - "components": [ [ [ "fur", 1 ] ] ] + "components": [ [ [ "fur", 8 ], [ "sheet_fur_patchwork", 1 ], [ "tanned_pelt", 1 ] ] ] }, { "id": "fabric_fur_pelt", "type": "requirement", - "//": "Materials used for crafting fur clothing, when tanned pelts are available it seems to roughly be a 1:6 ratio", - "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ] + "//": "Materials used for crafting fur clothing", + "components": [ [ [ "fur", 8 ], [ "sheet_fur_patchwork", 1 ], [ "tanned_pelt", 1 ] ] ] }, { "id": "fabric_leather_hide", "type": "requirement", - "//": "Materials used for crafting leather clothing, when tanned hides are available it seems to roughly be a 1:6 ratio", - "components": [ [ [ "leather", 6 ], [ "tanned_hide", 1 ] ] ] + "//": "Materials used for crafting leather clothing.", + "components": [ [ [ "leather", 8 ], [ "sheet_leather_patchwork", 1 ], [ "tanned_hide", 1 ] ] ] }, { "id": "fabric_leather_fur_hide", "type": "requirement", - "//": "Materials used for crafting leather clothing where fur is or should be an option (can be scraped off with a cutting tool for example), when tanned hides/pelts are available it seems to roughly be a 1:6 ratio", - "components": [ [ [ "leather", 6 ], [ "fur", 6 ], [ "tanned_hide", 1 ], [ "tanned_pelt", 1 ] ] ] + "//": "Materials used for crafting leather clothing where fur is or should be an option (can be scraped off with a cutting tool for example), when tanned hides/pelts are available it seems to roughly be a 1:8 ratio", + "components": [ + [ + [ "leather", 8 ], + [ "fur", 8 ], + [ "tanned_hide", 1 ], + [ "tanned_pelt", 1 ], + [ "sheet_leather_patchwork", 1 ], + [ "sheet_fur_patchwork", 1 ] + ] + ] }, { "id": "fabric_nomex", "type": "requirement", "//": "Materials used for crafting Nomex clothing", - "components": [ [ [ "nomex", 1 ], [ "sheet_nomex_patchwork", 1 ], [ "sheet_nomex", 1 ] ] ] + "components": [ [ [ "nomex", 8 ], [ "sheet_nomex_patchwork", 1 ], [ "sheet_nomex", 1 ] ] ] }, { "id": "fabric_nylon", "type": "requirement", "//": "Materials used for crafting nylon clothing", - "components": [ [ [ "nylon", 1 ], [ "sheet_nylon_patchwork", 1 ], [ "sheet_nylon", 1 ] ] ] + "components": [ [ [ "nylon", 8 ], [ "sheet_nylon_patchwork", 1 ], [ "sheet_nylon", 1 ] ] ] }, { "id": "fabric_neoprene", "type": "requirement", - "//": "Materials used for crafting fur clothing", - "components": [ [ [ "neoprene", 1 ], [ "sheet_neoprene_patchwork", 1 ], [ "sheet_neoprene", 1 ] ] ] + "//": "Materials used for crafting neoprene clothing", + "components": [ [ [ "neoprene", 8 ], [ "sheet_neoprene_patchwork", 1 ], [ "sheet_neoprene", 1 ] ] ] }, { "id": "fabric_lycra", "type": "requirement", "//": "Materials used for crafting lycra clothing", - "components": [ [ [ "lycra_patch", 1 ], [ "sheet_lycra", 1 ], [ "sheet_lycra_patchwork", 1 ] ] ] + "components": [ [ [ "lycra_patch", 8 ], [ "sheet_lycra", 1 ], [ "sheet_lycra_patchwork", 1 ] ] ] }, { "id": "filament", "type": "requirement", - "//": "Materials for use when sewing items", + "//": "Materials for use when sewing items. 10 inches of thread, sinew, fiber or yarn, or 12 inches of nomex and kevlar thread per unit.", "components": [ - [ [ "thread", 1 ], [ "sinew", 1 ], [ "plant_fibre", 1 ], [ "yarn", 1 ], [ "thread_nomex", 1 ], [ "thread_kevlar", 1 ] ] + [ [ "thread", 1 ], [ "sinew", 1 ], [ "plant_fibre", 1 ], [ "yarn", 1 ], [ "thread_nomex", 2 ], [ "thread_kevlar", 2 ] ] ] }, + { + "id": "advanced_filament", + "type": "requirement", + "//": "each of these equals 12 inches of thread for use when sewing items requiring advanced thread.", + "components": [ [ [ "thread_nomex", 2 ], [ "thread_kevlar", 2 ] ] ] + }, { "id": "filament_durable", "type": "requirement", - "//": "Materials for use when sewing high end items, restricted to only the aramid threads.", + "//": "Materials for use when sewing high end items, restricted to only the aramid threads. This was added in the middle of the tailoring overhaul and is actually half of the thread needed for the new calculations, so i'll be migrating to advanced_filament", "components": [ [ [ "thread_kevlar", 1 ], [ "thread_nomex", 1 ] ] ] }, { diff --git a/data/json/requirements/tailoring.json b/data/json/requirements/tailoring.json index 4f991f98c563c..fbd84a660e96e 100644 --- a/data/json/requirements/tailoring.json +++ b/data/json/requirements/tailoring.json @@ -64,16 +64,16 @@ { "id": "armor_kevlar_rigid", "type": "requirement", - "//": "Shaping and attaching a rigid Kevlar plate to something, per 300 g of rigid Kevlar. Time needed is 10 minutes per unit.", + "//": "Shaping and attaching a rigid Kevlar plate to something, per 430 g of rigid Kevlar. Time needed is 45 minutes per unit.", "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "rigid_kevlar_plate", 1 ] ], [ [ "superglue", 1 ] ] ] }, { "id": "armor_kevlar_layered", "type": "requirement", - "//": "Joining Kevlar panels together into something like a Kevlar vest or other armor per 80 g of Kevlar. Time needed is 90 minutes per unit.", + "//": "Joining Kevlar panels together into something like a Kevlar vest or other armor per 428 g of Kevlar. Time needed is 45 minutes per unit.", "qualities": [ { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "sheet_kevlar_layered", 1 ] ], [ [ "filament", 4, "LIST" ] ] ] + "components": [ [ [ "sheet_kevlar_layered", 1 ] ], [ [ "filament_durable", 5, "LIST" ] ] ] }, { "id": "armor_steel_plate", @@ -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": [ [ [ "rag", 1 ], [ "leather", 1 ], [ "fur", 1 ] ] ] + "components": [ [ [ "cotton_patchwork", 3 ], [ "leather", 3 ], [ "fur", 3 ] ] ] }, { "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", 2 ], [ "fur", 2 ] ] ] + "components": [ [ [ "cordage_short", 1, "LIST" ], [ "leather", 4 ], [ "fur", 4 ] ] ] }, { "id": "dye_cloth", @@ -257,9 +257,9 @@ { "id": "tailoring_cotton", "type": "requirement", - "//": "Crafting cotton items, per 101 g of cotton; 10 g + excessive weight of material is wasted, producing rags and cotton scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "35g per unit. Crafting cotton items, adjusted for tailoring rework. 3g+excessive weight of material is wasted, producing patches or scraps. Time needed is usually 30 minutes per unit if hand-stitching. This uses roughly 50 inches of thread to account for waste.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_cotton", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_cotton", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] }, { "id": "tailoring_cotton_knitting", @@ -271,138 +271,206 @@ { "id": "tailoring_cotton_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork cotton items, per 101 g of cotton; 10 g + excessive weight of material is wasted, producing rags and cotton scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet)", + "//": "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)", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_cotton", 22 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_cotton", 1 ], [ "sheet_cotton_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] + }, + { + "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 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_faux_fur", "type": "requirement", - "//": "Crafting faux fur items, per 201 g of faux fur; 20 g + excessive weight of material is wasted, producing faux fur patches and scraps. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "350g per unit. Crafting faux fur items, per 371 g of faux fur with rework; 21 g + excessive weight of material is wasted, producing faux fur patches and scraps. Time needed is usually 40 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "sheet_faux_fur", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_faux_fur", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] }, { "id": "tailoring_faux_fur_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork faux fur items, per 201 g of faux fur; 20 g + excessive weight of material is wasted, producing faux fur patches and scraps. Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", + "//": "350g per unit. Crafting possibly-patchwork faux fur items, per 371 g of faux fur; 21 g + excessive weight of material is wasted, producing faux fur patches and scraps. Time needed is usually 40 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "sheet_faux_fur", 22 ], [ "sheet_faux_fur_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_faux_fur", 1 ], [ "sheet_faux_fur_patchwork", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] + }, + { + "id": "tailoring_faux_fur_small", + "type": "requirement", + "//": "40g per unit. Crafting possibly-patchwork faux fur items, per 46 g of faux fur; 6 g + excessive weight of material is wasted, producing faux fur scraps. Time needed is usually 25 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], + "components": [ [ [ "faux_fur", 1 ] ], [ [ "filament", 4, "LIST" ] ] ] }, { "id": "tailoring_felt", "type": "requirement", - "//": "Crafting felt items (not via knitting), per 161 g of wool; 16 g + excessive weight of material is wasted, producing felt patches as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "25g per unit. Crafting felt items (not via knitting), per 28 g of felt; 3 g + excessive weight of material is wasted, producing felt patches as byproducts. Time needed is usually 35 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "sheet_felt", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_felt", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] }, { "id": "tailoring_felt_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork felt items (not via knitting), per 161 g of wool; 16 g + excessive weight of material is wasted, producing felt patches as byproducts. Time needed is usually 90 minutes per unit if hand-stitching. (most of the time actually needed goes into making a patchwork sheet)", + "//": "25g per unit. Crafting possibly-patchwork felt items (not via knitting), per 28 g of felt; 3 g + excessive weight of material is wasted, producing felt patches as byproducts. Time needed is usually 35 minutes per unit if hand-stitching. (most of the time actually needed goes into making a patchwork sheet)", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_felt", 22 ], [ "sheet_felt_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_felt", 1 ], [ "sheet_felt_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] + }, + { + "id": "tailoring_felt_small", + "type": "requirement", + "//": "3g per unit. Crafting possibly-patchwork felt items (not via knitting), per 3.4 g of felt; .4 g + excessive weight of material is wasted, producing felt scraps as byproducts. Time needed is usually 15 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], + "components": [ [ [ "felt_patch", 1 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_fur", "type": "requirement", - "//": "Crafting fur items, per 415 g of fur; 273 g + excessive weight of material is wasted, producing fur patches as byproducts. Time needed is usually 360 minutes per unit if hand-stitching.", + "//": "250g per unit. Crafting fur items, per 372 g of fur; 122 g + excessive weight of material is wasted, producing fur patches as byproducts. Time needed is usually 60 minutes per unit if hand-stitching for extra material processing time.", + "qualities": [ + { "id": "SEW", "level": 1 }, + { "id": "FABRIC_CUT", "level": 2 }, + { "id": "LEATHER_AWL", "level": 1 }, + { "id": "CUT_FINE", "level": 1 } + ], + "components": [ [ [ "tanned_pelt", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] + }, + { + "id": "tailoring_fur_patchwork", + "type": "requirement", + "//": "250g per unit. Crafting fur items, per 372 g of fur; 122 g + excessive weight of material is wasted, producing fur patches as byproducts. Time needed is usually 60 minutes per unit if hand-stitching for extra material processing time.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 }, { "id": "LEATHER_AWL", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "tanned_pelt", 1 ] ], [ [ "filament", 4, "LIST" ] ] ] + "components": [ [ [ "tanned_pelt", 1 ], [ "sheet_fur_patchwork", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] }, { "id": "tailoring_fur_small", "type": "requirement", - "//": "Crafting either small or patchwork fur items, per 92 g of fur; 23 g + excessive weight of material is wasted, producing fur patches as byproducts. Time needed is usually 180 minutes per unit if hand-stitching.", + "//": "35g per unit. Crafting either small or patchwork fur items, per 46 g of fur; 11 g + excessive weight of material is wasted, producing fur patches as byproducts. Time needed is usually 15 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 }, { "id": "LEATHER_AWL", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "fur", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "fur", 1 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_kevlar_fabric", "type": "requirement", - "//": "Crafting Kevlar items, per 101 g of Kevlar; 10 g + excessive weight of material is wasted, producing Kevlar scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "Crafting Kevlar items, per 26 g of Kevlar; 6 g + excessive weight of material is wasted, producing Kevlar scraps as byproducts. Time needed is usually 40 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 2 }, { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "sheet_kevlar", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_kevlar", 1 ] ], [ [ "filament_durable", 6, "LIST" ] ] ] }, { "id": "tailoring_leather", "type": "requirement", - "//": "Crafting leather items, per 364 g of leather; 240 g + excessive weight of material is wasted, producing leather patches as byproducts. Time needed is usually 360 minutes per unit if hand-stitching.", + "//": "275g per unit. Crafting leather items, per 296 g of leather; 21 g + excessive weight of material is wasted, producing leather patches as byproducts. Time needed is usually 60 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ], - "components": [ [ [ "tanned_hide", 1 ] ], [ [ "filament", 4, "LIST" ] ] ] + "components": [ [ [ "tanned_hide", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] + }, + { + "id": "tailoring_leather_patchwork", + "type": "requirement", + "//": "275g per unit. Crafting leather items, per 296 g of leather; 21 g + excessive weight of material is wasted, producing leather patches as byproducts. Time needed is usually 60 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ], + "components": [ [ [ "tanned_hide", 1 ], [ "sheet_leather_patchwork", 1 ] ], [ [ "filament", 7, "LIST" ] ] ] }, { "id": "tailoring_leather_small", "type": "requirement", - "//": "Crafting either small or patchwork leather items, per 81 g of leather; 20 g + excessive weight of material is wasted, producing leather patches as byproducts. Time needed is usually 180 minutes per unit if hand-stitching.", + "//": "35g per unit. Crafting either small or patchwork leather items, per 37 g of leather; 2 g + excessive weight of material is wasted, producing leather patches as byproducts. Time needed is usually 15 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ], - "components": [ [ [ "leather", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "leather", 1 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_lycra", "type": "requirement", - "//": "Crafting Lycra items, per 55 g of Lycra; 6 g + excessive weight of material is wasted, producing Lycra scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "30g per unit. Crafting Lycra items, per 33 g of Lycra; 3 g + excessive weight of material is wasted, producing Lycra scraps as byproducts. Time needed is usually 60 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_lycra", 22 ] ], [ [ "thread_nomex", 1 ] ] ] + "components": [ [ [ "sheet_lycra", 1 ] ], [ [ "thread_nomex", 5 ] ] ] }, { "id": "tailoring_lycra_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork Lycra items, per 55 g of Lycra; 6 g + excessive weight of material is wasted, producing Lycra scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", + "//": "30g per unit. Crafting possibly-patchwork Lycra items, per 33 g of Lycra; 3 g + excessive weight of material is wasted, producing Lycra scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_lycra", 22 ], [ "sheet_lycra_patchwork", 1 ] ], [ [ "thread_nomex", 1 ] ] ] + "components": [ [ [ "sheet_lycra", 1 ], [ "sheet_lycra_patchwork", 1 ] ], [ [ "thread_nomex", 5 ] ] ] + }, + { + "id": "tailoring_lycra_small", + "type": "requirement", + "//": "4g per unit. Crafting possibly-patchwork Lycra items, per 4.18 g of Lycra; .18 g + excessive weight of material is wasted, producing Lycra scraps as byproducts. Time needed is usually 30 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], + "components": [ [ [ "lycra_patch", 1 ] ], [ [ "thread_nomex", 3 ] ] ] }, { "id": "tailoring_neoprene", "type": "requirement", - "//": "Crafting neoprene items, per 121 g of neoprene; 12 g + excessive weight of material is wasted, producing neoprene scraps as byproducts. Superglue and duct tape will usually be needed for extra waterproofing. Time needed is usually 100 minutes per unit if hand-stitching.", + "//": "25g per unit. Crafting neoprene items, per 26 g of neoprene; 1 g + excessive weight of material is wasted, producing neoprene scraps as byproducts. Superglue and duct tape will usually be needed for extra waterproofing. Time needed is usually 60 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_neoprene", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_neoprene", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] }, { "id": "tailoring_neoprene_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork neoprene items, per 121 g of neoprene; 12 g + excessive weight of material is wasted, producing neoprene scraps as byproducts. Superglue and duct tape will usually be needed for extra waterproofing. Time needed is usually 100 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", + "//": "25g per unit. Crafting possibly-patchwork neoprene items, per 26 g of neoprene; 1 g + excessive weight of material is wasted, producing neoprene scraps as byproducts. Superglue and duct tape will usually be needed for extra waterproofing. Time needed is usually 60 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_neoprene", 22 ], [ "sheet_neoprene_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_neoprene", 1 ], [ "sheet_neoprene_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] + }, + { + "id": "tailoring_neoprene_small", + "type": "requirement", + "//": "3g per unit. Crafting possibly-patchwork neoprene items, per 3 g of neoprene; .5 g + excessive weight of material is wasted, producing neoprene scraps as byproducts. Superglue and duct tape will usually be needed for extra waterproofing. Time needed is usually 30 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], + "components": [ [ [ "neoprene", 1 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_nomex", "type": "requirement", - "//": "Crafting Nomex items, per 101 g of Nomex; 10 g + excessive weight of material is wasted, producing Nomex scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "30g per unit. Crafting Nomex items, per 32 g of Nomex; 2 g + excessive weight of material is wasted, producing Nomex scraps as byproducts. Time needed is usually 45 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "sheet_nomex", 22 ] ], [ [ "thread_nomex", 1 ] ] ] + "components": [ [ [ "sheet_nomex", 1 ] ], [ [ "thread_nomex", 5 ], [ "thread_kevlar", 5 ] ] ] }, { "id": "tailoring_nomex_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork Nomex items, per 101 g of Nomex; 10 g + excessive weight of material is wasted, producing Nomex scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "30g per unit. Crafting possibly-patchwork Nomex items, per 32 g of Nomex; 2 g + excessive weight of material is wasted, producing Nomex scraps as byproducts. Time needed is usually 45 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], + "components": [ [ [ "sheet_nomex", 1 ], [ "sheet_nomex_patchwork", 1 ] ], [ [ "thread_nomex", 5 ], [ "thread_kevlar", 5 ] ] ] + }, + { + "id": "tailoring_nomex_small", + "type": "requirement", + "//": "3g per unit. Crafting small Nomex items, per 32 g of Nomex; 1 g + excessive weight of material is wasted, producing Nomex scraps as byproducts.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 2 } ], - "components": [ [ [ "sheet_nomex", 22 ], [ "sheet_nomex_patchwork", 1 ] ], [ [ "thread_nomex", 1 ] ] ] + "components": [ [ [ "nomex", 1 ] ], [ [ "thread_nomex", 3 ], [ "thread_kevlar", 3 ] ] ] }, { "id": "tailoring_nylon", "type": "requirement", - "//": "Crafting synthetic fabric items, per 55 g of neoprene; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching.", + "//": "40g per unit. Crafting synthetic fabric items, per 46 g of nylon; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts. Time needed is usually 30 minutes per unit if hand-stitching.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], + "components": [ [ [ "sheet_nylon", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] + }, + { + "id": "tailoring_nylon_patchwork", + "type": "requirement", + "//": "40g per unit. Crafting possibly-patchwork synthetic fabric items, per 46 g of nylon; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts. Time needed is usually 30 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_nylon", 22 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "sheet_nylon", 1 ], [ "sheet_nylon_patchwork", 1 ] ], [ [ "filament", 5, "LIST" ] ] ] }, { "id": "tailoring_nylon_patchwork", "type": "requirement", - "//": "Crafting possibly-patchwork synthetic fabric items, per 55 g of neoprene; 6 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts. Time needed is usually 90 minutes per unit if hand-stitching (most of the time actually needed goes into making a patchwork sheet).", + "//": "5g per unit. Crafting possibly-patchwork synthetic fabric items, per 6 g of nylon; 1 g + excessive weight of material is wasted, producing synthetic fabric scraps as byproducts. Time needed is usually 25 minutes per unit if hand-stitching.", "qualities": [ { "id": "SEW", "level": 1 }, { "id": "FABRIC_CUT", "level": 1 } ], - "components": [ [ [ "sheet_nylon", 22 ], [ "sheet_nylon_patchwork", 1 ] ], [ [ "filament", 1, "LIST" ] ] ] + "components": [ [ [ "nylon", 1 ] ], [ [ "filament", 3, "LIST" ] ] ] }, { "id": "tailoring_wool_knitting", diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json index 5f20d7ebc0ebe..2ba7f5c62d017 100644 --- a/data/json/requirements/toolsets.json +++ b/data/json/requirements/toolsets.json @@ -63,14 +63,21 @@ { "id": "sewing_standard", "type": "requirement", - "//": "Crafting or repair of fabric items", - "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], + "//": "Crafting or repair of fabric items, includes roughly 10 inches of thread.", + "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 }, { "id": "FABRIC_CUT", "level": 1 } ], "components": [ [ [ "filament", 1, "LIST" ] ] ] }, + { + "id": "sewing_aramids", + "type": "requirement", + "//": "crafting or repair of aramid based fabrics (nomex, kevlar). Aramid threads are abrasive and require a stronger needle. they also have special cutting considerations.", + "qualities": [ { "id": "SEW", "level": 3 }, { "id": "CUT", "level": 2 }, { "id": "FABRIC_CUT", "level": 2 } ], + "components": [ [ [ "advanced_filament", 1, "LIST" ] ] ] + }, { "id": "sewing_kevlar", "type": "requirement", - "//": "Crafting or repair of Kevlar/aramid items", + "//": "Crafting or repair of Kevlar/aramid items. This was added in the middle of the tailoring overhaul, i'll be migrating to sewing_aramids", "qualities": [ { "id": "SEW", "level": 2 }, { "id": "CUT", "level": 2 }, { "id": "FABRIC_CUT", "level": 2 } ], "components": [ [ [ "filament_durable", 1, "LIST" ] ] ] }, diff --git a/data/json/uncraft/armor.json b/data/json/uncraft/armor.json index 664337df1427d..e8f752dd6efd1 100644 --- a/data/json/uncraft/armor.json +++ b/data/json/uncraft/armor.json @@ -125,7 +125,7 @@ "activity_level": "LIGHT_EXERCISE", "time": "20 m", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 35 ] ], [ [ "down_feather", 160 ] ] ] + "components": [ [ [ "cotton_patchwork", 35 ] ], [ [ "down_feather", 160 ] ] ] }, { "result": "under_armor_shorts", @@ -141,6 +141,6 @@ "activity_level": "LIGHT_EXERCISE", "time": "2 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 2 ] ], [ [ "wire", 1 ] ], [ [ "button_plastic", 9 ] ] ] + "components": [ [ [ "cotton_patchwork", 2 ] ], [ [ "wire", 1 ] ], [ [ "button_plastic", 9 ] ] ] } ] diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json index 243e6ad1bb52d..283eae96f1215 100644 --- a/data/json/uncraft/armor/boots.json +++ b/data/json/uncraft/armor/boots.json @@ -7,7 +7,13 @@ "difficulty": 2, "time": "10 m", "qualities": [ { "id": "PRY", "level": 1 } ], - "components": [ [ [ "wheel_skate", 6 ] ], [ [ "rag", 6 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "scrap", 18 ] ], [ [ "bearing", 6 ] ] ] + "components": [ + [ [ "wheel_skate", 6 ] ], + [ [ "cotton_patchwork", 6 ] ], + [ [ "plastic_chunk", 6 ] ], + [ [ "scrap", 18 ] ], + [ [ "bearing", 6 ] ] + ] }, { "result": "rollerskates", diff --git a/data/json/uncraft/armor/suit.json b/data/json/uncraft/armor/suit.json index 0bfad7cf5eca6..c96e9fa8cfaaf 100644 --- a/data/json/uncraft/armor/suit.json +++ b/data/json/uncraft/armor/suit.json @@ -7,7 +7,7 @@ "difficulty": 3, "time": "10 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 33 ] ], [ [ "leather", 35 ] ], [ [ "scrap", 24 ] ], [ [ "sheet_kevlar_layered", 48 ] ] ] + "components": [ [ [ "cotton_patchwork", 33 ] ], [ [ "leather", 35 ] ], [ [ "scrap", 24 ] ], [ [ "sheet_kevlar_layered", 48 ] ] ] }, { "result": "xshsurvivor_suit", @@ -17,7 +17,7 @@ "difficulty": 3, "time": "10 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 16 ] ], [ [ "leather", 16 ] ], [ [ "scrap", 8 ] ], [ [ "sheet_kevlar_layered", 16 ] ] ] + "components": [ [ [ "cotton_patchwork", 16 ] ], [ [ "leather", 16 ] ], [ [ "scrap", 8 ] ], [ [ "sheet_kevlar_layered", 16 ] ] ] }, { "result": "xlsurvivor_suit", @@ -27,6 +27,6 @@ "difficulty": 3, "time": "5 m", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 23 ] ], [ [ "leather", 25 ] ], [ [ "scrap", 12 ] ], [ [ "sheet_kevlar_layered", 24 ] ] ] + "components": [ [ [ "cotton_patchwork", 23 ] ], [ [ "leather", 25 ] ], [ [ "scrap", 12 ] ], [ [ "sheet_kevlar_layered", 24 ] ] ] } ] diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 580f748be8d13..cd57767461330 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -69,7 +69,7 @@ "difficulty": 1, "time": "22 s", "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 60 ] ], [ [ "sheet", 4 ] ], [ [ "spring", 4 ] ], [ [ "wire", 20 ] ] ] + "components": [ [ [ "cotton_patchwork", 60 ] ], [ [ "sheet", 4 ] ], [ [ "spring", 4 ] ], [ [ "wire", 20 ] ] ] }, { "result": "character_sheet", diff --git a/data/json/vehicleparts/rams.json b/data/json/vehicleparts/rams.json index d3b11a758da88..bb9bede8d989e 100644 --- a/data/json/vehicleparts/rams.json +++ b/data/json/vehicleparts/rams.json @@ -166,7 +166,7 @@ "damage_modifier": 50, "durability": 40, "description": "A mattress, strapped onto the vehicle. It could serve to blunt any impact.", - "breaks_into": [ { "item": "rag", "count": [ 40, 55 ] } ], + "breaks_into": [ { "item": "cotton_patchwork", "count": [ 40, 55 ] } ], "requirements": { "install": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "rope_natural_short", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ ] } diff --git a/data/json/vehicleparts/seats.json b/data/json/vehicleparts/seats.json index d59b48227c57c..2fd41cdb3e2da 100644 --- a/data/json/vehicleparts/seats.json +++ b/data/json/vehicleparts/seats.json @@ -1,7 +1,7 @@ [ { "entries": [ - { "count": [ 2, 8 ], "item": "rag" }, + { "count": [ 2, 8 ], "item": "cotton_patchwork" }, { "count": [ 1, 3 ], "item": "pipe" }, { "count": [ 0, 2 ], "item": "spring" }, { "count": [ 3, 5 ], "item": "scrap" } @@ -13,7 +13,7 @@ { "entries": [ { "count": [ 1, 5 ], "item": "leather" }, - { "count": [ 1, 3 ], "item": "rag" }, + { "count": [ 1, 3 ], "item": "cotton_patchwork" }, { "count": [ 1, 3 ], "item": "pipe" }, { "count": [ 0, 2 ], "item": "spring" }, { "count": [ 3, 5 ], "item": "scrap" } @@ -201,7 +201,7 @@ } }, "flags": [ "SEAT", "BOARDABLE", "FOLDABLE", "NONBELTABLE" ], - "breaks_into": [ { "item": "rag", "count": [ 1, 6 ] } ] + "breaks_into": [ { "item": "cotton_patchwork", "count": [ 1, 6 ] } ] }, { "abstract": "metal_bench_abstract", diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index b6eae5daaa475..54ae9ca704e6e 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -46,7 +46,7 @@ "type": "item_group", "id": "ig_vp_cloth", "subtype": "collection", - "entries": [ { "item": "rag", "count": [ 3, 6 ] } ] + "entries": [ { "item": "cotton_patchwork", "count": [ 3, 6 ] } ] }, { "type": "item_group", @@ -1245,7 +1245,7 @@ "STABLE", "UNMOUNT_ON_DAMAGE" ], - "breaks_into": [ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "rag", "count": [ 5, 10 ] } ] + "breaks_into": [ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "cotton_patchwork", "count": [ 5, 10 ] } ] }, { "type": "vehicle_part", @@ -1927,7 +1927,7 @@ }, "flags": [ "FOLDABLE" ], "pseudo_tools": [ { "id": "towel", "hotkey": "t" } ], - "breaks_into": [ { "item": "scrap", "count": [ 1, 3 ] }, { "item": "rag", "count": [ 1, 6 ] } ] + "breaks_into": [ { "item": "scrap", "count": [ 1, 3 ] }, { "item": "cotton_patchwork", "count": [ 1, 6 ] } ] }, { "type": "vehicle_part", diff --git a/data/mods/Aftershock/items/crafting_scrap/cloth_scrap.json b/data/mods/Aftershock/items/crafting_scrap/cloth_scrap.json index c82c59029dd53..0d02bf0b0c17c 100644 --- a/data/mods/Aftershock/items/crafting_scrap/cloth_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/cloth_scrap.json @@ -5,6 +5,6 @@ "copy-from": "afs_scrap_4", "name": { "str": "woven metamaterial sheet" }, "description": "An intricately spun and carefully engineered sheet of iridescent fibers.", - "looks_like": "rag" + "looks_like": "cotton_patchwork" } ] diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json index eaa59fdfb966d..1245daad36bb3 100644 --- a/data/mods/Aftershock/items/items.json +++ b/data/mods/Aftershock/items/items.json @@ -43,7 +43,7 @@ "to_hit": -1, "material": [ "cotton" ], "symbol": "[", - "looks_like": "rag", + "looks_like": "cotton_patchwork", "color": "brown" }, { diff --git a/data/mods/Aftershock/maps/furniture.json b/data/mods/Aftershock/maps/furniture.json index 41ac8203b888e..25a640dafeca3 100644 --- a/data/mods/Aftershock/maps/furniture.json +++ b/data/mods/Aftershock/maps/furniture.json @@ -13,7 +13,9 @@ "comfort": 3, "floor_bedding_warmth": 500, "bonus_fire_warmth_feet": 1000, - "deconstruct": { "items": [ { "item": "pipe", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "rope_6" } ] }, + "deconstruct": { + "items": [ { "item": "pipe", "count": 10 }, { "item": "cotton_patchwork", "count": [ 30, 33 ] }, { "item": "rope_6" } ] + }, "required_str": 20 }, { @@ -160,7 +162,7 @@ "items": [ { "item": "afs_energy_storage_2", "count": [ 2, 4 ] }, { "item": "steel_chunk", "count": [ 3, 6 ] }, - { "item": "rag", "count": [ 40, 55 ] }, + { "item": "cotton_patchwork", "count": [ 40, 55 ] }, { "item": "afs_material_1", "count": [ 10, 20 ] } ] } @@ -186,7 +188,7 @@ { "item": "steel_chunk", "count": [ 1, 2 ] }, { "item": "reinforced_glass_pane", "count": [ 1, 2 ] }, { "item": "plastic_sheet", "count": [ 10, 15 ] }, - { "item": "rag", "count": [ 20, 30 ] }, + { "item": "cotton_patchwork", "count": [ 20, 30 ] }, { "item": "afs_material_1", "count": [ 10, 20 ] }, { "item": "afs_magnet_2", "count": [ 1, 3 ] }, { "item": "afs_circuitry_3", "count": [ 0, 1 ] } @@ -203,7 +205,7 @@ { "item": "steel_chunk", "count": [ 3, 6 ] }, { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "plastic_chunk", "count": [ 20, 30 ] }, - { "item": "rag", "count": [ 20, 30 ] }, + { "item": "cotton_patchwork", "count": [ 20, 30 ] }, { "item": "afs_material_1", "count": [ 10, 20 ] }, { "item": "afs_magnet_2", "count": [ 1, 3 ] }, { "item": "afs_circuitry_3", "count": [ 0, 1 ] } diff --git a/data/mods/Aftershock/recipes/armor_recipes.json b/data/mods/Aftershock/recipes/armor_recipes.json index 68cc81979f8c1..5f64eb71df510 100644 --- a/data/mods/Aftershock/recipes/armor_recipes.json +++ b/data/mods/Aftershock/recipes/armor_recipes.json @@ -11,7 +11,7 @@ "autolearn": true, "reversible": true, "using": [ [ "sewing_standard", 14 ] ], - "components": [ [ [ "afs_scrap_titanium", 8 ] ], [ [ "rag", 6 ] ] ] + "components": [ [ [ "afs_scrap_titanium", 8 ] ], [ [ "cotton_patchwork", 6 ] ] ] }, { "result": "afs_recall_rig", diff --git a/data/mods/CrazyCataclysm/crazy_recipes.json b/data/mods/CrazyCataclysm/crazy_recipes.json index 88450322262e9..3a8c4bd86a1f8 100644 --- a/data/mods/CrazyCataclysm/crazy_recipes.json +++ b/data/mods/CrazyCataclysm/crazy_recipes.json @@ -59,7 +59,7 @@ "reversible": true, "autolearn": true, "components": [ - [ [ "rag", 1 ] ], + [ [ "cotton_patchwork", 1 ] ], [ [ "bat", 1 ] ], [ [ "nomex", 5 ] ], [ diff --git a/data/mods/DinoMod/mapgen/DinoLabFinale.json b/data/mods/DinoMod/mapgen/DinoLabFinale.json index 2e4bdaa0b861f..78ba64ff8d642 100644 --- a/data/mods/DinoMod/mapgen/DinoLabFinale.json +++ b/data/mods/DinoMod/mapgen/DinoLabFinale.json @@ -139,7 +139,7 @@ { "item": "blanket", "repeat": [ 1, 5 ], "chance": 70 }, { "item": "sheet", "repeat": [ 1, 5 ], "chance": 70 }, { "item": "down_blanket", "repeat": [ 1, 2 ], "chance": 50 }, - { "item": "rag", "repeat": [ 20, 50 ] } + { "item": "cotton_patchwork", "repeat": [ 20, 50 ] } ] } }, @@ -205,7 +205,7 @@ { "item": "blanket", "repeat": [ 1, 5 ], "chance": 70 }, { "item": "sheet", "repeat": [ 1, 5 ], "chance": 70 }, { "item": "down_blanket", "repeat": [ 1, 2 ], "chance": 50 }, - { "item": "rag", "repeat": [ 20, 50 ] } + { "item": "cotton_patchwork", "repeat": [ 20, 50 ] } ] }, "D": { "item": [ { "item": "report_dino_exploration" } ] } diff --git a/data/mods/DinoMod/recipes/pets_elephant.json b/data/mods/DinoMod/recipes/pets_elephant.json index 4ecdf909a9e32..bacc73abe98c4 100644 --- a/data/mods/DinoMod/recipes/pets_elephant.json +++ b/data/mods/DinoMod/recipes/pets_elephant.json @@ -68,7 +68,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 190 ], [ "clasps", 4 ] ], - "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ], + "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "cotton_patchwork", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_closures" } ] }, { @@ -82,7 +82,7 @@ "time": "4 h 30 m", "byproducts": [ [ "leather", 21 ] ], "using": [ [ "sewing_standard", 30 ], [ "clasps", 4 ] ], - "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "rag", 18 ] ] ], + "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "cotton_patchwork", 18 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, @@ -115,7 +115,7 @@ ], [ [ "salt", 150 ] ], [ [ "leather", 105 ], [ "tanned_hide", 17 ] ], - [ [ "rag", 18 ] ] + [ [ "cotton_patchwork", 18 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -145,7 +145,7 @@ "difficulty": 4, "time": "6 h 30 m", "autolearn": true, - "byproducts": [ [ "rag", 6 ] ], + "byproducts": [ [ "cotton_patchwork", 6 ] ], "using": [ [ "sewing_standard", 35 ], [ "clasps", 4 ] ], "components": [ [ [ "bone_sturdy", 39, "LIST" ] ], [ [ "leather_armor_elephant", 1 ] ] ], "proficiencies": [ @@ -221,7 +221,7 @@ "autolearn": true, "using": [ [ "clasps", 4 ] ], "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "rag", 70 ] ] ], + "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "cotton_patchwork", 70 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_closures" } ] }, { diff --git a/data/mods/DinoMod/recipes/pets_ostrich.json b/data/mods/DinoMod/recipes/pets_ostrich.json index fe9651df74581..233596b679efb 100644 --- a/data/mods/DinoMod/recipes/pets_ostrich.json +++ b/data/mods/DinoMod/recipes/pets_ostrich.json @@ -68,7 +68,7 @@ "reversible": true, "autolearn": true, "using": [ [ "sewing_standard", 190 ], [ "clasps", 4 ] ], - "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ], + "components": [ [ [ "sheet_kevlar_layered", 56 ] ], [ [ "cotton_patchwork", 42 ] ], [ [ "leather", 24 ], [ "tanned_hide", 4 ] ] ], "proficiencies": [ { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_closures" } ] }, { @@ -82,7 +82,7 @@ "time": "4 h 30 m", "byproducts": [ [ "leather", 21 ] ], "using": [ [ "sewing_standard", 30 ], [ "clasps", 4 ] ], - "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "rag", 18 ] ] ], + "components": [ [ [ "armor_blarmor", 3 ] ], [ [ "cotton_patchwork", 18 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_closures" }, @@ -115,7 +115,7 @@ ], [ [ "salt", 150 ] ], [ [ "leather", 105 ], [ "tanned_hide", 17 ] ], - [ [ "rag", 18 ] ] + [ [ "cotton_patchwork", 18 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, @@ -145,7 +145,7 @@ "difficulty": 4, "time": "6 h 30 m", "autolearn": true, - "byproducts": [ [ "rag", 6 ] ], + "byproducts": [ [ "cotton_patchwork", 6 ] ], "using": [ [ "sewing_standard", 35 ], [ "clasps", 4 ] ], "components": [ [ [ "bone_sturdy", 39, "LIST" ] ], [ [ "leather_armor_ostrich", 1 ] ] ], "proficiencies": [ @@ -221,7 +221,7 @@ "autolearn": true, "using": [ [ "clasps", 4 ] ], "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ], - "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "rag", 70 ] ] ], + "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "cotton_patchwork", 70 ] ] ], "proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_closures" } ] }, { diff --git a/data/mods/Magiclysm/recipes.json b/data/mods/Magiclysm/recipes.json index b9f790d76094e..42f39b37808dd 100644 --- a/data/mods/Magiclysm/recipes.json +++ b/data/mods/Magiclysm/recipes.json @@ -29,7 +29,7 @@ [ [ "glow_dust", 2 ] ], [ [ "diamond", 1 ], [ "bulette_pearl", 1 ] ], [ [ "string_6", 1 ] ], - [ [ "rag", 2 ] ] + [ [ "cotton_patchwork", 2 ] ] ] }, { diff --git a/data/mods/Magiclysm/recipes/deconstruction.json b/data/mods/Magiclysm/recipes/deconstruction.json index 6bbaa94a5afaf..071c970dd0441 100644 --- a/data/mods/Magiclysm/recipes/deconstruction.json +++ b/data/mods/Magiclysm/recipes/deconstruction.json @@ -45,7 +45,7 @@ "activity_level": "NO_EXERCISE", "skill_used": "fabrication", "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "dragon_black_scale", 10 ] ], [ [ "rag", 3 ] ] ], + "components": [ [ [ "dragon_black_scale", 10 ] ], [ [ "cotton_patchwork", 3 ] ] ], "flags": [ "BLIND_EASY" ] }, { diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json index 5bba25e5ccf34..e7f9f94df8b78 100644 --- a/data/mods/Magiclysm/recipes/dragon_black.json +++ b/data/mods/Magiclysm/recipes/dragon_black.json @@ -39,7 +39,7 @@ "autolearn": true, "using": [ [ "filament", 8 ] ], "qualities": [ { "id": "SEW", "level": 2 } ], - "components": [ [ [ "dragon_black_scale", 10 ] ], [ [ "rag", 3 ] ] ] + "components": [ [ [ "dragon_black_scale", 10 ] ], [ [ "cotton_patchwork", 3 ] ] ] }, { "result": "bundle_black_hide", diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json index 0a50db679ba4a..1d7b29512aab4 100644 --- a/data/mods/Magiclysm/recipes/magic_tools.json +++ b/data/mods/Magiclysm/recipes/magic_tools.json @@ -13,7 +13,7 @@ [ [ "knife_butcher_plus_one", 1 ] ], [ [ "knife_carving_plus_one", 1 ] ], [ [ "knife_meat_cleaver_plus_one", 1 ] ], - [ [ "leather", 2 ], [ "rag", 2 ] ], + [ [ "leather", 2 ], [ "cotton_patchwork", 2 ] ], [ [ "string_6", 2 ], [ "cordage_6", 2 ] ] ] }, @@ -31,7 +31,7 @@ [ [ "knife_butcher_plus_two", 1 ] ], [ [ "knife_carving_plus_two", 1 ] ], [ [ "knife_meat_cleaver_plus_two", 1 ] ], - [ [ "leather", 2 ], [ "rag", 2 ] ], + [ [ "leather", 2 ], [ "cotton_patchwork", 2 ] ], [ [ "string_6", 2 ], [ "cordage_6", 2 ] ] ] }, diff --git a/data/mods/Magiclysm/recipes/weapons.json b/data/mods/Magiclysm/recipes/weapons.json index b3d91c6c26aa0..13818d344ecac 100644 --- a/data/mods/Magiclysm/recipes/weapons.json +++ b/data/mods/Magiclysm/recipes/weapons.json @@ -61,7 +61,7 @@ "tools": [ [ [ "fire", -1 ] ] ], "components": [ [ [ "stick_long", 1 ], [ "pool_cue", 1 ] ], - [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ], [ [ "bone", 3 ], [ "bone_human", 3 ], [ "bone_tainted", 6 ] ], [ [ "rune_biomancer", 1 ] ] diff --git a/data/mods/No_Hope/Mapgen/prison_1.json b/data/mods/No_Hope/Mapgen/prison_1.json index bdb8a6205bca1..ffaa0425835dc 100644 --- a/data/mods/No_Hope/Mapgen/prison_1.json +++ b/data/mods/No_Hope/Mapgen/prison_1.json @@ -831,7 +831,7 @@ [ "towel", 20 ], [ "soap", 10 ], [ "gloves_medical", 20 ], - [ "rag", 15 ], + [ "cotton_patchwork", 15 ], [ "bag_plastic", 20 ], [ "jerky", 40 ], [ "rope_6", 15 ] diff --git a/data/mods/No_Hope/Mapgen/whaleys_house_river.json b/data/mods/No_Hope/Mapgen/whaleys_house_river.json index 31d96102fa9b5..918d5bed774e5 100644 --- a/data/mods/No_Hope/Mapgen/whaleys_house_river.json +++ b/data/mods/No_Hope/Mapgen/whaleys_house_river.json @@ -392,7 +392,7 @@ { "item": "splinter", "repeat": 1, "x": 16, "y": 4 }, { "item": "corpse", "repeat": 1, "x": 17, "y": 11 }, { "item": "splinter", "repeat": 1, "x": 4, "y": 13 }, - { "item": "rag", "repeat": 1, "x": 16, "y": 15, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "repeat": 1, "x": 16, "y": 15, "custom-flags": [ "FILTHY" ] }, { "item": "log", "repeat": 1, "x": 20, "y": 16 }, { "item": "splinter", "repeat": 1, "x": 11, "y": 19 } ], @@ -1336,12 +1336,12 @@ "object": { "place_item": [ { "item": "corpse", "repeat": 1, "x": 19, "y": 7 }, - { "item": "rag", "repeat": 1, "x": 13, "y": 12, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "repeat": 1, "x": 13, "y": 12, "custom-flags": [ "FILTHY" ] }, { "item": "human_flesh", "repeat": 1, "x": 19, "y": 12 }, { "item": "corpse", "repeat": 1, "x": 13, "y": 14 }, { "item": "corpse", "repeat": 1, "x": 19, "y": 14 }, { "item": "corpse", "repeat": 1, "x": 13, "y": 15 }, - { "item": "rag", "repeat": 1, "x": 14, "y": 15, "custom-flags": [ "FILTHY" ] } + { "item": "cotton_patchwork", "repeat": 1, "x": 14, "y": 15, "custom-flags": [ "FILTHY" ] } ], "furniture": { "#": "f_null", diff --git a/data/mods/No_Hope/item_groups.json b/data/mods/No_Hope/item_groups.json index 4e2d58588cf36..65acbcc91d18d 100644 --- a/data/mods/No_Hope/item_groups.json +++ b/data/mods/No_Hope/item_groups.json @@ -126,7 +126,7 @@ [ "can_food", 5 ], [ "bubblewrap", 3 ], [ "cig_butt", 15 ], - { "item": "rag", "prob": 8, "custom-flags": [ "FILTHY" ] }, + { "item": "cotton_patchwork", "prob": 8, "custom-flags": [ "FILTHY" ] }, { "item": "syringe", "prob": 5, "custom-flags": [ "FILTHY" ] }, { "item": "lighter", "prob": 5, "charges-min": 0, "charges-max": 10 }, { "item": "matches", "prob": 5, "charges-min": 0, "charges-max": 20 }, diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json index aae5ba584d228..07dfb021c978d 100644 --- a/data/mods/TEST_DATA/items.json +++ b/data/mods/TEST_DATA/items.json @@ -91,7 +91,7 @@ "id": "test_rag", "type": "TOOL", "category": "spare_parts", - "name": "TEST rag", + "name": "TEST cotton patchwork", "description": "This is a largish piece of cloth, useful in crafting and possibly for staunching bleeding.", "weight": "80 g", "volume": "250 ml", @@ -100,7 +100,7 @@ "symbol": ",", "color": "white", "use_action": [ - { "type": "heal", "move_cost": 200, "used_up_item": { "id": "rag", "quantity": 1, "flags": [ "FILTHY" ] } }, + { "type": "heal", "move_cost": 200, "used_up_item": { "id": "cotton_patchwork", "quantity": 1, "flags": [ "FILTHY" ] } }, "WASH_HARD_ITEMS" ], "flags": [ "NO_SALVAGE" ] @@ -110,7 +110,7 @@ "type": "GENERIC", "category": "spare_parts", "name": "TEST rag bundle", - "description": "This is a bundle of 100 rags tied together with a piece of string.", + "description": "This is a bundle of 100 cotton patchwork pieces tied together with a piece of string.", "weight": "800 g", "volume": "2000 ml", "price": 0, diff --git a/data/mods/TEST_DATA/mapgen-test.json b/data/mods/TEST_DATA/mapgen-test.json index aaa3c73d20d73..9e99cbd4e4eaa 100644 --- a/data/mods/TEST_DATA/mapgen-test.json +++ b/data/mods/TEST_DATA/mapgen-test.json @@ -121,7 +121,7 @@ "items": { "o": { "item": "clothing_work_set", "chance": 20 }, "s": { "item": "bionics", "chance": 70 } }, "place_items": [ { "item": "bionics", "x": 1, "y": 3, "chance": 70 }, { "item": "clothing_work_set", "x": 2, "y": 3, "chance": 20 } ], "item": { - "t": { "item": "rag", "chance": 4, "custom-flags": [ "FILTHY" ] }, + "t": { "item": "cotton_patchwork", "chance": 4, "custom-flags": [ "FILTHY" ] }, "u": [ { "item": "television", "chance": 1 }, { "item": "electrohack", "chance": 1 } ] }, "place_item": [ { "item": "frame", "x": [ 0, 7 ], "y": [ 4, 5 ], "chance": 4, "repeat": 10 } ], diff --git a/data/mods/TEST_DATA/uncraft.json b/data/mods/TEST_DATA/uncraft.json index ac7c0596d79d2..fb43950d9b827 100644 --- a/data/mods/TEST_DATA/uncraft.json +++ b/data/mods/TEST_DATA/uncraft.json @@ -17,7 +17,7 @@ "difficulty": 0, "time": "5 m", "qualities": [ { "id": "CUT_FINE", "level": 1 } ], - "components": [ [ [ "thread", 10 ] ], [ [ "rag", 2 ] ] ] + "components": [ [ [ "thread", 10 ] ], [ [ "cotton_patchwork", 2 ] ] ] }, { "result": "test_rag_bundle", @@ -25,7 +25,7 @@ "activity_level": "fake", "difficulty": 0, "time": "1 m", - "components": [ [ [ "string_36", 1 ] ], [ [ "rag", 100 ] ] ] + "components": [ [ [ "string_36", 1 ] ], [ [ "cotton_patchwork", 100 ] ] ] }, { "result": "test_knotted_string_ball", diff --git a/data/mods/innawood/materials.json b/data/mods/innawood/materials.json index dcf44510c6d4a..6d14b18c1d988 100644 --- a/data/mods/innawood/materials.json +++ b/data/mods/innawood/materials.json @@ -17,7 +17,7 @@ "elec_resist": 2, "chip_resist": 6, "wind_resist": 70, - "repaired_with": "rag", + "repaired_with": "cotton_patchwork", "breathability": "AVERAGE", "salvaged_into": "cotton_patchwork", "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], diff --git a/data/mods/innawood/recipes/armor_arms.json b/data/mods/innawood/recipes/armor_arms.json index eb3766df310b1..2fe61e758b4ab 100644 --- a/data/mods/innawood/recipes/armor_arms.json +++ b/data/mods/innawood/recipes/armor_arms.json @@ -12,6 +12,6 @@ "reversible": true, "using": [ [ "cordage_short", 2 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "rag", 1 ] ] ] + "components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "cotton_patchwork", 1 ] ] ] } ] diff --git a/data/mods/innawood/recipes/other/parts.json b/data/mods/innawood/recipes/other/parts.json index df0326b7234ba..7e6ed67fa37b1 100644 --- a/data/mods/innawood/recipes/other/parts.json +++ b/data/mods/innawood/recipes/other/parts.json @@ -215,6 +215,6 @@ "autolearn": true, "book_learn": [ [ "mag_fieldrepair", 1 ] ], "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "rag", 4 ], [ "leather_belt", 1 ], [ "rope_superior_short", 1, "LIST" ] ], [ [ "duct_tape", 20 ] ] ] + "components": [ [ [ "cotton_patchwork", 4 ], [ "leather_belt", 1 ], [ "rope_superior_short", 1, "LIST" ] ], [ [ "duct_tape", 20 ] ] ] } ] diff --git a/data/mods/innawood/recipes/recipe_food.json b/data/mods/innawood/recipes/recipe_food.json index f5b7580cd0747..5270e033e4d01 100644 --- a/data/mods/innawood/recipes/recipe_food.json +++ b/data/mods/innawood/recipes/recipe_food.json @@ -495,7 +495,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ], - [ [ "colander_steel", -1 ], [ "sieve_steel", -1 ], [ "sieve_primitive", -1 ], [ "rag", -1 ] ] + [ [ "colander_steel", -1 ], [ "sieve_steel", -1 ], [ "sieve_primitive", -1 ], [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "raw_butter", 8 ], [ "butter", 8 ] ] ] }, @@ -644,7 +644,7 @@ { "id": "BOIL", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 4, "LIST" ] ], [ [ "rag", -1 ] ] ], + "tools": [ [ [ "surface_heat", 4, "LIST" ] ], [ [ "cotton_patchwork", -1 ] ] ], "components": [ [ [ "milk_curdled", 2 ] ], [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ], [ "seasoning_salt", 1 ] ] ] }, { diff --git a/data/mods/innawood/recipes/recipe_others.json b/data/mods/innawood/recipes/recipe_others.json index e50b061bd0eda..c92fb27efe81b 100644 --- a/data/mods/innawood/recipes/recipe_others.json +++ b/data/mods/innawood/recipes/recipe_others.json @@ -47,7 +47,7 @@ "using": [ [ "filament", 50 ] ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "superglue", 1 ] ], [ [ "rag", 6 ] ], [ [ "plastic_chunk", 1 ] ] ] + "components": [ [ [ "superglue", 1 ] ], [ [ "cotton_patchwork", 6 ] ], [ [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", diff --git a/data/mods/innawood/recipes/tools_lights.json b/data/mods/innawood/recipes/tools_lights.json index d5d873c08f074..dffeed96d9a83 100644 --- a/data/mods/innawood/recipes/tools_lights.json +++ b/data/mods/innawood/recipes/tools_lights.json @@ -167,7 +167,13 @@ "book_learn": [ [ "textbook_fabrication", 0 ], [ "manual_fabrication", 0 ], [ "mag_electronics", 0 ] ], "components": [ [ [ "flashlight", 1 ] ], - [ [ "rag", 2 ], [ "leather", 2 ], [ "cordage", 1, "LIST" ], [ "duct_tape", 10 ], [ "medical_tape", 20 ] ] + [ + [ "cotton_patchwork", 2 ], + [ "leather", 2 ], + [ "cordage", 1, "LIST" ], + [ "duct_tape", 10 ], + [ "medical_tape", 20 ] + ] ] }, { @@ -190,7 +196,13 @@ [ [ "amplifier", 1 ], [ "makeshift_transformer", 2 ] ], [ [ "scrap", 2 ] ], [ [ "wire", 2 ] ], - [ [ "rag", 4 ], [ "leather", 4 ], [ "duct_tape", 20 ], [ "medical_tape", 40 ], [ "cordage", 1, "LIST" ] ] + [ + [ "cotton_patchwork", 4 ], + [ "leather", 4 ], + [ "duct_tape", 20 ], + [ "medical_tape", 40 ], + [ "cordage", 1, "LIST" ] + ] ] } ] diff --git a/data/mods/innawood/recipes/weapon/cutting.json b/data/mods/innawood/recipes/weapon/cutting.json index cbf98625f45be..30d2aadff0bc9 100644 --- a/data/mods/innawood/recipes/weapon/cutting.json +++ b/data/mods/innawood/recipes/weapon/cutting.json @@ -15,7 +15,7 @@ "qualities": [ { "id": "GRIND", "level": 2 } ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], @@ -42,7 +42,7 @@ "qualities": [ { "id": "GRIND", "level": 2 } ], "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ], diff --git a/data/mods/innawood/requirements/materials.json b/data/mods/innawood/requirements/materials.json index b0973a9fb9397..64e1d93d09215 100644 --- a/data/mods/innawood/requirements/materials.json +++ b/data/mods/innawood/requirements/materials.json @@ -5,7 +5,7 @@ "//": "Materials used for crafting or repairing clothing or sheeting, etc.", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ], @@ -29,7 +29,7 @@ "//": "Materials used for crafting or repairing woven fabrics", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ], @@ -50,7 +50,7 @@ "//": "Materials used for crafting or repairing non-form fitting clothing", "components": [ [ - [ "rag", 1 ], + [ "cotton_patchwork", 1 ], [ "sheet_cotton_patchwork", 1 ], [ "sheet_cotton", 1 ], [ "sheet_fibercloth", 1 ], diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp index d44b6195a33d9..750e19bfb5e37 100644 --- a/tests/crafting_test.cpp +++ b/tests/crafting_test.cpp @@ -49,11 +49,10 @@ static const itype_id itype_cash_card( "cash_card" ); static const itype_id itype_chisel( "chisel" ); static const itype_id itype_hacksaw( "hacksaw" ); static const itype_id itype_hammer( "hammer" ); -static const itype_id itype_needle_bone( "needle_bone" ); +static const itype_id itype_kevlar_shears( "kevlar_shears" ); static const itype_id itype_pockknife( "pockknife" ); -static const itype_id itype_rag( "rag" ); -static const itype_id itype_scissors( "scissors" ); static const itype_id itype_sewing_kit( "sewing_kit" ); +static const itype_id itype_sheet_cotton( "sheet_cotton" ); static const itype_id itype_test_cracklins( "test_cracklins" ); static const itype_id itype_test_gum( "test_gum" ); static const itype_id itype_thread( "thread" ); @@ -792,7 +791,7 @@ TEST_CASE( "total crafting time with or without interruption", "[crafting][time] } static std::map quality_to_tool = {{ - { qual_CUT, itype_pockknife }, { qual_SEW, itype_needle_bone }, { qual_LEATHER_AWL, itype_awl_bone }, { qual_ANVIL, itype_anvil }, { qual_HAMMER, itype_hammer }, { qual_SAW_M, itype_hacksaw }, { qual_CHISEL, itype_chisel }, { qual_FABRIC_CUT, itype_scissors } + { qual_CUT, itype_pockknife }, { qual_SEW, itype_sewing_kit }, { qual_LEATHER_AWL, itype_awl_bone }, { qual_ANVIL, itype_anvil }, { qual_HAMMER, itype_hammer }, { qual_SAW_M, itype_hacksaw }, { qual_CHISEL, itype_chisel }, { qual_FABRIC_CUT, itype_kevlar_shears } } }; @@ -883,13 +882,13 @@ TEST_CASE( "crafting_skill_gain", "[skill],[crafting],[slow]" ) { SECTION( "lvl 0 -> 1" ) { GIVEN( "nominal morale" ) { - test_skill_progression( recipe_blanket, 175, 0, true ); + test_skill_progression( recipe_blanket, 174, 0, true ); } GIVEN( "high morale" ) { - test_skill_progression( recipe_blanket, 173, 50, true ); + test_skill_progression( recipe_blanket, 172, 50, true ); } GIVEN( "very high morale" ) { - test_skill_progression( recipe_blanket, 173, 100, true ); + test_skill_progression( recipe_blanket, 172, 100, true ); } } SECTION( "lvl 1 -> 2" ) { @@ -905,24 +904,24 @@ TEST_CASE( "crafting_skill_gain", "[skill],[crafting],[slow]" ) } SECTION( "lvl 2 -> lvl 3" ) { GIVEN( "nominal morale" ) { - test_skill_progression( recipe_vambrace_larmor, 6291, 0, true ); + test_skill_progression( recipe_vambrace_larmor, 6298, 0, true ); } GIVEN( "high morale" ) { - test_skill_progression( recipe_vambrace_larmor, 5230, 50, true ); + test_skill_progression( recipe_vambrace_larmor, 5236, 50, true ); } GIVEN( "very high morale" ) { - test_skill_progression( recipe_vambrace_larmor, 4836, 100, true ); + test_skill_progression( recipe_vambrace_larmor, 4841, 100, true ); } } SECTION( "lvl 3 -> lvl 4" ) { GIVEN( "nominal morale" ) { - test_skill_progression( recipe_armguard_larmor, 12138, 0, true ); + test_skill_progression( recipe_armguard_larmor, 12131, 0, true ); } GIVEN( "high morale" ) { - test_skill_progression( recipe_armguard_larmor, 10003, 50, true ); + test_skill_progression( recipe_armguard_larmor, 9997, 50, true ); } GIVEN( "very high morale" ) { - test_skill_progression( recipe_armguard_larmor, 9203, 100, true ); + test_skill_progression( recipe_armguard_larmor, 9197, 100, true ); } } SECTION( "lvl 4 -> 5" ) { @@ -1715,14 +1714,14 @@ TEST_CASE( "recipe byproducts and byproduct groups", "[recipes][crafting]" ) TEST_CASE( "tools with charges as components", "[crafting]" ) { - const int rags_in_recipe = 4; - const int threads_in_recipe = 3; + const int cotton_sheets_in_recipe = 2; + const int threads_in_recipe = 10; map &m = get_map(); Character &c = get_player_character(); item pocketknife( itype_pockknife ); item sew_kit( itype_sewing_kit ); item thread( "thread" ); - item rag( "rag" ); + item sheet_cotton( "sheet_cotton" ); thread.charges = 100; sew_kit.put_in( thread, item_pocket::pocket_type::MAGAZINE ); REQUIRE( sew_kit.ammo_remaining() == 100 ); @@ -1734,7 +1733,7 @@ TEST_CASE( "tools with charges as components", "[crafting]" ) REQUIRE( m.i_at( c.pos() ).empty() ); c.i_add_or_drop( sew_kit ); c.i_add_or_drop( thread ); - c.i_add_or_drop( rag, rags_in_recipe ); + c.i_add_or_drop( sheet_cotton, cotton_sheets_in_recipe ); WHEN( "crafting a balaclava" ) { craft_command cmd( &*recipe_balclava, 1, false, &c, c.pos() ); cmd.execute( true ); @@ -1742,32 +1741,32 @@ TEST_CASE( "tools with charges as components", "[crafting]" ) THEN( "craft uses the free thread instead of tool ammo as component" ) { CHECK( !res.is_null() ); CHECK( res.is_craft() ); - int rags = 0; + int cotton_sheets = 0; int threads = 0; for( const item &comp : res.components ) { - if( comp.typeId() == itype_rag ) { - rags += comp.count_by_charges() ? comp.charges : 1; + if( comp.typeId() == itype_sheet_cotton ) { + cotton_sheets += comp.count_by_charges() ? comp.charges : 1; } else if( comp.typeId() == itype_thread ) { threads += comp.count_by_charges() ? comp.charges : 1; } else { FAIL( "found unexpected component " << comp.typeId().str() ); } } - CHECK( rags == rags_in_recipe ); + CHECK( cotton_sheets == cotton_sheets_in_recipe ); CHECK( threads == threads_in_recipe ); - rags = 0; + cotton_sheets = 0; threads = 0; int threads_in_tool = 0; for( const item &i : m.i_at( c.pos() ) ) { - if( i.typeId() == itype_rag ) { - rags += i.count_by_charges() ? i.charges : 1; + if( i.typeId() == itype_sheet_cotton ) { + cotton_sheets += i.count_by_charges() ? i.charges : 1; } else if( i.typeId() == itype_thread ) { threads += i.count_by_charges() ? i.charges : 1; } else if( i.typeId() == itype_sewing_kit ) { threads_in_tool += i.ammo_remaining(); } } - CHECK( rags == 0 ); + CHECK( cotton_sheets == 0 ); CHECK( threads == 100 - threads_in_recipe ); CHECK( threads_in_tool == 100 ); } @@ -1781,7 +1780,7 @@ TEST_CASE( "tools with charges as components", "[crafting]" ) REQUIRE( pack_loc->is_container_empty() ); c.i_add_or_drop( sew_kit ); c.i_add_or_drop( thread ); - c.i_add_or_drop( rag, rags_in_recipe ); + c.i_add_or_drop( sheet_cotton, cotton_sheets_in_recipe ); WHEN( "crafting a balaclava" ) { craft_command cmd( &*recipe_balclava, 1, false, &c, c.pos() ); cmd.execute( true ); @@ -1789,32 +1788,32 @@ TEST_CASE( "tools with charges as components", "[crafting]" ) THEN( "craft uses the free thread instead of tool ammo as component" ) { CHECK( !res.is_null() ); CHECK( res.is_craft() ); - int rags = 0; + int cotton_sheets = 0; int threads = 0; for( const item &comp : res.components ) { - if( comp.typeId() == itype_rag ) { - rags += comp.count_by_charges() ? comp.charges : 1; + if( comp.typeId() == itype_sheet_cotton ) { + cotton_sheets += comp.count_by_charges() ? comp.charges : 1; } else if( comp.typeId() == itype_thread ) { threads += comp.count_by_charges() ? comp.charges : 1; } else { FAIL( "found unexpected component " << comp.typeId().str() ); } } - CHECK( rags == rags_in_recipe ); + CHECK( cotton_sheets == cotton_sheets_in_recipe ); CHECK( threads == threads_in_recipe ); - rags = 0; + cotton_sheets = 0; threads = 0; int threads_in_tool = 0; for( const item *i : pack_loc->all_items_top() ) { - if( i->typeId() == itype_rag ) { - rags += i->count_by_charges() ? i->charges : 1; + if( i->typeId() == itype_sheet_cotton ) { + cotton_sheets += i->count_by_charges() ? i->charges : 1; } else if( i->typeId() == itype_thread ) { threads += i->count_by_charges() ? i->charges : 1; } else if( i->typeId() == itype_sewing_kit ) { threads_in_tool += i->ammo_remaining(); } } - CHECK( rags == 0 ); + CHECK( cotton_sheets == 0 ); CHECK( threads == 100 - threads_in_recipe ); CHECK( threads_in_tool == 100 ); } diff --git a/tests/uncraft_test.cpp b/tests/uncraft_test.cpp index bb1e34990a7e5..04989c4d877c5 100644 --- a/tests/uncraft_test.cpp +++ b/tests/uncraft_test.cpp @@ -15,8 +15,8 @@ // - Uncraft recipe "difficulty" affects component recovery success using character skill // - Damage to the original item reduces the chance of successful component recovery +static const itype_id itype_cotton_patchwork( "cotton_patchwork" ); static const itype_id itype_debug_backpack( "debug_backpack" ); -static const itype_id itype_rag( "rag" ); static const itype_id itype_string_6( "string_6" ); static const itype_id itype_test_knotted_string_ball( "test_knotted_string_ball" ); static const itype_id itype_test_multitool( "test_multitool" ); @@ -199,28 +199,28 @@ TEST_CASE( "uncraft from a damaged item", "[uncraft][damage]" ) // Chance of recovering all 100 is about 1 in 5 billion SECTION( "1 damage_level: 80 percent chance to recover components" ) { yield = repeat_uncraft( they, itype_test_rag_bundle, uncraft_rags, 1, 1000 ); - CHECK( yield[itype_rag] == Approx( 80 ).margin( 20 ) ); + CHECK( yield[itype_cotton_patchwork] == Approx( 80 ).margin( 20 ) ); } // 64% chance for each component // Recovering more than 90 is billlions-to-one SECTION( "2 damage_level: 64 percent chance to recover components" ) { yield = repeat_uncraft( they, itype_test_rag_bundle, uncraft_rags, 1, 2000 ); - CHECK( yield[itype_rag] == Approx( 64 ).margin( 30 ) ); + CHECK( yield[itype_cotton_patchwork] == Approx( 64 ).margin( 30 ) ); } // 51% chance for each component // Recovering more than 80 is billions-to-one SECTION( "3 damage_level: 51 percent chance to recover components" ) { yield = repeat_uncraft( they, itype_test_rag_bundle, uncraft_rags, 1, 3000 ); - CHECK( yield[itype_rag] == Approx( 51 ).margin( 40 ) ); + CHECK( yield[itype_cotton_patchwork] == Approx( 51 ).margin( 40 ) ); } // 41% chance for each component // Recovering more than 70 is billions-to-one SECTION( "4 damage_level: 41 percent chance to recover components" ) { yield = repeat_uncraft( they, itype_test_rag_bundle, uncraft_rags, 1, 4000 ); - CHECK( yield[itype_rag] == Approx( 41 ).margin( 40 ) ); + CHECK( yield[itype_cotton_patchwork] == Approx( 41 ).margin( 40 ) ); } }