CleverRaven · Maleclypse · Jun 18, 2024 · Jun 16, 2024 · Jun 16, 2024
diff --git a/data/json/itemgroups/SUS/lodge.json b/data/json/itemgroups/SUS/lodge.json
@@ -29,7 +29,6 @@
       { "item": "ruger_1022", "prob": 70, "charges": [ 0, 10 ] },
       { "item": "ruger_mini", "prob": 10, "charges": [ 0, 5 ] },
       { "item": "win70", "prob": 20, "charges": [ 0, 3 ] },
-      { "item": "colt_lightning", "prob": 2, "charges": [ 0, 10 ] },
       { "item": "henry_big_boy", "prob": 2, "charges": [ 0, 10 ] },
       { "item": "weatherby_5", "prob": 2, "charges": [ 0, 3 ] },
       { "item": "single_sling", "prob": 10 }

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -341,7 +341,6 @@
       { "group": "guns_rifle_rare_3006", "prob": 35 },
       { "group": "guns_rifle_rare_44", "prob": 10 },
       { "group": "guns_rifle_rare_45", "prob": 21 },
-      { "group": "guns_rifle_rare_45colt", "prob": 7 },
       { "group": "guns_rifle_rare_762R", "prob": 27 },
       { "group": "guns_rifle_rare_300blk", "prob": 10 },
       { "group": "guns_rifle_rare_other", "prob": 94 }
@@ -360,7 +359,6 @@
       { "group": "guns_rifle_rare_display_3006", "prob": 20 },
       { "group": "guns_rifle_rare_display_44", "prob": 10 },
       { "group": "guns_rifle_rare_display_45", "prob": 10 },
-      { "group": "guns_rifle_rare_display_45colt", "prob": 5 },
       { "group": "guns_rifle_rare_display_762R", "prob": 17 },
       { "group": "guns_rifle_rare_display_300blk", "prob": 15 },
       { "group": "guns_rifle_rare_display_other", "prob": 106 }
@@ -465,7 +463,6 @@
       { "item": "m14ebr", "prob": 15 },
       { "item": "arx160", "prob": 10 },
       { "item": "modular_m16_auto_rifle", "variant": "modular_acr", "prob": 25 },
-      { "item": "fs2000", "prob": 6 },
       { "item": "acr_300blk", "prob": 15 },
       { "item": "hk417_13", "prob": 40 },
       { "item": "m2carbine", "prob": 5 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -607,7 +607,6 @@
     "type": "item_group",
     "id": "guns_rifle_rare_223",
     "items": [
-      { "group": "nested_fs2000", "prob": 6 },
       { "group": "nested_hk_g36", "prob": 30 },
       { "group": "nested_m249_semi", "prob": 5 },
       { "group": "nested_m4_carbine", "prob": 45 },
@@ -656,11 +655,6 @@
     "id": "guns_rifle_rare_45",
     "items": [ { "group": "nested_hk_usc45", "prob": 20 }, { "group": "nested_greasegun", "prob": 1 } ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_rifle_rare_45colt",
-    "items": [ { "group": "nested_colt_lightning", "prob": 15 } ]
-  },
   {
     "type": "item_group",
     "id": "guns_rifle_rare_762R",
@@ -744,11 +738,6 @@
     "id": "guns_rifle_rare_display_45",
     "items": [ { "item": "hk_usc45", "prob": 10 } ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_rifle_rare_display_45colt",
-    "items": [ { "group": "nested_colt_lightning", "prob": 10 } ]
-  },
   {
     "type": "item_group",
     "id": "guns_rifle_rare_display_762R",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1504,14 +1504,6 @@
       { "group": "on_hand_223" }
     ]
   },
-  {
-    "id": "nested_colt_lightning",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [ { "item": "colt_lightning", "charges": [ 0, 14 ] }, { "group": "on_hand_45colt" } ]
-  },
   {
     "id": "nested_fn_fal",
     "type": "item_group",
@@ -1525,19 +1517,6 @@
       { "group": "on_hand_308" }
     ]
   },
-  {
-    "id": "nested_fs2000",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "fs2000", "charges": [ 0, 30 ] },
-      { "group": "stanag_30_random" },
-      { "group": "stanag_30_random", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_m249_semi",
     "type": "item_group",

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -88,40 +88,6 @@
     ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "fs2000",
-    "copy-from": "rifle_semi",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "FS2000" },
-    "description": "A sleek bullpup carbine designed by FN Herstal, complete with an integrated sight accessory rail.  The forward ejecting action and ambidextrous controls make firing comfortable for both left and right-handed shooting.  The whole rifle is well sealed from mud and dust for reliability, but this makes it incompatible with many aftermarket magazines.",
-    "weight": "3319 g",
-    "volume": "7986 ml",
-    "longest_side": "740 mm",
-    "barrel_length": "442 mm",
-    "price": "1 kUSD 250 USD",
-    "price_postapoc": "20 USD",
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "223" ],
-    "dispersion": 150,
-    "durability": 9,
-    "min_cycle_recoil": 1350,
-    "default_mods": [ "factory_handguard" ],
-    "//": "Forward ejection port would require a different brass catcher design, so there is no slot for it. Bullpup design requires the factory stock to function.",
-    "valid_mod_locations": [
-      [ "muzzle", 1 ],
-      [ "sling", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "stanag30", "stanag30ranger" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "//": "Groups all 'H&K416' related rifles together. Used M27 due to it being the most popular of the three in the US.",
     "id": "modular_m27_assault_rifle",

diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json
@@ -35,45 +35,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 2, "410shot": 2 } } ],
     "melee_damage": { "bash": 2 }
   },
-  {
-    "id": "colt_lightning",
-    "copy-from": "rifle_manual",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "Colt Lightning .45 Carbine" },
-    "description": "A modern reproduction of a Colt pump-action rifle.  Originally chambered in .44-40, modern versions most commonly use .45 Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.",
-    "weight": "2722 g",
-    "volume": "1601 ml",
-    "longest_side": "1106 mm",
-    "barrel_length": "660 mm",
-    "price": "1 kUSD 320 USD",
-    "price_postapoc": "25 USD",
-    "to_hit": -1,
-    "material": [ "steel", "wood" ],
-    "color": "brown",
-    "range": 7,
-    "ammo": [ "45colt" ],
-    "dispersion": 180,
-    "durability": 7,
-    "clip_size": 14,
-    "blackpowder_tolerance": 56,
-    "reload_noise": "chik chik.",
-    "flags": [ "RELOAD_ONE" ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "sights mount", 1 ],
-      [ "sling", 1 ],
-      [ "grip mount", 1 ],
-      [ "rail mount", 1 ],
-      [ "stock mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 14 } } ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "id": "colt_saa",
     "copy-from": "pistol_revolver",

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -131,23 +131,6 @@
     "flags": [ "IRREMOVABLE", "RELOAD_ONE", "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ]
   },
-  {
-    "id": "factory_handguard",
-    "type": "GUNMOD",
-    "name": { "str": "factory handguard" },
-    "description": "A removable molded grip that comes standard on guns without rails.  It's not as efficient as a proper forward grip or bipod at controlling recoil, but it's better than nothing.",
-    "weight": "246 g",
-    "volume": "568ml",
-    "price": "60 USD",
-    "install_time": "5 m",
-    "material": [ "plastic" ],
-    "symbol": ":",
-    "color": "light_gray",
-    "location": "underbarrel mount",
-    "mod_targets": [ "fs2000" ],
-    "handling_modifier": 2,
-    "min_skills": [ [ "weapon", 2 ] ]
-  },
   {
     "id": "grip",
     "type": "GUNMOD",

diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json
@@ -379,5 +379,44 @@
     },
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ]
+  },
+  {
+    "id": "colt_lightning",
+    "copy-from": "rifle_manual",
+    "looks_like": "modular_ar15",
+    "type": "GUN",
+    "name": { "str": "Colt Lightning .45 Carbine" },
+    "description": "A modern reproduction of a Colt pump-action rifle.  Originally chambered in .44-40, modern versions most commonly use .45 Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.",
+    "weight": "2722 g",
+    "volume": "1601 ml",
+    "longest_side": "1106 mm",
+    "barrel_length": "660 mm",
+    "price": "1 kUSD 320 USD",
+    "price_postapoc": "25 USD",
+    "to_hit": -1,
+    "material": [ "steel", "wood" ],
+    "color": "brown",
+    "range": 7,
+    "ammo": [ "45colt" ],
+    "dispersion": 180,
+    "durability": 7,
+    "clip_size": 14,
+    "blackpowder_tolerance": 56,
+    "reload_noise": "chik chik.",
+    "flags": [ "RELOAD_ONE" ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "mechanism", 2 ],
+      [ "muzzle", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "grip mount", 1 ],
+      [ "rail mount", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 14 } } ],
+    "melee_damage": { "bash": 12 }
   }
 ]
diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1468,5 +1468,15 @@
     "id": "cop_38",
     "type": "MIGRATION",
     "replace": "sw_619"
+  },
+  {
+    "id": "fs2000",
+    "type": "MIGRATION",
+    "replace": "rdb_223"
+  },
+  {
+    "id": "factory_handguard",
+    "type": "MIGRATION",
+    "replace": "grip"
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -347,7 +347,6 @@
       "bren2_762",
       "805_bren",
       "bren2_556",
-      "fs2000",
       "robofac_gun",
       "psl",
       "xedra_gun",

diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -14,7 +14,6 @@
       "ts12_aux_shotgun",
       "ts12_aux_shotgun2",
       "inter_bayonet",
-      "factory_handguard",
       "robofac_gun_ar",
       "robofac_gun_dmr",
       "robofac_gun_shotgun",

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -709,7 +709,6 @@
             "ar15": 1,
             "ar_pistol": 1,
             "famas": 1,
-            "fs2000": 1,
             "scar_l": 1,
             "m16a4": 1,
             "m16_auto_rifle": 1,
@@ -854,11 +853,7 @@
           "weight": 8,
           "items": { "combination_gun": 1, "browning_blr": 1, "garand": 1, "m1903": 1, "m1918": 1, "remington_700": 1, "ruger_m77": 1 }
         },
-        {
-          "type": "45colt",
-          "weight": 8,
-          "items": { "colt_lightning": 1, "colt_saa": 1, "bond_410": 1, "taurus_judge": 1 }
-        },
+        { "type": "45colt", "weight": 8, "items": { "colt_saa": 1, "bond_410": 1, "taurus_judge": 1 } },
         { "type": "762R", "weight": 4, "items": { "mosin44": 1, "mosin91_30": 1, "psl": 1 } },
         { "type": "270win", "weight": 3, "items": { "remington700_270": 1 } },
         { "type": "410shot", "weight": 3, "items": { "saiga_410": 1, "shotgun_410": 1 } },
@@ -1096,15 +1091,13 @@
             "bren2_556": 1,
             "bren2_762": 1,
             "browning_blr": 1,
-            "colt_lightning": 1,
             "combination_gun": 1,
             "cx4": 1,
             "cz600": 1,
             "cz600_762": 1,
             "famas": 1,
             "fn_fal": 1,
             "fn_ps90": 1,
-            "fs2000": 1,
             "garand": 1,
             "henry_big_boy": 1,
             "hk417_13": 1,

diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
@@ -204,7 +204,6 @@
       "cx4",
       "emp_gun",
       "fetus",
-      "fs2000",
       "gatling_mech_laser",
       "gatling_mech_laser_single",
       "heavy_atomic_battery_cell",

diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py
@@ -154,7 +154,6 @@
     "p226_357sig",
     "glock_31",
     "p320_357sig",
-    "fs2000",
     "scar_l",
     "brogyaga",
     "raging_bull",