From a5e79b74f5431ce655056373c606588e0ab19371 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 23 Sep 2023 19:30:47 -0500 Subject: [PATCH] Add some more basic armor items (#3221) * Add some more basic armor items * Update masks.json --- .../itemgroups/Clothing_Gear/clothing.json | 9 +++++ .../Locations_MapExtras/mansion.json | 25 ++++++++++-- data/json/itemgroups/art_antiques_crafts.json | 1 + data/json/items/armor/arms_armor.json | 13 +++++++ data/json/items/armor/helmets.json | 22 +++++++++++ data/json/items/armor/masks.json | 33 ++++++++++++++++ data/json/recipes/armor/arms.json | 13 +++++++ data/json/recipes/armor/head.json | 39 +++++++++++++++++++ 8 files changed, 152 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index bcda33d14575..83f6286c4de0 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -2025,6 +2025,7 @@ [ "modularvestsuper", 1 ], [ "dump_pouch", 20 ], [ "mask_bal", 5 ], + [ "mask_cavalry_iron", 2 ], [ "vest", 15 ], [ "gloves_fingerless", 15 ], [ "gloves_light_fingerless", 5 ], @@ -2379,6 +2380,7 @@ [ "duffelbag", 8 ], [ "mask_h20survivor", 1 ], [ "mask_bal", 14 ], + [ "mask_cavalry_iron", 4 ], [ "mask_hockey", 26 ], [ "mask_gas", 24 ], [ "mask_filter", 12 ], @@ -2469,11 +2471,14 @@ [ "helmet_larmor", 40 ], [ "helmet_nasal", 50 ], [ "helmet_galea", 40 ], + [ "mask_cavalry_iron", 10 ], + [ "mask_cavalry_bronze", 10 ], [ "boots_larmor", 40 ], [ "armor_larmor", 40 ], [ "armguard_larmor", 40 ], [ "vambrace_larmor", 20 ], [ "gambeson", 50 ], + [ "cap_arming", 25 ], [ "legguard_metal", 10 ], [ "helmet_corinthian", 45 ], [ "armor_cuirass", 25 ], @@ -2523,6 +2528,9 @@ [ "helmet_larmor", 40 ], [ "helmet_nasal", 50 ], [ "helmet_galea", 40 ], + [ "mask_cavalry_iron", 10 ], + [ "mask_cavalry_bronze", 10 ], + [ "cap_arming", 25 ], [ "chainmail_hood", 30 ] ] }, @@ -2530,6 +2538,7 @@ "type": "item_group", "id": "museum_armor_arms", "items": [ + [ "armguard_bronze", 10 ], [ "armguard_lightplate", 30 ], [ "armguard_larmor", 40 ], [ "vambrace_larmor", 20 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index 8f389c0b68a2..bd0b68898447 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -448,7 +448,13 @@ "id": "soa_decor", "type": "item_group", "subtype": "collection", - "items": [ { "group": "soa_weapons_decor" }, [ "armor_plate", 100 ], [ "helmet_plate", 100 ] ] + "items": [ + { "group": "soa_weapons_decor" }, + [ "gambeson", 50 ], + [ "armor_plate", 100 ], + [ "cap_arming", 50 ], + [ "helmet_plate", 100 ] + ] }, { "id": "soa_weapons_decor", @@ -467,7 +473,9 @@ "items": [ { "group": "soa_weapons_plate" }, { "group": "soa_shields_plate", "prob": 25 }, + [ "gambeson", 50 ], [ "armor_lightplate", 100 ], + [ "cap_arming", 50 ], [ "helmet_barbute", 100 ] ] }, @@ -490,7 +498,12 @@ "id": "soa_mail", "type": "item_group", "subtype": "collection", - "items": [ { "group": "soa_weapons_mail" }, { "group": "soa_shields_mail", "prob": 50 }, [ "chainmail_suit", 100 ] ] + "items": [ + { "group": "soa_weapons_mail" }, + { "group": "soa_shields_mail", "prob": 50 }, + [ "cap_arming", 50 ], + [ "chainmail_suit", 100 ] + ] }, { "id": "soa_weapons_mail", @@ -517,7 +530,13 @@ "id": "soa_samurai", "type": "item_group", "subtype": "collection", - "items": [ { "group": "soa_weapons_samurai" }, [ "scabbard", 50 ], [ "armor_samurai", 100 ], [ "helmet_kabuto", 100 ] ] + "items": [ + { "group": "soa_weapons_samurai" }, + [ "scabbard", 50 ], + [ "armor_samurai", 100 ], + [ "cap_arming", 50 ], + [ "helmet_kabuto", 100 ] + ] }, { "id": "soa_weapons_samurai", diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json index ba5a4747ac96..4f59a613bf46 100644 --- a/data/json/itemgroups/art_antiques_crafts.json +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -97,6 +97,7 @@ { "item": "nodachi_inferior", "prob": 2 }, { "item": "knife_baselard", "prob": 2 }, { "item": "gambeson", "prob": 3 }, + { "item": "cap_arming", "prob": 2 }, { "item": "tunic", "prob": 1 }, { "item": "armor_lamellar", "prob": 2 }, { "item": "armor_lightplate", "prob": 1 }, diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index 9939017eb0b4..6a028c0fbf12 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -141,6 +141,19 @@ "environmental_protection": 1, "flags": [ "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ] }, + { + "id": "armguard_bronze", + "copy-from": "armguard_metal", + "type": "ARMOR", + "name": { "str": "pair of bronze arm guards", "str_pl": "pairs of arm guards" }, + "description": "A pair of arm guards hammered out from sheets of bronze, for a classical take on the Post-Apocalyptic Warrior look.", + "weight": "1500 g", + "price": "400 USD", + "price_postapoc": "12 USD", + "material": [ "bronze" ], + "color": "yellow", + "encumbrance": 20 + }, { "id": "armguard_paper", "type": "ARMOR", diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 5f7e59151f2e..cfdc66ab11ca 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -405,6 +405,28 @@ "material_thickness": 2, "flags": [ "VARSIZE", "SKINTIGHT" ] }, + { + "id": "cap_arming", + "repairs_like": "gambeson", + "type": "ARMOR", + "name": { "str": "arming cap" }, + "description": "This goes inside a helmet to help keep your head warm in cold climates.", + "weight": "165 g", + "volume": "250 ml", + "price": "20 USD", + "price_postapoc": "250 cent", + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "helmet_liner", + "color": "light_gray", + "covers": [ "head" ], + "coverage": 90, + "encumbrance": 15, + "warmth": 30, + "material_thickness": 5, + "valid_mods": [ "steel_padded", "alloy_padded" ], + "flags": [ "VARSIZE", "SKINTIGHT", "STURDY" ] + }, { "id": "helmet_lobster", "repairs_like": "xlkevlar", diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json index 6b719727f4e3..d7f67b185aa1 100644 --- a/data/json/items/armor/masks.json +++ b/data/json/items/armor/masks.json @@ -127,6 +127,39 @@ "environmental_protection": 1, "flags": [ "WATER_FRIENDLY", "STURDY" ] }, + { + "id": "mask_cavalry_iron", + "repairs_like": "helmet_plarmor", + "type": "ARMOR", + "name": { "str": "iron battle mask" }, + "description": "A full-face mask made of iron, in the vein of Roman cavalry masks. Provides decent protection and gives an imposing post-apocalyptic look.", + "weight": "900 g", + "volume": "750 ml", + "price": "300 USD", + "price_postapoc": "5 USD", + "material": [ "iron" ], + "symbol": "[", + "looks_like": "mask_bal", + "color": "dark_gray", + "covers": [ "mouth", "eyes" ], + "coverage": 95, + "encumbrance": 15, + "warmth": 10, + "material_thickness": 3, + "environmental_protection": 1, + "flags": [ "STURDY" ] + }, + { + "id": "mask_cavalry_bronze", + "copy-from": "mask_cavalry_iron", + "type": "ARMOR", + "name": { "str": "bronze battle mask" }, + "description": "A full-face mask made of bronze, in the vein of Roman cavalry masks. Provides decent protection and gives an imposing post-apocalyptic look.", + "weight": "950 g", + "price": "500 USD", + "material": [ "bronze" ], + "color": "yellow" + }, { "id": "mask_dust", "repairs_like": "tshirt", diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json index 6984c45620fe..566bacac1231 100644 --- a/data/json/recipes/armor/arms.json +++ b/data/json/recipes/armor/arms.json @@ -102,6 +102,19 @@ "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 4 ] ] ] }, + { + "result": "armguard_bronze", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_ARMS", + "skill_used": "fabrication", + "difficulty": 4, + "time": "30 m", + "autolearn": true, + "book_learn": [ [ "textbook_armwest", 3 ], [ "recipe_melee", 3 ] ], + "using": [ [ "forging_standard", 4 ], [ "bronzesmithing_tools", 1 ] ], + "components": [ [ [ "fabric_standard", 1, "LIST" ], [ "fabric_hides_any", 1, "LIST" ] ], [ [ "scrap_bronze", 7 ] ] ] + }, { "result": "armguard_paper", "type": "recipe", diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json index d00e212542ce..00a0489736fd 100644 --- a/data/json/recipes/armor/head.json +++ b/data/json/recipes/armor/head.json @@ -83,6 +83,19 @@ ], "flags": [ "BLIND_EASY", "NO_RESIZE" ] }, + { + "result": "cap_arming", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HEAD", + "skill_used": "tailor", + "difficulty": 4, + "time": "25 m", + "autolearn": true, + "book_learn": [ [ "textbook_armwest", 3 ] ], + "using": [ [ "sewing_standard", 10 ] ], + "components": [ [ [ "rag", 10 ] ] ] + }, { "result": "cowboy_hat", "type": "recipe", @@ -1490,6 +1503,32 @@ "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "goggles_welding", 1 ] ] ] }, + { + "result": "mask_cavalry_iron", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HEAD", + "skill_used": "fabrication", + "difficulty": 4, + "time": "4 h", + "autolearn": true, + "book_learn": [ [ "textbook_armwest", 3 ], [ "textbook_armeast", 3 ] ], + "using": [ [ "blacksmithing_intermediate", 8 ], [ "steel_standard", 2 ] ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "fabric_standard", 1, "LIST" ], [ "fabric_hides_any", 1, "LIST" ] ] ] + }, + { + "result": "mask_cavalry_bronze", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_HEAD", + "skill_used": "fabrication", + "difficulty": 5, + "time": "45 m", + "book_learn": [ [ "textbook_armwest", 3 ], [ "textbook_armeast", 3 ] ], + "using": [ [ "forging_standard", 2 ], [ "bronzesmithing_tools", 1 ] ], + "components": [ [ [ "scrap_bronze", 5 ] ], [ [ "fabric_standard", 1, "LIST" ], [ "fabric_hides_any", 1, "LIST" ] ] ] + }, { "result": "wetsuit_hood", "type": "recipe",