From 79475135812e1e1a85dfa6d1f3585c6898971f64 Mon Sep 17 00:00:00 2001 From: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com> Date: Sat, 7 Mar 2020 19:38:14 -0600 Subject: [PATCH] Migrate/obsolete incongruent Leadworks, EBR, and Rivtech guns (#37979) * yoink --- data/json/itemgroups/Clothing_Gear/gear.json | 4 - .../Locations_MapExtras/locations.json | 6 - .../locations_commercial.json | 4 - .../locations_mapextras.json | 6 - .../monster_drops_lairs.json | 1 - .../itemgroups/Weapons_Mods_Ammo/guns.json | 16 +- .../Weapons_Mods_Ammo/magazines.json | 21 +- data/json/items/classes/gun.json | 2 +- data/json/items/generic.json | 98 -------- data/json/items/gun/22.json | 39 ---- data/json/items/gun/223.json | 141 ------------ data/json/items/gun/460.json | 101 +-------- data/json/items/gun/9mm.json | 60 +---- data/json/items/gunmod/barrel.json | 39 ---- data/json/items/gunmod/magazine.json | 22 -- data/json/items/gunmod/rail.json | 11 - data/json/items/gunmod/sights.json | 43 ---- data/json/items/gunmod/underbarrel.json | 55 ----- data/json/items/magazine/22.json | 36 --- data/json/items/magazine/223.json | 52 ----- data/json/items/magazine/45.json | 34 --- data/json/items/magazine/460.json | 40 ++-- data/json/items/magazine/9mm.json | 34 --- data/json/items/migration.json | 210 ++++++++++++++++++ data/json/items/obsolete.json | 95 ++++++++ data/json/martialarts.json | 7 - data/json/npcs/NC_CITY_COP.json | 1 - .../robofac/NPC_robofac_generic_security.json | 4 +- data/json/recipes/recipe_deconstruction.json | 14 -- data/json/recipes/recipe_obsolete.json | 45 ++++ data/json/recipes/recipe_weapon.json | 120 ---------- .../firearms/gg_firearms_migration.json | 39 +--- .../gunmods/gg_gunmods_blacklist.json | 11 - .../items/gg_items_blacklist.json | 16 -- .../magazines/gg_magazines_migration.json | 19 +- .../temp_magazine_json_load_hack.json | 14 -- 36 files changed, 393 insertions(+), 1067 deletions(-) delete mode 100644 data/json/items/gunmod/magazine.json delete mode 100644 data/mods/Generic_Guns/items/gg_items_blacklist.json diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json index 05e919e508284..c75899d1fe53b 100644 --- a/data/json/itemgroups/Clothing_Gear/gear.json +++ b/data/json/itemgroups/Clothing_Gear/gear.json @@ -22,10 +22,6 @@ [ "torso_bandolier_shotgun", 8 ], [ "kevlar", 20 ], [ "knife_combat", 10 ], - [ "l_car_223_kit", 5 ], - [ "l_dsr_223_kit", 5 ], - [ "l_lmg_223_kit", 5 ], - [ "l_mbr_223_kit", 5 ], [ "legpouch_large", 5 ], [ "mask_bal", 10 ], [ "mask_gas", 10 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index f3ac8cde02aea..1f50cda2b9360 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -40,10 +40,6 @@ { "group": "ammo_swat", "prob": 20 }, { "group": "guns_swat", "prob": 20 }, { "group": "mags_swat", "prob": 20 }, - [ "l_car_223_kit", 5 ], - [ "l_dsr_223_kit", 5 ], - [ "l_lmg_223_kit", 5 ], - [ "l_mbr_223_kit", 5 ], [ "survnote", 1 ] ] }, @@ -128,7 +124,6 @@ { "group": "guns_shotgun_common", "prob": 50 }, { "group": "guns_survival", "prob": 100 }, { "item": "flaregun", "prob": 25 }, - { "item": "l_HFPack", "prob": 50 }, { "item": "large_repairkit", "prob": 5 }, { "item": "signal_flare", "prob": 20 }, { "item": "small_repairkit", "prob": 5 } @@ -1393,7 +1388,6 @@ "type": "item_group", "id": "cop_evidence", "items": [ - [ "lwfeed", 30 ], [ "crackpipe", 8 ], [ "weed", 10 ], [ "joint", 10 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 1670306523af0..ffce0312ffd1a 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -10,9 +10,6 @@ { "group": "tobacco_products", "prob": 161 }, [ "sponge", 10 ], { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "l_enforcer_45", 4 ], - [ "l_sp_45", 3 ], - [ "l_mp_45", 2 ], [ "rm99_pistol", 1 ], [ "rm103a_pistol", 1 ], [ "rm228", 2 ], @@ -467,7 +464,6 @@ [ "elbow_pads", 10 ], [ "cu_pipe", 5 ], [ "e_tool", 5 ], - [ "lwfeed", 40 ], [ "knife_trench", 7 ], [ "sm_extinguisher", 10 ], [ "switchblade", 6 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json index 5d3de95ca963c..eabc414cc1fb6 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json @@ -68,16 +68,10 @@ [ "223", 2 ], [ "20x66_shot", 2 ], [ "glock_19", 5 ], - [ "l_lookout_9mm", 5 ], - [ "l_sp_9mm", 5 ], [ "uzi", 8 ], [ "tec9", 10 ], [ "cx4", 2 ], [ "ksub2000", 10 ], - [ "l_bak_223", 4 ], - [ "l_car_223", 3 ], - [ "l_mp_9mm", 4 ], - [ "l_mp_45", 7 ], [ "mac_10", 7 ], [ "mac_11", 10 ], [ "j22", 13 ], diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json index 445cf8e2762e6..8be51e1328e7d 100644 --- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json +++ b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json @@ -188,7 +188,6 @@ [ "ax", 8 ], [ "bee_sting", 5 ], [ "chitin_piece", 10 ], - [ "lwfeed", 40 ], [ "vest", 15 ], [ "mask_gas", 10 ], [ "goggles_nv", 1 ], diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 55a9bdee9a010..3424eaec673a8 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -47,12 +47,6 @@ { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 }, { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 }, { "item": "fn57", "prob": 80, "charges-min": 0, "charges-max": 20 }, - { "item": "l_enforcer_45", "prob": 25, "charges-min": 0, "charges-max": 6 }, - { "item": "l_lookout_9mm", "prob": 20, "charges-min": 0, "charges-max": 7 }, - { "item": "l_sp_45", "prob": 35, "charges-min": 0, "charges-max": 12 }, - { "item": "l_sp_9mm", "prob": 60, "charges-min": 0, "charges-max": 21 }, - { "item": "l_mp_45", "prob": 25, "charges-min": 0, "charges-max": 12 }, - { "item": "l_mp_9mm", "prob": 25, "charges-min": 0, "charges-max": 21 }, { "item": "ruger_lcr_22", "prob": 35, "charges-min": 0, "charges-max": 8 }, { "item": "ruger_redhawk", "prob": 25, "charges-min": 0, "charges-max": 6 }, { "item": "sig_40", "prob": 35, "charges-min": 0, "charges-max": 12 }, @@ -86,13 +80,13 @@ { "item": "af2011a1_38super", "prob": 1, "charges-min": 0, "charges-max": 16 }, { "item": "bfr", "prob": 100, "charges-min": 0, "charges-max": 5 }, { "item": "cop_38", "prob": 100, "charges-min": 0, "charges-max": 4 }, + { "item": "m1911-460", "prob": 3, "charges-min": 0, "charges-max": 7 }, { "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 }, { "item": "makarov", "prob": 100, "charges-min": 0, "charges-max": 8 }, { "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "pistol_flintlock", "prob": 150 }, { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 }, { "item": "raging_judge", "prob": 20, "charges-min": 0, "charges-max": 5 }, - { "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 }, { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 }, { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 }, { "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 }, @@ -132,7 +126,6 @@ { "item": "hk_ump45", "prob": 30, "charges-min": 0, "charges-max": 25 }, { "item": "mac_10", "prob": 40, "charges-min": 0, "charges-max": 30 }, { "item": "mac_11", "prob": 20, "charges-min": 0, "charges-max": 32 }, - { "item": "rm360_carbine", "prob": 30, "charges-min": 0, "charges-max": 100 }, { "item": "TDI", "prob": 10, "charges-min": 0, "charges-max": 30 }, { "item": "american_180", "prob": 50, "charges-min": 0, "charges-max": 100 }, { "item": "briefcase_smg", "prob": 5, "charges-min": 0, "charges-max": 30 }, @@ -202,12 +195,6 @@ { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 }, { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 }, { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 10 }, - { "item": "l_base_223", "prob": 40, "charges-min": 0, "charges-max": 32 }, - { "item": "l_car_223", "prob": 10, "charges-min": 0, "charges-max": 32 }, - { "item": "l_dsr_223", "prob": 5, "charges-min": 0, "charges-max": 32 }, - { "item": "l_lmg_223", "prob": 5, "charges-min": 0, "charges-max": 32 }, - { "item": "l_mbr_223", "prob": 10, "charges-min": 0, "charges-max": 32 }, - { "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 }, { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 }, { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 }, { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, @@ -524,7 +511,6 @@ { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 }, { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 }, { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 }, - { "item": "l_enforcer_45", "prob": 10, "charges-min": 0, "charges-max": 6 }, { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 }, { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 }, { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 1d753bfaefb78..608f32d83da0e 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -152,13 +152,10 @@ "//": "Aftermarket or otherwise uncommon pistol magazines excluding milspec.", "items": [ [ "22_speedloader8", 15 ], - [ "223_speedloader5", 5 ], [ "44_speedloader6", 15 ], [ "454_speedloader5", 5 ], - [ "460_speedloader6", 10 ], [ "500_speedloader5", 5 ], [ "8x40_speedloader5", 5 ], - [ "9mm_speedloader7", 10 ], [ "glock_drum_50rd", 5 ], [ "glock_drum_100rd", 5 ], [ "deaglemag", 40 ], @@ -173,9 +170,7 @@ [ "j22mag", 1 ], [ "kp32mag", 5 ], [ "fn1910mag", 2 ], - [ "ppkmag", 15 ], - [ "lw12mag", 5 ], - [ "lw21mag", 5 ] + [ "ppkmag", 15 ] ] }, { @@ -183,7 +178,6 @@ "id": "mags_smg_common", "//": "Factory specification SMG magazines commonly owned by citizens.", "items": [ - [ "360_200_mag", 5 ], [ "a180mag", 10 ], [ "mac10mag", 10 ], [ "mac11mag", 5 ], @@ -206,14 +200,7 @@ "type": "item_group", "id": "mags_smg_rare", "//": "Aftermarket or otherwise uncommon SMG magazines excluding milspec.", - "items": [ - [ "360_400_mag", 5 ], - [ "calicomag", 15 ], - [ "fnp90mag", 15 ], - [ "mp5bigmag", 10 ], - [ "thompson_bigmag", 5 ], - [ "thompson_drum", 15 ] - ] + "items": [ [ "calicomag", 15 ], [ "fnp90mag", 15 ], [ "mp5bigmag", 10 ], [ "thompson_bigmag", 5 ], [ "thompson_drum", 15 ] ] }, { "type": "item_group", @@ -250,9 +237,7 @@ [ "g3mag", 80 ], [ "g3bigmag", 40 ], [ "m1918bigmag", 40 ], - [ "ruger1022bigmag", 70 ], - [ "lw223mag", 20 ], - [ "lw223bigmag", 20 ] + [ "ruger1022bigmag", 70 ] ] }, { diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json index ca0b3dc189dcc..b7396c6e8a3e0 100644 --- a/data/json/items/classes/gun.json +++ b/data/json/items/classes/gun.json @@ -128,7 +128,7 @@ [ "mechanism", 4 ], [ "magazine", 1 ], [ "muzzle", 1 ], - [ "rail", 1 ], + [ "rail", 2 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], diff --git a/data/json/items/generic.json b/data/json/items/generic.json index fcd169362590f..98a84e2d97014 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1595,104 +1595,6 @@ "weight": "50 g", "volume": "250 ml" }, - { - "id": "l_HFPack", - "type": "GENERIC", - "symbol": ")", - "color": "brown", - "name": { "str": "Home Frontier Starter Pack", "str_pl": "Home Frontier Starter Packs" }, - "category": "other", - "description": "This not-so-little bundle of joy contains Leadworks, LLC's premier offerings: the Enforcer autorevolver (with holster) and Long Ranger rifle. Maintenance kit, batteries for same, and a complimentary copy of the Gun Owner's Handbook are included. The perfect investment for a new family starting out! Disassemble to unpack and enjoy.", - "price": 463500, - "weight": "8932 g", - "volume": "4500 ml", - "to_hit": -2, - "material": [ "wood", "steel" ] - }, - { - "id": "mn_classic_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "Mosin-Nagant classic conversion kit" }, - "category": "other", - "description": "A beautiful wooden stock and hardware built to support common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could take a 'tacti-cool' rifle and convert it to the classic Russian design.", - "price": 12000, - "weight": "2000 g", - "volume": "2750 ml", - "to_hit": -2, - "material": [ "wood", "steel" ] - }, - { - "id": "mn_ebr_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "Mosin-Nagant EBR conversion kit" }, - "category": "spare_parts", - "description": "A synthetic stock and hardware designed to accommodate common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could give the classic Russian design modern furniture and customization capacity.", - "price": 12000, - "weight": "2000 g", - "volume": "2750 ml", - "to_hit": -2, - "material": [ "plastic", "steel" ] - }, - { - "id": "l_car_223_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "L523-CAR conversion" }, - "category": "spare_parts", - "description": "All the parts necessary to convert an L523 to the Carbine configuration, Leadworks LLC's choice for close-quarters work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", - "price": 170000, - "weight": "400 g", - "volume": "500 ml", - "to_hit": -2, - "material": [ "steel", "plastic" ] - }, - { - "id": "l_mbr_223_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "L523-MBR conversion" }, - "category": "spare_parts", - "description": "All the parts necessary to convert an L523 to a Main Battle Rifle, a balanced weapon for all situations. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", - "price": 170000, - "weight": "700 g", - "volume": "750 ml", - "to_hit": -2, - "material": [ "steel", "plastic" ] - }, - { - "id": "l_dsr_223_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "L523-DSR conversion" }, - "category": "spare_parts", - "description": "All the parts necessary to convert an L523 to a Designated Shootist Rifle, suitable for long-ranged work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", - "price": 200000, - "weight": "1900 g", - "volume": "2500 ml", - "to_hit": -2, - "material": [ "steel", "plastic" ] - }, - { - "id": "l_lmg_223_kit", - "type": "GENERIC", - "symbol": ")", - "color": "light_gray", - "name": { "str": "L523-LMG conversion" }, - "category": "spare_parts", - "description": "All the parts necessary to convert an L523 to a light machine gun. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", - "price": 270000, - "weight": "2300 g", - "volume": "2750 ml", - "to_hit": -2, - "material": [ "steel", "plastic" ] - }, { "type": "GENERIC", "id": "mobile_memory_card", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index b1572bfe2e458..fe61fc031bac8 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -150,45 +150,6 @@ "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], "flags": [ "RELOAD_EJECT" ] }, - { - "id": "rm360_carbine", - "looks_like": "ar15", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "RM360 rotary carbine" }, - "description": "This unusual Rivtech carbine features five rotating barrels and a large capacity helical magazine. Durable and easy to handle, it was designed to overcome the deficiencies of its low power .22LR cartridge by rapidly delivering a large number of projectiles.", - "weight": "1620 g", - "volume": "1 L", - "price": 180000, - "to_hit": -2, - "bashing": 8, - "material": [ "superalloy", "ceramic" ], - "symbol": "(", - "color": "light_gray", - "ammo": "22", - "skill": "smg", - "ranged_damage": 3, - "dispersion": 220, - "durability": 9, - "blackpowder_tolerance": 24, - "min_cycle_recoil": 39, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], - "reload": 500, - "valid_mod_locations": [ - [ "accessories", 3 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "22", [ "360_200_mag", "360_400_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] - }, { "id": "ruger_1022", "looks_like": "ar15", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index dee3852ca15b3..552d0d271edfb 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -91,147 +91,6 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] }, - { - "id": "l_bak_223", - "copy-from": "pistol_revolver", - "looks_like": "sw_619", - "type": "GUN", - "name": { "str": "L2037 Backup" }, - "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.", - "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.", - "weight": "2370 g", - "volume": "750 ml", - "price": 267000, - "to_hit": -2, - "bashing": 7, - "material": [ "steel", "aluminum" ], - "symbol": "(", - "color": "light_gray", - "ammo": "223", - "range": -6, - "ranged_damage": -16, - "dispersion": 380, - "durability": 8, - "blackpowder_tolerance": 32, - "loudness": 30, - "clip_size": 5, - "magazines": [ [ "223", [ "223_speedloader5" ] ] ], - "built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ], - "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ] - }, - { - "id": "l_base_223", - "copy-from": "rifle_auto", - "looks_like": "ar15", - "type": "GUN", - "name": { "str": "L523 platform" }, - "//": "Current milspec, so Expensive.", - "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The base mechanism could--theoretically--be used on its own, but such use is inadvisable and will void your warranty. There's no real place to incorporate aftermarket modifications on this barren proto-weapon.", - "weight": "2500 g", - "volume": "1500 ml", - "price": 350000, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": "223", - "ranged_damage": -1, - "dispersion": 140, - "durability": 3, - "min_cycle_recoil": 1350, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "valid_mod_locations": [ [ "accessories", 2 ], [ "brass catcher", 1 ], [ "muzzle", 1 ], [ "sling", 1 ] ], - "magazines": [ [ "223", [ "lw223mag", "lw223bigmag" ] ] ], - "flags": [ "DISABLE_SIGHTS" ] - }, - { - "id": "l_car_223", - "copy-from": "l_base_223", - "type": "GUN", - "name": { "str": "L523-CAR carbine" }, - "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a red-dot sight and an integral laser sight. Additionally it comes with underslung shotgun for close range encounters. Like the rest of the family, doesn't accept third-party modifications.", - "price": 520000, - "durability": 9, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "relative": { "weight": 400 }, - "built_in_mods": [ "lead_red_dot_sight", "lead_barrel_small", "lead_laser_sight", "lead_u_shotgun", "lead_stabilizer" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "barrel", 1 ], - [ "underbarrel", 2 ], - [ "rail", 1 ] - ] - }, - { - "id": "l_dsr_223", - "copy-from": "l_base_223", - "type": "GUN", - "name": { "str": "L523-DSR rifle" }, - "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The designated-shootist rifle incorporates a specially-designed extended barrel with integral bipod and foregrip, along with an integral 8x optic, and trades selective-fire for the Leadworks gyro-stabilization system. Like the rest of the family, though, it doesn't accept third-party modifications.", - "price": 580000, - "durability": 9, - "barrel_length": "750 ml", - "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], - "relative": { "//": "Volume, range, and bullpup all point to a very large barrel on this one.", "weight": 1200, "volume": 4 }, - "delete": { "modes": [ [ "AUTO", "auto", 3 ] ] }, - "built_in_mods": [ "lead_rifle_scope", "lead_barrel_big", "lead_bipod", "lead_grip", "lead_stabilizer" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "barrel", 1 ], - [ "underbarrel", 2 ], - [ "rail", 1 ] - ] - }, - { - "id": "l_lmg_223", - "copy-from": "l_base_223", - "type": "GUN", - "name": { "str": "L523-LMG" }, - "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The rather ambitious light machine gun variant incorporates ACOG scope, a heavy-duty barrel, foregrip, bipod and as well as the Leadworks gyro system. Unlike the other configurations, the L523 LMG can be loaded with ammo belts.", - "price": 620000, - "durability": 9, - "modes": [ [ "DEFAULT", "low auto", 3 ], [ "AUTO", "high auto", 14 ] ], - "relative": { "weight": 2000, "volume": 7, "dispersion": 50 }, - "magazines": [ [ "223", [ "lw223mag", "lw223bigmag", "belt223" ] ] ], - "built_in_mods": [ "lead_acog_scope", "lead_barrel_heavy_duty", "lead_bipod", "lead_grip", "lead_stabilizer" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "barrel", 1 ], - [ "underbarrel", 2 ], - [ "rail", 1 ] - ] - }, - { - "id": "l_mbr_223", - "copy-from": "l_base_223", - "type": "GUN", - "name": { "str": "L523-MBR rifle" }, - "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The battle rifle's (proprietary) combination optic & red-dot sights provide quick and accurate targeting, with Leadworks gyro-stabilization system and foregrip available for greater control. Additionally it comes with grenade launcher module for dealing with hard targets. Like the rest of the family, though, it doesn't accept third-party modifications.", - "price": 520000, - "durability": 9, - "relative": { "weight": 1200, "volume": 2 }, - "built_in_mods": [ "lead_acog_scope", "lead_red_dot_sight", "lead_grip", "lead_glm", "lead_stabilizer" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "muzzle", 1 ], - [ "sights", 2 ], - [ "sling", 1 ], - [ "underbarrel", 2 ], - [ "rail", 1 ] - ] - }, { "id": "m249", "copy-from": "rifle_auto", diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json index c72c9bf055c2c..225d168a60793 100644 --- a/data/json/items/gun/460.json +++ b/data/json/items/gun/460.json @@ -1,100 +1,15 @@ [ { - "id": "l_sp_45", - "copy-from": "l_sp_9mm", + "id": "m1911-460", + "copy-from": "m1911", + "looks_like": "m1911", "type": "GUN", - "name": { "str": "L39-460" }, - "description": "Developed as a testament to the L39 family of pistols' strength, this hefty pistol chambers powerful .460 Rowland. In addition to the heavy slide and L39 standard sighting package, this pistol sports a large compensator. Notably, normal .45ACP can also be fired through the weapon. Similar to other Leadworks products it doesn't accept third-party modifications.", - "price": 90000, + "name": { "str": "1911-460" }, + "description": "This 1911 has been customized to chamber powerful .460 Rowland ammunition. It now sports a large, integral compensator to aid in taming recoil and reducing slide velocity. Notably, normal .45ACP can also be fired through the weapon.", + "price": 166800, "ammo": [ "460", "45" ], - "magazines": [ [ "460", [ "lw12mag" ] ], [ "45", [ "lw12mag" ] ] ], - "min_cycle_recoil": 540, + "magazines": [ [ "460", [ "m1911mag", "m1911bigmag" ] ], [ "45", [ "m1911mag", "m1911bigmag" ] ] ], "relative": { "durability": -1 }, - "built_in_mods": [ "lead_holo_sight", "muzzle_brake", "lead_laser_sight" ] - }, - { - "id": "l_mp_45", - "copy-from": "l_mp_9mm", - "type": "GUN", - "name": { "str": "L39B-45" }, - "description": "After the success of their 9x19mm machine pistol, Leadworks LLC developed the L39B-45 from their .460 Rowland semi-autos, intending them to be used with .45ACP. Because it shares most of its parts with the L39-460, this variant retains the ability to fire fearsome .460 Rowland, though users are strongly advised not to do so during automatic fire. Comes with built in red dot, recoil compensator and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", - "ammo": [ "460", "45" ], - "magazines": [ [ "460", [ "lw12mag" ] ], [ "45", [ "lw12mag" ] ] ], - "min_cycle_recoil": 540, - "relative": { "durability": -1 }, - "built_in_mods": [ "lead_holo_sight", "muzzle_brake", "lead_laser_sight" ] - }, - { - "id": "l_enforcer_45", - "copy-from": "pistol_revolver", - "looks_like": "sw_619", - "type": "GUN", - "name": { "str": "L2031 Enforcer", "str_pl": "L2031 Enforcer" }, - "//": "Real-life Autorevolvers tended to vary between 6-7.5 inch barrels, so we'll err on the side of a +1 here.", - "description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver. In addition to ubiquitous .45 ACP, the Enforcer also fires powerful .460 Rowland, offering .44 Magnum performance in a smaller package. It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series. Comes with built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", - "weight": "1370 g", - "volume": "500 ml", - "price": 83000, - "to_hit": -2, - "bashing": 7, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "light_gray", - "ammo": [ "460", "45" ], - "ranged_damage": 1, - "dispersion": 360, - "durability": 8, - "blackpowder_tolerance": 56, - "clip_size": 6, - "magazines": [ [ "460", [ "460_speedloader6" ] ], [ "45", [ "460_speedloader6" ] ] ], - "built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "sights", 1 ], - [ "underbarrel", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "stock mount", 1 ] - ] - }, - { - "id": "l_long_45", - "looks_like": "sw_619", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "L1820 Long Ranger", "str_pl": "L1820 Long Ranger" }, - "//": "If it's based off the Winchester 94, it's likely got a 20 inch barrel. For sanity's sake though, let's cap it at +4.", - "description": "The Leadworks Long Ranger was designed to give Enforcer users (or anyone using .460/.45 caliber cartridges) a little extra reach while using the same ammunition. Loaded with powerful .460 Rowland ammunition, this rifle offers a competitive replacement to the AR-15 in politically restrictive climates, but was met with disgust from lever action purists because of its synthetic furniture and built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", - "weight": "4175 g", - "volume": "3250 ml", - "price": 90000, - "to_hit": -1, - "bashing": 12, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "brown", - "ammo": [ "460", "45" ], - "skill": "rifle", - "range": 8, - "ranged_damage": 4, - "dispersion": 180, - "durability": 9, - "blackpowder_tolerance": 32, - "clip_size": 12, - "barrel_length": "500 ml", - "built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "underbarrel", 1 ], - [ "muzzle", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "stock mount", 1 ] - ], - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "flags": [ "RELOAD_ONE" ] + "built_in_mods": [ "barrel_ported" ] } ] diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 3beaf9b943f69..d4e926f217b2c 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -280,70 +280,12 @@ "magazine_well": 1, "magazines": [ [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ] }, - { - "id": "l_lookout_9mm", - "copy-from": "l_enforcer_45", - "looks_like": "sw_619", - "type": "GUN", - "name": { "str": "L2032 Lookout", "str_pl": "L2032 Lookout" }, - "description": "After the Enforcer's success, Leadworks LLC reworked their autorevolver design to cater to the 9x19mm market. The Lookout takes advantage of the smaller 9x19mm to hold a seventh round, without sacrificing the ease of handling or reloading the Enforcer made legendary. Comes with built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", - "ammo": "9mm", - "clip_size": 7, - "magazines": [ [ "9mm", [ "9mm_speedloader7" ] ] ] - }, - { - "id": "l_mp_9mm", - "copy-from": "l_sp_9mm", - "type": "GUN", - "name": { "str": "L39B" }, - "//": "The M93R can go through up to 110 rounds in six seconds, FWIW.", - "description": "A selective-firing 9x19mm handgun introduced by Leadworks LLC's, L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode. Users praised its accuracy and fearsome appearance. Comes with built in red dot and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", - "price": 95000, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ], - "relative": { "weight": 130, "durability": -1 } - }, - { - "id": "l_sp_9mm", - "copy-from": "pistol_base", - "looks_like": "glock_17", - "type": "GUN", - "name": { "str": "L39" }, - "//": "L39s are based off the Robocop Auto-9, in turn a dolled-up Beretta 93R.", - "description": "A semiautomatic 9x19mm handgun introduced by Leadworks LLC's, L39 provides accurate single-shot placement in a very robust frame with built in red dot and laser sights. Several urban legends describe using it in ways that would have destroyed a lesser weapon. Similar to other Leadworks products it doesn't accept third-party modifications.", - "weight": "935 g", - "volume": "500 ml", - "price": 70000, - "to_hit": -2, - "bashing": 8, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "9mm", "460" ], - "range": 1, - "dispersion": 340, - "durability": 9, - "min_cycle_recoil": 450, - "built_in_mods": [ "lead_red_dot_sight", "lead_laser_sight" ], - "valid_mod_locations": [ - [ "accessories", 2 ], - [ "brass catcher", 1 ], - [ "sights", 1 ], - [ "underbarrel", 1 ], - [ "muzzle", 1 ], - [ "grip mount", 1 ], - [ "rail mount", 1 ], - [ "stock mount", 1 ] - ], - "magazine_well": 1, - "magazines": [ [ "9mm", [ "lw21mag" ] ], [ "460", [ "lw12mag" ] ] ], - "flags": [ "DURABLE_MELEE" ] - }, { "id": "m9", "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "Beretta M9A1" }, + "name": { "str": "Beretta M9A1", "str_pl": "Beretta M9A1" }, "description": "An iconic 9x19mm pistol, the M9 was the standard issue sidearm of US armed force from 1985 only until recently. It was formerly popular amongst law enforcement before the advent of commercially available polymer-framed handguns and the FBI's adoption of .40S&W.", "weight": "961 g", "volume": "528 ml", diff --git a/data/json/items/gunmod/barrel.json b/data/json/items/gunmod/barrel.json index b575de373ddc9..57de0ed937740 100644 --- a/data/json/items/gunmod/barrel.json +++ b/data/json/items/gunmod/barrel.json @@ -33,44 +33,5 @@ "dispersion_modifier": 500, "ups_charges_multiplier": 50.0, "min_skills": [ [ "gun", 1 ] ] - }, - { - "id": "lead_barrel_big", - "type": "GUNMOD", - "name": { "str": "LW barrel extension" }, - "description": "A Leadworks built in longer barrel increases the muzzle velocity of a firearm, contributing to both accuracy and damage.", - "to_hit": 2, - "bashing": 5, - "material": [ "steel" ], - "symbol": ":", - "color": "light_gray", - "location": "barrel", - "mod_targets": [ "smg", "rifle", "shotgun", "pistol" ], - "damage_modifier": 3, - "dispersion_modifier": -45, - "range_modifier": 3, - "min_skills": [ [ "weapon", 4 ] ], - "flags": [ "IRREMOVABLE" ] - }, - { - "id": "lead_barrel_small", - "copy-from": "barrel_small", - "type": "GUNMOD", - "name": { "str": "LW shortened barrel" }, - "description": "A Leadworks built-in shortened barrel results in reduced weapon range, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.", - "price": 0, - "volume": "0 ml", - "dispersion_modifier": 0, - "range_modifier": -6, - "flags": [ "IRREMOVABLE" ] - }, - { - "id": "lead_barrel_heavy_duty", - "copy-from": "lead_barrel_big", - "type": "GUNMOD", - "name": { "str": "LW heavy duty barrel" }, - "description": "A Leadworks built-in heavy-duty barrel especially designed for prolonged shooting. Increases damage output and weapon range.", - "dispersion_modifier": 0, - "flags": [ "IRREMOVABLE" ] } ] diff --git a/data/json/items/gunmod/magazine.json b/data/json/items/gunmod/magazine.json deleted file mode 100644 index 925bfd5520c11..0000000000000 --- a/data/json/items/gunmod/magazine.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "id": "lwfeed", - "type": "GUNMOD", - "name": { "str": "Leadworks magazine adapter" }, - "description": "A bootleg adapter for permanently converting a firearm to accept proprietary Leadworks magazines. Guaranteed to void your warranty.", - "weight": "140 g", - "volume": "250 ml", - "integral_volume": "250 ml", - "price": 48000, - "material": "steel", - "symbol": ":", - "color": "green", - "location": "magazine", - "mod_targets": [ "pistol", "rifle" ], - "acceptable_ammo": [ "9mm", "460", "223" ], - "install_time": "60 m", - "magazine_adaptor": [ [ "9mm", [ "lw21mag" ] ], [ "460", [ "lw12mag" ] ], [ "223", [ "lw223mag", "lw223bigmag" ] ] ], - "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ], - "flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ] - } -] diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index 06adaf0758ec4..16c9a979e6215 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -120,16 +120,5 @@ "name": { "str": "modified gyroscopic stabilizer" }, "description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and slightly increasing accuracy. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] - }, - { - "id": "lead_stabilizer", - "copy-from": "stabilizer", - "type": "GUNMOD", - "name": { "str": "LW gyroscopic stabilizer" }, - "description": "An advanced Leadworks built-in gyroscopic stabilizer.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "IRREMOVABLE" ] } ] diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index bcd919355b34f..4069a2c333fb1 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -237,48 +237,5 @@ "consume_divisor": 85, "min_skills": [ [ "weapon", 2 ], [ "gun", 3 ] ], "flags": [ "DISABLE_SIGHTS", "CONSUMABLE", "ZOOM" ] - }, - { - "id": "lead_red_dot_sight", - "copy-from": "red_dot_sight", - "type": "GUNMOD", - "name": { "str": "LW red dot sight" }, - "description": "Built in red-dot sight for the Leadworks weapon.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "DISABLE_SIGHTS", "IRREMOVABLE" ] - }, - { - "id": "lead_rifle_scope", - "copy-from": "rifle_scope", - "type": "GUNMOD", - "name": { "str": "LW rifle scope" }, - "description": "Built in rifle scope for the Leadworks weapon.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ] - }, - { - "id": "lead_acog_scope", - "copy-from": "acog_scope", - "type": "GUNMOD", - "name": { "str": "LW ACOG scope" }, - "description": "A Leadworks built-in Advanced Combat Optical Gunsight, a milspec medium magnification scope. Improves accuracy significantly.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ] - }, - { - "id": "lead_holo_sight", - "copy-from": "holo_sight", - "type": "GUNMOD", - "name": { "str": "LW holographic sight" }, - "description": "Leadworks built-in holographic sight.", - "weight": "0 g", - "price": 0, - "flags": [ "DISABLE_SIGHTS", "IRREMOVABLE" ] } ] diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index b500cb77efca5..fa51d93a47ea5 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -412,60 +412,5 @@ "name": { "str": "modified underslung shotgun" }, "description": "A short shotgun with 2 barrels, which can be mounted under the barrel of many rifles. It allows two shotgun shells to be loaded and fired. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] - }, - { - "id": "lead_laser_sight", - "copy-from": "laser_sight", - "type": "GUNMOD", - "name": { "str": "LW underbarrel laser sight" }, - "description": "A Leadworks built-in visible-light laser that mounts under a firearm's barrel to enhance ease and speed of target acquisition.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ] - }, - { - "id": "lead_grip", - "copy-from": "grip", - "type": "GUNMOD", - "name": { "str": "LW forward grip" }, - "description": "A Leadworks built-in grip placed forward on the barrel allows for greater control.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ] - }, - { - "id": "lead_bipod", - "copy-from": "bipod", - "type": "GUNMOD", - "name": { "str": "LW bipod" }, - "description": "Leadworks built-in bipod designed to provide a forward rest and reduce motion. Although it greatly improves handling of recoil it is usable only on certain surfaces and are slow to equip.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "BIPOD", "SLOW_WIELD", "IRREMOVABLE" ] - }, - { - "id": "lead_u_shotgun", - "copy-from": "masterkey", - "type": "GUNMOD", - "name": { "str": "LW underslung shotgun" }, - "description": "Leadworks built-in minimalist pump action shotgun module. It allows 4 shotgun shells to be loaded and fired.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "RELOAD_ONE", "IRREMOVABLE" ] - }, - { - "id": "lead_glm", - "copy-from": "m320_mod", - "type": "GUNMOD", - "name": { "str": "LW GLM", "str_pl": "LW GLM" }, - "description": "The Leadworks built-in Grenade Launcher Module offers the functionality of larger launchers in a very small package.", - "weight": "0 g", - "volume": "0 ml", - "price": 0, - "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "IRREMOVABLE" ] } ] diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 2734cf7cc455a..e311852df09ed 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -15,42 +15,6 @@ "capacity": 8, "flags": [ "SPEEDLOADER" ] }, - { - "id": "360_200_mag", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "RMRB200 .22 magazine" }, - "description": "A 200 round box magazine for use with the RM360 rotary carbine.", - "weight": "360 g", - "volume": "500 ml", - "price": 20000, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": "22", - "capacity": 200, - "reliability": 10, - "reload_time": 60, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "360_400_mag", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "RMRD400 .22 drum magazine" }, - "description": "A 400 round drum magazine for use with the RM360 rotary carbine.", - "weight": "440 g", - "volume": "750 ml", - "price": 30000, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": "22", - "capacity": 400, - "reliability": 10, - "reload_time": 60, - "flags": [ "MAG_BULKY" ] - }, { "id": "a180mag", "looks_like": "mp5mag", diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json index 47d69c343d536..3471f43f39245 100644 --- a/data/json/items/magazine/223.json +++ b/data/json/items/magazine/223.json @@ -1,20 +1,4 @@ [ - { - "id": "223_speedloader5", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "LW-5 speedloader" }, - "description": "This speedloader, made by Leadworks for use with L2037 Backup revolver, can hold 5 rounds of .223 and quickly reload a compatible revolver.", - "weight": "116 g", - "volume": "250 ml", - "price": 3200, - "material": "plastic", - "symbol": "#", - "color": "light_gray", - "ammo_type": "223", - "capacity": 5, - "flags": [ "SPEEDLOADER" ] - }, { "id": "belt223", "copy-from": "magazine_belt", @@ -27,42 +11,6 @@ "default_ammo": "556", "linkage": "ammolink223" }, - { - "id": "lw223bigmag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "LW-56 magazine" }, - "description": "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact design makes it surprisingly easy to store. Lightweight and reliable but somewhat more difficult to reload.", - "weight": "340 g", - "volume": "750 ml", - "price": 14200, - "material": "plastic", - "symbol": "#", - "color": "light_gray", - "ammo_type": "223", - "capacity": 56, - "reliability": 9, - "reload_time": 160, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "lw223mag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "LW-32 magazine" }, - "description": "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.", - "weight": "190 g", - "volume": "500 ml", - "price": 10200, - "material": "plastic", - "symbol": "#", - "color": "light_gray", - "ammo_type": "223", - "capacity": 32, - "reliability": 9, - "reload_time": 120, - "flags": [ "MAG_COMPACT" ] - }, { "id": "ruger5", "looks_like": "stanag30", diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index 66a428072a066..03d1209579696 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -1,38 +1,4 @@ [ - { - "id": "m1911bigmag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "M1911 extended magazine" }, - "description": "An extended 10-round magazine for use with the M1911 handgun.", - "weight": "100 g", - "volume": "500 ml", - "price": 3720, - "material": "steel", - "symbol": "#", - "color": "light_gray", - "ammo_type": "45", - "capacity": 10, - "reliability": 9, - "flags": [ "MAG_COMPACT" ] - }, - { - "id": "m1911mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "M1911 magazine" }, - "description": "A military issue 7-round magazine for use with the M1911 handgun.", - "weight": "70 g", - "volume": "250 ml", - "price": 2980, - "material": "steel", - "symbol": "#", - "color": "light_gray", - "ammo_type": "45", - "capacity": 7, - "reliability": 10, - "flags": [ "MAG_COMPACT" ] - }, { "id": "mac10mag", "looks_like": "mp5mag", diff --git a/data/json/items/magazine/460.json b/data/json/items/magazine/460.json index 5e4cfad8c5bf1..4c8d1336f7ee5 100644 --- a/data/json/items/magazine/460.json +++ b/data/json/items/magazine/460.json @@ -1,36 +1,34 @@ [ { - "id": "460_speedloader6", - "looks_like": "glock17_17", + "id": "m1911bigmag", "type": "MAGAZINE", - "name": { "str": ".460 6-round speedloader" }, - "description": "This speedloader, made by Leadworks for use with L2031 Enforcer revolver, can hold 6 rounds of .460 or .45 and quickly reload a compatible revolver.", - "weight": "86 g", - "volume": "250 ml", - "price": 3200, - "material": "plastic", + "name": { "str": "M1911 extended magazine" }, + "description": "An extended 10-round magazine for use with the M1911 handgun.", + "weight": "100 g", + "volume": "500 ml", + "price": 3720, + "material": "steel", "symbol": "#", "color": "light_gray", - "ammo_type": [ "460", "45" ], - "capacity": 6, - "flags": [ "SPEEDLOADER" ] + "ammo_type": [ "45", "460" ], + "capacity": 10, + "reliability": 9, + "flags": [ "MAG_COMPACT" ] }, { - "id": "lw12mag", - "looks_like": "glock17_17", + "id": "m1911mag", "type": "MAGAZINE", - "name": { "str": "LW-12 magazine" }, - "description": "A 12-round polymer magazine for use with the Leadworks LLC L39-460 and L39B-45 pistols.", - "weight": "60 g", + "name": { "str": "M1911 magazine" }, + "description": "A military issue 7-round magazine for use with the M1911 handgun.", + "weight": "70 g", "volume": "250 ml", - "price": 5800, - "material": "plastic", + "price": 2980, + "material": "steel", "symbol": "#", "color": "light_gray", - "ammo_type": [ "460", "45" ], - "capacity": 12, + "ammo_type": [ "45", "460" ], + "capacity": 7, "reliability": 10, - "reload_time": 140, "flags": [ "MAG_COMPACT" ] } ] diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index 0c4a51739c45f..dd47b3e694514 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -1,20 +1,4 @@ [ - { - "id": "9mm_speedloader7", - "looks_like": "38_speedloader", - "type": "MAGAZINE", - "name": { "str": "LW-7 speedloader" }, - "description": "This speedloader, made by Leadworks for use with L2032 Lookout revolver, can hold 7 rounds of 9x19mm and quickly reload a compatible revolver.", - "weight": "72 g", - "volume": "250 ml", - "price": 2800, - "material": "plastic", - "symbol": "#", - "color": "light_gray", - "ammo_type": "9mm", - "capacity": 7, - "flags": [ "SPEEDLOADER" ] - }, { "id": "calicomag", "looks_like": "mp5mag", @@ -137,24 +121,6 @@ "reliability": 8, "flags": [ "MAG_BULKY" ] }, - { - "id": "lw21mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "LW-21 magazine" }, - "description": "A 21-round polymer magazine for Leadworks LLC 9x19mm firearms. Lightweight and reliable but somewhat more difficult to reload.", - "weight": "105 g", - "volume": "500 ml", - "price": 7600, - "material": "plastic", - "symbol": "#", - "color": "light_gray", - "ammo_type": "9mm", - "capacity": 21, - "reliability": 10, - "reload_time": 140, - "flags": [ "MAG_COMPACT" ] - }, { "id": "m9bigmag", "looks_like": "glock17_17", diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 7d070924b2dd9..a466a5d2b3106 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -988,5 +988,215 @@ "id": "40mm_casing", "type": "MIGRATION", "replace": "40x46mm_m118_casing" + }, + { + "id": [ "360_200_mag", "360_400_mag" ], + "type": "MIGRATION", + "replace": "a180mag" + }, + { + "id": "rm360_carbine", + "type": "MIGRATION", + "replace": "american_180" + }, + { + "id": "lead_stabilizer", + "type": "MIGRATION", + "replace": "stabilizer" + }, + { + "id": "lead_barrel_small", + "type": "MIGRATION", + "replace": "barrel_small" + }, + { + "id": "lead_red_dot_sight", + "type": "MIGRATION", + "replace": "red_dot_sight" + }, + { + "id": "lead_rifle_scope", + "type": "MIGRATION", + "replace": "rifle_scope" + }, + { + "id": "lead_acog_scope", + "type": "MIGRATION", + "replace": "acog_scope" + }, + { + "id": "lead_holo_sight", + "type": "MIGRATION", + "replace": "holo_sight" + }, + { + "id": "lead_laser_sight", + "type": "MIGRATION", + "replace": "rail_laser_sight" + }, + { + "id": "lead_grip", + "type": "MIGRATION", + "replace": "offset_sight_rail" + }, + { + "id": "lead_bipod", + "type": "MIGRATION", + "replace": "bipod" + }, + { + "id": "lead_u_shotgun", + "type": "MIGRATION", + "replace": "masterkey" + }, + { + "id": "lead_glm", + "type": "MIGRATION", + "replace": "m320_mod" + }, + { + "id": "lead_stabilizer", + "type": "MIGRATION", + "replace": "stabilizer" + }, + { + "id": "lead_barrel_small", + "type": "MIGRATION", + "replace": "barrel_small" + }, + { + "id": "lead_red_dot_sight", + "type": "MIGRATION", + "replace": "red_dot_sight" + }, + { + "id": "lead_rifle_scope", + "type": "MIGRATION", + "replace": "rifle_scope" + }, + { + "id": "lead_acog_scope", + "type": "MIGRATION", + "replace": "acog_scope" + }, + { + "id": "lead_holo_sight", + "type": "MIGRATION", + "replace": "holo_sight" + }, + { + "id": "lead_laser_sight", + "type": "MIGRATION", + "replace": "rail_laser_sight" + }, + { + "id": "lead_grip", + "type": "MIGRATION", + "replace": "offset_sight_rail" + }, + { + "id": "lead_bipod", + "type": "MIGRATION", + "replace": "bipod" + }, + { + "id": "lead_u_shotgun", + "type": "MIGRATION", + "replace": "masterkey" + }, + { + "id": "lead_glm", + "type": "MIGRATION", + "replace": "m320" + }, + { + "id": "l_sp_9mm", + "type": "MIGRATION", + "replace": "glock_17" + }, + { + "id": "l_mp_9mm", + "type": "MIGRATION", + "replace": "glock_18c" + }, + { + "id": "lw21mag", + "type": "MIGRATION", + "replace": "glockbigmag" + }, + { + "id": "l_lookout_9mm", + "type": "MIGRATION", + "replace": "sw_619" + }, + { + "id": "9mm_speedloader7", + "type": "MIGRATION", + "replace": "38_speedloader" + }, + { + "id": [ "l_HFPack", "l_long_45" ], + "type": "MIGRATION", + "replace": "colt_lightning" + }, + { + "id": [ "l_sp_45", "l_mp_45" ], + "type": "MIGRATION", + "replace": "m1911-460" + }, + { + "id": "l_enforcer_45", + "type": "MIGRATION", + "replace": "sw629" + }, + { + "id": "460_speedloader6", + "type": "MIGRATION", + "replace": "44_speedloader6" + }, + { + "id": "l_enforcer_45", + "type": "MIGRATION", + "replace": "sw629" + }, + { + "id": [ "mosin91_30_ebr", "mn_ebr_kit", "mn_classic_kit" ], + "type": "MIGRATION", + "replace": "mosin91_30" + }, + { + "id": "mosin44_ebr", + "type": "MIGRATION", + "replace": "mosin44" + }, + { + "id": [ "l_base_223", "l_car_223", "l_car_223_kit", "l_mbr_223", "l_mbr_223_kit" ], + "type": "MIGRATION", + "replace": "h&k416a5" + }, + { + "id": [ "l_lmg_223", "l_lmg_223_kit" ], + "type": "MIGRATION", + "replace": "m249" + }, + { + "id": [ "l_dsr_223", "l_dsr_223_kit" ], + "type": "MIGRATION", + "replace": "m16a4" + }, + { + "id": "lw223bigmag", + "type": "MIGRATION", + "replace": "stanag50" + }, + { + "id": "lw223mag", + "type": "MIGRATION", + "replace": "stanag30" + }, + { + "id": "lw12mag", + "type": "MIGRATION", + "replace": "m1911mag" } ] diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index b90f57bf75a99..c85a5af8c375b 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1705,6 +1705,101 @@ "techniques": [ "WBLOCK_1" ], "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] }, + { + "id": "l_bak_223", + "copy-from": "pistol_base", + "looks_like": "sw_619", + "type": "GUN", + "name": "L2037 Backup", + "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.", + "weight": "2370 g", + "volume": "750 ml", + "price": 267000, + "to_hit": -2, + "bashing": 7, + "material": [ "steel", "aluminum" ], + "symbol": "(", + "color": "light_gray", + "ammo": "223", + "range": -6, + "ranged_damage": -16, + "dispersion": 380, + "durability": 8, + "blackpowder_tolerance": 32, + "loudness": 30, + "clip_size": 5, + "magazines": [ [ "223", [ "223_speedloader5" ] ] ], + "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ], + "proportional": { "reload": 0.7 }, + "extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] }, + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] + }, + { + "id": "223_speedloader5", + "type": "MAGAZINE", + "name": "LW-5 speedloader", + "description": "This speedloader, made by Leadworks for use with L2037 Backup revolver, can hold 5 rounds of .223 and quickly reload a compatible revolver.", + "weight": "116 g", + "volume": "250 ml", + "price": 3200, + "material": "plastic", + "symbol": "#", + "color": "light_gray", + "ammo_type": "223", + "capacity": 5, + "flags": [ "SPEEDLOADER" ] + }, + { + "id": "lwfeed", + "type": "GUNMOD", + "name": "Leadworks magazine adapter", + "description": "A bootleg adapter for permanently converting a firearm to accept proprietary Leadworks magazines. Guaranteed to void your warranty.", + "weight": "140 g", + "volume": "250 ml", + "integral_volume": "250 ml", + "price": 48000, + "material": "steel", + "symbol": ":", + "color": "green", + "location": "magazine", + "mod_targets": [ "pistol", "rifle" ], + "acceptable_ammo": [ "9mm", "460", "223" ], + "install_time": "60 m", + "magazine_adaptor": [ + [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ], + [ "460", [ "m1911mag", "m1911bigmag" ] ], + [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] + ], + "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ], + "flags": [ "INSTALL_DIFFICULT" ] + }, + { + "id": "lead_barrel_big", + "type": "GUNMOD", + "name": "LW barrel extension", + "description": "A Leadworks built in longer barrel increases the muzzle velocity of a firearm, contributing to both accuracy and damage.", + "to_hit": 2, + "bashing": 5, + "material": [ "steel" ], + "symbol": ":", + "color": "light_gray", + "location": "barrel", + "mod_targets": [ "smg", "rifle", "shotgun", "pistol" ], + "damage_modifier": 3, + "dispersion_modifier": -45, + "range_modifier": 3, + "min_skills": [ [ "weapon", 4 ] ], + "flags": [ "IRREMOVABLE" ] + }, + { + "id": "lead_barrel_heavy_duty", + "copy-from": "lead_barrel_big", + "type": "GUNMOD", + "name": "LW heavy duty barrel", + "description": "A Leadworks built in heavy duty barrel especially designed for prolonged shooting. Increases damage output and weapon range.", + "dispersion_modifier": 0, + "flags": [ "IRREMOVABLE" ] + }, { "id": "aux_flamer", "type": "GUNMOD", diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 92bf6897be7b9..7aa1ac6f96f80 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -601,9 +601,6 @@ "glock_19", "glock_22", "glock_31", - "l_lookout_9mm", - "l_mp_9mm", - "l_sp_9mm", "m17", "m1911", "m1911a1_38super", @@ -625,10 +622,6 @@ "scar_l", "hk_g3", "hk_g36", - "l_car_223", - "l_dsr_223", - "l_lmg_223", - "l_mbr_223", "m14ebr", "M24", "m27iar", diff --git a/data/json/npcs/NC_CITY_COP.json b/data/json/npcs/NC_CITY_COP.json index c8945093d3da3..bd5443af71a02 100644 --- a/data/json/npcs/NC_CITY_COP.json +++ b/data/json/npcs/NC_CITY_COP.json @@ -103,7 +103,6 @@ [ "antiparasitic", 2 ], [ "diazepam", 1 ], [ "lsd", 6 ], - [ "lwfeed", 30 ], [ "weed", 10 ], [ "electrohack", 3 ], [ "textbook_gaswarfare", 1 ], diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json index 4192a680e7181..bad1918763758 100644 --- a/data/json/npcs/robofac/NPC_robofac_generic_security.json +++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json @@ -55,8 +55,8 @@ { "item": "grenade", "prob": 2 }, { "item": "PR24-extended" }, { "item": "flashlight" }, - { "item": "l_mp_9mm", "charges": 21, "ammo-item": "9mmP" }, - { "item": "lw21mag", "charges": 21, "ammo-item": "9mmP" }, + { "item": "glock_17", "charges": 21, "ammo-item": "9mmP" }, + { "item": "glock17_22", "charges": 21, "ammo-item": "9mmP" }, { "item": "9mmP", "count": 6 } ] }, diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index b04d0380c351d..8785f12ddd360 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -2069,20 +2069,6 @@ "components": [ [ [ "spike", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, - { - "result": "l_HFPack", - "type": "uncraft", - "time": "30 s", - "components": [ - [ [ "l_long_45", 1 ] ], - [ [ "l_enforcer_45", 1 ] ], - [ [ "small_repairkit", 1 ] ], - [ [ "medium_battery_cell", 1 ] ], - [ [ "manual_gun", 1 ] ], - [ [ "holster", 1 ] ] - ], - "flags": [ "BLIND_EASY", "FULL_MAGAZINE" ] - }, { "result": "laptop", "type": "uncraft", diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 3439c7d466950..884e592ed6c6b 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2303,5 +2303,50 @@ "type": "recipe", "result": "helmet_xlsurvivor", "obsolete": true + }, + { + "type": "recipe", + "result": "l_HFPack", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin91_30", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin44", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin91_30_ebr", + "obsolete": true + }, + { + "type": "recipe", + "result": "mosin44_ebr", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_car_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_mbr_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_dsr_223", + "obsolete": true + }, + { + "type": "recipe", + "result": "l_lmg_223", + "obsolete": true } ] diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index a6bd518eb99fa..ccf6dfc419ed4 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -714,126 +714,6 @@ ], "components": [ [ [ "pipe", 1 ] ], [ [ "spring", 1 ] ], [ [ "steel_chunk", 2 ] ], [ [ "scrap", 2 ] ] ] }, - { - "type": "recipe", - "result": "mosin91_30", - "byproducts": [ [ "mn_ebr_kit" ] ], - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "3 h", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "mosin91_30_ebr", 1 ] ], [ [ "mn_classic_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "mosin44", - "byproducts": [ [ "mn_ebr_kit" ] ], - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "3 h", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "mosin44_ebr", 1 ] ], [ [ "mn_classic_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "mosin91_30_ebr", - "byproducts": [ [ "mn_classic_kit" ] ], - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "3 h", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "mosin91_30", 1 ] ], [ [ "mn_ebr_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "mosin44_ebr", - "byproducts": [ [ "mn_classic_kit" ] ], - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "3 h", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "mosin44", 1 ] ], [ [ "mn_ebr_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "l_car_223", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "1 h 30 m", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "reversible": true, - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_car_223_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "l_mbr_223", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 4 ] ], - "difficulty": 5, - "time": "1 h 35 m", - "reversible": true, - "autolearn": true, - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_mbr_223_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "l_dsr_223", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 6 ] ], - "difficulty": 6, - "time": "2 h", - "reversible": true, - "autolearn": true, - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_dsr_223_kit", 1 ] ] ] - }, - { - "type": "recipe", - "result": "l_lmg_223", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ [ "gun", 5 ] ], - "difficulty": 7, - "time": "1 h 40 m", - "//": "Firearms kits are mandatory by design--you're doing significant modifications to your gun and should use the right gear to sight everything in, etc.", - "reversible": true, - "autolearn": true, - "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ], - "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_lmg_223_kit", 1 ] ] ] - }, { "type": "recipe", "result": "hand_crossbow", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 8e2d504853afe..9e670dda9d701 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -48,7 +48,6 @@ "needlepistol", "hk_mp5k", "briefcase_smg", - "l_mp_9mm", "skorpion_82", "tec9", "glock_18c" @@ -57,12 +56,12 @@ "replace": "pistol_machine" }, { - "id": [ "deagle_44", "l_sp_45", "l_mp_45" ], + "id": [ "deagle_44", "m1911-460" ], "type": "MIGRATION", "replace": "pistol_magnum_automag" }, { - "id": [ "henry_big_boy", "bh_m89", "l_long_45" ], + "id": [ "henry_big_boy", "bh_m89" ], "type": "MIGRATION", "replace": "pistol_magnum_levergun" }, @@ -72,18 +71,7 @@ "replace": "pistol_magnum_pipe" }, { - "id": [ - "rm228", - "l_bak_223", - "sw_619", - "ruger_redhawk", - "sw629", - "bfr", - "l_enforcer_45", - "sw_500", - "raging_bull", - "raging_judge" - ], + "id": [ "rm228", "sw_619", "ruger_redhawk", "sw629", "bfr", "sw_500", "raging_bull", "raging_judge" ], "type": "MIGRATION", "replace": "pistol_magnum_revolver" }, @@ -104,7 +92,6 @@ "tokarev", "rm103a_pistol", "glock_19", - "l_sp_9mm", "m9", "usp_9mm", "m17", @@ -154,17 +141,7 @@ "replace": "pistol_pipe_smg" }, { - "id": [ - "cop_38", - "model_10_revolver", - "ruger_lcr_38", - "sw_610", - "bond_410", - "colt_saa", - "l_lookout_9mm", - "rm99_pistol", - "m47a1" - ], + "id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "rm99_pistol", "m47a1" ], "type": "MIGRATION", "replace": "pistol_revolver" }, @@ -174,7 +151,7 @@ "replace": "pistol_smg" }, { - "id": [ "american_180", "rm360_carbine", "ruger_1022" ], + "id": [ "american_180", "ruger_1022" ], "type": "MIGRATION", "replace": "pistol_tiny_rifle" }, @@ -195,9 +172,6 @@ "acr_300blk", "hk417_13", "acr", - "l_base_223", - "l_car_223", - "l_mbr_223", "m4a1", "m16a4", "scar_l", @@ -225,7 +199,7 @@ "replace": "rifle_huge_hmg" }, { - "id": [ "m134", "l_lmg_223", "m249", "m27iar", "m240", "m60", "rm614_lmg", "rm298" ], + "id": [ "m134", "m249", "m27iar", "m240", "m60", "rm614_lmg", "rm298" ], "type": "MIGRATION", "replace": "rifle_lmg" }, @@ -246,7 +220,6 @@ "mosin44_ebr", "mosin91_30_ebr", "rm11b_sniper_rifle", - "l_dsr_223", "remington700_270", "m2010", "weatherby_5", diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json index c7c2468c193d9..74156fe6524b6 100644 --- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json +++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json @@ -15,17 +15,6 @@ "lwfeed", "lead_barrel_big", "lead_barrel_heavy_duty", - "lead_glm", - "lead_u_shotgun", - "lead_barrel_small", - "lead_laser_sight", - "lead_red_dot_sight", - "lead_rifle_scope", - "lead_acog_scope", - "lead_holo_sight", - "lead_stabilizer", - "lead_grip", - "lead_bipod", "inter_bayonet" ] } diff --git a/data/mods/Generic_Guns/items/gg_items_blacklist.json b/data/mods/Generic_Guns/items/gg_items_blacklist.json deleted file mode 100644 index e0e0456fb6ee4..0000000000000 --- a/data/mods/Generic_Guns/items/gg_items_blacklist.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "ITEM_BLACKLIST", - "items": [ - "l_HFPack", - "l_car_223_kit", - "l_mbr_223_kit", - "l_dsr_223_kit", - "l_lmg_223_kit", - "l_mbr_223_kit", - "lwfeed", - "lead_barrel_big", - "lead_barrel_heavy_duty", - "mn_classic_kit", - "mn_ebr_kit" - ] -} diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 0625cba48c116..13723cfef68d2 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -55,7 +55,7 @@ "replace": "pistol_mag" }, { - "id": [ "deaglemag", "hptjhpmag", "lw12mag", "8x40_10_mag" ], + "id": [ "deaglemag", "hptjhpmag", "8x40_10_mag" ], "type": "MIGRATION", "replace": "pistol_magnum_mag" }, @@ -88,7 +88,6 @@ "glock17_22", "glock_drum_50rd", "glock_drum_100rd", - "lw21mag", "m9bigmag", "mp5bigmag", "mp5mag", @@ -120,18 +119,7 @@ "replace": "pistol_speedloader" }, { - "id": [ - "360_200_mag", - "360_400_mag", - "a180mag", - "mosquitomag", - "ruger1022bigmag", - "ruger1022mag", - "sw22mag", - "j22mag", - "wp22mag", - "kp32mag" - ], + "id": [ "a180mag", "mosquitomag", "ruger1022bigmag", "ruger1022mag", "sw22mag", "j22mag", "wp22mag", "kp32mag" ], "type": "MIGRATION", "replace": "pistol_tiny_mag" }, @@ -152,8 +140,6 @@ }, { "id": [ - "lw223bigmag", - "lw223mag", "stanag30", "stanag50", "blrmag", @@ -186,7 +172,6 @@ { "id": [ "m2010mag", - "223_speedloader5", "ruger5", "stanag10", "survivor223mag", diff --git a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json index 80e2b37bf6f35..295abd0720a7d 100644 --- a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json +++ b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_magazine_json_load_hack.json @@ -146,20 +146,6 @@ "ammo_type": [ "ammo_rifle", "223", "300blk" ], "name": "5.56x45mm ammo belt" }, - { - "id": "lw223bigmag", - "copy-from": "lw223bigmag", - "type": "MAGAZINE", - "ammo_type": [ "ammo_rifle", "223", "300blk" ], - "name": "LW-56 magazine" - }, - { - "id": "lw223mag", - "copy-from": "lw223mag", - "type": "MAGAZINE", - "ammo_type": [ "ammo_rifle", "223", "300blk" ], - "name": "LW-32 magazine" - }, { "id": "ruger5", "copy-from": "ruger5",