Merge pull request #144 from CleverRaven/master

Merge pull request CleverRaven#36920 from ymber/mbr
fengjixuchui · Apr 17, 2020 · 7396de1 · 7396de1
2 parents 31ae3b5 + 5dd7e74
commit 7396de1
Show file tree

Hide file tree

Showing 19 changed files with 376 additions and 383 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
@@ -485,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 },

diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -238,210 +238,6 @@
     },
     "flags": [ "WATER_FRIENDLY", "BELTED" ]
   },
-  {
-    "id": "modularvest",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" },
-    "description": "A Modular Bullet Resistant Vest.  It has pouches for extra armor inserts, but without them provides little more protection over a regular vest.  It has four pouches capable of carrying magazines.",
-    "weight": "2860 g",
-    "volume": "6 L",
-    "price": 29900,
-    "price_postapoc": 2000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 7,
-    "storage": "2500 ml",
-    "warmth": 15,
-    "material_thickness": 4,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
-  {
-    "id": "modularvestceramic",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
-    "description": "A Modular Bullet Resistant Vest.  Ceramic plates have been inserted to improve its protection.  The ceramic plates cannot be repaired, only replaced.  It has four pouches capable of carrying magazines.",
-    "weight": "4308 g",
-    "volume": "6 L",
-    "price": 39900,
-    "price_postapoc": 4000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar", "ceramic" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 15,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 9,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
-  {
-    "id": "modularvesthard",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" },
-    "description": "A Modular Bullet Resistant Vest.  Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility.  It has four pouches capable of carrying magazines.",
-    "weight": "14860 g",
-    "volume": "6 L",
-    "price": 39900,
-    "price_postapoc": 3500,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar", "hardsteel" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 25,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 5,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
-  {
-    "id": "modularvestkevlar",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (Kevlar plates)", "str_pl": "MBR vests (Kevlar plates)" },
-    "description": "A Modular Bullet Resistant Vest.  Kevlar plates have been inserted to improve its protection.  It has four pouches capable of carrying magazines.",
-    "weight": "5721 g",
-    "volume": "6 L",
-    "price": 39900,
-    "price_postapoc": 3000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar", "kevlar_rigid" ],
-    "symbol": "[",
-    "looks_like": "vest",
-    "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 12,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 6,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
-  {
-    "id": "modularveststeel",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" },
-    "description": "A Modular Bullet Resistant Vest.  Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering.  It has four pouches capable of carrying magazines.",
-    "weight": "10860 g",
-    "volume": "6 L",
-    "price": 39900,
-    "price_postapoc": 2500,
-    "to_hit": -3,
-    "bashing": 8,
-    "material": [ "kevlar", "steel" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 20,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 7,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
-  {
-    "id": "modularvestsuper",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" },
-    "description": "A Modular Bullet Resistant Vest.  Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight.  It has four pouches capable of carrying magazines.",
-    "weight": "6460 g",
-    "volume": "6 L",
-    "price": 80000,
-    "price_postapoc": 5000,
-    "to_hit": -3,
-    "bashing": 8,
-    "material": [ "kevlar", "superalloy" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 15,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 6,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
-  },
   {
     "id": "quiver",
     "type": "ARMOR",