Migrate/obsolete incongruent Leadworks, EBR, and Rivtech guns (#37979)

* yoink
CleverRaven · Mar 8, 2020 · 7947513 · 7947513
1 parent 49d6ded
commit 7947513
Show file tree

Hide file tree

Showing 36 changed files with 393 additions and 1,067 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,17 +170,14 @@
       [ "j22mag", 1 ],
       [ "kp32mag", 5 ],
       [ "fn1910mag", 2 ],
-      [ "ppkmag", 15 ],
-      [ "lw12mag", 5 ],
-      [ "lw21mag", 5 ]
+      [ "ppkmag", 15 ]
     ]
   },
   {
     "type": "item_group",
     "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
@@ -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
@@ -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
@@ -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",