Balance riot and swat armour

data/json/itemgroups/Clothing_Gear/gear.json

@@ -31,7 +31,7 @@
       [ "smokebomb", 5 ],
       [ "suppressor", 25 ],
       [ "suppressor_compact", 20 ],
-      [ "swat_armor", 20 ],
+      [ "swat_armor", 5 ],
       [ "tac_fullhelmet", 5 ],
       [ "tac_helmet", 10 ]
     ]

data/json/items/armor/suits_protection.json

@@ -320,21 +320,24 @@
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "riot armor" },
-    "description": "Black body armor used by riot police officers, back when they were just riots.  The word POLICE is emblazoned across the front.",
-    "weight": "4000 g",
+    "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,
     "to_hit": -3,
-    "bashing": 6,
-    "material": [ "plastic", "cotton" ],
+    "material": [ "thermo_resin", "plastic" ],
     "symbol": "[",
     "looks_like": "kevlar",
     "color": "light_gray",
     "warmth": 10,
-    "material_thickness": 6,
+    "material_thickness": 2.5,
     "flags": [ "STURDY", "OUTER" ],
-    "armor": [ { "encumbrance": 10, "coverage": 85, "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ] } ]
+    "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" ] }
+    ]
   },
   {
     "id": "armor_samurai",
@@ -747,33 +750,31 @@
     "category": "armor",
     "name": { "str": "SWAT armor" },
     "//": "This is well within the pricing structure I found for ballistic vest, shins, and LBE.  LEO gear ain't cheap.",
-    "description": "A suit of black bulletproof armor with lots of pockets.  The word SWAT is emblazoned across the back.",
-    "weight": "7800 g",
-    "volume": "13 L",
+    "description": "A suit of black armour plating covering the vital parts of the chest, arms, and legs.  The word SWAT is emblazoned across the back.",
+    "weight": "2200 g",
+    "volume": "9 L",
     "price": 285000,
-    "price_postapoc": 2000,
+    "price_postapoc": 2500,
     "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar_layered", "cotton" ],
+    "material": [ "kevlar_layered", "thermo_resin", "plastic" ],
     "symbol": "[",
-    "looks_like": "touring_suit",
+    "looks_like": "armor_riot",
     "color": "dark_gray",
     "armor": [
-      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 12, 19 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 12, 16 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 12, 12 ] }
+      { "covers": [ "torso" ], "coverage": 65, "encumbrance": [ 10, 17 ] },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 65, "encumbrance": [ 10, 14 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 60, "encumbrance": [ 12, 12 ] }
     ],
     "pocket_data": [
       { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 },
       { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }
     ],
-    "warmth": 35,
-    "material_thickness": 11,
-    "valid_mods": [ "steel_padded" ],
-    "environmental_protection": 4,
-    "flags": [ "POCKETS", "STURDY" ]
+    "warmth": 12,
+    "material_thickness": 5,
+    "environmental_protection": 1,
+    "flags": [ "POCKETS", "STURDY", "OUTER" ]
   },
   {
     "id": "touring_suit",

data/json/monsterdrops/zombie_cop.json

@@ -123,17 +123,13 @@
     "subtype": "collection",
     "entries": [
       {
-        "collection": [
+        "distribution": [
           { "item": "adhesive_bandages", "prob": 30 },
           { "item": "bandages", "prob": 30 },
           { "group": "full_1st_aid", "prob": 20 }
         ],
         "prob": 25
       },
-      {
-        "collection": [ { "item": "swat_armor", "prob": 50 }, { "item": "kevlar", "prob": 25 }, { "item": "tacvest", "prob": 5 } ],
-        "prob": 75
-      },
       {
         "collection": [
           { "item": "heavy_flashlight", "prob": 20, "charges": [ 0, 300 ] },
@@ -202,13 +198,28 @@
   {
     "id": "swat_torso",
     "type": "item_group",
-    "subtype": "distribution",
+    "subtype": "collection",
     "entries": [
-      { "item": "tank_top", "prob": 30 },
-      { "item": "army_top", "prob": 40 },
-      { "item": "tshirt", "prob": 20 },
-      { "item": "longshirt", "prob": 10 },
-      { "item": "thermal_shirt", "prob": 10 }
+      {
+        "distribution": [
+          { "item": "swat_armor", "prob": 15 },
+          { "item": "kevlar", "prob": 25 },
+          { "item": "tacvest", "prob": 5 },
+          { "item": "armor_riot", "prob": 25 },
+          { "item": "ballistic_vest_esapi", "prob": 10 }
+        ],
+        "prob": 65
+      },
+      {
+        "distribution": [
+          { "item": "tank_top", "prob": 30 },
+          { "item": "army_top", "prob": 40 },
+          { "item": "tshirt", "prob": 20 },
+          { "item": "longshirt", "prob": 10 },
+          { "item": "thermal_shirt", "prob": 10 }
+        ],
+        "prob": 75
+      }
     ]
   },
   {

data/json/professions.json

@@ -1599,8 +1599,6 @@
           "gloves_tactical",
           "armor_riot",
           "helmet_riot",
-          "armguard_hard",
-          "legguard_hard",
           "badge_deputy",
           "wristwatch",
           "gasbomb"