From 27121bf693be79b00044fbed0a59ba1e72e8c3e9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 31 Jan 2022 20:36:01 -0800 Subject: Port to DDA. --- json/items/armor/cloaks.json | 12 ++++-- json/items/armor/helmet.json | 20 +++++----- json/items/armor/hoods.json | 18 ++++----- json/recipes/armor/head.json | 89 ++++++++++++++++---------------------------- 4 files changed, 60 insertions(+), 79 deletions(-) diff --git a/json/items/armor/cloaks.json b/json/items/armor/cloaks.json index a8fd335..7ee8e5a 100644 --- a/json/items/armor/cloaks.json +++ b/json/items/armor/cloaks.json @@ -13,10 +13,16 @@ "material": [ "cotton", "kevlar" ], "symbol": "[", "color": "brown", - "covers": [ "torso", "arms", "legs" ], + "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ], "coverage": 65, - "encumbrance": 2, - "storage": "9 L", + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 120 } + ], "warmth": 10, "material_thickness": 3, "valid_mods": [ "steel_padded", "alloy_padded" ], diff --git a/json/items/armor/helmet.json b/json/items/armor/helmet.json index 422c7d9..a46feee 100644 --- a/json/items/armor/helmet.json +++ b/json/items/armor/helmet.json @@ -3,7 +3,7 @@ "id": "helmet_lsurvivor", "type": "ARMOR", "name": { "str": "light survivor helmet" }, - "note": "Roughly an improved tactical helmet.", + "//": "Roughly an improved tactical helmet.", "description": "A customized, heavily armored Kevlar helmet, modified with cotton reinforcements to provide maximum comfort and protection from harm. All the added material has kept it rather light.", "weight": "910 g", "volume": "1750 ml", @@ -11,7 +11,7 @@ "price_postapoc": 3000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "cotton" ], + "material": [ "kevlar_rigid", "cotton" ], "symbol": "[", "looks_like": "helmet_survivor", "color": "dark_gray", @@ -28,7 +28,7 @@ "id": "helmet_survivor", "type": "ARMOR", "name": { "str": "survivor helmet" }, - "note": "Roughly an improved army helmet.", + "//": "Roughly an improved army helmet.", "description": "A customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.", "weight": "1420 g", "volume": "2000 ml", @@ -36,7 +36,7 @@ "price_postapoc": 4000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_rigid", "leather" ], "symbol": "[", "looks_like": "helmet_army", "color": "dark_gray", @@ -53,7 +53,7 @@ "id": "helmet_xlsurvivor", "type": "ARMOR", "name": { "str": "XL survivor helmet" }, - "note": "Double the weight of a survivor helm for the same protection.", + "//": "Double the weight of a survivor helm for the same protection.", "description": "A massive customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.", "weight": "2840 g", "volume": "6 L", @@ -61,7 +61,7 @@ "price_postapoc": 6000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_rigid", "leather" ], "symbol": "[", "looks_like": "helmet_army", "color": "dark_gray", @@ -78,7 +78,7 @@ "id": "helmet_hsurvivor", "type": "ARMOR", "name": { "str": "heavy survivor helmet" }, - "note": "A furthur improved army helmet. But still greatly inferior to a light power armor helmet.", + "//": "A furthur improved army helmet. But still greatly inferior to a light power armor helmet.", "description": "A customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm. All the added material has made it rather heavy.", "weight": "1712 g", "volume": "2500 ml", @@ -86,7 +86,7 @@ "price_postapoc": 6000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_rigid", "steel", "leather" ], "symbol": "[", "looks_like": "helmet_army", "color": "dark_gray", @@ -103,7 +103,7 @@ "id": "helmet_xlhsurvivor", "type": "ARMOR", "name": { "str": "XL heavy survivor helmet" }, - "note": "Double the weight of a heavy survivor helm for the same protection.", + "//": "Double the weight of a heavy survivor helm for the same protection.", "description": "A massive customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm. All the added material has made it rather heavy.", "weight": "4224 g", "volume": "6 L", @@ -111,7 +111,7 @@ "price_postapoc": 8000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_rigid", "steel", "leather" ], "symbol": "[", "looks_like": "helmet_xlsurvivor", "color": "dark_gray", diff --git a/json/items/armor/hoods.json b/json/items/armor/hoods.json index 89b9be4..fdb5f23 100644 --- a/json/items/armor/hoods.json +++ b/json/items/armor/hoods.json @@ -6,11 +6,11 @@ "description": "A massive customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.", "weight": "1640 g", "volume": "4500 ml", - "price": 0, - "price_postapoc": 5000, + "price": 58000, + "price_postapoc": 2500, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "leather" ], + "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "hood_survivor", "color": "brown", @@ -30,11 +30,11 @@ "description": "A customized, heavily armored steel and Kevlar hood, designed to provide comfort and protection from harm.", "weight": "1100 g", "volume": "3250 ml", - "price": 0, - "price_postapoc": 5000, + "price": 58000, + "price_postapoc": 2500, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_layered", "steel", "leather" ], "symbol": "[", "looks_like": "hood_survivor", "color": "brown", @@ -54,11 +54,11 @@ "description": "A massive customized, heavily armored steel and Kevlar hood, designed to provide comfort and protection from harm.", "weight": "2200 g", "volume": "6 L", - "price": 0, - "price_postapoc": 6000, + "price": 58000, + "price_postapoc": 2500, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "steel", "leather" ], + "material": [ "kevlar_layered", "steel", "leather" ], "symbol": "[", "looks_like": "hood_survivor", "color": "brown", diff --git a/json/recipes/armor/head.json b/json/recipes/armor/head.json index 4725823..2e3e837 100644 --- a/json/recipes/armor/head.json +++ b/json/recipes/armor/head.json @@ -2,12 +2,13 @@ { "result": "helmet_lsurvivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 5, "skills_required": [ "fabrication", 3 ], - "time": "45 m", + "time": "3 h", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -29,17 +30,19 @@ [ "pickelhaube", 1 ], [ "plastic_chunk", 8 ] ] - ] + ], + "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "helmet_survivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": "45 m", + "time": "6 h", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -61,17 +64,19 @@ [ "pickelhaube", 1 ], [ "plastic_chunk", 8 ] ] - ] + ], + "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "helmet_xlsurvivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 6, "skills_required": [ "fabrication", 4 ], - "time": "1 h", + "time": "4 h", "autolearn": true, "using": [ [ "sewing_standard", 20 ] ], "tools": [ [ [ "welder", 84 ], [ "welder_crude", 126 ], [ "soldering_iron", 126 ], [ "toolset", 126 ] ] ], @@ -93,17 +98,19 @@ [ "pickelhaube", 2 ], [ "plastic_chunk", 18 ] ] - ] + ], + "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "helmet_hsurvivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": "45 m", + "time": "8 h", "autolearn": true, "using": [ [ "sewing_standard", 10 ] ], "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ], @@ -126,11 +133,13 @@ [ "pickelhaube", 1 ], [ "plastic_chunk", 8 ] ] - ] + ], + "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "helmet_xlhsurvivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", @@ -159,68 +168,34 @@ [ "pickelhaube", 2 ], [ "plastic_chunk", 18 ] ] - ] - }, - { - "result": "hood_xlsurvivor", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_HEAD", - "skill_used": "tailor", - "difficulty": 6, - "skills_required": [ "fabrication", 4 ], - "time": "1 h", - "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], - "components": [ - [ [ "leather", 6 ] ], - [ [ "rag", 2 ] ], - [ [ "kevlar_plate", 4 ] ], - [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], - [ [ "duct_tape", 100 ] ] - ] + ], + "proficiencies": [ { "proficiency": "prof_millinery" }, { "proficiency": "prof_polymerworking" } ] }, { "result": "hood_hsurvivor", "type": "recipe", + "activity_level": "LIGHT_EXERCISE", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_HEAD", "skill_used": "tailor", "difficulty": 7, "skills_required": [ "fabrication", 5 ], - "time": "45 m", - "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], - "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], - "components": [ - [ [ "leather", 6 ] ], - [ [ "rag", 2 ] ], - [ [ "kevlar_plate", 4 ] ], - [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ], - [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ], - [ [ "duct_tape", 100 ] ] - ] - }, - { - "result": "hood_xlhsurvivor", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_HEAD", - "skill_used": "tailor", - "difficulty": 7, - "skills_required": [ "fabrication", 5 ], - "time": "1 h", + "time": "8 h", "autolearn": true, - "using": [ [ "sewing_standard", 40 ] ], + "using": [ [ "sewing_standard", 60 ] ], "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ], "components": [ - [ [ "leather", 14 ] ], - [ [ "rag", 5] ], - [ [ "kevlar_plate", 9 ] ], - [ [ "steel_chunk", 5 ], [ "scrap", 14 ] ], - [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ], + [ [ "leather", 8 ], [ "tanned_hide", 2 ] ], + [ [ "rag", 3 ] ], + [ [ "sheet_kevlar_layered", 5 ] ], + [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ], [ "hood_gut", 1 ] ], [ [ "duct_tape", 200 ] ] + ], + "proficiencies": [ + { "proficiency": "prof_millinery" }, + { "proficiency": "prof_leatherworking_basic" }, + { "proficiency": "prof_plasticworking" }, + { "proficiency": "prof_polymerworking" } ] } ] -- cgit v1.2.1