Remove Raging Judge, A180, KSG-25, PPSH (#74397)

* Main commit * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * re-add ppsh * Adjust generic guns migration * Re-remove ppsh * Update gg_firearms_migration.json * Readd shotgun gatling gun * Lint * Update data/mods/Generic_Guns/magazines/gg_magazines_migration.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Linting * Update data/mods/Generic_Guns/magazines/gg_magazines_migration.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jun 15, 2024 · 0530835 · 0530835
1 parent d3f8d74
commit 0530835
Show file tree

Hide file tree

Showing 22 changed files with 412 additions and 454 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -3382,7 +3382,6 @@
       [ "balclava", 12 ],
       [ "mask_survivorxl", 2 ],
       [ "combatsaw_off", 1 ],
-      [ "bigun", 2 ],
       [ "ashot", 4 ],
       [ "pickaxe", 1 ],
       [ "makeshift_machete", 4 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -100,7 +100,6 @@
       { "item": "sw_619", "prob": 40 },
       { "item": "bfr", "prob": 10 },
       { "item": "raging_bull", "prob": 15 },
-      { "item": "raging_judge", "prob": 15 },
       { "item": "sw_500", "prob": 10 },
       { "group": "modular_deagle_357", "prob": 2 },
       { "group": "modular_deagle_44", "prob": 5 },
@@ -138,7 +137,6 @@
       { "group": "nested_mr73", "prob": 8 },
       { "group": "nested_pistol_flintlock", "prob": 150 },
       { "group": "nested_raging_bull", "prob": 100 },
-      { "group": "nested_raging_judge", "prob": 20 },
       { "group": "nested_tokarev", "prob": 100 },
       { "group": "nested_walther_ppk", "prob": 100 },
       { "group": "guns_pistol_collectible", "prob": 1 }
@@ -258,7 +256,7 @@
     "id": "guns_smg_obscure",
     "subtype": "distribution",
     "//": "Imported or otherwise very obscure SMGs.",
-    "items": [ { "item": "ppsh", "prob": 50 }, { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ]
+    "items": [ { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ]
   },
   {
     "type": "item_group",
@@ -564,7 +562,6 @@
     "subtype": "distribution",
     "entries": [
       { "group": "nested_ksg", "prob": 50 },
-      { "group": "nested_ksg-25", "prob": 8 },
       { "group": "nested_tavor_12", "prob": 5 },
       { "group": "nested_m1014", "prob": 10 },
       { "group": "nested_slp", "prob": 10 }
@@ -578,7 +575,6 @@
     "subtype": "distribution",
     "entries": [
       { "item": "ksg", "prob": 50, "charges": [ 0, 7 ] },
-      { "item": "ksg-25", "prob": 8, "charges": [ 0, 12 ] },
       { "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] },
       { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] },
       { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] }
@@ -659,7 +655,6 @@
     "//": "Makeshift or otherwise poor quality shotguns.",
     "items": [
       { "item": "blunderbuss", "prob": 70 },
-      { "item": "bigun", "prob": 10, "charges": [ 0, 6 ] },
       { "item": "pipe_double_shotgun", "prob": 70, "charges": [ 0, 2 ] },
       { "item": "pipe_shotgun", "prob": 100 },
       { "item": "revolver_shotgun", "prob": 30, "charges": [ 0, 6 ] }

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -377,7 +377,6 @@
       { "item": "sw_500", "prob": 15 },
       { "item": "walther_p38", "prob": 10 },
       { "item": "raging_bull", "prob": 10 },
-      { "item": "raging_judge", "prob": 20 },
       { "item": "mauser_m714", "prob": 15 },
       { "item": "m1911-460", "prob": 10 },
       { "item": "bfr", "prob": 10 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -207,7 +207,6 @@
       [ "22_speedloader8", 15 ],
       [ "44_speedloader6", 15 ],
       [ "454_speedloader5", 5 ],
-      [ "454_speedloader6", 5 ],
       [ "500_speedloader5", 5 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
@@ -256,8 +255,7 @@
       { "item": "38_speedloader", "prob": 40, "charges": 0 },
       { "item": "40_speedloader6", "prob": 30, "charges": 0 },
       { "item": "44_speedloader6", "prob": 30, "charges": 0 },
-      { "item": "454_speedloader5", "prob": 20, "charges": 0 },
-      { "item": "454_speedloader6", "prob": 20, "charges": 0 }
+      { "item": "454_speedloader5", "prob": 20, "charges": 0 }
     ]
   },
   {
@@ -304,11 +302,6 @@
     "id": "mags_smg_rare",
     "//": "Aftermarket or otherwise uncommon SMG magazines excluding milspec.",
     "items": [
-      [ "a180mag", 1 ],
-      [ "a180mag1", 1 ],
-      [ "a180mag2", 1 ],
-      [ "a180mag3", 1 ],
-      [ "a180mag4", 1 ],
       [ "calicomag", 19 ],
       [ "calicomag_100rd", 15 ],
       [ "fnp90mag", 150 ],
@@ -573,8 +566,6 @@
       [ "mp40mag_32rd", 5 ],
       [ "p08mag_32rd", 1 ],
       [ "p08mag_8rd", 10 ],
-      [ "ppshmag", 10 ],
-      [ "ppshdrum", 10 ],
       [ "rpk74mag", 10 ],
       [ "tokarevmag", 10 ],
       [ "greasegun30mag", 5 ]

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -913,14 +913,6 @@
     "ammo": 100,
     "entries": [ { "item": "raging_bull" }, { "group": "on_hand_454" } ]
   },
-  {
-    "id": "nested_raging_judge",
-    "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": "raging_judge" }, { "group": "on_hand_454" } ]
-  },
   {
     "id": "nested_tokarev",
     "type": "item_group",
@@ -1213,19 +1205,6 @@
       { "group": "on_hand_45" }
     ]
   },
-  {
-    "id": "nested_american_180",
-    "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": "american_180", "charges": [ 0, 100 ] },
-      { "item": "a180mag" },
-      { "item": "a180mag", "prob": 50 },
-      { "group": "on_hand_22" }
-    ]
-  },
   {
     "id": "nested_briefcase_smg",
     "type": "item_group",
@@ -2140,14 +2119,6 @@
     "ammo": 100,
     "entries": [ { "item": "ksg", "charges": [ 0, 7 ] }, { "group": "on_hand_shot" } ]
   },
-  {
-    "id": "nested_ksg-25",
-    "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": "ksg", "charges": [ 0, 12 ] }, { "group": "on_hand_shot" } ]
-  },
   {
     "id": "nested_tavor_12",
     "type": "item_group",

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -1,57 +1,4 @@
 [
-  {
-    "id": "american_180",
-    "looks_like": "hk_mp5",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": ".22 caliber submachine gun" },
-    "description": "A dramatically uncommon automatic weapon, making use of high-capacity pan magazines and firing the low power .22 caliber cartridge: an unusual ammunition choice for a submachine gun.  With negligible recoil on account of its modest cartridge and a suppressively high rate of fire, a burst of .22 LR rounds from this little machine gun can be best likened with a swarm of hornets… an incredibly angry swarm of hornets.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "american_180",
-        "name": { "str": "American-180 submachine gun" },
-        "description": "The American-180 is a submachine gun developed in the 1960s that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon."
-      }
-    ],
-    "weight": "2585 g",
-    "volume": "2200 ml",
-    "longest_side": "905 mm",
-    "barrel_length": "470 mm",
-    "price": "1 kUSD 630 USD",
-    "price_postapoc": "25 USD",
-    "to_hit": -2,
-    "material": [ "steel" ],
-    "symbol": "(",
-    "color": "light_gray",
-    "range": 6,
-    "ammo": [ "22" ],
-    "skill": "smg",
-    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
-    "dispersion": 280,
-    "durability": 6,
-    "min_cycle_recoil": 39,
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ],
-    "barrel_volume": "250 ml",
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "stock accessory", 2 ],
-      [ "underbarrel", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "pocket_data": [
-      { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "a180mag", "a180mag1", "a180mag2", "a180mag3", "a180mag4" ] }
-    ],
-    "melee_damage": { "bash": 11 }
-  },
   {
     "id": "marlin_9a",
     "looks_like": "ar15",

diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json
@@ -31,27 +31,5 @@
       }
     ],
     "melee_damage": { "bash": 12 }
-  },
-  {
-    "id": "raging_judge",
-    "copy-from": "raging_bull",
-    "looks_like": "sw_619",
-    "type": "GUN",
-    "name": { "str_sp": "Taurus Raging Judge Magnum" },
-    "description": "The Taurus Raging Judge Magnum is a 6-shot revolver chambered in .454 Casull.  It can fire .410 shotshells and .45 Colt cartridges as well.",
-    "weight": "2070 g",
-    "volume": "1175 ml",
-    "longest_side": "385 mm",
-    "barrel_length": "241 mm",
-    "//": "165.1 + 76mm max OAL for .410 3in. Revolvers just built different.",
-    "clip_size": 6,
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE",
-        "holster": true,
-        "ammo_restriction": { "454": 6, "410shot": 6, "45colt": 6 },
-        "allowed_speedloaders": [ "454_speedloader6" ]
-      }
-    ]
   }
 ]
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
@@ -1,55 +1,4 @@
 [
-  {
-    "id": "ppsh",
-    "looks_like": "hk_mp5",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "PPSh-41 submachine gun" },
-    "description": "The Soviet-made PPSh-41 is a mass-produced selective-fire submachine gun.  It has a relatively high rate of fire.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "ppsh",
-        "name": { "str": "PPSh-41 submachine gun" },
-        "description": "A bulky and simple Second World War submachine gun of Russian manufacture, composed from a basic wooden buttstock, steel barrel shroud, and the hopes and prayers of Soviet soldiers under threat of German invasion.  Designed for mass production with limited materials, the weapon is notable for its high-capacity drum magazines, capability of rapidly depleting said magazines, and vicious 7.62x25mm chambering."
-      }
-    ],
-    "weight": "3640 g",
-    "volume": "2873 ml",
-    "longest_side": "844 mm",
-    "barrel_length": "269 mm",
-    "price": "2 kUSD 800 USD",
-    "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
-    "material": [ "steel", "wood" ],
-    "symbol": "(",
-    "color": "brown",
-    "ammo": [ "762x25" ],
-    "skill": "smg",
-    "range": 2,
-    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
-    "dispersion": 120,
-    "durability": 8,
-    "min_cycle_recoil": 270,
-    "barrel_volume": "500 ml",
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "stock mount", 1 ],
-      [ "stock accessory", 2 ],
-      [ "underbarrel", 1 ],
-      [ "rail mount", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ppshmag", "ppshdrum" ] } ],
-    "melee_damage": { "bash": 10 }
-  },
   {
     "id": "tokarev",
     "copy-from": "pistol_base",

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -104,50 +104,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 7 } } ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "ksg-25",
-    "copy-from": "shotgun_pump",
-    "looks_like": "remington_870",
-    "type": "GUN",
-    "name": { "str": "extended bullpup shotgun" },
-    "description": "This pump-action shotgun uses a system of twin magazines to carry 24 total rounds of 12-gauge shotgun shells.  Each tube must be loaded separately, but this offers the option of loading different ammunition for different situations.  As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's still only as long as conventional shotguns despite having a comparatively far higher capacity.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "ksg-25",
-        "name": { "str": "Kel-Tec KSG-25 shotgun" },
-        "description": "A bullpup pump-action shotgun, the Kel-Tec KSG-25 uses a pair of magazine tubes to increase its capacity.  Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.  The big brother of the KSG, it has a longer barrel and longer magazine tubes."
-      }
-    ],
-    "ascii_picture": "ksg-25",
-    "weight": "2100 g",
-    "volume": "4495 ml",
-    "longest_side": "971 mm",
-    "barrel_length": "775 mm",
-    "price": "1 kUSD 400 USD",
-    "price_postapoc": "40 USD",
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
-    "dispersion": 425,
-    "sight_dispersion": 500,
-    "durability": 7,
-    "clip_size": 12,
-    "built_in_mods": [ "ksg25_aux_shotgun" ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip mount", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail mount", 1 ],
-      [ "sights", 1 ],
-      [ "sling", 1 ],
-      [ "underbarrel", 2 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ],
-    "melee_damage": { "bash": 9 }
-  },
   {
     "id": "mossberg_500",
     "copy-from": "shotgun_pump_3gun",

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -274,35 +274,6 @@
     "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 7 } } ]
   },
-  {
-    "id": "ksg25_aux_shotgun",
-    "copy-from": "underbarrel_base",
-    "type": "GUNMOD",
-    "name": { "str": "KSG-25 second magazine" },
-    "description": "The integrated second tube magazine of the Kel-Tec KSG-25, which holds 12 shots.  It's irremovable.",
-    "weight": "1550 g",
-    "volume": "1750 ml",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "install_time": "0 s",
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "shotgun" ],
-    "gun_data": {
-      "barrel_length": "775 mm",
-      "ammo": "shot",
-      "skill": "shotgun",
-      "ranged_damage": { "damage_type": "bullet", "amount": 5 },
-      "dispersion": 425,
-      "durability": 7,
-      "clip_size": 12,
-      "reload": 120
-    },
-    "flags": [ "RELOAD_ONE", "IRREMOVABLE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ]
-  },
   {
     "id": "ts12_aux_shotgun",
     "copy-from": "underbarrel_base",