From 88b37ca0afa96389b5a863c73292fd51353794d7 Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:17:22 -0500 Subject: [PATCH 1/7] add chitinous helmet variants --- data/json/items/armor/helmets.json | 112 ++++++++++++++++++++++++----- 1 file changed, 95 insertions(+), 17 deletions(-) diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index c6262345be851..1cc28f2d90fa1 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -755,11 +755,11 @@ "type": "ARMOR", "category": "armor", "name": { "str": "chitinous helmet" }, - "description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.", - "weight": "1447 g", - "volume": "2500 ml", - "price": "380 USD", - "price_postapoc": "12 USD 50 cent", + "description": "A helmet made from the exoskeletons of insects. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Very light and durable.", + "weight": "1247 g", + "volume": "2300 ml", + "price": "300 USD", + "price_postapoc": "10 USD", "material": [ "chitin" ], "symbol": "[", "looks_like": "helmet_larmor", @@ -771,21 +771,13 @@ "coverage": 95, "encumbrance_modifiers": [ "NONE" ] }, - { - "covers": [ "mouth" ], - "rigid_layer_only": true, - "coverage": 70, - "specifically_covers": [ "mouth_lips", "mouth_nose" ], - "encumbrance": 5 - }, { "covers": [ "mouth" ], "rigid_layer_only": true, "specifically_covers": [ "mouth_cheeks", "mouth_chin" ], - "coverage": 95 + "coverage": 60 }, - { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 }, - { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 60, "encumbrance": 5 } + { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 } ], "warmth": 20, "material_thickness": 4, @@ -797,6 +789,7 @@ "id": "xl_helmet_chitin", "type": "ARMOR", "copy-from": "helmet_chitin", + "looks_like": "helmet_chitin", "name": { "str": "chitinous helmet" }, "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } @@ -810,6 +803,61 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "WATERPROOF", "STURDY", "UNDERSIZE", "PREFIX_XS" ] }, + { + "id": "helmet_chitin_full", + "copy-from": "helmet_chitin", + "looks_like": "helmet_chitin", + "type": "ARMOR", + "name": { "str": "full chitinous helmet" }, + "description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.", + "weight": "1447 g", + "volume": "2500 ml", + "price": "380 USD", + "price_postapoc": "12 USD 50 cent", + "material": [ "chitin" ], + "relative": { "melee_damage": { "bash": 1 } }, + "armor": [ + { + "covers": [ "head" ], + "specifically_covers": [ "head_crown", "head_forehead", "head_ear_l", "head_ear_r" ], + "coverage": 95, + "encumbrance_modifiers": [ "NONE" ] + }, + { + "covers": [ "mouth" ], + "rigid_layer_only": true, + "coverage": 70, + "specifically_covers": [ "mouth_lips", "mouth_nose" ], + "encumbrance": 5 + }, + { + "covers": [ "mouth" ], + "rigid_layer_only": true, + "specifically_covers": [ "mouth_cheeks", "mouth_chin" ], + "coverage": 95 + }, + { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 }, + { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 60, "encumbrance": 5 } + ] + }, + { + "id": "xl_helmet_chitin_full", + "type": "ARMOR", + "copy-from": "helmet_chitin_full", + "looks_like": "helmet_chitin", + "name": { "str": "full chitinous helmet" }, + "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } + }, + { + "id": "helmet_chitin_full_xs", + "type": "ARMOR", + "copy-from": "helmet_chitin_full", + "looks_like": "helmet_chitin", + "name": { "str": "full chitinous helmet" }, + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "flags": [ "WATERPROOF", "STURDY", "UNDERSIZE", "PREFIX_XS" ] + }, { "id": "helmet_conical", "type": "ARMOR", @@ -862,8 +910,8 @@ "looks_like": "helmet_chitin", "type": "ARMOR", "name": { "str": "biosilicified chitin helmet" }, - "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant but brittle.", - "price_postapoc": "17 USD 50 cent", + "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Acid-resistant but brittle.", + "price_postapoc": "14 USD 50 cent", "material": [ "acidchitin" ], "relative": { "melee_damage": { "bash": 1 } } }, @@ -871,6 +919,7 @@ "id": "xl_helmet_acidchitin", "type": "ARMOR", "copy-from": "helmet_acidchitin", + "looks_like": "helmet_acidchitin", "name": { "str": "biosilicified chitin helmet" }, "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } @@ -884,6 +933,35 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] } }, + { + "id": "helmet_acidchitin_full", + "copy-from": "helmet_chitin_full", + "looks_like": "helmet_chitin_full", + "type": "ARMOR", + "name": { "str": "biosilicified full chitin helmet" }, + "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers the whole head. Acid-resistant but brittle.", + "price_postapoc": "17 USD 50 cent", + "material": [ "acidchitin" ], + "relative": { "melee_damage": { "bash": 1 } } + }, + { + "id": "xl_helmet_acidchitin_full", + "type": "ARMOR", + "copy-from": "helmet_acidchitin_full", + "looks_like": "helmet_acidchitin_full", + "name": { "str": "biosilicified full chitin helmet" }, + "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, + "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } + }, + { + "id": "helmet_acidchitin_full_xs", + "type": "ARMOR", + "copy-from": "helmet_acidchitin_full", + "looks_like": "helmet_acidchitin_full", + "name": { "str": "biosilicified full chitin helmet" }, + "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, + "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] } + }, { "id": "helmet_football", "type": "ARMOR", From 17ba614c171d357af3595b0204aae934da1c0927 Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:22:51 -0500 Subject: [PATCH 2/7] chitinous helmet variant recipes --- data/json/recipes/armor/head.json | 85 ++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 8 deletions(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index a32fab7f5f89d..0e3beefc550b7 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -564,10 +564,10 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ [ "fabrication", 3 ] ], - "time": "2 h", + "time": "1 h 30 m", "autolearn": true, "book_learn": [ [ "textbook_arthropod", 5 ] ], - "using": [ [ "armor_chitin", 12 ] ], + "using": [ [ "armor_chitin", 10 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -578,13 +578,46 @@ "result": "helmet_chitin_xs", "type": "recipe", "copy-from": "helmet_chitin", - "time": "1 h 30 m", - "using": [ [ "armor_chitin", 9 ] ] + "time": "1 h", + "using": [ [ "armor_chitin", 7 ] ] }, { "result": "xl_helmet_chitin", "type": "recipe", "copy-from": "helmet_chitin", + "time": "2 h 20 m", + "using": [ [ "armor_chitin", 15 ] ] + }, + { + "result": "helmet_chitin_full", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 6, + "skills_required": [ [ "fabrication", 3 ] ], + "time": "2 h", + "autolearn": true, + "book_learn": [ [ "textbook_arthropod", 5 ] ], + "using": [ [ "armor_chitin", 12 ] ], + "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_chitinworking" }, + { "proficiency": "prof_fibers" } + ] + }, + { + "result": "helmet_chitin_full_xs", + "type": "recipe", + "copy-from": "helmet_chitin_full", + "time": "1 h 30 m", + "using": [ [ "armor_chitin", 9 ] ] + }, + { + "result": "xl_helmet_chitin_full", + "type": "recipe", + "copy-from": "helmet_chitin_full", "time": "2 h 50 m", "using": [ [ "armor_chitin", 17 ] ] }, @@ -639,10 +672,10 @@ "difficulty": 7, "book_learn": [ [ "textbook_arthropod", 6 ] ], "skills_required": [ [ "fabrication", 4 ], [ "chemistry", 2 ] ], - "time": "3 h", + "time": "2 h 30 m", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 10 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -653,14 +686,50 @@ "result": "helmet_acidchitin_xs", "type": "recipe", "copy-from": "helmet_acidchitin", - "time": "3 h", + "time": "2 h 30 m", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 9 ] ] ] + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 7 ] ] ] }, { "result": "xl_helmet_acidchitin", "type": "recipe", "copy-from": "helmet_acidchitin", + "time": "2 h 50 m", + "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "cordage_superior", 2, "LIST" ] ], [ [ "acidchitin_piece", 17 ] ] ] + }, + { + "result": "helmet_acidchitin_full", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_*", + "subcategory": "CSC_*_NESTED", + "skill_used": "tailor", + "difficulty": 7, + "book_learn": [ [ "textbook_arthropod", 6 ] ], + "skills_required": [ [ "fabrication", 4 ], [ "chemistry", 2 ] ], + "time": "3 h", + "autolearn": true, + "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ], + "proficiencies": [ + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_chitinworking" }, + { "proficiency": "prof_fibers" } + ] + }, + { + "result": "helmet_acidchitin_full_xs", + "type": "recipe", + "copy-from": "helmet_acidchitin_full", + "time": "3 h", + "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 9 ] ] ] + }, + { + "result": "xl_helmet_acidchitin_full", + "type": "recipe", + "copy-from": "helmet_acidchitin_full", "time": "3 h 20 m", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "cordage_superior", 2, "LIST" ] ], [ [ "acidchitin_piece", 17 ] ] ] From 5c277da6c26d49b91dd258e4af7cc4c4b5fc033c Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Thu, 29 Aug 2024 22:24:31 -0500 Subject: [PATCH 3/7] chitin helmet variant nested recipes added --- data/json/recipes/nested.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index f36b966606890..8bd4b282fde80 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -500,9 +500,15 @@ "description": "Recipes related to constructing durable helmets from chitin.", "skill_used": "tailor", "nested_category_data": [ + "helmet_acidchitin_full", + "helmet_acidchitin_full_xs", + "xl_helmet_acidchitin_full", "helmet_acidchitin", "helmet_acidchitin_xs", "xl_helmet_acidchitin", + "helmet_chitin_full", + "helmet_chitin_full_xs", + "xl_helmet_chitin_full", "helmet_chitin", "helmet_chitin_xs", "xl_helmet_chitin" From 0ba5edffe7bf88d1d36abd4ecad7c02b38f330fe Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:25:46 -0500 Subject: [PATCH 4/7] correct id issue with light chitinous helmet --- data/json/items/armor/helmets.json | 99 +++++++++++++++--------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 1cc28f2d90fa1..6d6f5fe96fdbe 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -755,11 +755,11 @@ "type": "ARMOR", "category": "armor", "name": { "str": "chitinous helmet" }, - "description": "A helmet made from the exoskeletons of insects. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Very light and durable.", - "weight": "1247 g", - "volume": "2300 ml", - "price": "300 USD", - "price_postapoc": "10 USD", + "description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.", + "weight": "1447 g", + "volume": "2500 ml", + "price": "380 USD", + "price_postapoc": "12 USD 50 cent", "material": [ "chitin" ], "symbol": "[", "looks_like": "helmet_larmor", @@ -771,13 +771,21 @@ "coverage": 95, "encumbrance_modifiers": [ "NONE" ] }, + { + "covers": [ "mouth" ], + "rigid_layer_only": true, + "coverage": 70, + "specifically_covers": [ "mouth_lips", "mouth_nose" ], + "encumbrance": 5 + }, { "covers": [ "mouth" ], "rigid_layer_only": true, "specifically_covers": [ "mouth_cheeks", "mouth_chin" ], - "coverage": 60 + "coverage": 95 }, - { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 } + { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 }, + { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 60, "encumbrance": 5 } ], "warmth": 20, "material_thickness": 4, @@ -804,18 +812,16 @@ "flags": [ "WATERPROOF", "STURDY", "UNDERSIZE", "PREFIX_XS" ] }, { - "id": "helmet_chitin_full", + "id": "helmet_chitin_light", + "type": "ARMOR", "copy-from": "helmet_chitin", "looks_like": "helmet_chitin", - "type": "ARMOR", - "name": { "str": "full chitinous helmet" }, - "description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.", - "weight": "1447 g", - "volume": "2500 ml", - "price": "380 USD", - "price_postapoc": "12 USD 50 cent", - "material": [ "chitin" ], - "relative": { "melee_damage": { "bash": 1 } }, + "name": { "str": "light chitinous helmet" }, + "description": "A helmet made from the exoskeletons of insects. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Very light and durable.", + "weight": "1247 g", + "volume": "2300 ml", + "price": "340 USD", + "price_postapoc": "10 USD", "armor": [ { "covers": [ "head" ], @@ -823,38 +829,35 @@ "coverage": 95, "encumbrance_modifiers": [ "NONE" ] }, - { - "covers": [ "mouth" ], - "rigid_layer_only": true, - "coverage": 70, - "specifically_covers": [ "mouth_lips", "mouth_nose" ], - "encumbrance": 5 - }, { "covers": [ "mouth" ], "rigid_layer_only": true, "specifically_covers": [ "mouth_cheeks", "mouth_chin" ], - "coverage": 95 + "coverage": 60 }, - { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 }, - { "covers": [ "eyes" ], "rigid_layer_only": true, "coverage": 60, "encumbrance": 5 } - ] + { "covers": [ "head" ], "specifically_covers": [ "head_nape", "head_throat" ], "coverage": 60 } + ], + "warmth": 20, + "material_thickness": 4, + "environmental_protection": 4, + "flags": [ "WATERPROOF", "STURDY" ], + "melee_damage": { "bash": 1 } }, { - "id": "xl_helmet_chitin_full", + "id": "xl_helmet_chitin_light", "type": "ARMOR", - "copy-from": "helmet_chitin_full", - "looks_like": "helmet_chitin", - "name": { "str": "full chitinous helmet" }, + "copy-from": "helmet_chitin_light", + "looks_like": "helmet_chitin_light", + "name": { "str": "light chitinous helmet" }, "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } }, { - "id": "helmet_chitin_full_xs", + "id": "helmet_chitin_light_xs", "type": "ARMOR", - "copy-from": "helmet_chitin_full", - "looks_like": "helmet_chitin", - "name": { "str": "full chitinous helmet" }, + "copy-from": "helmet_chitin_light", + "looks_like": "helmet_chitin_light", + "name": { "str": "light chitinous helmet" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "WATERPROOF", "STURDY", "UNDERSIZE", "PREFIX_XS" ] }, @@ -934,31 +937,31 @@ "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] } }, { - "id": "helmet_acidchitin_full", - "copy-from": "helmet_chitin_full", - "looks_like": "helmet_chitin_full", + "id": "helmet_acidchitin_light", + "copy-from": "helmet_chitin_light", + "looks_like": "helmet_chitin_light", "type": "ARMOR", - "name": { "str": "biosilicified full chitin helmet" }, + "name": { "str": "biosilicified light chitin helmet" }, "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers the whole head. Acid-resistant but brittle.", "price_postapoc": "17 USD 50 cent", "material": [ "acidchitin" ], "relative": { "melee_damage": { "bash": 1 } } }, { - "id": "xl_helmet_acidchitin_full", + "id": "xl_helmet_acidchitin_light", "type": "ARMOR", - "copy-from": "helmet_acidchitin_full", - "looks_like": "helmet_acidchitin_full", - "name": { "str": "biosilicified full chitin helmet" }, + "copy-from": "helmet_acidchitin_light", + "looks_like": "helmet_acidchitin_light", + "name": { "str": "biosilicified light chitin helmet" }, "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 }, "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } }, { - "id": "helmet_acidchitin_full_xs", + "id": "helmet_acidchitin_light_xs", "type": "ARMOR", - "copy-from": "helmet_acidchitin_full", - "looks_like": "helmet_acidchitin_full", - "name": { "str": "biosilicified full chitin helmet" }, + "copy-from": "helmet_acidchitin_light", + "looks_like": "helmet_acidchitin_light", + "name": { "str": "biosilicified light chitin helmet" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] } }, From b09e258ac5d868aef25969ff56b50cac95e5926d Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:31:30 -0500 Subject: [PATCH 5/7] correct id issue with light chitinous helmet recipes --- data/json/recipes/armor/head.json | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index 0e3beefc550b7..239b36f6f2966 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -564,10 +564,10 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ [ "fabrication", 3 ] ], - "time": "1 h 30 m", + "time": "2 h", "autolearn": true, "book_learn": [ [ "textbook_arthropod", 5 ] ], - "using": [ [ "armor_chitin", 10 ] ], + "using": [ [ "armor_chitin", 12 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -578,18 +578,18 @@ "result": "helmet_chitin_xs", "type": "recipe", "copy-from": "helmet_chitin", - "time": "1 h", - "using": [ [ "armor_chitin", 7 ] ] + "time": "1 h 30 m", + "using": [ [ "armor_chitin", 9 ] ] }, { "result": "xl_helmet_chitin", "type": "recipe", "copy-from": "helmet_chitin", - "time": "2 h 20 m", - "using": [ [ "armor_chitin", 15 ] ] + "time": "2 h 50 m", + "using": [ [ "armor_chitin", 17 ] ] }, { - "result": "helmet_chitin_full", + "result": "helmet_chitin_light", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -597,10 +597,10 @@ "skill_used": "tailor", "difficulty": 6, "skills_required": [ [ "fabrication", 3 ] ], - "time": "2 h", + "time": "1 h 30 m", "autolearn": true, "book_learn": [ [ "textbook_arthropod", 5 ] ], - "using": [ [ "armor_chitin", 12 ] ], + "using": [ [ "armor_chitin", 10 ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -608,18 +608,18 @@ ] }, { - "result": "helmet_chitin_full_xs", + "result": "helmet_chitin_light_xs", "type": "recipe", - "copy-from": "helmet_chitin_full", - "time": "1 h 30 m", - "using": [ [ "armor_chitin", 9 ] ] + "copy-from": "helmet_chitin_light", + "time": "1 h", + "using": [ [ "armor_chitin", 7 ] ] }, { - "result": "xl_helmet_chitin_full", + "result": "xl_helmet_chitin_light", "type": "recipe", - "copy-from": "helmet_chitin_full", - "time": "2 h 50 m", - "using": [ [ "armor_chitin", 17 ] ] + "copy-from": "helmet_chitin_light", + "time": "2 h 20 m", + "using": [ [ "armor_chitin", 15 ] ] }, { "result": "helmet_conical", @@ -672,10 +672,10 @@ "difficulty": 7, "book_learn": [ [ "textbook_arthropod", 6 ] ], "skills_required": [ [ "fabrication", 4 ], [ "chemistry", 2 ] ], - "time": "2 h 30 m", + "time": "3 h", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 10 ] ] ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -686,20 +686,20 @@ "result": "helmet_acidchitin_xs", "type": "recipe", "copy-from": "helmet_acidchitin", - "time": "2 h 30 m", + "time": "3 h", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 7 ] ] ] + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 9 ] ] ] }, { "result": "xl_helmet_acidchitin", "type": "recipe", "copy-from": "helmet_acidchitin", - "time": "2 h 50 m", + "time": "3 h 20 m", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "cordage_superior", 2, "LIST" ] ], [ [ "acidchitin_piece", 17 ] ] ] }, { - "result": "helmet_acidchitin_full", + "result": "helmet_acidchitin_light", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_*", @@ -708,10 +708,10 @@ "difficulty": 7, "book_learn": [ [ "textbook_arthropod", 6 ] ], "skills_required": [ [ "fabrication", 4 ], [ "chemistry", 2 ] ], - "time": "3 h", + "time": "2 h 30 m", "autolearn": true, "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 12 ] ] ], + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 10 ] ] ], "proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_chitinworking" }, @@ -719,18 +719,18 @@ ] }, { - "result": "helmet_acidchitin_full_xs", + "result": "helmet_acidchitin_light_xs", "type": "recipe", - "copy-from": "helmet_acidchitin_full", - "time": "3 h", + "copy-from": "helmet_acidchitin", + "time": "2 h 30 m", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], - "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 9 ] ] ] + "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 7 ] ] ] }, { - "result": "xl_helmet_acidchitin_full", + "result": "xl_helmet_acidchitin_light", "type": "recipe", - "copy-from": "helmet_acidchitin_full", - "time": "3 h 20 m", + "copy-from": "helmet_acidchitin", + "time": "2 h 50 m", "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ], "components": [ [ [ "cordage_superior", 2, "LIST" ] ], [ [ "acidchitin_piece", 17 ] ] ] }, From 437ef5d83472d42ef7c0a032f8f48a130323c97d Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:33:26 -0500 Subject: [PATCH 6/7] correct id issue with light chitinous helmet recipe nested data --- data/json/recipes/nested.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json index 8bd4b282fde80..406f924e02ea4 100644 --- a/data/json/recipes/nested.json +++ b/data/json/recipes/nested.json @@ -500,18 +500,18 @@ "description": "Recipes related to constructing durable helmets from chitin.", "skill_used": "tailor", "nested_category_data": [ - "helmet_acidchitin_full", - "helmet_acidchitin_full_xs", - "xl_helmet_acidchitin_full", "helmet_acidchitin", "helmet_acidchitin_xs", "xl_helmet_acidchitin", - "helmet_chitin_full", - "helmet_chitin_full_xs", - "xl_helmet_chitin_full", + "helmet_acidchitin_light", + "helmet_acidchitin_light_xs", + "xl_helmet_acidchitin_light", "helmet_chitin", "helmet_chitin_xs", - "xl_helmet_chitin" + "xl_helmet_chitin", + "helmet_chitin_light", + "helmet_chitin_light_xs", + "xl_helmet_chitin_light" ], "difficulty": 6 }, From a3d4d65cc239bb7a28ce3aedf4ff7c60cdbb86bb Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:42:09 -0500 Subject: [PATCH 7/7] fix biosilicified chitin helmet description and price swap --- data/json/items/armor/helmets.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 6d6f5fe96fdbe..1a58cb9e817d1 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -913,8 +913,8 @@ "looks_like": "helmet_chitin", "type": "ARMOR", "name": { "str": "biosilicified chitin helmet" }, - "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Acid-resistant but brittle.", - "price_postapoc": "14 USD 50 cent", + "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers the whole head. Acid-resistant but brittle.", + "price_postapoc": "17 USD 50 cent", "material": [ "acidchitin" ], "relative": { "melee_damage": { "bash": 1 } } }, @@ -942,8 +942,8 @@ "looks_like": "helmet_chitin_light", "type": "ARMOR", "name": { "str": "biosilicified light chitin helmet" }, - "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers the whole head. Acid-resistant but brittle.", - "price_postapoc": "17 USD 50 cent", + "description": "A helmet crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Covers most of the head but leaves some space around the eyes and mouth open for breathability. Acid-resistant but brittle.", + "price_postapoc": "14 USD 50 cent", "material": [ "acidchitin" ], "relative": { "melee_damage": { "bash": 1 } } },