From c8fcd5cf8bf54a58578266bfb869dc9ca14f2a3b Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:19:34 +0200 Subject: [PATCH] A bit more shotguns (#75378) * add tar_12p and it's mags * obsolete and migrate Streetsweeper * variants of ar12_shotgun * finish items, add triple barrel shotgun, add itemgroups * spellchecker fixes * Apply suggestions from code review Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * add weights for shotgun variants --------- Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 15 +- .../Weapons_Mods_Ammo/magazines.json | 3 + .../Weapons_Mods_Ammo/nested_guns.json | 70 +++++- data/json/items/gun/shot.json | 216 ++++++++++++++---- data/json/items/magazine/shot.json | 77 +++++++ .../migration_items.json | 5 + .../firearms/gg_firearms_migration.json | 8 +- .../magazines/gg_magazines_migration.json | 3 + data/mods/TEST_DATA/item_demographics.json | 2 - data/mods/TEST_DATA/legacy_to_hit.json | 1 - .../classic_zombies/items/blacklists.json | 4 +- 11 files changed, 338 insertions(+), 66 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 4720953774c43..8da379ef20ad2 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -499,6 +499,7 @@ { "group": "nested_mossberg_930", "prob": 15 }, { "group": "nested_shotgun_410", "prob": 30 }, { "group": "nested_shotgun_d", "prob": 30 }, + { "group": "nested_shotgun_triple", "prob": 2 }, { "group": "nested_shotgun_s", "prob": 30 } ] }, @@ -565,6 +566,8 @@ { "group": "nested_ksg", "prob": 50 }, { "group": "nested_dp_12", "prob": 3 }, { "group": "nested_srm_1216", "prob": 2 }, + { "group": "nested_ar12_shotgun", "prob": 5 }, + { "group": "nested_gfy_1", "prob": 2 }, { "group": "nested_tavor_12", "prob": 5 }, { "group": "nested_m1014", "prob": 10 }, { "group": "nested_slp", "prob": 10 }, @@ -580,8 +583,11 @@ "entries": [ { "item": "ksg", "prob": 50, "charges": [ 0, 7 ] }, { "item": "srm_1216", "prob": 1, "charges": [ 0, 16 ] }, + { "item": "ar12_shotgun", "prob": 5, "charges": [ 0, -1 ] }, + { "item": "gfy_1", "prob": 2, "charges": [ 0, -1 ] }, { "item": "dp_12", "prob": 2, "charges": [ 0, 14 ] }, { "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] }, + { "item": "shotgun_triple", "prob": 1, "charges": [ 0, 3 ] }, { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] }, { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] }, { "item": "mossberg_590m", "prob": 2, "charges": [ 0, 5 ] } @@ -596,6 +602,8 @@ { "item": "ksg", "prob": 25 }, { "item": "tavor_12", "prob": 5 }, { "item": "srm_1216", "prob": 3 }, + { "item": "ar12_shotgun", "prob": 5 }, + { "item": "gfy_1", "prob": 2 }, { "item": "dp_12", "prob": 4 }, { "item": "mossberg_930", "variant": "m1014", "prob": 10 }, { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10 }, @@ -640,11 +648,7 @@ "id": "guns_shotgun_obscure", "//": "Imported or otherwise very obscure shotguns.", "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ - { "group": "nested_saiga_12", "prob": 50 }, - { "group": "nested_streetsweeper", "prob": 4 }, - { "group": "nested_saiga_410", "prob": 40 } - ] + "items": [ { "group": "nested_saiga_12", "prob": 50 }, { "group": "nested_saiga_410", "prob": 40 } ] }, { "type": "item_group", @@ -653,7 +657,6 @@ "//": "Imported or otherwise very obscure shotguns, unloaded for storage in a gunstore, some violate AWA.", "items": [ { "item": "saiga_12", "prob": 25 }, - { "item": "streetsweeper", "prob": 4 }, { "item": "winchester_1887", "prob": 10 }, { "item": "winchester_1897", "prob": 20 }, { "item": "saiga_410", "prob": 10 } diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index c0e611d2fab4c..932fb710d5dfb 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -484,6 +484,9 @@ { "item": "saiga30mag", "prob": 10 }, { "item": "saiga410mag_10rd", "prob": 30 }, { "item": "saiga410mag_30rd", "prob": 10 }, + { "item": "mka_1919_5", "prob": 4 }, + { "item": "mka_1919_10", "prob": 4 }, + { "item": "mka_1919_20", "prob": 3 }, { "item": "mossberg_590m_mag_5", "prob": 3, "charges": 0 }, { "item": "mossberg_590m_mag_10", "prob": 2, "charges": 0 }, { "item": "mossberg_590m_mag_15", "prob": 1, "charges": 0 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 0a1d7cc73e383..402f2f3650cb4 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -2118,6 +2118,14 @@ "ammo": 100, "entries": [ { "item": "shotgun_d", "charges": [ 0, 2 ] }, { "group": "on_hand_shot" } ] }, + { + "id": "nested_shotgun_triple", + "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": "shotgun_triple", "charges": [ 0, 3 ] }, { "group": "on_hand_shot" } ] + }, { "id": "nested_shotgun_s", "type": "item_group", @@ -2147,6 +2155,60 @@ { "group": "on_hand_shot" } ] }, + { + "id": "nested_ar12_shotgun", + "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": "ar12_shotgun", "charges": [ 0, -1 ] }, + { + "distribution": [ + { + "collection": [ { "item": "mka_1919_5" }, { "item": "mka_1919_5", "prob": 70 }, { "item": "mka_1919_5", "prob": 30 } ], + "prob": 3 + }, + { + "collection": [ { "item": "mka_1919_10" }, { "item": "mka_1919_10", "prob": 70 }, { "item": "mka_1919_10", "prob": 30 } ], + "prob": 2 + }, + { + "collection": [ { "item": "mka_1919_20" }, { "item": "mka_1919_20", "prob": 70 }, { "item": "mka_1919_20", "prob": 30 } ], + "prob": 1 + } + ] + }, + { "group": "on_hand_shot" } + ] + }, + { + "id": "nested_gfy_1", + "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": "gfy_1", "charges": [ 0, -1 ] }, + { + "distribution": [ + { + "collection": [ { "item": "mka_1919_5" }, { "item": "mka_1919_5", "prob": 70 }, { "item": "mka_1919_5", "prob": 30 } ], + "prob": 3 + }, + { + "collection": [ { "item": "mka_1919_10" }, { "item": "mka_1919_10", "prob": 70 }, { "item": "mka_1919_10", "prob": 30 } ], + "prob": 2 + }, + { + "collection": [ { "item": "mka_1919_20" }, { "item": "mka_1919_20", "prob": 70 }, { "item": "mka_1919_20", "prob": 30 } ], + "prob": 1 + } + ] + }, + { "group": "on_hand_shot" } + ] + }, { "id": "nested_ksg", "type": "item_group", @@ -2283,14 +2345,6 @@ { "group": "on_hand_shot" } ] }, - { - "id": "nested_streetsweeper", - "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": "streetsweeper", "charges": [ 0, 12 ] }, { "group": "on_hand_shot" } ] - }, { "id": "nested_saiga_410", "type": "item_group", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index e46938f944afa..132e24802008f 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -524,6 +524,41 @@ "extend": { "flags": [ "RELOAD_ONE" ] }, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ] }, + { + "id": "shotgun_triple", + "copy-from": "shotgun_s", + "type": "GUN", + "name": { "str": "triple-barrelled shotgun" }, + "description": "A pretty modern-looking shotgun that has three barrels.", + "variant_type": "gun", + "variants": [ + { + "id": "triple_honcho", + "name": { "str": "Triple Honcho" }, + "description": "Made by Charles Daly, this modern three-barrel shotgun had a unique balance between how much it cost and how little firepower it could release with its 18.5-inch barrels. Luckily, you do not need to pay the full price for it anymore." + } + ], + "clip_size": 3, + "modes": [ [ "DEFAULT", "single", 1 ] ], + "weight": "2721 g", + "volume": "2926 ml", + "longest_side": "686 mm", + "barrel_length": "469 mm", + "price": "2000 USD", + "price_postapoc": "2 USD", + "valid_mod_locations": [ + [ "barrel", 1 ], + [ "sights mount", 1 ], + [ "sling", 1 ], + [ "mechanism", 2 ], + [ "stock mount", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "underbarrel mount", 1 ] + ], + "extend": { "flags": [ "RELOAD_ONE" ] }, + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 3 } } ] + }, { "id": "shotgun_s", "copy-from": "shotgun_base", @@ -559,51 +594,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ], "melee_damage": { "bash": 12 } }, - { - "id": "streetsweeper", - "copy-from": "shotgun_base", - "type": "GUN", - "name": { "str": "automatic shotgun" }, - "description": "This shotgun, deemed a destructive device, resembles a comically oversized revolver. It can hold 12 rounds of 12 gauge shot, and fire all of them in under 3 seconds", - "variant_type": "gun", - "variants": [ - { - "id": "streetsweeper", - "name": { "str": "Cobray Streetsweeper" }, - "description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch." - } - ], - "weight": "4200 g", - "volume": "3193 ml", - "longest_side": "592 mm", - "barrel_length": "470 mm", - "looks_like": "revolver_shotgun", - "price": "1 kUSD 200 USD", - "price_postapoc": "35 USD", - "to_hit": -1, - "material": [ "steel", "wood" ], - "dispersion": 855, - "durability": 6, - "clip_size": 12, - "reload": 220, - "barrel_volume": "505 ml", - "default_mods": [ "grip" ], - "built_in_mods": [ "wire_stock" ], - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel mount", 1 ] - ], - "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ], - "melee_damage": { "bash": 8 } - }, { "id": "tavor_12", "copy-from": "shotgun_base", @@ -899,6 +889,142 @@ "//": "no provision for separate triggers", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 2 } } ] }, + { + "id": "ar12_shotgun", + "copy-from": "shotgun_pump", + "looks_like": "remington_870", + "type": "GUN", + "name": { "str": "rifle shotgun" }, + "description": "Despite looking like a military-issued rifle, this is, in fact, a shotgun. It can accept a variety of magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "tar_12p", + "name": { "str": "Tokarev TAR 12P" }, + "weight": 327, + "description": "Not related to the Soviet weapon designer, Tokarev, this Turkish shotgun uses an AR-12 shotgun platform to make the user comfortably hold it like a rifle and to utilise MKA 1919 magazines of different sizes." + }, + { + "id": "vr80", + "name": { "str": "VR 80" }, + "weight": 575, + "description": "The work of Rock Island Armoury, this AR-12-style shotgun affords both the comfort of being similar to a rifle and the ability to use MKA 1919 shotgun magazines." + }, + { + "id": "boss25", + "name": { "str": "BOSS 25" }, + "weight": 299, + "description": "Manufactured in Turkey, this work of Farncolin Arms uses an AR-12 shotgun platform to let the user comfortably hold it like a rifle and utilise MKA 1919 magazines of different sizes." + }, + { + "id": "ar12s", + "name": { "str": "AR-12S" }, + "weight": 101, + "description": "Created by Charles Daly, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes." + }, + { + "id": "ar12a", + "name": { "str": "AR-12A" }, + "weight": 98, + "description": "Made by Charles Daly, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes." + }, + { + "id": "gf25", + "name": { "str": "GF25" }, + "weight": 158, + "description": "Work of GForce Arms, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes." + }, + { + "id": "mka1919", + "name": { "str": "MKA 1919" }, + "weight": 85, + "description": "First of its type, this Akdal Arms MKA 1919 looks like a bulky M-4 rifle, and was a parent for numerous shotguns, that soon after got a named \"AR-12 platform\", inspired by Armalite design." + }, + { + "id": "krx", + "name": { "str": "KRX" }, + "weight": 231, + "description": "Created by TriStar Arms, this shotgun uses AR-12 platform to make user comfortably hold it like a rifle, and to utilize MKA 1919 magazines of different sizes." + }, + { + "id": "vr60", + "name": { "str": "VR60" }, + "weight": 109, + "description": "Work of Rock Island Armory, this AR-12 style shotgun afford both the comfort of being similar to rifle, and ability to use MKA 1919 shotgun magazines." + } + ], + "weight": "3335 g", + "volume": "3443 ml", + "longest_side": "990 mm", + "barrel_length": "469 mm", + "price": "320 USD", + "price_postapoc": "12 USD", + "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" }, + "material": [ "steel", "plastic" ], + "dispersion": 425, + "sight_dispersion": 500, + "durability": 7, + "valid_mod_locations": [ + [ "barrel", 1 ], + [ "brass catcher", 1 ], + [ "grip mount", 1 ], + [ "mechanism", 2 ], + [ "muzzle", 1 ], + [ "rail mount", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mka_1919_5", "mka_1919_10", "mka_1919_20" ] } ], + "melee_damage": { "bash": 9 } + }, + { + "id": "gfy_1", + "copy-from": "shotgun_pump", + "looks_like": "remington_870", + "type": "GUN", + "name": { "str": "bullpup shotgun" }, + "description": "A curious magazine-fed shotgun, made using bullpup scheme.", + "variant_type": "gun", + "variants": [ + { + "id": "gfy_1", + "name": { "str": "GFY-1" }, + "weight": 101, + "description": "A work of GForce Arms, this curious bullpup shotgun is compact, familiar to any rifleman, and can use standard MKA 1919 magazines." + }, + { + "id": "bp12", + "name": { "str": "BP-12" }, + "weight": 82, + "description": "Manufactured by Century Arms, it is a compact bullpup shotgun, that accept a variety of MKA 1919 magazines." + } + ], + "weight": "3628 g", + "volume": "3443 ml", + "longest_side": "723 mm", + "barrel_length": "469 mm", + "price": "325 USD", + "price_postapoc": "13 USD", + "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" }, + "material": [ "steel", "plastic" ], + "dispersion": 425, + "sight_dispersion": 500, + "durability": 7, + "valid_mod_locations": [ + [ "barrel", 1 ], + [ "brass catcher", 1 ], + [ "grip mount", 1 ], + [ "mechanism", 2 ], + [ "muzzle", 1 ], + [ "rail mount", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "underbarrel", 1 ] + ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mka_1919_5", "mka_1919_10", "mka_1919_20" ] } ], + "melee_damage": { "bash": 9 } + }, { "id": "srm_1216", "copy-from": "shotgun_pump", diff --git a/data/json/items/magazine/shot.json b/data/json/items/magazine/shot.json index 0383b05278029..5754ce81a1c6c 100644 --- a/data/json/items/magazine/shot.json +++ b/data/json/items/magazine/shot.json @@ -280,5 +280,82 @@ "symbol": "#", "color": "dark_gray", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 20 } } ] + }, + { + "id": "mka_1919_5", + "copy-from": "mka_1919_10", + "type": "MAGAZINE", + "name": { "str": "shotgun 5-round magazine" }, + "description": "5-round box magazine for rifle-like magazine-fed shotguns.", + "variant_type": "gun", + "variants": [ + { + "id": "mka_1919_5", + "name": { "str": "MKA 1919 5-round magazine" }, + "description": "Despite being intended to use with the Akdal MKA 1919, this type of magazines was adopted by multiple Turkish firearm manufacturers, and can be used with almost any Turkish-manufactured mag-fed shotgun. This one is box shaped, and can hold 5 shots." + } + ], + "weight": "313 g", + "volume": "430 ml", + "longest_side": "156 mm", + "price": "27 USD", + "price_postapoc": "1 USD", + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "shot" ], + "flags": [ "MAG_COMPACT" ], + "material": [ "lc_steel", "plastic" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 20 } } ] + }, + { + "id": "mka_1919_10", + "type": "MAGAZINE", + "name": { "str": "shotgun 10-round magazine" }, + "description": "10-round box magazine for rifle-like magazine-fed shotguns.", + "variant_type": "gun", + "variants": [ + { + "id": "mka_1919_10", + "name": { "str": "MKA 1919 10-round magazine" }, + "description": "Despite being intended to use with Akdal MKA 1919, this type of magazine was adopted by multiple Turkish firearm manufactures, and can be used with almost any Turkish-manufactured mag-fed shotgun. This one is box shaped, and can hold 10 shots." + } + ], + "weight": "476 g", + "volume": "696 ml", + "longest_side": "305 mm", + "price": "52 USD", + "price_postapoc": "2 USD", + "material": [ "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "shot" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 10 } } ] + }, + { + "id": "mka_1919_20", + "copy-from": "mka_1919_10", + "type": "MAGAZINE", + "name": { "str": "shotgun 20-round drum magazine" }, + "description": "20-round drum magazine for rifle-like magazine-fed shotguns.", + "variant_type": "gun", + "variants": [ + { + "id": "mka_1919_20", + "name": { "str": "MKA 1919 20-round magazine" }, + "description": "Despite being intended to use with the Akdal MKA 1919, this type of magazine was adopted by multiple Turkish firearm manufacturers, and can be used with almost any Turkish-manufactured mag-fed shotgun. This one is a drum, and can hold 20 shots." + } + ], + "weight": "1424 g", + "volume": "5866 ml", + "longest_side": "356 mm", + "price": "110 USD", + "price_postapoc": "3 USD", + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "shot" ], + "flags": [ "MAG_BULKY" ], + "material": [ "lc_steel", "plastic" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 20 } } ] } ] diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index 205238a082c85..9fcfe43d65702 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -9,6 +9,11 @@ "type": "MIGRATION", "replace": "combat_exoskeleton_armor_head_light" }, + { + "id": "streetsweeper", + "type": "MIGRATION", + "replace": "dp_12" + }, { "id": "power_armor_frame", "type": "MIGRATION", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 386893571198d..8c5f3ccd4e230 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -406,7 +406,7 @@ "replace": "rocket_recoilless" }, { - "id": [ "lever_shotgun", "shotgun_d", "shotgun_s", "winchester_1887", "pipe_shotgun", "winchester_1897" ], + "id": [ "lever_shotgun", "shotgun_d", "shotgun_triple", "shotgun_s", "winchester_1887", "pipe_shotgun", "winchester_1897" ], "type": "MIGRATION", "replace": "shot_double" }, @@ -426,6 +426,9 @@ "tavor_12", "dp_12", "srm_1216", + "shotgun_triple", + "ar12_shotgun", + "gfy_1", "aa_12", "benelli_tsa", "bigun", @@ -444,8 +447,7 @@ "mossberg_590", "mossberg_930", "remington_870", - "remington_870_express", - "streetsweeper" + "remington_870_express" ], "type": "MIGRATION", "replace": "shot_pump" diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 4301b430d5b50..07ec5302b2efa 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -382,6 +382,9 @@ "saiga10mag", "saiga30mag", "srm_1216_mag_16", + "mka_1919_5", + "mka_1919_10", + "mka_1919_20", "afs_raketa30mag", "afs_shot_speedloader8", "USAS10mag", diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 7b982071feff5..54abfa513c0fb 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -811,7 +811,6 @@ "saiga_12": 1, "shotgun_d": 1, "shotgun_s": 1, - "streetsweeper": 1, "tavor_12": 1, "winchester_1887": 1, "winchester_1897": 1, @@ -1267,7 +1266,6 @@ "shotgun_s": 1, "slamfire_shotgun": 1, "slamfire_shotgun_d": 1, - "streetsweeper": 1, "tavor_12": 1, "u_shotgun": 1, "u_shotgun_mod": 1, diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json index 7b212e9dfa06a..fe9eef75d3f15 100644 --- a/data/mods/TEST_DATA/legacy_to_hit.json +++ b/data/mods/TEST_DATA/legacy_to_hit.json @@ -1177,7 +1177,6 @@ "stopcock", "storage_line", "straw_basket", - "streetsweeper", "striped_pants", "subsuit_xl", "suit", diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json index bf78de2e265e9..51ca01c9394ef 100644 --- a/data/mods/classic_zombies/items/blacklists.json +++ b/data/mods/classic_zombies/items/blacklists.json @@ -359,7 +359,6 @@ "sp2022mag_10rd_9mm", "sp2022mag_12rd_9mm", "sp2022mag_15rd_9mm", - "streetsweeper", "sw_500", "500_speedloader5", "taurus_spectrum", @@ -367,6 +366,9 @@ "tavor_12", "dp_12", "srm_1216", + "shotgun_triple", + "ar12_shotgun", + "gfy_1", "TDI", "tdi_mag", "TDI_10",