Rework kevlar, add slash resistant and EOD gear

data/json/clothing_mods.json

@@ -30,7 +30,7 @@
     "type": "clothing_mod",
     "id": "kevlar_padded",
     "flag": "kevlar_padded",
-    "item": "kevlar_plate",
+    "item": "sheet_kevlar_layered",
     "implement_prompt": "Pad with Kevlar",
     "destroy_prompt": "Destroy Kevlar padding",
     "mod_value": [

data/json/harvest.json

@@ -530,7 +530,7 @@
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "kevlar_plate", "type": "skin", "mass_ratio": 0.015 },
+      { "drop": "sheet_kevlar", "type": "skin", "mass_ratio": 0.24 },
       { "drop": "pheromone", "type": "bionic", "max": 1 }
     ]
   },

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -120,6 +120,10 @@
       { "item": "webbing_belt" },
       { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] },
       { "item": "boots_combat" },
+      {
+        "collection": [ { "distribution": [ { "item": "balclava", "prob": 90 }, { "item": "balaclava_cut_resistant", "prob": 10 } ] } ],
+        "prob": 25
+      },
       {
         "distribution": [
           { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] },
@@ -367,7 +371,8 @@
     "entries": [
       { "item": "gloves_leather", "prob": 30 },
       { "item": "gloves_rubber", "prob": 10 },
-      { "item": "gloves_work", "prob": 60 }
+      { "item": "gloves_work", "prob": 60 },
+      { "item": "gloves_cut_resistant", "prob": 10 }
     ]
   },
   {
@@ -446,6 +451,10 @@
       [ "mask_filter", 30 ],
       [ "glasses_safety", 30 ],
       [ "ear_plugs", 35 ],
+      [ "apron_cut_resistant", 5 ],
+      [ "gloves_cut_resistant", 10 ],
+      [ "chaps_cut_resistant", 5 ],
+      [ "armguard_cut_resistant", 5 ],
       [ "apron_leather", 10 ],
       [ "tool_belt", 30 ],
       [ "knee_pads", 20 ],
@@ -1825,6 +1834,24 @@
       [ "sneakers", 70 ]
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "eod_armor",
+    "entries": [
+      {
+        "collection": [
+          { "item": "helmet_eod" },
+          { "item": "jacket_eod" },
+          { "item": "trousers_eod" },
+          { "item": "foot_protectors_eod" },
+          { "item": "gloves_eod", "prob": 20 }
+        ],
+        "prob": 100
+      },
+      { "collection": [ { "item": "jacket_eod_light" }, { "item": "trousers_eod_light" } ], "prob": 20 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "mil_armor",

data/json/itemgroups/Clothing_Gear/gear.json

@@ -17,6 +17,8 @@
       [ "helmet_lobster", 5 ],
       [ "helmet_riot", 5 ],
       [ "holo_sight", 20 ],
+      [ "balclava", 10 ],
+      [ "balaclava_cut_resistant", 5 ],
       [ "holster", 15 ],
       [ "bandolier_shotgun", 15 ],
       [ "torso_bandolier_shotgun", 8 ],

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -42,6 +42,7 @@
       { "group": "ammo_swat", "prob": 20 },
       { "group": "guns_swat", "prob": 20 },
       { "group": "mags_swat", "prob": 20 },
+      { "group": "eod_armor", "prob": 20 },
       { "item": "survnote", "prob": 1 }
     ]
   },

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -236,6 +236,9 @@
       [ "sleeveless_duster", 5 ],
       [ "sleeveless_duster_leather", 5 ],
       [ "sleeveless_duster_fur", 5 ],
+      [ "apron_cut_resistant", 2 ],
+      [ "chaps_cut_resistant", 5 ],
+      [ "balaclava_cut_resistant", 5 ],
       [ "gold_watch", 15 ],
       [ "silver_watch", 20 ],
       [ "sf_watch", 7 ],
@@ -1862,7 +1865,7 @@
       { "item": "shed_stick", "prob": 2 },
       [ "tailors_kit", 9 ],
       [ "knitting_needles", 15 ],
-      [ "kevlar_plate", 10 ],
+      [ "sheet_kevlar_layered", 10 ],
       [ "leather", 10 ],
       [ "rag", 20 ],
       [ "needle_curved", 10 ],

data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json

@@ -15,7 +15,7 @@
       { "item": "steel_chunk", "prob": 30 },
       { "item": "spring", "prob": 50 },
       { "item": "steel_lump", "prob": 30 },
-      { "item": "kevlar_plate", "prob": 10 },
+      { "item": "sheet_kevlar_layered", "prob": 10 },
       { "item": "ceramic_armor", "prob": 15 },
       { "item": "motor", "prob": 2 },
       { "group": "ammo_heavy_batteries_full", "prob": 50 },
@@ -60,7 +60,7 @@
     "entries": [
       { "item": "baton", "prob": 8 },
       { "item": "tazer", "prob": 3 },
-      { "item": "kevlar_plate", "prob": 10 },
+      { "item": "sheet_kevlar_layered", "prob": 10 },
       { "item": "ceramic_armor", "prob": 15 },
       { "item": "tonfa", "prob": 10 },
       { "item": "shocktonfa_off", "prob": 5 },

data/json/itemgroups/collections_domestic.json

@@ -449,6 +449,7 @@
       { "group": "kitchen_appliances", "prob": 253 },
       { "item": "hat_chef", "prob": 2 },
       { "item": "jacket_chef", "prob": 2 },
+      { "item": "gloves_cut_resistant", "prob": 1 },
       { "item": "pot", "prob": 25 },
       { "item": "sponge", "prob": 30 },
       { "item": "pot_copper", "prob": 15 },

data/json/itemgroups/food_service.json

@@ -896,6 +896,8 @@
       [ "foon", 5 ],
       { "group": "wines_worthy", "prob": 66 },
       [ "fruit_wine", 20 ],
+      [ "gloves_cut_resistant", 5 ],
+      [ "armguard_cut_resistant", 2 ],
       [ "hat_chef", 30 ],
       [ "jacket_chef", 30 ],
       [ "pants_checkered", 28 ]

data/json/itemgroups/military.json

@@ -486,7 +486,7 @@
       { "item": "jumpsuit", "prob": 20 },
       { "item": "kevlar", "prob": 10 },
       { "item": "ballistic_vest_esapi", "prob": 40 },
-      { "item": "kevlar_plate", "prob": 10 },
+      { "item": "sheet_kevlar_layered", "prob": 10 },
       { "item": "mask_gas", "prob": 10 },
       { "item": "helmet_army", "prob": 40 },
       { "item": "helmet_liner", "prob": 10 },

data/json/itemgroups/trash_and_debris.json

@@ -119,7 +119,7 @@
       [ "tinder", 1 ],
       [ "rag", 1 ],
       [ "hairpin", 1 ],
-      [ "kevlar_plate", 1 ],
+      [ "sheet_kevlar_layered", 1 ],
       [ "ceramic_armor", 1 ],
       [ "leather", 1 ],
       [ "software_hacking", 10 ],

data/json/items/armor/ammo_pouch.json

@@ -454,7 +454,7 @@
     "price_postapoc": 6000,
     "to_hit": -3,
     "bashing": 6,
-    "material": [ "kevlar" ],
+    "material": [ "kevlar_layered" ],
     "symbol": "[",
     "color": "light_gray",
     "covers": [ "TORSO" ],

data/json/items/armor/arms_armor.json

@@ -279,5 +279,15 @@
     "material_thickness": 3,
     "environmental_protection": 1,
     "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "armguard_cut_resistant",
+    "type": "ARMOR",
+    "name": { "str": "pair of cut-resistant arm sleeves", "str_pl": "pairs of cut-resistant arm sleeves" },
+    "description": "A long pair of cut resistant sleeves, with thumbholes.  Useful for chainsaw protection.",
+    "weight": "113 g",
+    "copy-from": "armguard_soft",
+    "price": 1200,
+    "material": [ "kevlar" ]
   }
 ]

data/json/items/armor/ballistic_armor.json

@@ -54,7 +54,7 @@
     "price_postapoc": 6000,
     "to_hit": -3,
     "bashing": 6,
-    "material": [ "lightceramic", "kevlar" ],
+    "material": [ "lightceramic", "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "kevlar",
     "color": "light_red",
@@ -79,7 +79,7 @@
     "price_postapoc": 2000,
     "to_hit": -3,
     "bashing": 6,
-    "material": [ "kevlar" ],
+    "material": [ "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "dragonskin",
     "color": "light_red",

data/json/items/armor/boots.json

@@ -145,6 +145,47 @@
     "environmental_protection": 2,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
   },
+  {
+    "id": "foot_protectors_eod",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of EOD foot protectors", "str_pl": "pairs of EOD foot protectors" },
+    "description": "Armored foot protectors constructed from steel and nomex for explosive ordnance disposal.  They are designed to protect against overpressure, fragmentation, impact and heat.",
+    "weight": "1220 g",
+    "volume": "3 L",
+    "price": 50000,
+    "covers": [ "FEET" ],
+    "coverage": 100,
+    "encumbrance": 40,
+    "warmth": 10,
+    "material": [ "steel", "nomex" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "environmental_protection": 2,
+    "material_thickness": 7,
+    "flags": [ "STURDY", "OUTER" ]
+  },
+  {
+    "id": "toecaps",
+    "type": "ARMOR",
+    "name": { "str": "pair of toecaps", "str_pl": "pairs of toecaps" },
+    "description": "Rubbery overshoes that cover your toes with sturdy, ANSI compliant steel toes.",
+    "weight": "907 g",
+    "volume": "1 L",
+    "price": 2500,
+    "to_hit": -1,
+    "bashing": 2,
+    "material": [ "plastic", "steel" ],
+    "symbol": "[",
+    "color": "brown",
+    "covers": [ "FEET" ],
+    "coverage": 15,
+    "encumbrance": 10,
+    "warmth": 10,
+    "material_thickness": 3,
+    "environmental_protection": 1,
+    "flags": [ "OUTER", "STURDY" ]
+  },
   {
     "id": "boots_fsurvivor",
     "type": "ARMOR",

data/json/items/armor/coats.json

@@ -337,7 +337,7 @@
     "price": 40000,
     "price_postapoc": 8000,
     "to_hit": -1,
-    "material": [ "cotton", "kevlar" ],
+    "material": [ "cotton", "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "duster_leather",
     "color": "brown",
@@ -1074,7 +1074,7 @@
     "price": 34000,
     "price_postapoc": 4500,
     "to_hit": -1,
-    "material": [ "cotton", "kevlar" ],
+    "material": [ "cotton", "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "duster_survivor",
     "color": "brown",
@@ -1213,7 +1213,7 @@
     "price": 34000,
     "price_postapoc": 500,
     "to_hit": -1,
-    "material": [ "cotton", "kevlar" ],
+    "material": [ "cotton", "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "sleeveless_duster_survivor",
     "color": "brown",
@@ -1391,7 +1391,7 @@
     "price": 40000,
     "price_postapoc": 8000,
     "to_hit": -1,
-    "material": [ "cotton", "kevlar" ],
+    "material": [ "cotton", "kevlar_layered" ],
     "symbol": "[",
     "looks_like": "trenchcoat",
     "color": "brown",

data/json/items/armor/eyewear.json

@@ -76,7 +76,7 @@
     "price": 7500,
     "price_postapoc": 500,
     "to_hit": -2,
-    "material": [ "kevlar_rigid", "plastic" ],
+    "material": [ "plastic", "nylon" ],
     "symbol": "[",
     "looks_like": "glasses_safety",
     "color": "dark_gray",
@@ -296,7 +296,7 @@
     "price": 7500,
     "price_postapoc": 3000,
     "to_hit": -2,
-    "material": [ "kevlar", "leather" ],
+    "material": [ "kevlar_layered", "leather" ],
     "symbol": "[",
     "looks_like": "glasses_bal",
     "color": "dark_gray",