diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 2b7cc428fb9a3..9b11fee49f451 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -2684,19 +2684,19 @@ [ "armor_larmor", 40 ], [ "gambeson", 50 ], [ "armor_cuirass", 25 ], - [ "chainmail_suit", 10 ], - [ "chainmail_vest", 3 ] + [ "chainmail_junk_suit", 10 ], + [ "chainmail_junk_vest", 3 ] ] }, { "type": "item_group", "id": "museum_armor_legs", - "items": [ [ "legguard_lightplate", 30 ], [ "legguard_metal", 10 ], [ "legguard_bronze", 20 ], [ "chainmail_legs", 10 ] ] + "items": [ [ "legguard_lightplate", 30 ], [ "legguard_metal", 10 ], [ "legguard_bronze", 20 ], [ "chainmail_junk_legs", 10 ] ] }, { "type": "item_group", "id": "museum_armor_feet", - "items": [ [ "boots_plate", 60 ], [ "boots_larmor", 40 ], [ "chainmail_feet", 40 ] ] + "items": [ [ "boots_plate", 60 ], [ "boots_larmor", 40 ], [ "chainmail_junk_feet", 40 ] ] }, { "type": "item_group", @@ -2708,7 +2708,7 @@ [ "helmet_larmor", 40 ], [ "helmet_nasal", 50 ], [ "helmet_galea", 40 ], - [ "chainmail_hood", 30 ] + [ "chainmail_junk_hood", 30 ] ] }, { @@ -2719,8 +2719,8 @@ [ "armguard_larmor", 40 ], [ "vambrace_larmor", 20 ], [ "gloves_plate", 60 ], - [ "chainmail_arms", 30 ], - [ "chainmail_hands", 30 ] + [ "chainmail_junk_arms", 30 ], + [ "chainmail_junk_hands", 30 ] ] }, { diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 1745ed36d8bbc..236ac07ea7e99 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -579,13 +579,13 @@ [ "straw_hat", 5 ], [ "straw_fedora", 5 ], [ "shark_suit", 1 ], - [ "chainmail_suit", 1 ], - [ "chainmail_hood", 2 ], - [ "chainmail_vest", 2 ], - [ "chainmail_arms", 2 ], - [ "chainmail_legs", 2 ], - [ "chainmail_feet", 2 ], - [ "chainmail_hands", 2 ], + [ "chainmail_junk_suit", 1 ], + [ "chainmail_junk_hood", 2 ], + [ "chainmail_junk_vest", 2 ], + [ "chainmail_junk_arms", 2 ], + [ "chainmail_junk_legs", 2 ], + [ "chainmail_junk_feet", 2 ], + [ "chainmail_junk_hands", 2 ], [ "motorbike_armor", 2 ], [ "motorbike_pants", 2 ], [ "motorbike_boots", 2 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index 8e0f8d090eff3..82cf73131ab01 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -486,7 +486,7 @@ "id": "soa_mail", "type": "item_group", "subtype": "collection", - "items": [ { "group": "soa_weapons_mail" }, [ "chainmail_suit", 100 ] ] + "items": [ { "group": "soa_weapons_mail" }, [ "chainmail_junk_suit", 100 ] ] }, { "id": "soa_weapons_mail", diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index 726fdf191d1f5..67c700f337361 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -609,6 +609,7 @@ "price": 7500, "price_postapoc": 2500, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "armguard_metal", "color": "light_red", @@ -616,9 +617,9 @@ "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -643,6 +644,32 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, + { + "id": "chainmail_junk_arms", + "type": "ARMOR", + "category": "armor", + "name": { "str": "pair of chainmail sleeves", "str_pl": "pairs of chainmail sleeves" }, + "description": "Customized chainmail arms. The metal shows signs of rust and corrosion. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", + "weight": "2812 g", + "volume": "750 ml", + "price": 7500, + "price_postapoc": 2500, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "armguard_metal", + "color": "light_red", + "material_thickness": 3, + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "arm_l", "arm_r" ], + "coverage": 95, + "encumbrance": 20 + } + ] + }, { "id": "lc_chainmail_arms", "type": "ARMOR", @@ -656,13 +683,14 @@ "to_hit": -1, "symbol": "[", "looks_like": "armguard_metal", + "material": [ "lc_steel_chain" ], "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -689,13 +717,14 @@ "id": "mc_chainmail_arms", "type": "ARMOR", "copy-from": "lc_chainmail_arms", + "material": [ "mc_steel_chain" ], "name": { "str": "pair of medium steel chainmail sleeves", "str_pl": "pairs of medium steel chainmail sleeves" }, "description": "Customized medium steel chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -722,13 +751,14 @@ "id": "hc_chainmail_arms", "type": "ARMOR", "copy-from": "lc_chainmail_arms", + "material": [ "hc_steel_chain" ], "name": { "str": "pair of high steel chainmail sleeves", "str_pl": "pairs of high steel chainmail sleeves" }, "description": "Customized high steel chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -755,13 +785,14 @@ "id": "ch_chainmail_arms", "type": "ARMOR", "copy-from": "lc_chainmail_arms", + "material": [ "ch_steel_chain" ], "name": { "str": "pair of hardened steel chainmail sleeves", "str_pl": "pairs of hardened steel chainmail sleeves" }, "description": "Customized hardened steel chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -788,13 +819,14 @@ "id": "qt_chainmail_arms", "type": "ARMOR", "copy-from": "lc_chainmail_arms", + "material": [ "qt_steel_chain" ], "name": { "str": "pair of tempered steel chainmail sleeves", "str_pl": "pairs of tempered steel chainmail sleeves" }, "description": "Customized tempered steel chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "arm_l", "arm_r" ], - "coverage": 100, + "coverage": 95, "encumbrance": 20 } ] @@ -922,12 +954,13 @@ "bashing": 8, "symbol": "[", "looks_like": "armguard_metal", + "material": [ "lc_steel", "lc_steel_chain" ], "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "sided": true, "material_thickness": 2, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -954,6 +987,7 @@ "id": "armor_mc_lightarmguard", "type": "ARMOR", "copy-from": "armor_lc_lightarmguard", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel light arm guard" }, "description": "A light armguard, 1.25 mm at the thickest. Made with tougher medium steel, this offers solid protection.", "armor": [ @@ -982,6 +1016,7 @@ "id": "armor_hc_lightarmguard", "type": "ARMOR", "copy-from": "armor_lc_lightarmguard", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel light arm guard" }, "description": "A light armguard, 1.25 mm at the thickest. Made with high carbon steel offering excellent protection.", "armor": [ @@ -1010,6 +1045,7 @@ "id": "armor_ch_lightarmguard", "type": "ARMOR", "copy-from": "armor_lc_lightarmguard", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened light arm guard" }, "description": "A light armguard, 1.25 mm at the thickest. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -1038,6 +1074,7 @@ "id": "armor_qt_lightarmguard", "type": "ARMOR", "copy-from": "armor_lc_lightarmguard", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered light arm guard" }, "description": "A light armguard, 1.25 mm at the thickest. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -1076,12 +1113,13 @@ "bashing": 8, "symbol": "[", "looks_like": "armor_larmor", + "material": [ "lc_steel", "lc_steel_chain" ], "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "sided": true, "material_thickness": 4, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -1108,6 +1146,7 @@ "id": "armor_mc_armguard", "type": "ARMOR", "copy-from": "armor_lc_armguard", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel arm guard" }, "description": "An armguard, 1.75 mm at the thickest. Made with tougher medium steel, this offers solid protection.", "armor": [ @@ -1137,6 +1176,7 @@ "type": "ARMOR", "copy-from": "armor_lc_armguard", "name": { "str": "high steel arm guard" }, + "material": [ "hc_steel", "hc_steel_chain" ], "description": "An armguard, 1.75 mm at the thickest. Made with high carbon steel offering excellent protection.", "armor": [ { @@ -1164,6 +1204,7 @@ "id": "armor_ch_armguard", "type": "ARMOR", "copy-from": "armor_lc_armguard", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened arm guard" }, "description": "An armguard, 1.75 mm at the thickest. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -1193,6 +1234,7 @@ "type": "ARMOR", "copy-from": "armor_lc_armguard", "name": { "str": "tempered arm guard" }, + "material": [ "qt_steel", "qt_steel_chain" ], "description": "An armguard, 1.75 mm at the thickest. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ { @@ -1235,7 +1277,7 @@ "longest_side": "60 cm", "sided": true, "material_thickness": 6, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 43ffb88081c79..19c08acb86a36 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1208,12 +1208,13 @@ "price": 5012, "price_postapoc": 2000, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1237,6 +1238,30 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "VARSIZE", "STURDY", "UNDERSIZE" ] }, + { + "id": "chainmail_junk_feet", + "type": "ARMOR", + "category": "armor", + "name": { "str": "pair of chainmail chausses", "str_pl": "pairs of chainmail chausses" }, + "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail. The metal shows signs of rust and corrosion.", + "weight": "2006 g", + "volume": "500 ml", + "price": 5012, + "price_postapoc": 2000, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "color": "light_red", + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "foot_l", "foot_r" ], + "coverage": 100, + "encumbrance": 20 + } + ] + }, { "id": "lc_chainmail_feet", "type": "ARMOR", @@ -1248,12 +1273,13 @@ "price": 5012, "price_postapoc": 2000, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1281,11 +1307,12 @@ "id": "mc_chainmail_feet", "type": "ARMOR", "copy-from": "lc_chainmail_feet", + "material": [ "mc_steel_chain" ], "name": { "str": "pair of medium steel chainmail chausses", "str_pl": "pairs of medium steel chainmail chausses" }, "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1313,11 +1340,12 @@ "id": "hc_chainmail_feet", "type": "ARMOR", "copy-from": "lc_chainmail_feet", + "material": [ "hc_steel_chain" ], "name": { "str": "pair of high steel chainmail chausses", "str_pl": "pairs of high steel chainmail chausses" }, "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1344,11 +1372,12 @@ "id": "ch_chainmail_feet", "type": "ARMOR", "copy-from": "lc_chainmail_feet", + "material": [ "ch_steel_chain" ], "name": { "str": "pair of hardened steel chainmail chausses", "str_pl": "pairs of hardened steel chainmail chausses" }, "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1375,11 +1404,12 @@ "id": "qt_chainmail_feet", "type": "ARMOR", "copy-from": "lc_chainmail_feet", + "material": [ "qt_steel_chain" ], "name": { "str": "pair of tempered steel chainmail chausses", "str_pl": "pairs of tempered steel chainmail chausses" }, "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": 20 @@ -1671,6 +1701,7 @@ "bashing": 7, "symbol": "[", "looks_like": "boots_steel", + "material": [ "lc_steel" ], "color": "light_gray", "warmth": 0, "sided": true, @@ -1701,6 +1732,7 @@ "id": "mc_sabaton", "type": "ARMOR", "copy-from": "lc_sabaton", + "material": [ "mc_steel" ], "name": { "str": "medium steel sabaton" }, "armor": [ { @@ -1727,6 +1759,7 @@ "id": "hc_sabaton", "type": "ARMOR", "copy-from": "lc_sabaton", + "material": [ "hc_steel" ], "name": { "str": "high steel sabaton" }, "armor": [ { @@ -1753,6 +1786,7 @@ "id": "ch_sabaton", "type": "ARMOR", "copy-from": "lc_sabaton", + "material": [ "ch_steel" ], "name": { "str": "hardened steel sabaton" }, "armor": [ { @@ -1779,6 +1813,7 @@ "id": "qt_sabaton", "type": "ARMOR", "copy-from": "lc_sabaton", + "material": [ "qt_steel" ], "name": { "str": "tempered steel sabaton" }, "armor": [ { diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 44d71f7496075..a52394468d7b7 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -52,13 +52,14 @@ "price": 5012, "price_postapoc": 2500, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "color": "light_red", "material_thickness": 2, "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -82,6 +83,31 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, + { + "id": "chainmail_junk_hands", + "type": "ARMOR", + "category": "armor", + "name": { "str": "pair of chainmail gloves", "str_pl": "pairs of chainmail gloves" }, + "description": "Customized chainmail gloves that fully enclose the hand. The metal shows signs of rust and corrosion.", + "weight": "2006 g", + "volume": "500 ml", + "price": 5012, + "price_postapoc": 2500, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "color": "light_red", + "material_thickness": 2, + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "hand_l", "hand_r" ], + "coverage": 100, + "encumbrance": 20 + } + ] + }, { "id": "lc_chainmail_hands", "type": "ARMOR", @@ -93,13 +119,14 @@ "price": 5012, "price_postapoc": 2500, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "color": "light_red", "material_thickness": 2, "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -126,11 +153,12 @@ "id": "mc_chainmail_hands", "type": "ARMOR", "copy-from": "lc_chainmail_hands", + "material": [ "mc_steel_chain" ], "name": { "str": "pair of medium steel chainmail gloves", "str_pl": "pairs of medium steel chainmail gloves" }, "description": "Customized medium steel chainmail gloves that fully enclose the hand.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -157,11 +185,12 @@ "id": "hc_chainmail_hands", "type": "ARMOR", "copy-from": "lc_chainmail_hands", + "material": [ "hc_steel_chain" ], "name": { "str": "pair of high steel chainmail gloves", "str_pl": "pairs of high steel chainmail gloves" }, "description": "Customized high steel chainmail gloves that fully enclose the hand.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -188,11 +217,12 @@ "id": "ch_chainmail_hands", "type": "ARMOR", "copy-from": "lc_chainmail_hands", + "material": [ "ch_steel_chain" ], "name": { "str": "pair of hardened steel chainmail gloves", "str_pl": "pairs of hardened steel chainmail gloves" }, "description": "Customized hardened steel chainmail gloves that fully enclose the hand.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -219,11 +249,12 @@ "id": "qt_chainmail_hands", "type": "ARMOR", "copy-from": "lc_chainmail_hands", + "material": [ "qt_steel_chain" ], "name": { "str": "pair of tempered steel chainmail gloves", "str_pl": "pairs of tempered steel chainmail gloves" }, "description": "Customized tempered steel chainmail gloves that fully enclose the hand.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 20 @@ -1145,6 +1176,7 @@ "bashing": 7, "symbol": "[", "looks_like": "fire_gauntlets", + "material": [ "lc_steel", "lc_steel_chain" ], "color": "light_gray", "warmth": 15, "environmental_protection": 1, @@ -1174,6 +1206,7 @@ "id": "mc_demi_gaunt", "type": "ARMOR", "copy-from": "lc_demi_gaunt", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str_sp": "medium steel demi-gauntlet" }, "flags": [ "STURDY" ], "armor": [ @@ -1201,6 +1234,7 @@ "id": "hc_demi_gaunt", "type": "ARMOR", "copy-from": "lc_demi_gaunt", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str_sp": "high steel demi-gauntlet" }, "armor": [ { @@ -1227,6 +1261,7 @@ "id": "ch_demi_gaunt", "type": "ARMOR", "copy-from": "lc_demi_gaunt", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str_sp": "hardened steel demi-gauntlet" }, "armor": [ { @@ -1246,6 +1281,7 @@ "type": "ARMOR", "name": { "str_sp": "XL hardened steel demi-gauntlet" }, "copy-from": "ch_demi_gaunt", + "material": [ "qt_steel", "qt_steel_chain" ], "proportional": { "weight": 1.5, "volume": 1.5 }, "extend": { "flags": [ "OVERSIZE" ] } }, @@ -1289,6 +1325,7 @@ "bashing": 7, "symbol": "[", "looks_like": "fire_gauntlets", + "material": [ "lc_steel", "lc_steel_chain" ], "color": "light_gray", "warmth": 15, "environmental_protection": 1, @@ -1318,6 +1355,7 @@ "id": "mc_mitten_gaunt", "type": "ARMOR", "copy-from": "lc_mitten_gaunt", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str_sp": "medium steel mitten gauntlet" }, "armor": [ { @@ -1344,6 +1382,7 @@ "id": "hc_mitten_gaunt", "type": "ARMOR", "copy-from": "lc_mitten_gaunt", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str_sp": "high steel mitten gauntlet" }, "armor": [ { @@ -1370,6 +1409,7 @@ "id": "ch_mitten_gaunt", "type": "ARMOR", "copy-from": "lc_mitten_gaunt", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str_sp": "hardened mitten gauntlet" }, "armor": [ { @@ -1396,6 +1436,7 @@ "id": "qt_mitten_gaunt", "type": "ARMOR", "copy-from": "lc_mitten_gaunt", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str_sp": "tempered steel mitten gauntlet" }, "armor": [ { diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 33aa756f56fd7..5493be84efb62 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -904,6 +904,7 @@ "price_postapoc": 5500, "use_action": { "type": "transform", "msg": "You raise the helm's visor.", "target": "lc_helm_close_raised", "menu_text": "Raise" }, "bashing": 8, + "material": [ "lc_steel" ], "symbol": "o", "looks_like": "helmet_sallet", "color": "light_gray", @@ -986,6 +987,7 @@ "price_postapoc": 5500, "use_action": { "type": "transform", "msg": "You raise the helm's visor.", "target": "lc_helm_close_raised", "menu_text": "Raise" }, "bashing": 8, + "material": [ "mc_steel" ], "symbol": "o", "looks_like": "helmet_sallet", "color": "light_gray", @@ -1068,6 +1070,7 @@ "price_postapoc": 5500, "use_action": { "type": "transform", "msg": "You raise the helm's visor.", "target": "mc_helm_close_raised", "menu_text": "Raise" }, "bashing": 8, + "material": [ "hc_steel" ], "symbol": "o", "looks_like": "helmet_sallet", "color": "light_gray", @@ -1150,6 +1153,7 @@ "price_postapoc": 5500, "use_action": { "type": "transform", "msg": "You raise the helm's visor.", "target": "hc_helm_close_raised", "menu_text": "Raise" }, "bashing": 8, + "material": [ "ch_steel" ], "symbol": "o", "looks_like": "helmet_sallet", "color": "light_gray", @@ -1232,6 +1236,7 @@ "price_postapoc": 5500, "use_action": { "type": "transform", "msg": "You raise the helm's visor.", "target": "qt_helm_close_raised", "menu_text": "Raise" }, "bashing": 8, + "material": [ "qt_steel" ], "symbol": "o", "looks_like": "helmet_sallet", "color": "light_gray", diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json index 6970a6ea2e047..176f71f0920f9 100644 --- a/data/json/items/armor/hoods.json +++ b/data/json/items/armor/hoods.json @@ -33,6 +33,7 @@ "price": 5012, "price_postapoc": 2500, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "balclava", "color": "light_red", @@ -40,7 +41,7 @@ "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 @@ -66,6 +67,32 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "UNDERSIZE" ] }, + { + "id": "chainmail_junk_hood", + "type": "ARMOR", + "category": "armor", + "name": { "str": "chainmail coif" }, + "description": "A customized chainmail hood. Can be worn comfortably under helmets.", + "weight": "2006 g", + "volume": "500 ml", + "price": 5012, + "price_postapoc": 2500, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "balclava", + "color": "light_red", + "material_thickness": 4, + "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "head" ], + "coverage": 95, + "encumbrance": 10 + } + ] + }, { "id": "lc_chainmail_hood", "type": "ARMOR", @@ -77,13 +104,14 @@ "price": 5012, "price_postapoc": 2500, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "looks_like": "balclava", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 @@ -113,11 +141,12 @@ "id": "mc_chainmail_hood", "type": "ARMOR", "copy-from": "lc_chainmail_hood", + "material": [ "mc_steel_chain" ], "name": { "str": "medium steel chainmail coif" }, "description": "A customized medium steel chainmail hood. Can be worn comfortably under helmets.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 @@ -147,11 +176,12 @@ "id": "hc_chainmail_hood", "type": "ARMOR", "copy-from": "lc_chainmail_hood", + "material": [ "hc_steel_chain" ], "name": { "str": "high steel chainmail coif" }, "description": "A customized high steel chainmail hood. Can be worn comfortably under helmets.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 @@ -181,11 +211,12 @@ "id": "ch_chainmail_hood", "type": "ARMOR", "copy-from": "lc_chainmail_hood", + "material": [ "ch_steel_chain" ], "name": { "str": "hardened steel chainmail coif" }, "description": "A customized hardened steel chainmail hood. Can be worn comfortably under helmets.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 @@ -215,11 +246,12 @@ "id": "qt_chainmail_hood", "type": "ARMOR", "copy-from": "lc_chainmail_hood", + "material": [ "qt_steel_chain" ], "name": { "str": "tempered steel chainmail coif" }, "description": "A customized tempered steel chainmail hood. Can be worn comfortably under helmets.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head" ], "coverage": 95, "encumbrance": 10 diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index c130dec22224e..271e5c3c602fc 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -139,13 +139,14 @@ "price": 7500, "price_postapoc": 2000, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "legguard_hard", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -170,6 +171,31 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, + { + "id": "chainmail_junk_legs", + "type": "ARMOR", + "category": "armor", + "name": { "str": "chainmail leggings", "str_pl": "pairs of chainmail leggings" }, + "description": "Customized chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear. The metal shows signs of rust and corrosion.", + "weight": "4212 g", + "volume": "1500 ml", + "price": 7500, + "price_postapoc": 2000, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "legguard_hard", + "color": "light_red", + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "leg_l", "leg_r" ], + "coverage": 95, + "encumbrance": 20 + } + ] + }, { "id": "lc_chainmail_legs", "type": "ARMOR", @@ -181,13 +207,14 @@ "price": 7500, "price_postapoc": 2000, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "looks_like": "legguard_hard", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -216,11 +243,12 @@ "id": "mc_chainmail_legs", "type": "ARMOR", "copy-from": "lc_chainmail_legs", + "material": [ "mc_steel_chain" ], "name": { "str": "medium steel chainmail leggings", "str_pl": "pairs of medium steel chainmail leggings" }, "description": "Customized medium steel chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -249,11 +277,12 @@ "id": "hc_chainmail_legs", "type": "ARMOR", "copy-from": "lc_chainmail_legs", + "material": [ "hc_steel_chain" ], "name": { "str": "high steel chainmail leggings", "str_pl": "pairs of high steel chainmail leggings" }, "description": "Customized high steel chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -282,11 +311,12 @@ "id": "ch_chainmail_legs", "type": "ARMOR", "copy-from": "lc_chainmail_legs", + "material": [ "ch_steel_chain" ], "name": { "str": "hardened steel chainmail leggings", "str_pl": "pairs of hardened steel chainmail leggings" }, "description": "Customized hardened steel chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -315,11 +345,12 @@ "id": "qt_chainmail_legs", "type": "ARMOR", "copy-from": "lc_chainmail_legs", + "material": [ "qt_steel_chain" ], "name": { "str": "tempered steel chainmail leggings", "str_pl": "pairs of tempered steel chainmail leggings" }, "description": "Customized tempered steel chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": 20 @@ -976,14 +1007,14 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "legguard_lightplate", "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "sided": true, - "material_thickness": 2, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -1010,6 +1041,7 @@ "id": "armor_mc_light_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_light_leg_guard", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel light leg guard" }, "description": "A light leg guard, 1.25 mm at the thickest. Made with tougher medium steel, this offers solid protection.", "armor": [ @@ -1038,6 +1070,7 @@ "id": "armor_hc_light_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_light_leg_guard", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel light leg guard" }, "description": "A light leg guard, 1.25 mm at the thickest. Made with high carbon steel offering excellent protection.", "armor": [ @@ -1066,6 +1099,7 @@ "id": "armor_ch_light_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_light_leg_guard", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened light leg guard" }, "description": "A light leg guard, 1.25 mm at the thickest. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -1094,6 +1128,7 @@ "id": "armor_qt_light_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_light_leg_guard", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered light leg guard" }, "description": "A light leg guard, 1.25 mm at the thickest. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -1130,6 +1165,7 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", "color": "light_gray", @@ -1137,7 +1173,7 @@ "longest_side": "60 cm", "sided": true, "material_thickness": 4, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -1164,6 +1200,7 @@ "id": "armor_mc_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_leg_guard", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel leg guard" }, "description": "A leg guard, 1.75 mm at the thickest. Made with tougher medium steel, this offers solid protection.", "armor": [ @@ -1192,6 +1229,7 @@ "id": "armor_hc_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_leg_guard", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel leg guard" }, "description": "A leg guard, 1.75 mm at the thickest. Made with high carbon steel offering excellent protection.", "armor": [ @@ -1220,6 +1258,7 @@ "id": "armor_ch_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_leg_guard", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened leg guard" }, "description": "A leg guard, 1.75 mm at the thickest. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -1248,6 +1287,7 @@ "id": "armor_qt_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_leg_guard", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered leg guard" }, "description": "A leg guard, 1.75 mm at the thickest. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -1284,6 +1324,7 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", "color": "light_gray", @@ -1291,7 +1332,7 @@ "longest_side": "60 cm", "sided": true, "material_thickness": 6, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -1318,6 +1359,7 @@ "id": "armor_mc_heavy_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_heavy_leg_guard", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel heavy leg guard" }, "description": "A heavy leg guard, 2.25 mm at the thickest. Made with tougher medium steel, this offers solid protection.", "armor": [ @@ -1346,6 +1388,7 @@ "id": "armor_hc_heavy_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_heavy_leg_guard", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel heavy leg guard" }, "description": "A heavy leg guard, 2.25 mm at the thickest. Made with high carbon steel offering excellent protection.", "armor": [ @@ -1374,6 +1417,7 @@ "id": "armor_ch_heavy_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_heavy_leg_guard", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened heavy leg guard" }, "description": "A heavy leg guard, 2.25 mm at the thickest. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -1402,6 +1446,7 @@ "id": "armor_qt_heavy_leg_guard", "type": "ARMOR", "copy-from": "armor_lc_heavy_leg_guard", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered heavy leg guard" }, "description": "A heavy leg guard, 2.25 mm at the thickest. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 4170c56069ade..aab99897da8a2 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -254,31 +254,31 @@ "flags": [ "VARSIZE", "OUTER", "STURDY" ], "armor": [ { "encumbrance": 20, "coverage": 95, "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ] } ] }, - { - "id": "armor_junk_lightplate", - "type": "ARMOR", - "copy-from": "armor_lightplate", - "name": { "str": "junk plate armor" }, - "description": "A suit of Gothic plate armor. The metal shows signs of rust and corrosion and the leather straps are tattered.", - "material": [ "budget_steel", "leather" ] - }, { "id": "xl_armor_lightplate", "type": "ARMOR", "name": { "str": "XL plate armor" }, - "copy-from": "armor_junk_lightplate", + "copy-from": "armor_lightplate", "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, "flags": [ "VARSIZE", "OUTER", "STURDY", "OVERSIZE" ] }, { "id": "xs_armor_lightplate", "type": "ARMOR", - "copy-from": "armor_junk_lightplate", + "copy-from": "armor_lightplate", "looks_like": "armor_lightplate", "name": { "str": "XS plate armor" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "VARSIZE", "OUTER", "STURDY", "UNDERSIZE" ] }, + { + "id": "armor_junk_lightplate", + "type": "ARMOR", + "copy-from": "armor_lightplate", + "name": { "str": "junk plate armor" }, + "description": "A suit of Gothic plate armor. The metal shows signs of rust and corrosion and the leather straps are tattered.", + "material": [ "budget_steel", "leather" ] + }, { "id": "armor_lc_lightplate", "type": "ARMOR", @@ -291,13 +291,14 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "material_thickness": 2, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -343,6 +344,7 @@ "id": "armor_mc_lightplate", "type": "ARMOR", "copy-from": "armor_lc_lightplate", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel light plate armor" }, "description": "A light suit of plate armor with a 2 mm thick chestpiece. Made with tougher medium steel, this suit offers solid protection.", "armor": [ @@ -390,6 +392,7 @@ "id": "armor_hc_lightplate", "type": "ARMOR", "copy-from": "armor_lc_lightplate", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel light plate armor" }, "description": "A light suit of plate armor with a 2 mm thick chestpiece. Made with high carbon steel offering excellent protection.", "armor": [ @@ -437,6 +440,7 @@ "id": "armor_ch_lightplate", "type": "ARMOR", "copy-from": "armor_lc_lightplate", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened light plate armor" }, "description": "A light suit of plate armor with a 2 mm thick chestpiece. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -484,6 +488,7 @@ "id": "armor_qt_lightplate", "type": "ARMOR", "copy-from": "armor_lc_lightplate", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered light plate armor" }, "description": "A light suit of plate armor with a 2 mm thick chestpiece. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -539,13 +544,14 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "material_thickness": 4, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -591,6 +597,7 @@ "id": "armor_mc_plate", "type": "ARMOR", "copy-from": "armor_lc_plate", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel plate armor" }, "description": "A suit of plate armor with a 4 mm thick chestpiece. Made with tougher medium steel, this suit offers solid protection.", "armor": [ @@ -638,6 +645,7 @@ "id": "armor_hc_plate", "type": "ARMOR", "copy-from": "armor_lc_plate", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel plate armor" }, "description": "A suit of plate armor with a 4 mm thick chestpiece. Made with high carbon steel offering excellent protection.", "armor": [ @@ -685,6 +693,7 @@ "id": "armor_ch_plate", "type": "ARMOR", "copy-from": "armor_lc_plate", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened plate armor" }, "description": "A suit of plate armor with a 4 mm thick chestpiece. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -732,6 +741,7 @@ "id": "armor_qt_plate", "type": "ARMOR", "copy-from": "armor_lc_plate", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered plate armor" }, "description": "A suit of plate armor with a 4 mm thick chestpiece. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -787,13 +797,14 @@ "price_postapoc": 12000, "to_hit": -5, "bashing": 8, + "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", "color": "light_gray", "warmth": 20, "longest_side": "60 cm", "material_thickness": 6, - "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE" ], + "flags": [ "OUTER", "STURDY", "CONDUCTIVE", "ONLY_ONE", "BLOCK_WHILE_WORN" ], "armor": [ { "material": [ @@ -839,6 +850,7 @@ "id": "armor_mc_heavyplate", "type": "ARMOR", "copy-from": "armor_lc_heavyplate", + "material": [ "mc_steel", "mc_steel_chain" ], "name": { "str": "medium steel heavy plate armor" }, "description": "A heavy suit of plate armor with a 6 mm thick chestpiece. Made with tougher medium steel, this suit offers solid protection.", "armor": [ @@ -886,6 +898,7 @@ "id": "armor_hc_heavyplate", "type": "ARMOR", "copy-from": "armor_lc_heavyplate", + "material": [ "hc_steel", "hc_steel_chain" ], "name": { "str": "high steel heavy plate armor" }, "description": "A heavy suit of plate armor with a 6 mm thick chestpiece. Made with high carbon steel offering excellent protection.", "armor": [ @@ -933,6 +946,7 @@ "id": "armor_ch_heavyplate", "type": "ARMOR", "copy-from": "armor_lc_heavyplate", + "material": [ "ch_steel", "ch_steel_chain" ], "name": { "str": "case hardened heavy plate armor" }, "description": "A heavy suit of plate armor with a 6 mm thick chestpiece. The mild steel has been case hardened, offering superior protection.", "armor": [ @@ -980,6 +994,7 @@ "id": "armor_qt_heavyplate", "type": "ARMOR", "copy-from": "armor_lc_heavyplate", + "material": [ "qt_steel", "qt_steel_chain" ], "name": { "str": "tempered heavy plate armor" }, "description": "A heavy suit of plate armor with a 6 mm thick chestpiece. The medium steel has been quenched and tempered, offering top of the line protection.", "armor": [ @@ -1119,31 +1134,31 @@ "flags": [ "VARSIZE", "OUTER" ], "armor": [ { "encumbrance": 45, "coverage": 90, "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ] } ] }, - { - "id": "armor_junk_plate", - "type": "ARMOR", - "copy-from": "armor_plate", - "name": { "str": "junk ornamental plate armor" }, - "description": "An extremely heavy suit of ornamental armor. The metal shows signs of rust and corrosion and the leather straps are tattered.", - "material": [ "budget_steel", "leather" ] - }, { "id": "xl_armor_plate", "type": "ARMOR", "name": { "str": "XL ornamental plate armor" }, - "copy-from": "armor_junk_plate", + "copy-from": "armor_plate", "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 }, "flags": [ "VARSIZE", "OUTER", "OVERSIZE" ] }, { "id": "xs_armor_plate", "type": "ARMOR", - "copy-from": "armor_junk_plate", + "copy-from": "armor_plate", "looks_like": "armor_plate", "name": { "str": "XS ornamental plate armor" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "flags": [ "VARSIZE", "OUTER", "UNDERSIZE" ] }, + { + "id": "armor_junk_plate", + "type": "ARMOR", + "copy-from": "armor_plate", + "name": { "str": "junk ornamental plate armor" }, + "description": "An extremely heavy suit of ornamental armor. The metal shows signs of rust and corrosion and the leather straps are tattered.", + "material": [ "budget_steel", "leather" ] + }, { "id": "armor_riot", "repairs_like": "survivor_suit", @@ -1281,6 +1296,7 @@ "price": 35988, "price_postapoc": 3000, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "armor_blarmor", "color": "light_red", @@ -1288,7 +1304,7 @@ "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1310,7 +1326,33 @@ "looks_like": "chainmail_hauberk", "name": { "str": "XS chainmail hauberk" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "VARSIZE", "STURDY", "OUTER", "UNDERSIZE" ] + "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "chainmail_junk_hauberk", + "type": "ARMOR", + "category": "armor", + "name": { "str": "chainmail hauberk" }, + "description": "A fully customized chainmail outfit, leaving the head uncovered. Combine with a gambeson or other padded layer for optimal protection.", + "weight": "14430 g", + "volume": "2750 ml", + "price": 35988, + "price_postapoc": 3000, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "armor_blarmor", + "color": "light_red", + "warmth": 0, + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 95, + "encumbrance": 20 + } + ] }, { "id": "lc_chainmail_hauberk", @@ -1323,6 +1365,7 @@ "price": 35988, "price_postapoc": 3000, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_blarmor", "color": "light_red", @@ -1330,7 +1373,7 @@ "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1357,11 +1400,12 @@ "id": "mc_chainmail_hauberk", "type": "ARMOR", "copy-from": "lc_chainmail_hauberk", + "material": [ "mc_steel_chain" ], "name": { "str": "medium steel chainmail hauberk" }, "description": "A fully customized medium steel chainmail outfit, leaving the head uncovered. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1389,11 +1433,12 @@ "id": "hc_chainmail_hauberk", "type": "ARMOR", "copy-from": "lc_chainmail_hauberk", + "material": [ "hc_steel_chain" ], "name": { "str": "high steel chainmail hauberk" }, "description": "A fully customized high steel chainmail outfit, leaving the head uncovered. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1420,11 +1465,12 @@ "id": "ch_chainmail_hauberk", "type": "ARMOR", "copy-from": "lc_chainmail_hauberk", + "material": [ "ch_steel_chain" ], "name": { "str": "hardened steel chainmail hauberk" }, "description": "A fully customized hardened steel chainmail outfit, leaving the head uncovered. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1451,11 +1497,12 @@ "id": "qt_chainmail_hauberk", "type": "ARMOR", "copy-from": "lc_chainmail_hauberk", + "material": [ "qt_steel_chain" ], "name": { "str": "tempered steel chainmail hauberk" }, "description": "A fully customized tempered steel chainmail outfit, leaving the head uncovered. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1489,6 +1536,7 @@ "price": 45000, "price_postapoc": 8000, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "touring_suit", "color": "light_red", @@ -1496,7 +1544,7 @@ "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1518,7 +1566,33 @@ "looks_like": "chainmail_suit", "name": { "str": "XS chainmail armor" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, - "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER", "UNDERSIZE" ] + "extend": { "flags": [ "UNDERSIZE" ] } + }, + { + "id": "chainmail_junk_suit", + "type": "ARMOR", + "category": "armor", + "name": { "str": "chainmail armor" }, + "description": "A fully customized chainmail suit. The metal shows signs of rust and corrosion. Combine with a gambeson or other padded layer for optimal protection.", + "weight": "16436 g", + "volume": "3250 ml", + "price": 45000, + "price_postapoc": 8000, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "touring_suit", + "color": "light_red", + "warmth": 0, + "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], + "coverage": 95, + "encumbrance": 20 + } + ] }, { "id": "lc_chainmail_suit", @@ -1531,6 +1605,7 @@ "price": 45000, "price_postapoc": 8000, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "looks_like": "touring_suit", "color": "light_red", @@ -1538,7 +1613,7 @@ "flags": [ "VARSIZE", "STURDY", "HELMET_COMPAT", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1565,11 +1640,12 @@ "id": "mc_chainmail_suit", "type": "ARMOR", "copy-from": "lc_chainmail_suit", + "material": [ "mc_steel_chain" ], "name": { "str": "medium steel chainmail armor" }, "description": "A fully customized medium steel chainmail suit. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1596,11 +1672,12 @@ "id": "hc_chainmail_suit", "type": "ARMOR", "copy-from": "lc_chainmail_suit", + "material": [ "hc_steel_chain" ], "name": { "str": "high steel chainmail armor" }, "description": "A fully customized high steel chainmail suit. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1619,6 +1696,7 @@ "id": "hc_chainmail_suit_xs", "type": "ARMOR", "copy-from": "hc_chainmail_suit", + "material": [ "ch_steel_chain" ], "name": { "str": "XS high steel chainmail armor" }, "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } @@ -1631,7 +1709,7 @@ "description": "A fully customized hardened steel chainmail suit. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1658,11 +1736,12 @@ "id": "qt_chainmail_suit", "type": "ARMOR", "copy-from": "lc_chainmail_suit", + "material": [ "qt_steel_chain" ], "name": { "str": "tempered steel chainmail armor" }, "description": "A fully customized tempered steel chainmail suit. Combine with a gambeson or other padded layer for optimal protection.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "head", "torso", "leg_l", "leg_r", "arm_l", "arm_r" ], "coverage": 95, "encumbrance": 20 @@ -1693,7 +1772,7 @@ "description": "A fully customized chainmail suit that can be worn over your normal clothing. The suit is conductively interconnected, protecting against electricity.", "armor": [ { - "material": [ { "type": "lc_steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso", "head", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r", "mouth", "eyes" ], "coverage": 100, "encumbrance": 30 diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json index 07f76f3cf66a9..0cd6ebc97b3c5 100644 --- a/data/json/items/armor/torso_armor.json +++ b/data/json/items/armor/torso_armor.json @@ -214,13 +214,14 @@ "price": 10000, "price_postapoc": 2000, "to_hit": -1, + "material": [ "steel", "iron" ], "symbol": "[", "looks_like": "vest_leather", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "steel", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "steel", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 @@ -243,6 +244,31 @@ "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 }, "extend": { "flags": [ "UNDERSIZE" ] } }, + { + "id": "chainmail_junk_vest", + "type": "ARMOR", + "category": "armor", + "name": { "str": "chainmail vest" }, + "description": "A customized chainmail vest. The metal shows signs of rust and corrosion. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.", + "weight": "6953 g", + "volume": "1 L", + "price": 10000, + "price_postapoc": 2000, + "to_hit": -1, + "material": [ "budget_steel" ], + "symbol": "[", + "looks_like": "vest_leather", + "color": "light_red", + "flags": [ "VARSIZE", "STURDY", "OUTER" ], + "armor": [ + { + "material": [ { "type": "budget_steel", "covered_by_mat": 100, "thickness": 1.2 } ], + "covers": [ "torso" ], + "coverage": 95, + "encumbrance": 20 + } + ] + }, { "id": "lc_chainmail_vest", "type": "ARMOR", @@ -254,13 +280,14 @@ "price": 10000, "price_postapoc": 2000, "to_hit": -1, + "material": [ "lc_steel_chain" ], "symbol": "[", "looks_like": "vest_leather", "color": "light_red", "flags": [ "VARSIZE", "STURDY", "OUTER" ], "armor": [ { - "material": [ { "type": "lc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "lc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 @@ -287,11 +314,12 @@ "id": "mc_chainmail_vest", "type": "ARMOR", "copy-from": "lc_chainmail_vest", + "material": [ "mc_steel_chain" ], "name": { "str": "medium steel chainmail vest" }, "description": "A customized medium steel chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.", "armor": [ { - "material": [ { "type": "mc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "mc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 @@ -318,11 +346,12 @@ "id": "hc_chainmail_vest", "type": "ARMOR", "copy-from": "lc_chainmail_vest", + "material": [ "hc_steel_chain" ], "name": { "str": "high steel chainmail vest" }, "description": "A customized high steel chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.", "armor": [ { - "material": [ { "type": "hc_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "hc_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 @@ -349,11 +378,12 @@ "id": "ch_chainmail_vest", "type": "ARMOR", "copy-from": "lc_chainmail_vest", + "material": [ "ch_steel_chain" ], "name": { "str": "hardened steel chainmail vest" }, "description": "A customized high steel chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.", "armor": [ { - "material": [ { "type": "ch_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "ch_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 @@ -380,11 +410,12 @@ "id": "qt_chainmail_vest", "type": "ARMOR", "copy-from": "lc_chainmail_vest", + "material": [ "qt_steel_chain" ], "name": { "str": "tempered steel chainmail vest" }, "description": "A customized tempered steel chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.", "armor": [ { - "material": [ { "type": "qt_steel_chain", "covered_by_mat": 95, "thickness": 1.2 } ], + "material": [ { "type": "qt_steel_chain", "covered_by_mat": 100, "thickness": 1.2 } ], "covers": [ "torso" ], "coverage": 95, "encumbrance": 20 diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 34fc014e4bee8..3dd54bf6bdd29 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -1239,7 +1239,16 @@ "materials": [ "iron", "steel", + "lc_steel", + "mc_steel", + "hc_steel", + "ch_steel", "qt_steel", + "lc_steel_chain", + "mc_steel_chain", + "hc_steel_chain", + "ch_steel_chain", + "qt_steel_chain", "aluminum", "copper", "bronze", @@ -1306,6 +1315,11 @@ "hc_steel", "ch_steel", "qt_steel", + "lc_steel_chain", + "mc_steel_chain", + "hc_steel_chain", + "ch_steel_chain", + "qt_steel_chain", "platinum", "superalloy" ], @@ -1360,7 +1374,12 @@ "mc_steel", "hc_steel", "ch_steel", - "qt_steel" + "qt_steel", + "lc_steel_chain", + "mc_steel_chain", + "hc_steel_chain", + "ch_steel_chain", + "qt_steel_chain" ], "skill": "fabrication", "tool_quality": 5,