Updated Riot Armor to modern armor standards

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -2799,6 +2799,9 @@
       [ "chestguard_hard", 20 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 15 ],
+      [ "armor_riot_leg", 10 ],
+      [ "armor_riot_arm", 10 ],
+      [ "armor_riot_torso", 5 ],
       [ "under_armor", 20 ],
       [ "long_underpants", 40 ],
       [ "long_undertop", 40 ],

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1530,10 +1530,11 @@
     "items": [
       [ "helmet_riot", 25 ],
       { "item": "mask_gas", "prob": 25, "charges": [ 0, 100 ] },
-      [ "armor_riot", 20 ],
+      [ "armor_riot", 25 ],
+      [ "armor_riot_arm", 15 ],
+      [ "armor_riot_leg", 15 ],
+      [ "armor_riot_torso", 5 ],
       [ "gloves_tactical", 10 ],
-      [ "armguard_hard", 20 ],
-      [ "legguard_hard", 20 ],
       [ "emergency_book", 1 ]
     ]
   },

data/json/items/armor/arms_armor.json

@@ -1638,5 +1638,36 @@
     "material_thickness": 2.5,
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "armor_riot_arm",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of riot arm guards", "str_pl": "pairs of riot arm guards" },
+    "description": "Hard arm guards used by riot police.",
+    "weight": "500 g",
+    "volume": "2500 ml",
+    "price": 10000,
+    "price_postapoc": 750,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "armguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "40 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
+    "armor": [
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "encumbrance": 3,
+        "coverage": 90,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+        ],
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r" ]
+      }
+    ]
   }
 ]

data/json/items/armor/legs_armor.json

@@ -1572,5 +1572,43 @@
     "warmth": 25,
     "material_thickness": 2.0,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "armor_riot_leg",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of riot leg guards", "str_pl": "pairs of riot leg guards" },
+    "description": "Hard leg guards used by riot police.",
+    "weight": "500 g",
+    "volume": "2500 ml",
+    "price": 10000,
+    "price_postapoc": 750,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "legguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "40 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
+    "armor": [
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "encumbrance": 3,
+        "coverage": 90,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+        ],
+        "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "encumbrance": 2,
+        "coverage": 75,
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 100, "thickness": 1.5 } ],
+        "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
+      }
+    ]
   }
 ]

data/json/items/armor/suits_protection.json

@@ -1370,28 +1370,68 @@
   },
   {
     "id": "armor_riot",
-    "repairs_like": "survivor_suit",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "riot armor" },
-    "description": "Black plastic body armor plates used by riot police officers, back when they were just riots.  The word POLICE is emblazoned across the front.",
-    "weight": "1000 g",
-    "volume": "7500 ml",
-    "price": 35000,
-    "price_postapoc": 1500,
+    "name": { "str": "riot armor suit" },
+    "description": "A full suit of black plastic body armor plates used by riot police.  Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts.  Molle webbing is attached to the thighs and the word POLICE is emblazoned across the front.",
+    "weight": "3 kg",
+    "volume": "12500 ml",
+    "price": 60000,
+    "price_postapoc": 4000,
     "to_hit": -3,
-    "material": [ "thermo_resin", "plastic" ],
+    "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "kevlar",
-    "color": "light_gray",
-    "warmth": 10,
+    "color": "dark_gray",
+    "warmth": 20,
     "longest_side": "60 cm",
-    "material_thickness": 2.5,
-    "flags": [ "STURDY", "OUTER" ],
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED", "BLOCK_WHILE_WORN" ],
+    "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
     "armor": [
-      { "encumbrance": 7, "coverage": 60, "covers": [ "torso" ] },
-      { "encumbrance": 7, "coverage": 55, "covers": [ "leg_l", "leg_r" ] },
-      { "encumbrance": 7, "coverage": 60, "covers": [ "arm_l", "arm_r" ] }
+      {
+        "encumbrance": 7,
+        "coverage": 95,
+        "covers": [ "torso" ],
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
+        ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+        "encumbrance": 4,
+        "coverage": 90,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
+        ],
+        "specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
+        "coverage": 85,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "encumbrance": 2,
+        "coverage": 75,
+        "material": [ { "type": "thermo_resin", "covered_by_mat": 100, "thickness": 1.5 } ],
+        "specifically_covers": [ "foot_arch_l", "foot_arch_r", "foot_ankle_r", "foot_ankle_l" ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 95,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      }
     ]
   },
   {

data/json/items/armor/torso_armor.json

@@ -1843,5 +1843,56 @@
     "material_thickness": 2.5,
     "environmental_protection": 2,
     "flags": [ "VARSIZE", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "armor_riot_torso",
+    "repairs_like": "armor_larmor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "riot chest guard" },
+    "description": "A hard chest protector, attached to thigh and upper arm guards.  Used by riot police officers.  Molle webbing is attached to the thighs.  The word POLICE is emblazoned across the front.",
+    "weight": "2 kg",
+    "volume": "10000 ml",
+    "price": 40000,
+    "price_postapoc": 2500,
+    "to_hit": -3,
+    "material": [ "thermo_resin", "plastic_pad" ],
+    "symbol": "[",
+    "looks_like": "chestguard_hard",
+    "color": "dark_gray",
+    "warmth": 20,
+    "longest_side": "60 cm",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "PADDED" ],
+    "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
+    "armor": [
+      {
+        "encumbrance": 7,
+        "coverage": 95,
+        "covers": [ "torso" ],
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
+        ]
+      },
+      {
+        "covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
+        "encumbrance": 2,
+        "coverage": 85,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
+      },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 100,
+        "material": [
+          { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
+          { "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
+        ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
+      }
+    ]
   }
 ]

data/json/monsterdrops/zombie_cop.json

@@ -35,8 +35,11 @@
     "type": "item_group",
     "id": "cop_armor",
     "items": [
-      [ "armor_riot", 20 ],
-      [ "kevlar", 35 ],
+      [ "armor_riot", 65 ],
+      [ "armor_riot_arm", 5 ],
+      [ "armor_riot_leg", 5 ],
+      [ "armor_riot_torso", 10 ],
+      [ "kevlar", 100 ],
       {
         "item": "level_3_vest",
         "variant": "police_armor_vest",
@@ -270,7 +273,14 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "distribution": [ { "item": "armor_riot", "prob": 25 }, { "group": "swat_ballistic_vest", "prob": 75 } ], "prob": 65 },
+      {
+        "distribution": [
+          { "item": "armor_riot", "prob": 30 },
+          { "item": "armor_riot_torso", "prob": 15 },
+          { "group": "swat_ballistic_vest", "prob": 80 }
+        ],
+        "prob": 65
+      },
       {
         "distribution": [
           { "item": "tank_top", "prob": 30 },

data/json/recipes/armor/suit.json

@@ -3367,5 +3367,19 @@
       [ [ "xl_armor_qt_heavyarmguard", 2 ] ],
       [ [ "xl_armor_qt_heavy_leg_guard", 2 ] ]
     ]
+  },
+  {
+    "result": "armor_riot",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "id_suffix": "assembly",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "time": "2 m",
+    "reversible": true,
+    "autolearn": true,
+    "flags": [ "NO_RESIZE" ],
+    "components": [ [ [ "armor_riot_leg", 1 ] ], [ [ "armor_riot_arm", 1 ] ], [ [ "armor_riot_torso", 1 ] ] ]
   }
 ]

data/json/recipes/recipe_deconstruction.json

@@ -7164,6 +7164,13 @@
     "components": [ [ [ "cardboard", 1 ] ] ],
     "flags": [ "BLIND_EASY" ]
   },
+  {
+    "result": "armor_riot",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "time": "1 m",
+    "components": [ [ [ "armor_riot_leg", 1 ] ], [ [ "armor_riot_arm", 1 ] ], [ [ "armor_riot_torso", 1 ] ] ]
+  },
   {
     "result": "matches",
     "type": "uncraft",