More Metal Armor Updates (#55865)

* Adds block while worn * Junk chain
CleverRaven · Mar 9, 2022 · 39cd2e8 · 39cd2e8
1 parent 06a2cb0
commit 39cd2e8
Show file tree

Hide file tree

Showing 12 changed files with 432 additions and 103 deletions.
diff --git 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
@@ -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
@@ -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
@@ -609,16 +609,17 @@
     "price": 7500,
     "price_postapoc": 2500,
     "to_hit": -1,
+    "material": [ "steel", "iron" ],
     "symbol": "[",
     "looks_like": "armguard_metal",
     "color": "light_red",
     "material_thickness": 3,
     "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": [