From b1bb2b7c89fb9477732ad671b467566e7167f4b0 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 15:13:14 -0700 Subject: [PATCH 01/18] Modernize survivor boots --- .../armor/bespoke_armor/custom_boots.json | 155 +++++++++++++++--- 1 file changed, 135 insertions(+), 20 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 449b7fbdc9372..49f90b2cb439a 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -4,21 +4,54 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of light survivor boots", "str_pl": "pairs of light survivor boots" }, - "description": "A pair of customized, Kevlar-armored cloth boots. Favoring comfort over protection, these boots will keep you moving and agile, even when knee-deep in the dead.", + "description": "A pair of custom-made Kevlar boots with a chemical-resistant layer. Will keep you highly mobile without the worry of zombie acid dissolving your feet.", "weight": "1120 g", "volume": "2 L", "price": 24000, "price_postapoc": 5000, "to_hit": -1, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar", "nomex", "nylon" ], "symbol": "[", "looks_like": "boots_combat", "color": "green", "warmth": 15, - "material_thickness": 4, - "environmental_protection": 3, + "material_thickness": 1.5, + "environmental_protection": 5, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ], - "armor": [ { "encumbrance": 18, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ], + "armor": [ + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 } + ], + "encumbrance": 10, + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "rubber", "covered_by_mat": 100, "thickness": 0.6 } + ], + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], + "material": [ + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "rubber", "covered_by_mat": 100, "thickness": 5.0 } + ], + "coverage": 100 + } + ], "melee_damage": { "bash": 1 } }, { @@ -43,29 +76,62 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of survivor boots", "str_pl": "pairs of survivor boots" }, - "description": "A pair of customized leather boots armored with Kevlar. Balancing comfort and protection, these boots will keep you alive, even when knee-deep in the dead.", + "description": "A pair of custom-made boots constructed of thick Kevlar and a chemical resistant layer, featuring steel toes for extra protection. Keeps your feet safe from the myriad dangers of the apocalypse.", "weight": "1330 g", "volume": "2500 ml", "price": 24000, "price_postapoc": 6000, "to_hit": -1, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar", "nomex", "nylon", "steel" ], "symbol": "[", "looks_like": "boots_combat", "color": "brown", - "warmth": 15, - "material_thickness": 3.5, - "environmental_protection": 3, + "warmth": 30, + "material_thickness": 3, + "environmental_protection": 6, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ], - "armor": [ { "encumbrance": 24, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ], - "melee_damage": { "bash": 1 } + "armor": [ + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.2 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.6 } + ], + "encumbrance": 20, + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.2 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.2 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.6 }, + { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } + ], + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], + "material": [ + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } + ], + "coverage": 100 + } + ], + "melee_damage": { "bash": 4 } }, { "id": "boots_xlsurvivor", "type": "ARMOR", "category": "armor", "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" }, - "description": "A massive pair of customized leather boots armored with Kevlar. Balancing comfort and protection, these boots will keep you alive even when knee-deep in the dead.", + "description": "A pair of huge, custom-made boots constructed of thick Kevlar and a chemical resistant layer, featuring steel toes for extra protection. Keeps your feet safe from the myriad dangers of the apocalypse.", "weight": "2460 g", "volume": "5 L", "price": 24000, @@ -96,13 +162,38 @@ "id": "boots_wsurvivor_nofur", "type": "ARMOR", "name": { "str": "pair of faux fur winter survivor boots", "str_pl": "pairs of faux fur winter survivor boots" }, - "description": "A pair of customized, Kevlar-armored boots. Warm thanks to a faux-fur lining, these will keep you alive even when knee-deep in the dead.", + "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer. Warm thanks to the faux-fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", "copy-from": "boots_wsurvivor", - "material": [ "kevlar", "faux_fur" ], + "material": [ "kevlar", "nylon", "nomex", "faux_fur" ], "symbol": "[", "warmth": 50, "looks_like": "boots_fur", - "color": "pink" + "color": "pink", + "armor": [ + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l", "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 } + ], + "encumbrance": 35, + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], + "material": [ + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.0 } + { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } + ], + "coverage": 100 + } + ] }, { "id": "xl_boots_wsurvivor_nofur", @@ -131,21 +222,45 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of winter survivor boots", "str_pl": "pairs of winter survivor boots" }, - "description": "A pair of customized, Kevlar-armored boots. Warm thanks to the real fur lining, these will keep you alive, even when knee-deep in the dead.", + "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer. Warm thanks to the real fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", "weight": "1760 g", "volume": "3500 ml", "price": 24000, "price_postapoc": 6000, "to_hit": -1, - "material": [ "kevlar", "fur" ], + "material": [ "kevlar", "nylon", "nomex", "fur" ], "symbol": "[", "looks_like": "boots_fur", "color": "light_gray", "warmth": 75, "material_thickness": 5, - "environmental_protection": 5, + "environmental_protection": 6, "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ], - "armor": [ { "encumbrance": 38, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ], + "armor": [ + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l", "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 } + ], + "encumbrance": 35, + "coverage": 100 + }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], + "material": [ + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "fur", "covered_by_mat": 100, "thickness": 1.0 } + { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } + ], + "coverage": 100 + } + ], "melee_damage": { "bash": 1 } }, { From f3690bbbd64bac98b1367bec3e6344314edd52ac Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 15:24:10 -0700 Subject: [PATCH 02/18] commae --- data/json/items/armor/bespoke_armor/custom_boots.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 49f90b2cb439a..bf16bae372220 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -188,7 +188,7 @@ "material": [ { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.0 } + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.0 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } ], "coverage": 100 @@ -255,7 +255,7 @@ "material": [ { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "fur", "covered_by_mat": 100, "thickness": 1.0 } + { "type": "fur", "covered_by_mat": 100, "thickness": 1.0 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } ], "coverage": 100 From 08657ce61016facf54cde96d8ce1ad54a319e189 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 17:42:40 -0700 Subject: [PATCH 03/18] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../armor/bespoke_armor/custom_boots.json | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index bf16bae372220..dba60788fa889 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -21,7 +21,7 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, @@ -93,7 +93,7 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.2 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.2 }, @@ -172,7 +172,16 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l", "foot_toes_r", "foot_toes_l" ], + "specifically_covers": [ + "foot_ankle_r", + "foot_ankle_l", + "foot_arch_r", + "foot_arch_l", + "foot_heel_r", + "foot_heel_l", + "foot_toes_r", + "foot_toes_l" + ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, @@ -239,7 +248,16 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l", "foot_toes_r", "foot_toes_l" ], + "specifically_covers": [ + "foot_ankle_r", + "foot_ankle_l", + "foot_arch_r", + "foot_arch_l", + "foot_heel_r", + "foot_heel_l", + "foot_toes_r", + "foot_toes_l" + ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, From b621a66c7f40421bcf65b617f7d454c037571c4d Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 18:11:26 -0700 Subject: [PATCH 04/18] recipes #1 --- data/json/recipes/armor/feet.json | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 207c8d765f770..0f1683a7a64dc 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -380,20 +380,22 @@ "category": "CC_*", "subcategory": "CSC_*_NESTED", "skill_used": "tailor", - "difficulty": 5, - "skills_required": [ "fabrication", 3 ], + "difficulty": 6, + "skills_required": [ "fabrication", 5 ], "time": "20 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "fastener_small", 2 ] ], + "using": [ [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], [ "tailoring_nylon_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_closures }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "duct_tape", 100 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 50 ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], + [ [ "thread_nomex", 20 ] ], + [ [ "rubber_tire_chunk", 1 ] ] ] }, { @@ -505,19 +507,22 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": "22 h", + "time": "30 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "tailoring_leather_small", 8 ] ], + "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 4 ] ] "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_closures }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" }, - { "proficiency": "prof_leatherworking" } + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" } ], "components": [ - [ [ "duct_tape", 100 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 100 ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], + [ [ "thread_nomex", 20 ] ], + [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ] ] }, { From c3c4975e9b9f5aa100f4370dfddcaa2bedf17ab1 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 18:25:35 -0700 Subject: [PATCH 05/18] Update feet.json --- data/json/recipes/armor/feet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 0f1683a7a64dc..2da7314cd89c9 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -387,7 +387,7 @@ "using": [ [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], [ "tailoring_nylon_patchwork", 4 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_closures }, + { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" } ], @@ -512,7 +512,7 @@ "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 4 ] ] "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_closures }, + { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" }, { "proficiency": "prof_metalworking" }, From a0529b73d98ca8e1bfa6597e2e7ce7b39bbad407 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue, 16 May 2023 18:27:06 -0700 Subject: [PATCH 06/18] Update custom_boots.json --- .../armor/bespoke_armor/custom_boots.json | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index dba60788fa889..7539c19e73b6a 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -178,9 +178,7 @@ "foot_arch_r", "foot_arch_l", "foot_heel_r", - "foot_heel_l", - "foot_toes_r", - "foot_toes_l" + "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, @@ -191,6 +189,18 @@ "encumbrance": 35, "coverage": 100 }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } + ], + "coverage": 100 + }, { "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], @@ -254,9 +264,7 @@ "foot_arch_r", "foot_arch_l", "foot_heel_r", - "foot_heel_l", - "foot_toes_r", - "foot_toes_l" + "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, @@ -267,6 +275,18 @@ "encumbrance": 35, "coverage": 100 }, + { + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_toes_r", "foot_toes_l" ], + "material": [ + { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, + { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } + ], + "coverage": 100 + }, { "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], From 1f4725930959129394c15538c9e6cd20ea12e31e Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 09:48:44 -0700 Subject: [PATCH 07/18] a fix --- data/json/recipes/armor/feet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 2da7314cd89c9..2d61b0fb5d61d 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -381,7 +381,7 @@ "subcategory": "CSC_*_NESTED", "skill_used": "tailor", "difficulty": 6, - "skills_required": [ "fabrication", 5 ], + "skills_required": [ "fabrication", 3 ], "time": "20 h", "autolearn": true, "using": [ [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], [ "tailoring_nylon_patchwork", 4 ] ], @@ -509,7 +509,7 @@ "skills_required": [ "fabrication", 4 ], "time": "30 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 4 ] ] + "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 4 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, From 4a73720c2f8c3d3036fd8a23a4329d391c103eee Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 09:52:49 -0700 Subject: [PATCH 08/18] fixes --- .../items/armor/bespoke_armor/custom_boots.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 7539c19e73b6a..f4e1a94b0db24 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -4,7 +4,7 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of light survivor boots", "str_pl": "pairs of light survivor boots" }, - "description": "A pair of custom-made Kevlar boots with a chemical-resistant layer. Will keep you highly mobile without the worry of zombie acid dissolving your feet.", + "description": "A pair of custom-made Kevlar boots with a chemical-resistant layer and rubber toes. Will keep you highly mobile without the worry of zombie acid dissolving your feet.", "weight": "1120 g", "volume": "2 L", "price": 24000, @@ -162,9 +162,9 @@ "id": "boots_wsurvivor_nofur", "type": "ARMOR", "name": { "str": "pair of faux fur winter survivor boots", "str_pl": "pairs of faux fur winter survivor boots" }, - "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer. Warm thanks to the faux-fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", + "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer and steel toes. Warm thanks to the faux-fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", "copy-from": "boots_wsurvivor", - "material": [ "kevlar", "nylon", "nomex", "faux_fur" ], + "material": [ "kevlar", "nylon", "nomex", "faux_fur", "steel" ], "symbol": "[", "warmth": 50, "looks_like": "boots_fur", @@ -196,7 +196,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], "coverage": 100 @@ -241,13 +241,13 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of winter survivor boots", "str_pl": "pairs of winter survivor boots" }, - "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer. Warm thanks to the real fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", + "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer and steel toes. Warm thanks to the real fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", "weight": "1760 g", "volume": "3500 ml", "price": 24000, "price_postapoc": 6000, "to_hit": -1, - "material": [ "kevlar", "nylon", "nomex", "fur" ], + "material": [ "kevlar", "nylon", "nomex", "fur", "steel" ], "symbol": "[", "looks_like": "boots_fur", "color": "light_gray", @@ -282,7 +282,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], "coverage": 100 From 1bc42010c6df5c86be25c4ca5423b62a69b03c38 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 09:55:12 -0700 Subject: [PATCH 09/18] thickness --- data/json/items/armor/bespoke_armor/custom_boots.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index f4e1a94b0db24..089757ad724ec 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -184,7 +184,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.5 } ], "encumbrance": 35, "coverage": 100 @@ -196,7 +196,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.0 }, + { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.5 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], "coverage": 100 @@ -270,7 +270,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 } + { "type": "fur", "covered_by_mat": 100, "thickness": 2.5 } ], "encumbrance": 35, "coverage": 100 @@ -282,7 +282,7 @@ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, - { "type": "fur", "covered_by_mat": 100, "thickness": 2.0 }, + { "type": "fur", "covered_by_mat": 100, "thickness": 2.5 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], "coverage": 100 From 4ba99d6309514a849544cb1f91c6f50c3aa48f92 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 10:11:30 -0700 Subject: [PATCH 10/18] recipe stuff --- data/json/recipes/armor/feet.json | 38 ++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 2d61b0fb5d61d..810f404bdfbe2 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -226,19 +226,25 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": "24 h", + "time": "36 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "fastener_small", 2 ] ], + "using": [ [ "tailoring_kevlar_fabric", 14 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 4 ], [ "welding_standard", 10 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, - { "proficiency": "prof_polymerworking" } + { "proficiency": "prof_polymerworking" }, + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, + { "proficiency": "prof_furriery" } ], "components": [ - [ [ "faux_fur", 12 ] ], - [ [ "duct_tape", 100 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 150 ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], + [ [ "thread_nomex", 20 ] ], + [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ], + [ [ "sheet_faux_fur", 2 ], [ "sheet_faux_fur_patchwork", 2 ] ], + [ [ "faux_fur", 8 ] ] ] }, { @@ -509,7 +515,7 @@ "skills_required": [ "fabrication", 4 ], "time": "30 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 4 ] ], + "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 10 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, @@ -615,19 +621,25 @@ "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": "24 h", + "time": "36 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 4 ], [ "tailoring_fur_small", 12 ], [ "fastener_small", 2 ] ], + "using": [ [ "tailoring_kevlar_fabric", 14 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 4 ], [ "welding_standard", 10 ] ], "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" }, + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, { "proficiency": "prof_furriery" } ], "components": [ - [ [ "duct_tape", 100 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 150 ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], + [ [ "thread_nomex", 20 ] ], + [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ], + [ [ "sheet_fur_patchwork", 2 ], [ "tanned_pelt", 2 ] ], + [ [ "fur", 8 ] ] ] }, { From a8eebc55f71b00357de16524be979e38b0ec77f5 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 11:38:12 -0700 Subject: [PATCH 11/18] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/armor/feet.json | 35 +++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 810f404bdfbe2..b22d389b45a79 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -228,7 +228,14 @@ "skills_required": [ "fabrication", 5 ], "time": "36 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 14 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 4 ], [ "welding_standard", 10 ] ], + "using": [ + [ "tailoring_kevlar_fabric", 14 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 10 ] + ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, @@ -390,7 +397,13 @@ "skills_required": [ "fabrication", 3 ], "time": "20 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 8 ], [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], [ "tailoring_nylon_patchwork", 4 ] ], + "using": [ + [ "tailoring_kevlar_fabric", 8 ], + [ "fastener_small", 4 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 2 ], + [ "tailoring_nylon_patchwork", 4 ] + ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, @@ -515,7 +528,14 @@ "skills_required": [ "fabrication", 4 ], "time": "30 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 18 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 10 ], [ "welding_standard", 10 ] ], + "using": [ + [ "tailoring_kevlar_fabric", 18 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 10 ], + [ "welding_standard", 10 ] + ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, @@ -623,7 +643,14 @@ "skills_required": [ "fabrication", 5 ], "time": "36 h", "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 14 ], [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], [ "tailoring_nylon_patchwork", 4 ], [ "welding_standard", 10 ] ], + "using": [ + [ "tailoring_kevlar_fabric", 14 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 10 ] + ], "proficiencies": [ { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, From 61e17136b466d990a5dc8bebb990870fec42aa83 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 11:39:54 -0700 Subject: [PATCH 12/18] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../armor/bespoke_armor/custom_boots.json | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 089757ad724ec..6284ce8a2bdf5 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -172,14 +172,7 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ - "foot_ankle_r", - "foot_ankle_l", - "foot_arch_r", - "foot_arch_l", - "foot_heel_r", - "foot_heel_l" - ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, @@ -258,14 +251,7 @@ "armor": [ { "covers": [ "foot_l", "foot_r" ], - "specifically_covers": [ - "foot_ankle_r", - "foot_ankle_l", - "foot_arch_r", - "foot_arch_l", - "foot_heel_r", - "foot_heel_l" - ], + "specifically_covers": [ "foot_ankle_r", "foot_ankle_l", "foot_arch_r", "foot_arch_l", "foot_heel_r", "foot_heel_l" ], "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, From d565fa0d62e26c8584cdb4bf15d4d2b9de8e356d Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 12:41:18 -0700 Subject: [PATCH 13/18] Update feet.json --- data/json/recipes/armor/feet.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index b22d389b45a79..29ea196834714 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -246,10 +246,10 @@ { "proficiency": "prof_furriery" } ], "components": [ - [ [ "filament_durable", 150 ] ], + [ [ "filament_durable", 150, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], - [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ], + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], [ [ "sheet_faux_fur", 2 ], [ "sheet_faux_fur_patchwork", 2 ] ], [ [ "faux_fur", 8 ] ] ] @@ -411,7 +411,7 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "filament_durable", 50 ] ], + [ [ "filament_durable", 60, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], [ [ "rubber_tire_chunk", 1 ] ] @@ -545,10 +545,10 @@ { "proficiency": "prof_welding_basic" } ], "components": [ - [ [ "filament_durable", 100 ] ], + [ [ "filament_durable", 100, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], - [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ] + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ] ] }, { @@ -661,10 +661,10 @@ { "proficiency": "prof_furriery" } ], "components": [ - [ [ "filament_durable", 150 ] ], + [ [ "filament_durable", 150, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], - [ [ "boots_steel", 1 ], [ "shoes_steel", 1 ] ], + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], [ [ "sheet_fur_patchwork", 2 ], [ "tanned_pelt", 2 ] ], [ [ "fur", 8 ] ] ] From 11b07519dbe27761a69b1bd822a6c2a62a292a9a Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Wed, 17 May 2023 16:46:03 -0700 Subject: [PATCH 14/18] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/armor/feet.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 29ea196834714..528a03e839c61 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -411,7 +411,7 @@ { "proficiency": "prof_polymerworking" } ], "components": [ - [ [ "filament_durable", 60, "LIST" ] ], + [ [ "filament_durable", 60, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], [ [ "rubber_tire_chunk", 1 ] ] @@ -545,7 +545,7 @@ { "proficiency": "prof_welding_basic" } ], "components": [ - [ [ "filament_durable", 100, "LIST" ] ], + [ [ "filament_durable", 100, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ] @@ -661,7 +661,7 @@ { "proficiency": "prof_furriery" } ], "components": [ - [ [ "filament_durable", 150, "LIST" ] ], + [ [ "filament_durable", 150, "LIST" ] ], [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], From f3837d37c2190c68f63b80edaf6a9d5b3453f9a0 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Fri, 19 May 2023 10:12:10 -0700 Subject: [PATCH 15/18] xl and xs recipes --- data/json/recipes/armor/feet.json | 194 +++++++++++++++++++++++------- 1 file changed, 149 insertions(+), 45 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 528a03e839c61..badea42d3b863 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -258,12 +258,22 @@ "result": "xs_boots_wsurvivor_nofur", "type": "recipe", "copy-from": "boots_wsurvivor_nofur", - "time": "24 h", - "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "fastener_small", 1 ] ], + "time": "30 h", + "using": [ + [ "tailoring_kevlar_fabric", 12 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 8 ] + ], "components": [ - [ [ "faux_fur", 9 ] ], - [ [ "duct_tape", 75 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 125, "LIST" ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 3 ], [ "sheet_nomex_patchwork", 3 ] ], + [ [ "thread_nomex", 18 ] ], + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], + [ [ "sheet_faux_fur", 2 ], [ "sheet_faux_fur_patchwork", 2 ] ], + [ [ "faux_fur", 4 ] ] ] }, { @@ -271,13 +281,35 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "copy-from": "boots_wsurvivor_nofur", - "using": [ [ "tailoring_kevlar_fabric", 6 ], [ "fastener_small", 2 ] ], - "components": [ - [ [ "faux_fur", 16 ] ], - [ [ "duct_tape", 150 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + "difficulty": 8, + "skills_required": [ "fabrication", 6 ], + "time": "54 h", + "using": [ + [ "tailoring_kevlar_fabric", 14 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 10 ], + [ "steel_tiny", 2 ] + ], + "proficiencies": [ + { "proficiency": "prof_cobbling" }, + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_polymerworking" }, + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_furriery" } ], - "time": "32 h" + "components": [ + [ [ "filament_durable", 225, "LIST" ] ], + [ [ "xlnomex_socks", 1 ], [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], + [ [ "thread_nomex", 30 ] ], + [ [ "sheet_faux_fur", 4 ], [ "sheet_faux_fur_patchwork", 4 ] ], + [ [ "faux_fur", 12 ] ] + ] }, { "result": "boots_h20survivor", @@ -395,7 +427,7 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 3 ], - "time": "20 h", + "time": "24 h", "autolearn": true, "using": [ [ "tailoring_kevlar_fabric", 8 ], @@ -422,10 +454,18 @@ "type": "recipe", "copy-from": "boots_lsurvivor", "time": "20 h", - "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "fastener_small", 1 ] ], + "using": [ + [ "tailoring_kevlar_fabric", 8 ], + [ "fastener_small", 4 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 2 ], + [ "tailoring_nylon_patchwork", 4 ] + ], "components": [ - [ [ "duct_tape", 75 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 50, "LIST" ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 3 ], [ "sheet_nomex_patchwork", 3 ] ], + [ [ "thread_nomex", 18 ] ], + [ [ "rubber_tire_chunk", 1 ] ] ] }, { @@ -433,11 +473,21 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "copy-from": "boots_lsurvivor", - "using": [ [ "tailoring_kevlar_fabric", 6 ], [ "fastener_small", 2 ] ], - "time": "22 h 30 m", + "difficulty": 7, + "skills_required": [ "fabrication", 4 ], + "time": "32 h", + "using": [ + [ "tailoring_kevlar_fabric", 12 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 2 ], + [ "adhesive_rubber", 3 ], + [ "tailoring_nylon_patchwork", 6 ] + ], "components": [ - [ [ "duct_tape", 150 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 90, "LIST" ] ], + [ [ "xlnomex_socks", 1 ], [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], + [ [ "thread_nomex", 30 ] ], + [ [ "rubber_tire_chunk", 1 ] ] ] }, { @@ -555,11 +605,20 @@ "result": "boots_xssurvivor", "type": "recipe", "copy-from": "boots_survivor", - "time": "22 h", - "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "tailoring_leather_small", 6 ] ], + "time": "24 h", + "using": [ + [ "tailoring_kevlar_fabric", 16 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 8 ], + [ "welding_standard", 8 ] + ], "components": [ - [ [ "duct_tape", 75 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 80, "LIST" ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 3 ], [ "sheet_nomex_patchwork", 3 ] ], + [ [ "thread_nomex", 18 ] ], + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ] ] }, { @@ -665,7 +724,7 @@ [ [ "nomex_socks", 1 ], [ "sheet_nomex", 4 ], [ "sheet_nomex_patchwork", 4 ] ], [ [ "thread_nomex", 20 ] ], [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], - [ [ "sheet_fur_patchwork", 2 ], [ "tanned_pelt", 2 ] ], + [ [ "sheet_fur_patchwork", 2 ], [ "tanned_pelt", 2 ], [ "boots_fur", 1 ] ], [ [ "fur", 8 ] ] ] }, @@ -673,45 +732,90 @@ "result": "xs_boots_wsurvivor", "type": "recipe", "copy-from": "boots_wsurvivor", - "time": "24 h", - "using": [ [ "tailoring_kevlar_fabric", 3 ], [ "tailoring_fur_small", 9 ], [ "fastener_small", 1 ] ], + "time": "30 h", + "using": [ + [ "tailoring_kevlar_fabric", 12 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 8 ] + ], "components": [ - [ [ "duct_tape", 75 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + [ [ "filament_durable", 125, "LIST" ] ], + [ [ "nomex_socks", 1 ], [ "sheet_nomex", 3 ], [ "sheet_nomex_patchwork", 3 ] ], + [ [ "thread_nomex", 18 ] ], + [ [ "boots_steel", 1 ], [ "sneakers_steel", 1 ] ], + [ [ "tanned_pelt", 2 ], [ "sheet_fur_patchwork", 2 ], [ "boots_fur", 1 ] ], + [ [ "fur", 4 ] ] ] }, { "result": "xl_boots_wsurvivor", "type": "recipe", - "activity_level": "LIGHT_EXERCISE", "copy-from": "boots_wsurvivor", - "using": [ [ "tailoring_kevlar_fabric", 6 ], [ "tailoring_fur_small", 16 ], [ "fastener_small", 2 ] ], - "components": [ - [ [ "duct_tape", 150 ] ], - [ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ] + "difficulty": 8, + "skills_required": [ "fabrication", 6 ], + "time": "54 h", + "using": [ + [ "tailoring_kevlar_fabric", 14 ], + [ "fastener_small", 6 ], + [ "shoe_rubber", 1 ], + [ "adhesive_rubber", 1 ], + [ "tailoring_nylon_patchwork", 4 ], + [ "welding_standard", 10 ], + [ "steel_tiny", 2 ] ], - "time": "27 h" + "proficiencies": [ + { "proficiency": "prof_cobbling" }, + { "proficiency": "prof_closures" }, + { "proficiency": "prof_closures_waterproofing" }, + { "proficiency": "prof_polymerworking" }, + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_furriery" } + ], + "components": [ + [ [ "filament_durable", 225, "LIST" ] ], + [ [ "xlnomex_socks", 1 ], [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], + [ [ "thread_nomex", 30 ] ], + [ [ "sheet_fur", 4 ], [ "tanned_pelt", 4 ] ], + [ [ "fur", 12 ] ] + ] }, { "result": "boots_xlsurvivor", "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_*", - "subcategory": "CSC_*_NESTED", + "copy-from": "boots_survivor", "skill_used": "tailor", - "difficulty": 6, - "skills_required": [ "fabrication", 4 ], - "time": "24 h 45 m", - "autolearn": true, - "using": [ [ "tailoring_kevlar_fabric", 10 ], [ "tailoring_leather_small", 24 ], [ "fastener_small", 2 ] ], + "difficulty": 7, + "skills_required": [ "fabrication", 5 ], + "time": "45 h", + "using": [ + [ "tailoring_kevlar_fabric", 27 ], + [ "fastener_small", 10 ], + [ "shoe_rubber", 2 ], + [ "adhesive_rubber", 2 ], + [ "tailoring_nylon_patchwork", 15 ], + [ "welding_standard", 12 ], + [ "blacksmithing_standard", 6 ], + [ "steel_tiny", 2 ] + ], "proficiencies": [ { "proficiency": "prof_cobbling" }, - { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_polymerworking" }, - { "proficiency": "prof_leatherworking" } + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, + { "proficiency": "prof_blacksmithing" } ], - "components": [ [ [ "scrap", 4 ] ], [ [ "duct_tape", 200 ] ] ] + "components": [ + [ [ "filament_durable", 150, "LIST" ] ], + [ [ "xlnomex_socks", 1 ], [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], + [ [ "thread_nomex", 30 ] ] + ] }, { "result": "clogs", From 79baf46a769d416045b6bf328e12ef711ad95ea8 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Fri, 19 May 2023 11:19:59 -0700 Subject: [PATCH 16/18] fixes --- data/json/recipes/armor/feet.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index badea42d3b863..4dd5b32c9a0d5 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -780,7 +780,7 @@ [ [ "filament_durable", 225, "LIST" ] ], [ [ "xlnomex_socks", 1 ], [ "sheet_nomex", 6 ], [ "sheet_nomex_patchwork", 6 ] ], [ [ "thread_nomex", 30 ] ], - [ [ "sheet_fur", 4 ], [ "tanned_pelt", 4 ] ], + [ [ "sheet_fur_patchwork", 4 ], [ "tanned_pelt", 4 ] ], [ [ "fur", 12 ] ] ] }, @@ -788,7 +788,6 @@ "result": "boots_xlsurvivor", "type": "recipe", "copy-from": "boots_survivor", - "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], "time": "45 h", From c60f97c9b03c9c65575b9f6c69029c9f9c3ef28d Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:37:31 -0700 Subject: [PATCH 17/18] nylon->leather --- .../armor/bespoke_armor/custom_boots.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 6284ce8a2bdf5..7265a397c9abc 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -4,13 +4,13 @@ "type": "ARMOR", "category": "armor", "name": { "str": "pair of light survivor boots", "str_pl": "pairs of light survivor boots" }, - "description": "A pair of custom-made Kevlar boots with a chemical-resistant layer and rubber toes. Will keep you highly mobile without the worry of zombie acid dissolving your feet.", + "description": "A pair of custom-made Kevlar-armored boots with a chemical-resistant layer and rubber toes. Will keep you highly mobile without the worry of zombie acid dissolving your feet.", "weight": "1120 g", "volume": "2 L", "price": 24000, "price_postapoc": 5000, "to_hit": -1, - "material": [ "kevlar", "nomex", "nylon" ], + "material": [ "kevlar", "nomex", "leather" ], "symbol": "[", "looks_like": "boots_combat", "color": "green", @@ -25,7 +25,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 } + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 } ], "encumbrance": 10, "coverage": 100 @@ -36,7 +36,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 0.6 } ], "coverage": 100 @@ -45,7 +45,7 @@ "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], "material": [ - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 5.0 } ], @@ -82,7 +82,7 @@ "price": 24000, "price_postapoc": 6000, "to_hit": -1, - "material": [ "kevlar", "nomex", "nylon", "steel" ], + "material": [ "kevlar", "nomex", "leather", "steel" ], "symbol": "[", "looks_like": "boots_combat", "color": "brown", @@ -97,7 +97,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.2 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.2 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.6 } + { "type": "leather", "covered_by_mat": 100, "thickness": 0.8 } ], "encumbrance": 20, "coverage": 100 @@ -108,7 +108,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 2.2 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.2 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.6 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.8 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], "coverage": 100 @@ -117,7 +117,7 @@ "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], "material": [ - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } ], @@ -164,7 +164,7 @@ "name": { "str": "pair of faux fur winter survivor boots", "str_pl": "pairs of faux fur winter survivor boots" }, "description": "A pair of customized, Kevlar-armored boots with a chemical-resistant layer and steel toes. Warm thanks to the faux-fur lining, and quite protective due to the thick materials, though perhaps a little hard to move in.", "copy-from": "boots_wsurvivor", - "material": [ "kevlar", "nylon", "nomex", "faux_fur", "steel" ], + "material": [ "leather", "leather", "nomex", "faux_fur", "steel" ], "symbol": "[", "warmth": 50, "looks_like": "boots_fur", @@ -176,7 +176,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 }, { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.5 } ], "encumbrance": 35, @@ -188,7 +188,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 }, { "type": "faux_fur", "covered_by_mat": 100, "thickness": 2.5 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], @@ -198,7 +198,7 @@ "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], "material": [ - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.0 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } @@ -240,7 +240,7 @@ "price": 24000, "price_postapoc": 6000, "to_hit": -1, - "material": [ "kevlar", "nylon", "nomex", "fur", "steel" ], + "material": [ "kevlar", "leather", "nomex", "fur", "steel" ], "symbol": "[", "looks_like": "boots_fur", "color": "light_gray", @@ -255,7 +255,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 }, { "type": "fur", "covered_by_mat": 100, "thickness": 2.5 } ], "encumbrance": 35, @@ -267,7 +267,7 @@ "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1.6 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.3 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.5 }, { "type": "fur", "covered_by_mat": 100, "thickness": 2.5 }, { "type": "steel", "covered_by_mat": 100, "thickness": 0.5 } ], @@ -277,7 +277,7 @@ "covers": [ "foot_l", "foot_r" ], "specifically_covers": [ "foot_sole_r", "foot_sole_l" ], "material": [ - { "type": "nylon", "covered_by_mat": 100, "thickness": 0.1 }, + { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "nomex", "covered_by_mat": 100, "thickness": 0.1 }, { "type": "fur", "covered_by_mat": 100, "thickness": 1.0 }, { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 } From d246d33b95b1d1da31f610eab980fb3756b76138 Mon Sep 17 00:00:00 2001 From: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:44:09 -0700 Subject: [PATCH 18/18] nylon->leather --- data/json/recipes/armor/feet.json | 38 +++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 4dd5b32c9a0d5..97f17ff7c4d0a 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -233,10 +233,12 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 12 ], [ "welding_standard", 10 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -264,7 +266,7 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 10 ], [ "welding_standard", 8 ] ], "components": [ @@ -289,11 +291,13 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 16 ], [ "welding_standard", 10 ], [ "steel_tiny", 2 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -434,9 +438,11 @@ [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], - [ "tailoring_nylon_patchwork", 4 ] + [ "tailoring_leather_small", 12 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -459,7 +465,7 @@ [ "fastener_small", 4 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 2 ], - [ "tailoring_nylon_patchwork", 4 ] + [ "tailoring_leather_small", 10 ] ], "components": [ [ [ "filament_durable", 50, "LIST" ] ], @@ -481,7 +487,7 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 2 ], [ "adhesive_rubber", 3 ], - [ "tailoring_nylon_patchwork", 6 ] + [ "tailoring_leather_small", 18 ] ], "components": [ [ [ "filament_durable", 90, "LIST" ] ], @@ -583,10 +589,12 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 10 ], + [ "tailoring_leather_small", 24 ], [ "welding_standard", 10 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -611,7 +619,7 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 8 ], + [ "tailoring_leather_small", 12 ], [ "welding_standard", 8 ] ], "components": [ @@ -707,10 +715,12 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 12 ], [ "welding_standard", 10 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -738,7 +748,7 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 10 ], [ "welding_standard", 8 ] ], "components": [ @@ -762,11 +772,13 @@ [ "fastener_small", 6 ], [ "shoe_rubber", 1 ], [ "adhesive_rubber", 1 ], - [ "tailoring_nylon_patchwork", 4 ], + [ "tailoring_leather_small", 16 ], [ "welding_standard", 10 ], [ "steel_tiny", 2 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" }, @@ -796,12 +808,14 @@ [ "fastener_small", 10 ], [ "shoe_rubber", 2 ], [ "adhesive_rubber", 2 ], - [ "tailoring_nylon_patchwork", 15 ], + [ "tailoring_leather_small", 30 ], [ "welding_standard", 12 ], [ "blacksmithing_standard", 6 ], [ "steel_tiny", 2 ] ], "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_leatherworking" }, { "proficiency": "prof_cobbling" }, { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" },