From 6b36c10b273e693617cb161972fb561381a1c778 Mon Sep 17 00:00:00 2001 From: ymber Date: Sat, 11 Jan 2020 09:49:00 +0000 Subject: [PATCH] Remove modularvest items --- .../itemgroups/Clothing_Gear/clothing.json | 20 +- data/json/itemgroups/Clothing_Gear/gear.json | 3 +- .../Locations_MapExtras/locations.json | 2 +- data/json/itemgroups/military.json | 4 +- data/json/items/armor/ammo_pouch.json | 204 ------------------ data/json/items/obsolete.json | 204 ++++++++++++++++++ data/json/npcs/NC_SOLDIER.json | 4 +- data/json/npcs/items_generic.json | 4 +- .../NPC_scavenger_mercenary.json | 3 +- .../json/npcs/robofac/NPC_ROBOFAC_MERC_1.json | 2 +- .../robofac/NPC_robofac_generic_security.json | 2 +- data/json/professions.json | 6 +- data/json/recipes/armor/legs.json | 2 +- data/json/recipes/armor/suit.json | 22 +- data/json/recipes/armor/torso.json | 89 +------- data/json/recipes/recipe_obsolete.json | 30 +++ data/json/vehicles/helicopters.json | 9 +- 17 files changed, 271 insertions(+), 339 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 5e1ac65c47932..881b3779a5ab6 100644 --- 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 index c75899d1fe53b..0dfa98f2ea509 100644 --- 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 index 75b464e33c9c9..26cef7fa505e0 100644 --- 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 index de3741f23ef20..a3ad62f45fded 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -484,9 +484,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 index 3b61f63766cb8..6a668e2ec84eb 100644 --- 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", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 22ec1c29e297b..3f353d2c57b44 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1984,5 +1984,209 @@ "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE" ], "freezing_point": -22, "fun": -15 + }, + { + "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" ] } ] diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index e81bf3a13a23d..4abb8d3099882 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -41,9 +41,7 @@ { "item": "null", "prob": 10 }, { "item": "jacket_army", "prob": 50 }, { "item": "kevlar", "prob": 10 }, - { "item": "modularvest", "prob": 15 }, - { "item": "modularvestkevlar", "prob": 25 }, - { "item": "modularvestceramic", "prob": 25 } + { "item": "ballistic_vest_esapi", "prob": 25 } ] }, { diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index 609959db1da90..386f64bb0daa2 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -285,7 +285,7 @@ [ "vest", 10 ], [ "vest_leather", 5 ], [ "kevlar", 10 ], - [ "modularvest", 5 ], + [ "ballistic_vest_esapi", 5 ], [ "waistcoat", 5 ], [ "flotation_vest", 10 ], [ "chainmail_vest", 5 ] @@ -793,7 +793,7 @@ [ "minispeargun", 1 ], [ "mintpatties", 3 ], [ "misc_repairkit", 5 ], - [ "modularvest", 1 ], + [ "ballistic_vest_empty", 1 ], [ "molasses", 3 ], [ "money_bundle", 10 ], [ "moonshine", 5 ], diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json index 40c278309cbe7..913e305681401 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json @@ -45,7 +45,8 @@ "id": "NC_SCAVENGER_MERC_worn", "subtype": "collection", "items": [ - { "item": "modularvestkevlar", "contents-group": "army_mags_m4" }, + { "item": "ballistic_vest_esapi" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" }, { "item": "boxer_briefs" }, { "item": "pants_army" }, { "item": "duster" }, diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json index 7c0a8ecf4f420..11f4061308b30 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json @@ -37,7 +37,7 @@ "id": "NC_ROBOFAC_MERC_1_worn", "subtype": "collection", "items": [ - { "item": "modularvestkevlar", "contents-group": "army_mags_m4" }, + { "item": "ballistic_vest_esapi" }, { "item": "chestrig", "contents-group": "army_mags_m4" }, { "item": "under_armor" }, { "item": "under_armor_shorts" }, diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json index 3c4392502c166..817ba4c2ebb87 100644 --- a/data/json/npcs/robofac/NPC_robofac_generic_security.json +++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json @@ -38,7 +38,7 @@ { "item": "under_armor_shorts" }, { "item": "robofac_jumpsuit" }, { "item": "tac_helmet" }, - { "item": "modularvestceramic" }, + { "item": "ballistic_vest_esapi" }, { "item": "gloves_tactical" }, { "item": "glasses_bal", "prob": 33 }, { "item": "boots_combat" }, diff --git a/data/json/professions.json b/data/json/professions.json index 100c805120b04..4bc575a948986 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -750,6 +750,7 @@ "pants_army", "undershirt", "jacket_army", + "ballistic_vest_esapi", "helmet_army", "mask_ski", "gloves_liner", @@ -761,7 +762,7 @@ ], "entries": [ { "group": "charged_two_way_radio" }, - { "item": "modularvest", "contents-group": "army_mags_m4" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] } @@ -1976,7 +1977,8 @@ "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope" ] }, - { "item": "modularvestceramic", "contents-group": "army_mags_m4" } + { "item": "ballistic_vest_esapi" }, + { "item": "legpouch_large", "contents-group": "army_mags_m4" } ] }, "male": [ "boxer_shorts" ], diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index a769d54fa514f..1aaed6df39e1f 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -478,7 +478,7 @@ "using": [ [ "sewing_standard", 100 ] ], "components": [ [ [ "pants_army", 1 ], [ "pants_cargo", 1 ], [ "shorts_cargo", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "kevlar_plate", 12 ] ], [ [ "rag", 12 ] ], [ [ "tacvest", 1 ], diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index d4dcd0a6d8b8c..a4295f4551334 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -14,7 +14,7 @@ "components": [ [ [ "cleansuit", 1 ] ], [ [ "duct_tape", 600 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ], [ [ "plastic_sheet", 1 ] ] ] }, @@ -255,7 +255,7 @@ [ [ "fanny", 2 ], [ "dump_pouch", 1 ] ], [ [ "tool_belt", 1 ], [ "legrig", 1 ] ], [ [ "pants_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -426,7 +426,7 @@ [ [ "nomex", 40 ] ], [ [ "kevlar_plate", 8 ] ], [ [ "duct_tape", 200 ], [ "superglue", 5 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -458,7 +458,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -501,7 +501,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -533,7 +533,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -612,7 +612,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 200 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -668,7 +668,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -812,7 +812,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 300 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 24 ] ] ] }, { @@ -844,7 +844,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] + [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 48 ] ] ] }, { @@ -876,7 +876,7 @@ [ "fanny", 2 ] ], [ [ "duct_tape", 400 ] ], - [ [ "kevlar", 2 ], [ "modularvest", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] + [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "swat_armor", 2 ], [ "kevlar_plate", 42 ] ] ] }, { diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 98a3300132187..3c051cf2a27e0 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -292,7 +292,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 16 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 16 ] ], [ [ "rag", 19 ] ], [ [ "tacvest", 1 ], @@ -488,7 +488,7 @@ [ "fanny", 1 ] ], [ [ "duct_tape", 150 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 16 ] ] + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "swat_armor", 1 ], [ "kevlar_plate", 16 ] ] ] }, { @@ -504,85 +504,6 @@ "components": [ [ [ "ballistic_vest_empty", 1 ] ], [ [ "esapi_plate", 2 ] ], [ [ "esbi_plate", 2 ] ] ], "flags": [ "BLIND_EASY" ] }, - { - "result": "modularvest", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "difficulty": 4, - "time": "30 m", - "reversible": true, - "decomp_learn": 4, - "autolearn": true, - "using": [ [ "sewing_standard", 30 ] ], - "components": [ [ [ "kevlar_plate", 24 ] ] ] - }, - { - "result": "modularvestceramic", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "ceramic_armor", 4 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvesthard", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "hard_steel_armor", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvestkevlar", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "kevlar_plate", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularveststeel", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "steel_armor", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, - { - "result": "modularvestsuper", - "type": "recipe", - "category": "CC_ARMOR", - "subcategory": "CSC_ARMOR_TORSO", - "skill_used": "tailor", - "time": "5 m", - "reversible": true, - "decomp_learn": 0, - "autolearn": true, - "components": [ [ [ "modularvest", 1 ] ], [ [ "alloy_sheet", 8 ] ] ], - "flags": [ "BLIND_EASY" ] - }, { "result": "dragonskin", "type": "recipe", @@ -777,7 +698,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 13 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 13 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], @@ -922,7 +843,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 10 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 10 ] ], [ [ "rag", 11 ] ], [ [ "tacvest", 1 ], @@ -1104,7 +1025,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ], - [ [ "kevlar", 1 ], [ "modularvest", 1 ], [ "kevlar_plate", 12 ] ], + [ [ "kevlar", 1 ], [ "ballistic_vest_empty", 1 ], [ "kevlar_plate", 12 ] ], [ [ "rag", 14 ] ], [ [ "tacvest", 1 ], diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index bb65ead165aba..a317ae43b8cdc 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2394,5 +2394,35 @@ "result": "plastic_chunk", "id_suffix": "from_cash_cards", "obsolete": true + }, + { + "type": "recipe", + "result": "modularvest", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestsuper", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularveststeel", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestkevlar", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvesthard", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestceramic", + "obsolete": true } ] diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json index 6125d6c4ea9aa..f9769e43c3c80 100644 --- a/data/json/vehicles/helicopters.json +++ b/data/json/vehicles/helicopters.json @@ -1913,8 +1913,7 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": 1, "chance": 7, "items": [ "screwdriver" ] }, { "x": -2, "y": 1, "chance": 10, "items": [ "mag_fieldrepair" ] }, @@ -2354,9 +2353,8 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -6, "y": -1, "chance": 20, "item_groups": [ "remains_soldier" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, { "x": -5, "y": 1, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": -1, "chance": 7, "items": [ "aspirin" ] }, @@ -2730,9 +2728,8 @@ { "x": -7, "y": 2, "chance": 10, "items": [ "9mmfmj" ] }, { "x": -7, "y": 2, "chance": 20, "ammo": 80, "items": [ "mask_gas" ] }, { "x": -7, "y": 2, "chance": 10, "items": [ "flashlight" ] }, - { "x": -7, "y": 2, "chance": 7, "items": [ "modularvest" ] }, + { "x": -7, "y": 2, "chance": 7, "items": [ "ballistic_vest_empty" ] }, { "x": -6, "y": -1, "chance": 20, "item_groups": [ "remains_soldier" ] }, - { "x": -6, "y": 1, "chance": 7, "items": [ "modularvestkevlar" ] }, { "x": -5, "y": 1, "chance": 20, "item_groups": [ "remains_soldier" ] }, { "x": -4, "y": -1, "chance": 7, "ammo": 80, "items": [ "mp3" ] }, { "x": -2, "y": 1, "chance": 7, "items": [ "screwdriver" ] },