Remove AF-2011A1 (#74713)

* Main commit * Re-add test DPS
CleverRaven · Jun 22, 2024 · b7a356d · b7a356d
1 parent dda79f6
commit b7a356d
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 80 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -129,7 +129,6 @@
     "//": "Imported or otherwise very obscure pistols that are highly rare, but which are still, mostly, ownable by common civilian's, either normally or via an NFA permit.  For example, reasonably modern and uncommon foreign military pistols and weapons capable of automatic forms of fire can be placed in this item group.  Purely highly rare collector quality and historically valuable guns are handled elsewhere.",
     "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.",
     "items": [
-      { "group": "nested_af2011a1_38super", "prob": 1 },
       { "group": "nested_bfr", "prob": 100 },
       { "group": "nested_m1911-460", "prob": 3 },
       { "group": "nested_makarov", "prob": 100 },
@@ -148,7 +147,6 @@
     "id": "guns_pistol_obscure_display",
     "//": "Very obscure pistols which are illegal to sell.",
     "items": [
-      { "item": "af2011a1_38super", "prob": 25 },
       { "item": "draco", "prob": 30 },
       { "item": "ar_pistol", "prob": 35 },
       { "group": "guns_pistol_collectible", "prob": 1 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -563,7 +563,6 @@
       [ "762x39_clip", 10 ],
       [ "762R_clip", 10 ],
       [ "clip9mm_10rd", 5 ],
-      [ "af2011a1mag", 1 ],
       [ "ak74mag", 10 ],
       [ "makarovmag", 10 ],
       [ "mausermag_10rd", 3 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -942,19 +942,6 @@
       { "group": "on_hand_8x40" }
     ]
   },
-  {
-    "id": "nested_af2011a1_38super",
-    "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": "af2011a1_38super" },
-      { "item": "af2011a1mag" },
-      { "item": "af2011a1mag", "prob": 50 },
-      { "group": "on_hand_38super" }
-    ]
-  },
   {
     "id": "nested_m1911-460",
     "type": "item_group",

diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json
@@ -1,42 +1,4 @@
 [
-  {
-    "id": "af2011a1_38super",
-    "copy-from": "pistol_base",
-    "looks_like": "glock_17",
-    "type": "GUN",
-    "name": { "str_sp": "AF2011A1 .38 Super" },
-    "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.",
-    "weight": "2041 g",
-    "volume": "716 ml",
-    "longest_side": "247 mm",
-    "barrel_length": "125 mm",
-    "price": "4 kUSD 799 USD",
-    "price_postapoc": "20 USD",
-    "to_hit": -2,
-    "material": [ "steel" ],
-    "color": "light_gray",
-    "ammo": [ "38super" ],
-    "dispersion": 520,
-    "durability": 7,
-    "min_cycle_recoil": 225,
-    "blackpowder_tolerance": 48,
-    "modes": [ [ "DEFAULT", "double", 2 ] ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "flags": [ "ALLOWS_BODY_BLOCK" ],
-    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
-    "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "af2011a1mag" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "id": "m1911a1_38super",
     "copy-from": "pistol_base",

diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json
@@ -1,23 +1,4 @@
 [
-  {
-    "id": "af2011a1mag",
-    "//": "Volume and weight through comparison.",
-    "looks_like": "glock17_17",
-    "type": "MAGAZINE",
-    "name": { "str": "AF2011A1 16-round double magazine" },
-    "description": "Two .38 Super 8-round box magazines attached to a single base plate, holding up to 16 rounds in total, used by the AF2011A1 double-barrel pistol.",
-    "weight": "113 g",
-    "volume": "60 ml",
-    "longest_side": "10 cm",
-    "price": "100 USD",
-    "price_postapoc": "1 USD",
-    "material": [ "plastic", "steel" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "38super" ],
-    "flags": [ "MAG_COMPACT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38super": 16 } } ]
-  },
   {
     "id": "m1911mag_10rd_38super",
     "//": "Audited with ImageJ.  Weight from comparison.",

diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json
@@ -418,5 +418,62 @@
     ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 14 } } ],
     "melee_damage": { "bash": 12 }
+  },
+  {
+    "id": "af2011a1mag",
+    "//": "Volume and weight through comparison.",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "AF2011A1 16-round double magazine" },
+    "description": "Two .38 Super 8-round box magazines attached to a single base plate, holding up to 16 rounds in total, used by the AF2011A1 double-barrel pistol.",
+    "weight": "113 g",
+    "volume": "60 ml",
+    "longest_side": "10 cm",
+    "price": "100 USD",
+    "price_postapoc": "1 USD",
+    "material": [ "plastic", "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "38super" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38super": 16 } } ]
+  },
+  {
+    "id": "af2011a1_38super",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str_sp": "AF2011A1 .38 Super" },
+    "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.",
+    "weight": "2041 g",
+    "volume": "716 ml",
+    "longest_side": "247 mm",
+    "barrel_length": "125 mm",
+    "price": "4 kUSD 799 USD",
+    "price_postapoc": "20 USD",
+    "to_hit": -2,
+    "material": [ "steel" ],
+    "color": "light_gray",
+    "ammo": [ "38super" ],
+    "dispersion": 520,
+    "durability": 7,
+    "min_cycle_recoil": 225,
+    "blackpowder_tolerance": 48,
+    "modes": [ [ "DEFAULT", "double", 2 ] ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 2 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "flags": [ "ALLOWS_BODY_BLOCK" ],
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "af2011a1mag" ] } ],
+    "melee_damage": { "bash": 12 }
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -104,7 +104,6 @@
       "walther_ccp",
       "makarov",
       "STI_DS_10",
-      "af2011a1_38super",
       "m1911a1_38super",
       "glock_22",
       "civilian_cop_glock22",

diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json
@@ -12,7 +12,8 @@
       "a180mag1",
       "a180mag2",
       "a180mag3",
-      "a180mag4"
+      "a180mag4",
+      "af2011a1mag"
     ]
   }
 ]
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -6,7 +6,6 @@
   },
   {
     "id": [
-      "af2011a1mag",
       "ppkmag",
       "sigp230mag",
       "p226mag_12rd_357sig",

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -905,7 +905,6 @@
             "glock_31": 1,
             "p320_357sig": 1,
             "colt_navy": 1,
-            "af2011a1_38super": 1,
             "m1911a1_38super": 1,
             "colt_army": 1,
             "ruger_arr": 1,
@@ -957,7 +956,6 @@
           "items": {
             "2_shot_special": 1,
             "90two40": 1,
-            "af2011a1_38super": 1,
             "ar_pistol": 1,
             "ashot": 1,
             "bfr": 1,

diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
@@ -28,8 +28,6 @@
       "90two40",
       "90two40mag",
       "acr_300blk",
-      "af2011a1_38super",
-      "af2011a1mag",
       "alien_pod_resin",
       "arm",
       "arx160",

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
@@ -57,12 +57,14 @@
     'raging_judge',
     'american_180',
     'ppsh',
+    'af2011a1_38super',
     # Magazines
     'a180mag',
     'a180mag1',
     'a180mag2',
     'a180mag3',
     'a180mag4',
+    'af2011a1mag',
     '454_speedloader6',
     '223_speedloader5',
     'coin_wrapper',