Merge pull request #46 from CleverRaven/master

0.E Catchup April 17
xanderrootslayer · Apr 18, 2020 · 0a7a913 · 0a7a913
2 parents 2bb1380 + 5dd7e74
commit 0a7a913
Show file tree

Hide file tree

Showing 246 changed files with 7,568 additions and 5,058 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1836,9 +1836,7 @@
       [ "winter_gloves_army", 30 ],
       [ "army_top", 30 ],
       [ "kevlar", 10 ],
-      [ "modularvest", 25 ],
-      [ "modularvestkevlar", 23 ],
-      [ "modularvestceramic", 30 ],
+      [ "ballistic_vest_esapi", 30 ],
       [ "vest", 15 ],
       [ "mask_gas", 10 ],
       [ "goggles_nv", 1 ],
@@ -1917,9 +1915,7 @@
     "id": "mil_armor_torso",
     "items": [
       [ "kevlar", 10 ],
-      [ "modularvest", 25 ],
-      [ "modularvestkevlar", 23 ],
-      [ "modularvestceramic", 30 ],
+      [ "ballistic_vest_esapi", 30 ],
       [ "winter_jacket_army", 30 ],
       [ "vest", 15 ],
       [ "tacvest", 10 ],
@@ -1976,11 +1972,7 @@
       [ "sleeveless_duster", 2 ],
       [ "sleeveless_duster_leather", 5 ],
       [ "kevlar", 30 ],
-      [ "modularvest", 12 ],
-      [ "modularvestkevlar", 10 ],
-      [ "modularvestceramic", 8 ],
-      [ "modularveststeel", 5 ],
-      [ "modularvestsuper", 1 ],
+      [ "ballistic_vest_esapi", 8 ],
       [ "dump_pouch", 20 ],
       [ "mask_bal", 5 ],
       [ "vest", 15 ],
@@ -2206,12 +2198,6 @@
       [ "bookplate", 10 ],
       [ "ballistic_vest_empty", 2 ],
       [ "ballistic_vest_esapi", 4 ],
-      [ "modularvest", 4 ],
-      [ "modularvesthard", 1 ],
-      [ "modularvestkevlar", 2 ],
-      [ "modularvestceramic", 2 ],
-      [ "modularveststeel", 1 ],
-      [ "modularvestsuper", 1 ],
       [ "dragonskin", 1 ],
       [ "corset", 1 ],
       [ "football_armor", 18 ],

diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -25,8 +25,7 @@
       [ "legpouch_large", 5 ],
       [ "mask_bal", 10 ],
       [ "mask_gas", 10 ],
-      [ "modularvest", 15 ],
-      [ "modularvestkevlar", 15 ],
+      [ "ballistic_vest_esapi", 15 ],
       [ "smokebomb", 5 ],
       [ "suppressor", 25 ],
       [ "suppressor_compact", 20 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1387,7 +1387,7 @@
     "items": [
       [ "helmet_riot", 25 ],
       [ "mask_gas", 25 ],
-      [ "modularveststeel", 20 ],
+      [ "armor_riot", 20 ],
       [ "gloves_tactical", 10 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 20 ],

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -364,6 +364,7 @@
       { "item": "m2browning", "prob": 15 },
       { "item": "mark19", "prob": 15 },
       { "item": "556", "prob": 30 },
+      { "item": "belt40mm", "prob": 8 },
       { "item": "40x46mm_m433", "prob": 10 },
       { "item": "40x46mm_m576", "prob": 6 },
       { "item": "8mm_hvp", "prob": 4 },
@@ -484,9 +485,7 @@
       { "item": "gloves_tactical", "prob": 10 },
       { "item": "jumpsuit", "prob": 20 },
       { "item": "kevlar", "prob": 10 },
-      { "item": "modularvest", "prob": 27 },
-      { "item": "modularvestkevlar", "prob": 28 },
-      { "item": "modularvestceramic", "prob": 34 },
+      { "item": "ballistic_vest_esapi", "prob": 40 },
       { "item": "kevlar_plate", "prob": 10 },
       { "item": "mask_gas", "prob": 10 },
       { "item": "helmet_army", "prob": 40 },