From 27d994d19c11b3067f5cd4c2f252a8939292c66e Mon Sep 17 00:00:00 2001 From: ymber Date: Sat, 11 Jan 2020 09:49:00 +0000 Subject: [PATCH] Remove modularvest items --- data/json/itemgroups/clothing.json | 21 +- data/json/itemgroups/gear.json | 3 +- data/json/itemgroups/item_groups.json | 4 +- data/json/itemgroups/locations.json | 2 +- data/json/items/armor/ammo_pouch.json | 212 +----------------- data/json/items/obsolete.json | 210 +++++++++++++++++ data/json/npcs/NC_SOLDIER.json | 9 +- 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 | 5 +- 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, 278 insertions(+), 351 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index a6d4fff1d7eb2..dedcb0012cab1 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -1814,9 +1814,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 ], @@ -1893,9 +1891,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 ], @@ -1952,11 +1948,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 ], @@ -2179,12 +2171,7 @@ [ "vest_leather", 22 ], [ "bunker_coat", 6 ], [ "bookplate", 10 ], - [ "modularvest", 4 ], - [ "modularvesthard", 1 ], - [ "modularvestkevlar", 2 ], - [ "modularvestceramic", 2 ], - [ "modularveststeel", 1 ], - [ "modularvestsuper", 1 ], + [ "ballistic_vest_esapi", 2 ], [ "dragonskin", 1 ], [ "corset", 1 ], [ "football_armor", 18 ], diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json index 202b55dcc6f31..20d3782e2ff1e 100644 --- a/data/json/itemgroups/gear.json +++ b/data/json/itemgroups/gear.json @@ -84,8 +84,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/item_groups.json b/data/json/itemgroups/item_groups.json index b4067755a5d7f..f52d26a5972bd 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -2489,9 +2489,7 @@ [ "gloves_tactical", 10 ], [ "jumpsuit", 20 ], [ "kevlar", 10 ], - [ "modularvest", 27 ], - [ "modularvestkevlar", 28 ], - [ "modularvestceramic", 34 ], + [ "ballistic_vest_esapi", 34 ], [ "kevlar_plate", 10 ], [ "mask_gas", 10 ], [ "helmet_army", 40 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 4e17ad87706a2..21aa4e47de6b9 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -2445,7 +2445,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/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index f2f81f5026b52..7ae67d487f89d 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -171,223 +171,13 @@ }, "flags": [ "WATER_FRIENDLY", "BELTED" ] }, - { - "id": "modularvest", - "type": "ARMOR", - "category": "armor", - "name": "MBR vest (empty)", - "name_plural": "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": 100000, - "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": "MBR vest (ceramic plates)", - "name_plural": "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": 120000, - "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": 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": "modularvesthard", - "type": "ARMOR", - "category": "armor", - "name": "MBR vest (hard plates)", - "name_plural": "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": 120000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "hardsteel" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_cyan", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 45, - "storage": "1 L", - "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": "modularvestkevlar", - "type": "ARMOR", - "category": "armor", - "name": "MBR vest (Kevlar plates)", - "name_plural": "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": 120000, - "to_hit": -3, - "bashing": 6, - "material": [ "kevlar", "kevlar_rigid" ], - "symbol": "[", - "looks_like": "vest", - "color": "light_gray", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 8, - "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": "modularveststeel", - "type": "ARMOR", - "category": "armor", - "name": "MBR vest (steel plating)", - "name_plural": "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": 120000, - "to_hit": -3, - "bashing": 8, - "material": [ "kevlar", "steel" ], - "symbol": "[", - "looks_like": "modularvestkevlar", - "color": "light_cyan", - "covers": [ "TORSO" ], - "coverage": 85, - "encumbrance": 30, - "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": "modularvestsuper", - "type": "ARMOR", - "category": "armor", - "name": "MBR vest (superalloy)", - "name_plural": "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": 180000, - "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": 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": "xlkevlar", "type": "ARMOR", "category": "armor", "name": "XL kevlar vest", "description": "A massive, hand-built kevlar vest based on the design of existing bullet resistant vests. It has four pouches capable of carrying magazines.", - "looks_like": "modularvest", + "looks_like": "kevlar", "weight": "5148 g", "volume": "10750 ml", "price": 200000, diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 9d277916da7da..8550a02fbf9a6 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1264,5 +1264,215 @@ "price": 200000, "material": "steel", "category": "spare_parts" + }, + { + "id": "modularvest", + "type": "ARMOR", + "category": "armor", + "name": "MBR vest (empty)", + "name_plural": "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": 100000, + "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": "MBR vest (ceramic plates)", + "name_plural": "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": 120000, + "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": 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": "modularvesthard", + "type": "ARMOR", + "category": "armor", + "name": "MBR vest (hard plates)", + "name_plural": "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": 120000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "hardsteel" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_cyan", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 45, + "storage": "1 L", + "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": "modularvestkevlar", + "type": "ARMOR", + "category": "armor", + "name": "MBR vest (Kevlar plates)", + "name_plural": "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": 120000, + "to_hit": -3, + "bashing": 6, + "material": [ "kevlar", "kevlar_rigid" ], + "symbol": "[", + "looks_like": "vest", + "color": "light_gray", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 8, + "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": "modularveststeel", + "type": "ARMOR", + "category": "armor", + "name": "MBR vest (steel plating)", + "name_plural": "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": 120000, + "to_hit": -3, + "bashing": 8, + "material": [ "kevlar", "steel" ], + "symbol": "[", + "looks_like": "modularvestkevlar", + "color": "light_cyan", + "covers": [ "TORSO" ], + "coverage": 85, + "encumbrance": 30, + "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": "modularvestsuper", + "type": "ARMOR", + "category": "armor", + "name": "MBR vest (superalloy)", + "name_plural": "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": 180000, + "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": 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" ] } ] diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json index c03d624bd841b..77589ac5995ed 100644 --- a/data/json/npcs/NC_SOLDIER.json +++ b/data/json/npcs/NC_SOLDIER.json @@ -22,14 +22,7 @@ { "type": "item_group", "id": "NC_SOLDIER_vest", - "items": [ - [ "null", 10 ], - [ "jacket_army", 50 ], - [ "kevlar", 10 ], - [ "modularvest", 15 ], - [ "modularvestkevlar", 25 ], - [ "modularvestceramic", 25 ] - ] + "items": [ [ "null", 10 ], [ "jacket_army", 50 ], [ "kevlar", 10 ], [ "ballistic_vest_esapi", 25 ] ] }, { "type": "item_group", diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index c68493e638455..553c10944b281 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 ] @@ -789,7 +789,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 794b712412492..52d5a3d29b58d 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 e9ba2f72a9a31..39c2d311df00a 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 4192a680e7181..8d87692ec5c68 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 b4eda0c9233a0..3750d74ddadce 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -744,6 +744,7 @@ "pants_army", "undershirt", "jacket_army", + "ballistic_vest_esapi", "helmet_army", "mask_ski", "gloves_liner", @@ -755,7 +756,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" ] } @@ -1935,7 +1936,7 @@ "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope" ] }, - { "item": "modularvestceramic", "contents-group": "army_mags_m4" } + { "item": "ballistic_vest_esapi", "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 e10e784d3d1ef..a3529b4c0b2d6 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 4db73ccb1a9e7..0d3d4ab433440 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 ] ] ] }, @@ -254,7 +254,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 ] ] ] }, { @@ -422,7 +422,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 ] ] ] }, { @@ -454,7 +454,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 ] ] ] }, { @@ -497,7 +497,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 ] ] ] }, { @@ -529,7 +529,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 ] ] ] }, { @@ -608,7 +608,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 ] ] ] }, { @@ -663,7 +663,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 ] ] ] }, { @@ -806,7 +806,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 ] ] ] }, { @@ -838,7 +838,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 ] ] ] }, { @@ -870,7 +870,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 05055320f503c..e118e07128ee0 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -293,7 +293,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "duster_leather", 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", @@ -772,7 +693,7 @@ "components": [ [ [ "coat_rain", 1 ] ], [ [ "duster", 1 ], [ "duster_leather", 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 ], @@ -913,7 +834,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 ], @@ -1093,7 +1014,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 95e8193ae507d..437c69beb1b30 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2237,5 +2237,35 @@ "type": "recipe", "result": "bot_tankbot", "obsolete": true + }, + { + "type": "recipe", + "result": "modularvest", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestceramic", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvesthard", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestkevlar", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularveststeel", + "obsolete": true + }, + { + "type": "recipe", + "result": "modularvestsuper", + "obsolete": true } ] diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json index 9191e64eee665..069e823f0dd8f 100644 --- a/data/json/vehicles/helicopters.json +++ b/data/json/vehicles/helicopters.json @@ -965,8 +965,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" ] }, @@ -1393,9 +1392,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" ] }, @@ -1769,9 +1767,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" ] },