From 2d2bb284d093774a3f341e313dac5959d959f857 Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 8 Jun 2024 11:35:00 -0600 Subject: [PATCH 01/11] Main commit --- .../itemgroups/Clothing_Gear/clothing.json | 1 - .../itemgroups/Weapons_Mods_Ammo/guns.json | 7 +- .../Weapons_Mods_Ammo/guns_by_calibre.json | 1 - .../Weapons_Mods_Ammo/magazines.json | 11 +- .../Weapons_Mods_Ammo/nested_guns.json | 29 -- data/json/items/gun/22.json | 53 --- data/json/items/gun/454.json | 22 - data/json/items/gun/762x25.json | 51 --- data/json/items/gun/shot.json | 69 --- data/json/items/gunmod/underbarrel.json | 29 -- data/json/items/magazine/22.json | 135 ------ data/json/items/magazine/454.json | 8 - data/json/items/magazine/762x25.json | 39 -- .../obsoletion_and_migration_0.I/gun.json | 408 ++++++++++++++++++ data/json/recipes/weapon/ranged.json | 38 -- .../BombasticPerks/perkdata/old_guns.json | 7 - .../firearms/gg_firearm_blacklist.json | 8 + .../firearms/gg_firearms_migration.json | 8 +- .../magazines/gg_magazines_blacklist.json | 16 +- .../magazines/gg_magazines_migration.json | 8 - data/mods/TEST_DATA/item_demographics.json | 8 - .../Xedra_Evolved/recipes/inventor/gun.json | 1 - tests/ranged_balance_test.cpp | 2 +- 23 files changed, 436 insertions(+), 523 deletions(-) create mode 100644 data/json/obsoletion_and_migration_0.I/gun.json create mode 100644 data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index dec0b50ebe3bf..26752acd6a76f 100644 --- 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 index aff0301576d2d..f32004c010f0c 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -101,7 +101,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 }, @@ -140,7 +139,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 } @@ -260,7 +258,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", @@ -570,7 +568,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 } @@ -584,7 +581,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 ] } @@ -665,7 +661,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 index cb24a45f39fd0..dd580c2aa8f3e 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -389,7 +389,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 index 0b64eb7cb7030..58763e0e23e1d 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -208,7 +208,6 @@ [ "22_speedloader8", 15 ], [ "44_speedloader6", 15 ], [ "454_speedloader5", 5 ], - [ "454_speedloader6", 5 ], [ "500_speedloader5", 5 ], [ "glock_drum_50rd", 5 ], [ "glock_drum_100rd", 5 ], @@ -258,8 +257,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 } ] }, { @@ -306,11 +304,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 ], @@ -579,8 +572,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 index 7240c79803e74..ae8f9c07ab970 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -939,14 +939,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", @@ -1247,19 +1239,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", @@ -2174,14 +2153,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 index cb581e38be6d5..6763043709aa2 100644 --- 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 index 17325ff882cdd..efb4f42e5604c 100644 --- 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 index 3c030aea0d8d7..37fdce1c2f49a 100644 --- 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 index 59320fdd4fe20..5c25510f77902 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -36,31 +36,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ], "melee_damage": { "bash": 6 } }, - { - "id": "bigun", - "copy-from": "shotgun_base", - "looks_like": "remington_870", - "type": "GUN", - "name": { "str": "12-gauge gatling gun" }, - "description": "An electrically driven six barrel gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", - "weight": "4980 g", - "volume": "4500 ml", - "longest_side": "110 cm", - "barrel_length": "762 mm", - "price": "1 kUSD 800 USD", - "price_postapoc": "17 USD 50 cent", - "to_hit": -2, - "material": [ "steel" ], - "dispersion": 855, - "durability": 8, - "modes": [ [ "DEFAULT", "burst", 6 ] ], - "energy_drain": "1 kJ", - "reload": 200, - "valid_mod_locations": [ [ "sights", 1 ], [ "rail mount", 1 ] ], - "flags": [ "MOUNTED_GUN", "USE_UPS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ], - "melee_damage": { "bash": 9 } - }, { "id": "ksg", "copy-from": "shotgun_pump", @@ -104,50 +79,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 index d58e40cce7b69..8706e7b7fb455 100644 --- 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", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index cbef3e693d6a7..32cc904fbeb34 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -16,141 +16,6 @@ "flags": [ "SPEEDLOADER" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 8 } } ] }, - { - "id": "a180mag", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": ".22 165-round magazine" }, - "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.", - "variant_type": "gun", - "variants": [ - { - "id": "a180mag", - "name": { "str": "American-180 165-round magazine" }, - "description": "An unusually-shaped pan magazine for the American-180." - } - ], - "weight": "1039 g", - "volume": "892 ml", - "longest_side": "14 cm", - "price": "73 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "reload_time": 150, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ] - }, - { - "id": "a180mag1", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": ".22 165-round polymer magazine" }, - "description": "An unusually-shaped polymer constructed pan magazine for use with .22 caliber submachine guns.", - "variant_type": "gun", - "variants": [ - { - "id": "a180mag1", - "name": { "str": "American-180 polymer 165-round magazine" }, - "description": "An unusually-shaped, polymer pan magazine for the American-180." - } - ], - "weight": "779 g", - "volume": "892 ml", - "longest_side": "14 cm", - "price": "73 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "reload_time": 150, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ] - }, - { - "id": "a180mag2", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": ".22 177-round magazine" }, - "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.", - "variant_type": "gun", - "variants": [ - { - "id": "a180mag2", - "name": { "str": "American-180 177-round magazine" }, - "description": "An unusually-shaped pan magazine for the American-180." - } - ], - "weight": "1133 g", - "volume": "973 ml", - "longest_side": "15 cm", - "price": "75 USD", - "price_postapoc": "3 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "reload_time": 150, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 177 } } ] - }, - { - "id": "a180mag3", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": ".22 220-round polymer magazine" }, - "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.", - "variant_type": "gun", - "variants": [ - { - "id": "a180mag3", - "name": { "str": "American-180 polymer 220-round magazine" }, - "description": "An unusually-shaped polymer pan magazine for the American-180." - } - ], - "weight": "1258 g", - "volume": "1081 ml", - "longest_side": "16 cm", - "price": "80 USD", - "price_postapoc": "4 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "reload_time": 150, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 220 } } ] - }, - { - "id": "a180mag4", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": ".22 275-round polymer magazine" }, - "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.", - "variant_type": "gun", - "variants": [ - { - "id": "a180mag4", - "name": { "str": "American-180 polymer 275-round magazine" }, - "description": "An unusually-shaped polymer pan magazine for the American-180." - } - ], - "weight": "1258 g", - "volume": "1081 ml", - "longest_side": "17 cm", - "price": "80 USD", - "price_postapoc": "4 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "reload_time": 150, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] - }, { "id": "marlin_tubeloader", "looks_like": "stanag30", diff --git a/data/json/items/magazine/454.json b/data/json/items/magazine/454.json index bdcb876fb7a3f..69d843f6c09d8 100644 --- a/data/json/items/magazine/454.json +++ b/data/json/items/magazine/454.json @@ -16,13 +16,5 @@ "ammo_type": [ "454", "45colt", "410shot" ], "flags": [ "SPEEDLOADER" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 5, "45colt": 5, "410shot": 5 } } ] - }, - { - "id": "454_speedloader6", - "copy-from": "454_speedloader5", - "type": "MAGAZINE", - "name": { "str": ".454 6-round speedloader" }, - "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 6, "45colt": 6, "410shot": 6 } } ] } ] diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json index b71ae44eaa91e..9d32ed5f0e814 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -1,43 +1,4 @@ [ - { - "id": "ppshdrum", - "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 71-round drum magazine" }, - "description": "A high-capacity drum magazine for the PPSh-41.", - "weight": "1760 g", - "volume": "911 ml", - "longest_side": "14 cm", - "price": "70 USD", - "price_postapoc": "5 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "reload_time": 190, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] - }, - { - "id": "ppshmag", - "//": "Audited with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 35-round magazine" }, - "description": "A 35-round box magazine for the PPSh-41.", - "weight": "312 g", - "volume": "184 ml", - "longest_side": "230 mm", - "price": "22 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] - }, { "id": "tokarevmag", "//": "Audited from schematics.", diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json new file mode 100644 index 0000000000000..2f7ff03ff158b --- /dev/null +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -0,0 +1,408 @@ +[ + { + "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": "ppshdrum", + "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 71-round drum magazine" }, + "description": "A high-capacity drum magazine for the PPSh-41.", + "weight": "1760 g", + "volume": "911 ml", + "longest_side": "14 cm", + "price": "70 USD", + "price_postapoc": "5 USD", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "reload_time": 190, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] + }, + { + "id": "ppshmag", + "//": "Audited with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 35-round magazine" }, + "description": "A 35-round box magazine for the PPSh-41.", + "weight": "312 g", + "volume": "184 ml", + "longest_side": "230 mm", + "price": "22 USD", + "price_postapoc": "2 USD 50 cent", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] + }, + { + "id": "a180mag", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": ".22 165-round magazine" }, + "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.", + "variant_type": "gun", + "variants": [ + { + "id": "a180mag", + "name": { "str": "American-180 165-round magazine" }, + "description": "An unusually-shaped pan magazine for the American-180." + } + ], + "weight": "1039 g", + "volume": "892 ml", + "longest_side": "14 cm", + "price": "73 USD", + "price_postapoc": "2 USD 50 cent", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "reload_time": 150, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ] + }, + { + "id": "a180mag1", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": ".22 165-round polymer magazine" }, + "description": "An unusually-shaped polymer constructed pan magazine for use with .22 caliber submachine guns.", + "variant_type": "gun", + "variants": [ + { + "id": "a180mag1", + "name": { "str": "American-180 polymer 165-round magazine" }, + "description": "An unusually-shaped, polymer pan magazine for the American-180." + } + ], + "weight": "779 g", + "volume": "892 ml", + "longest_side": "14 cm", + "price": "73 USD", + "price_postapoc": "2 USD 50 cent", + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "reload_time": 150, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 165 } } ] + }, + { + "id": "a180mag2", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": ".22 177-round magazine" }, + "description": "An unusually-shaped pan magazine for use with .22 caliber submachine guns.", + "variant_type": "gun", + "variants": [ + { + "id": "a180mag2", + "name": { "str": "American-180 177-round magazine" }, + "description": "An unusually-shaped pan magazine for the American-180." + } + ], + "weight": "1133 g", + "volume": "973 ml", + "longest_side": "15 cm", + "price": "75 USD", + "price_postapoc": "3 USD", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "reload_time": 150, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 177 } } ] + }, + { + "id": "a180mag3", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": ".22 220-round polymer magazine" }, + "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.", + "variant_type": "gun", + "variants": [ + { + "id": "a180mag3", + "name": { "str": "American-180 polymer 220-round magazine" }, + "description": "An unusually-shaped polymer pan magazine for the American-180." + } + ], + "weight": "1258 g", + "volume": "1081 ml", + "longest_side": "16 cm", + "price": "80 USD", + "price_postapoc": "4 USD", + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "reload_time": 150, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 220 } } ] + }, + { + "id": "a180mag4", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": ".22 275-round polymer magazine" }, + "description": "An unusually-shaped polymer pan magazine for use with .22 caliber submachine guns.", + "variant_type": "gun", + "variants": [ + { + "id": "a180mag4", + "name": { "str": "American-180 polymer 275-round magazine" }, + "description": "An unusually-shaped polymer pan magazine for the American-180." + } + ], + "weight": "1258 g", + "volume": "1081 ml", + "longest_side": "17 cm", + "price": "80 USD", + "price_postapoc": "4 USD", + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "22" ], + "reload_time": 150, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 275 } } ] + }, + { + "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": "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" ] + } + ] + }, + { + "id": "454_speedloader6", + "copy-from": "454_speedloader5", + "type": "MAGAZINE", + "name": { "str": ".454 6-round speedloader" }, + "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 6, "45colt": 6, "410shot": 6 } } ] + }, + { + "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": "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": "bigun", + "copy-from": "shotgun_base", + "looks_like": "remington_870", + "type": "GUN", + "name": { "str": "12-gauge gatling gun" }, + "description": "An electrically driven six barrel gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", + "weight": "4980 g", + "volume": "4500 ml", + "longest_side": "110 cm", + "barrel_length": "762 mm", + "price": "1 kUSD 800 USD", + "price_postapoc": "17 USD 50 cent", + "to_hit": -2, + "material": [ "steel" ], + "dispersion": 855, + "durability": 8, + "modes": [ [ "DEFAULT", "burst", 6 ] ], + "energy_drain": "1 kJ", + "reload": 200, + "valid_mod_locations": [ [ "sights", 1 ], [ "rail mount", 1 ] ], + "flags": [ "MOUNTED_GUN", "USE_UPS" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ], + "melee_damage": { "bash": 9 } + } +] diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 2d4b49b616100..7f55fcdfc4a6a 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -992,44 +992,6 @@ "decomp_learn": 0, "components": [ [ [ "m26_mass", 1 ], [ "m26_mass_mod", 1 ] ], [ [ "m26_mass_stock", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "bigun", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "fabrication", - "skills_required": [ [ "traps", 2 ], [ "mechanics", 5 ], [ "gun", 2 ] ], - "difficulty": 7, - "time": "12 h", - "book_learn": [ [ "manual_shotgun", 2 ] ], - "//": "160cm weld", - "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 160 ] ], - "proficiencies": [ - { "proficiency": "prof_metalworking" }, - { "proficiency": "prof_welding_basic" }, - { "proficiency": "prof_gunsmithing_basic" }, - { "proficiency": "prof_gunsmithing_improv" } - ], - "qualities": [ - { "id": "SAW_M", "level": 1 }, - { "id": "SAW_M_FINE", "level": 1 }, - { "id": "SCREW_FINE", "level": 1 }, - { "id": "WRENCH_FINE", "level": 1 } - ], - "components": [ - [ [ "xlframe", 1 ] ], - [ [ "simple_crank", 1 ], [ "foot_crank", 1 ] ], - [ [ "sheet_metal_small", 12 ] ], - [ [ "pipe", 6 ] ], - [ [ "chain", 1 ] ], - [ [ "motor_tiny", 1 ] ], - [ [ "power_supply", 2 ] ], - [ [ "cable", 4 ] ], - [ [ "spring", 7 ] ], - [ [ "scrap", 2 ] ] - ] - }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/mods/BombasticPerks/perkdata/old_guns.json b/data/mods/BombasticPerks/perkdata/old_guns.json index 45df01214e5f3..3bff54ec2ba86 100644 --- a/data/mods/BombasticPerks/perkdata/old_guns.json +++ b/data/mods/BombasticPerks/perkdata/old_guns.json @@ -223,13 +223,6 @@ "name": { "str": "6-round trenchgun" }, "extend": { "flags": [ "OLD_GUN" ] } }, - { - "id": "ppsh", - "type": "GUN", - "copy-from": "ppsh", - "name": { "str": "PPSh-41 submachine gun" }, - "extend": { "flags": [ "OLD_GUN" ] } - }, { "id": "number4_mki", "type": "GUN", diff --git a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json new file mode 100644 index 0000000000000..c4236fd286014 --- /dev/null +++ b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json @@ -0,0 +1,8 @@ +[ + { + "type": "ITEM_BLACKLIST", + "whitelist": false, + "//": "Used for obsoleteing guns without a viable migration target", + "items": [ "ksg-25", "bigun", "ppsh", "raging_judge", "american_180" ] + } +] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 1f68f667e28a5..f171d885d6312 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -71,7 +71,7 @@ "replace": "pistol_magnum_pipe" }, { - "id": [ "sw_619", "mr73", "sw629", "bfr", "sw_500", "raging_bull", "raging_judge" ], + "id": [ "sw_619", "mr73", "sw629", "bfr", "sw_500", "raging_bull" ], "type": "MIGRATION", "replace": "pistol_magnum_revolver" }, @@ -158,7 +158,6 @@ }, { "id": [ - "ppsh", "hk_mp5", "hk_mp5sd", "uzi", @@ -181,7 +180,7 @@ "replace": "pistol_smg" }, { - "id": [ "american_180", "ruger_1022" ], + "id": [ "ruger_1022" ], "type": "MIGRATION", "replace": "pistol_tiny_rifle" }, @@ -411,13 +410,11 @@ "rm120c", "rm228", "rm20", - "bigun", "saiga_12", "afs_raketa_shotgun", "tavor_12", "aa_12", "benelli_tsa", - "bigun", "USAS_12" ], "type": "MIGRATION", @@ -428,7 +425,6 @@ "shotgun_410", "benelli_sa", "ksg", - "ksg-25", "mossberg_500", "mossberg_590", "mossberg_930", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index e309e87f90e53..825ebe7cca785 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -2,6 +2,20 @@ { "type": "ITEM_BLACKLIST", "whitelist": false, - "items": [ "m74_clip", "exodiisapramag5", "robofac_gun_40mm_10rd", "robofac_gun_40mm_5rd", "robofac_gun_40mm_3rd" ] + "items": [ + "m74_clip", + "exodiisapramag5", + "robofac_gun_40mm_10rd", + "robofac_gun_40mm_5rd", + "robofac_gun_40mm_3rd", + "a180mag", + "a180mag1", + "a180mag2", + "a180mag3", + "a180mag4", + "454_speedloader6", + "ppshdrum", + "ppshmag" + ] } ] diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 50f7e53b206be..53e85a43046af 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -131,8 +131,6 @@ "robofacmultimag", "5x50_100_mag", "5x50_50_mag", - "ppshdrum", - "ppshmag", "calicomag", "calicomag_100rd", "glockbigmag", @@ -188,7 +186,6 @@ "40_speedloader6", "44_speedloader6", "454_speedloader5", - "454_speedloader6", "460_speedloader6", "500_speedloader5", "8x40_speedloader5", @@ -200,11 +197,6 @@ }, { "id": [ - "a180mag", - "a180mag1", - "a180mag2", - "a180mag3", - "a180mag4", "mosquitomag", "ruger1022bigmag", "ruger1022mag", diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 656894d7b732f..1dbe102dba6c0 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -789,10 +789,8 @@ "weight": 26, "items": { "ashot": 1, - "bigun": 1, "lever_shotgun": 1, "ksg": 1, - "ksg-25": 1, "mossberg_500": 1, "mossberg_500_security": 1, "mossberg_590": 1, @@ -934,7 +932,6 @@ "fn_p90": 1, "p50": 1, "ruger_57": 1, - "ppsh": 1, "tokarev": 1, "rm103a_pistol": 1, "rm11b_sniper_rifle": 1, @@ -1023,7 +1020,6 @@ "px4": 1, "px4_40": 1, "raging_bull": 1, - "raging_judge": 1, "remington_870_breacher": 1, "rm103a_pistol": 1, "rm228": 1, @@ -1227,7 +1223,6 @@ "mac_11": 1, "mp40": 1, "mp40semi": 1, - "ppsh": 1, "rm2000_smg": 1, "skorpion_61": 1, "skorpion_82": 1, @@ -1245,11 +1240,8 @@ "type": "shotguns", "weight": 27, "items": { - "bigun": 1, "combination_gun_shotgun": 1, "ksg": 1, - "ksg-25": 1, - "ksg25_aux_shotgun": 1, "ksg_aux_shotgun": 1, "lever_shotgun": 1, "m26_mass": 1, diff --git a/data/mods/Xedra_Evolved/recipes/inventor/gun.json b/data/mods/Xedra_Evolved/recipes/inventor/gun.json index 2418d1eff73e7..bc6b5c8595900 100644 --- a/data/mods/Xedra_Evolved/recipes/inventor/gun.json +++ b/data/mods/Xedra_Evolved/recipes/inventor/gun.json @@ -359,7 +359,6 @@ [ "remington_870", 1 ], [ "remington_870_express", 1 ], [ "ksg", 1 ], - [ "ksg-25", 1 ], [ "saiga_12", 1 ], [ "tavor_12", 1 ], [ "winchester_1897", 1 ] diff --git a/tests/ranged_balance_test.cpp b/tests/ranged_balance_test.cpp index 6afc3f84ca172..2d624603d5d87 100644 --- a/tests/ranged_balance_test.cpp +++ b/tests/ranged_balance_test.cpp @@ -354,7 +354,7 @@ TEST_CASE( "expert_shooter_accuracy", "[ranged] [balance]" ) test_fast_shooting( shooter, 60, 0.5 ); } SECTION( "an expert shooter with an excellent smg" ) { - arm_shooter( shooter, "ppsh", { "holo_sight" } ); + arm_shooter( shooter, "fn_p90", { "holo_sight" } ); test_shooting_scenario( shooter, 20, 30, 190 ); test_fast_shooting( shooter, 60, 0.5 ); } From 0ce91ff9c2c5d4a4af238307c83ac5332d482192 Mon Sep 17 00:00:00 2001 From: Holli <78005870+Holli-Git@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:49:37 -0600 Subject: [PATCH 02/11] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/obsoletion_and_migration_0.I/gun.json | 10 +++++----- .../Generic_Guns/firearms/gg_firearm_blacklist.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json index 2f7ff03ff158b..49d52127a5fdb 100644 --- a/data/json/obsoletion_and_migration_0.I/gun.json +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -277,7 +277,7 @@ ], "melee_damage": { "bash": 11 } }, - { + { "id": "raging_judge", "copy-from": "raging_bull", "looks_like": "sw_619", @@ -299,7 +299,7 @@ } ] }, - { + { "id": "454_speedloader6", "copy-from": "454_speedloader5", "type": "MAGAZINE", @@ -307,7 +307,7 @@ "description": "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and quickly reload a compatible revolver.", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "454": 6, "45colt": 6, "410shot": 6 } } ] }, - { + { "id": "ksg-25", "copy-from": "shotgun_pump", "looks_like": "remington_870", @@ -351,7 +351,7 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 12 } } ], "melee_damage": { "bash": 9 } }, - { + { "id": "ksg25_aux_shotgun", "copy-from": "underbarrel_base", "type": "GUNMOD", @@ -380,7 +380,7 @@ "flags": [ "RELOAD_ONE", "IRREMOVABLE" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ] }, - { + { "id": "bigun", "copy-from": "shotgun_base", "looks_like": "remington_870", diff --git a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json index c4236fd286014..e9487aa7f6d9a 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json +++ b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json @@ -2,7 +2,7 @@ { "type": "ITEM_BLACKLIST", "whitelist": false, - "//": "Used for obsoleteing guns without a viable migration target", + "//": "Used for obsoleteing guns without a viable migration target", "items": [ "ksg-25", "bigun", "ppsh", "raging_judge", "american_180" ] } ] From 5110391e9255c0d1302e2ee77bfcc3cd32e32d50 Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 8 Jun 2024 15:50:06 -0600 Subject: [PATCH 03/11] re-add ppsh --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 2 +- .../Weapons_Mods_Ammo/magazines.json | 2 + data/json/items/gun/762x25.json | 51 +++++++++++ data/json/items/magazine/762x25.json | 39 ++++++++ .../obsoletion_and_migration_0.I/gun.json | 90 ------------------- .../BombasticPerks/perkdata/old_guns.json | 7 ++ .../firearms/gg_firearm_blacklist.json | 2 +- .../firearms/gg_firearms_migration.json | 1 + .../magazines/gg_magazines_blacklist.json | 4 +- .../magazines/gg_magazines_migration.json | 2 + data/mods/TEST_DATA/item_demographics.json | 2 + tests/ranged_balance_test.cpp | 2 +- 12 files changed, 108 insertions(+), 96 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index f32004c010f0c..7846f7ce5e0b1 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -258,7 +258,7 @@ "id": "guns_smg_obscure", "subtype": "distribution", "//": "Imported or otherwise very obscure SMGs.", - "items": [ { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ] + "items": [ { "item": "ppsh", "prob": 50 }, { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 58763e0e23e1d..534fd69bf3596 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -572,6 +572,8 @@ [ "mp40mag_32rd", 5 ], [ "p08mag_32rd", 1 ], [ "p08mag_8rd", 10 ], + [ "ppshmag", 10 ], + [ "ppshdrum", 10 ], [ "rpk74mag", 10 ], [ "tokarevmag", 10 ], [ "greasegun30mag", 5 ] diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index 37fdce1c2f49a..3c030aea0d8d7 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -1,4 +1,55 @@ [ + { + "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/magazine/762x25.json b/data/json/items/magazine/762x25.json index 9d32ed5f0e814..b71ae44eaa91e 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -1,4 +1,43 @@ [ + { + "id": "ppshdrum", + "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 71-round drum magazine" }, + "description": "A high-capacity drum magazine for the PPSh-41.", + "weight": "1760 g", + "volume": "911 ml", + "longest_side": "14 cm", + "price": "70 USD", + "price_postapoc": "5 USD", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "reload_time": 190, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] + }, + { + "id": "ppshmag", + "//": "Audited with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 35-round magazine" }, + "description": "A 35-round box magazine for the PPSh-41.", + "weight": "312 g", + "volume": "184 ml", + "longest_side": "230 mm", + "price": "22 USD", + "price_postapoc": "2 USD 50 cent", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] + }, { "id": "tokarevmag", "//": "Audited from schematics.", diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json index 49d52127a5fdb..c1356b35eedf0 100644 --- a/data/json/obsoletion_and_migration_0.I/gun.json +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -1,94 +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": "ppshdrum", - "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 71-round drum magazine" }, - "description": "A high-capacity drum magazine for the PPSh-41.", - "weight": "1760 g", - "volume": "911 ml", - "longest_side": "14 cm", - "price": "70 USD", - "price_postapoc": "5 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "reload_time": 190, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] - }, - { - "id": "ppshmag", - "//": "Audited with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 35-round magazine" }, - "description": "A 35-round box magazine for the PPSh-41.", - "weight": "312 g", - "volume": "184 ml", - "longest_side": "230 mm", - "price": "22 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] - }, { "id": "a180mag", "looks_like": "mp5mag", diff --git a/data/mods/BombasticPerks/perkdata/old_guns.json b/data/mods/BombasticPerks/perkdata/old_guns.json index 3bff54ec2ba86..45df01214e5f3 100644 --- a/data/mods/BombasticPerks/perkdata/old_guns.json +++ b/data/mods/BombasticPerks/perkdata/old_guns.json @@ -223,6 +223,13 @@ "name": { "str": "6-round trenchgun" }, "extend": { "flags": [ "OLD_GUN" ] } }, + { + "id": "ppsh", + "type": "GUN", + "copy-from": "ppsh", + "name": { "str": "PPSh-41 submachine gun" }, + "extend": { "flags": [ "OLD_GUN" ] } + }, { "id": "number4_mki", "type": "GUN", diff --git a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json index e9487aa7f6d9a..e4623c0248552 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json +++ b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json @@ -3,6 +3,6 @@ "type": "ITEM_BLACKLIST", "whitelist": false, "//": "Used for obsoleteing guns without a viable migration target", - "items": [ "ksg-25", "bigun", "ppsh", "raging_judge", "american_180" ] + "items": [ "ksg-25", "bigun", "raging_judge", "american_180" ] } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index f171d885d6312..7a3abe596a31b 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -158,6 +158,7 @@ }, { "id": [ + "ppsh", "hk_mp5", "hk_mp5sd", "uzi", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index 825ebe7cca785..979a86c96e795 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -13,9 +13,7 @@ "a180mag2", "a180mag3", "a180mag4", - "454_speedloader6", - "ppshdrum", - "ppshmag" + "454_speedloader6" ] } ] diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 53e85a43046af..fa17eba602951 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -131,6 +131,8 @@ "robofacmultimag", "5x50_100_mag", "5x50_50_mag", + "ppshdrum", + "ppshmag", "calicomag", "calicomag_100rd", "glockbigmag", diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 1dbe102dba6c0..4a73552264a0c 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -932,6 +932,7 @@ "fn_p90": 1, "p50": 1, "ruger_57": 1, + "ppsh": 1, "tokarev": 1, "rm103a_pistol": 1, "rm11b_sniper_rifle": 1, @@ -1223,6 +1224,7 @@ "mac_11": 1, "mp40": 1, "mp40semi": 1, + "ppsh": 1, "rm2000_smg": 1, "skorpion_61": 1, "skorpion_82": 1, diff --git a/tests/ranged_balance_test.cpp b/tests/ranged_balance_test.cpp index 2d624603d5d87..6afc3f84ca172 100644 --- a/tests/ranged_balance_test.cpp +++ b/tests/ranged_balance_test.cpp @@ -354,7 +354,7 @@ TEST_CASE( "expert_shooter_accuracy", "[ranged] [balance]" ) test_fast_shooting( shooter, 60, 0.5 ); } SECTION( "an expert shooter with an excellent smg" ) { - arm_shooter( shooter, "fn_p90", { "holo_sight" } ); + arm_shooter( shooter, "ppsh", { "holo_sight" } ); test_shooting_scenario( shooter, 20, 30, 190 ); test_fast_shooting( shooter, 60, 0.5 ); } From 28acc74dcca90d3ddc656f4e9c5f37145d9169a9 Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 8 Jun 2024 16:16:30 -0600 Subject: [PATCH 04/11] Adjust generic guns migration --- .../firearms/gg_firearm_blacklist.json | 8 -------- .../magazines/gg_magazines_blacklist.json | 14 +------------- tools/json_tools/generic_guns_validator.py | 11 ++++++++++- 3 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json diff --git a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json b/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json deleted file mode 100644 index e4623c0248552..0000000000000 --- a/data/mods/Generic_Guns/firearms/gg_firearm_blacklist.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "type": "ITEM_BLACKLIST", - "whitelist": false, - "//": "Used for obsoleteing guns without a viable migration target", - "items": [ "ksg-25", "bigun", "raging_judge", "american_180" ] - } -] diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index 979a86c96e795..e309e87f90e53 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -2,18 +2,6 @@ { "type": "ITEM_BLACKLIST", "whitelist": false, - "items": [ - "m74_clip", - "exodiisapramag5", - "robofac_gun_40mm_10rd", - "robofac_gun_40mm_5rd", - "robofac_gun_40mm_3rd", - "a180mag", - "a180mag1", - "a180mag2", - "a180mag3", - "a180mag4", - "454_speedloader6" - ] + "items": [ "m74_clip", "exodiisapramag5", "robofac_gun_40mm_10rd", "robofac_gun_40mm_5rd", "robofac_gun_40mm_3rd" ] } ] diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index 4c7be5268f89c..5abec9a375000 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -53,7 +53,17 @@ 'l_bak_223', 'pneumatic_shotgun', 'rifle_223', + 'ksg-25', + 'bigun', + 'raging_judge', + 'american_180', # Magazines + 'a180mag', + 'a180mag1', + 'a180mag2', + 'a180mag3', + 'a180mag4', + '454_speedloader6', '223_speedloader5', 'coin_wrapper', 'exodiisapramag5', @@ -62,7 +72,6 @@ 'robofac_gun_40mm_10rd', 'bio_shotgun_gun', 'gasfilter_med', - 'gasfilter_sm', 'matchhead_30carbine', 'matchhead_30carbine_jsp', From a5473fc7df18e1b72663dbd3959b749e102e4d38 Mon Sep 17 00:00:00 2001 From: Holli Date: Sat, 8 Jun 2024 16:27:34 -0600 Subject: [PATCH 05/11] Re-remove ppsh --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 2 +- .../Weapons_Mods_Ammo/magazines.json | 2 - data/json/items/gun/762x25.json | 51 ----------- data/json/items/magazine/762x25.json | 39 -------- .../obsoletion_and_migration_0.I/gun.json | 90 +++++++++++++++++++ .../BombasticPerks/perkdata/old_guns.json | 7 -- .../firearms/gg_firearms_migration.json | 1 - tests/ranged_balance_test.cpp | 2 +- tools/json_tools/generic_guns_validator.py | 1 + 9 files changed, 93 insertions(+), 102 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 7846f7ce5e0b1..f32004c010f0c 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -258,7 +258,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", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 534fd69bf3596..58763e0e23e1d 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -572,8 +572,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/items/gun/762x25.json b/data/json/items/gun/762x25.json index 3c030aea0d8d7..37fdce1c2f49a 100644 --- 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/magazine/762x25.json b/data/json/items/magazine/762x25.json index b71ae44eaa91e..9d32ed5f0e814 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -1,43 +1,4 @@ [ - { - "id": "ppshdrum", - "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 71-round drum magazine" }, - "description": "A high-capacity drum magazine for the PPSh-41.", - "weight": "1760 g", - "volume": "911 ml", - "longest_side": "14 cm", - "price": "70 USD", - "price_postapoc": "5 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "reload_time": 190, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] - }, - { - "id": "ppshmag", - "//": "Audited with ImageJ.", - "looks_like": "mp5mag", - "type": "MAGAZINE", - "name": { "str": "PPSh 35-round magazine" }, - "description": "A 35-round box magazine for the PPSh-41.", - "weight": "312 g", - "volume": "184 ml", - "longest_side": "230 mm", - "price": "22 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762x25" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] - }, { "id": "tokarevmag", "//": "Audited from schematics.", diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json index c1356b35eedf0..49d52127a5fdb 100644 --- a/data/json/obsoletion_and_migration_0.I/gun.json +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -1,4 +1,94 @@ [ + { + "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": "ppshdrum", + "//": "Provisional. Audited by previous PR, longest_side with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 71-round drum magazine" }, + "description": "A high-capacity drum magazine for the PPSh-41.", + "weight": "1760 g", + "volume": "911 ml", + "longest_side": "14 cm", + "price": "70 USD", + "price_postapoc": "5 USD", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "reload_time": 190, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 71 } } ] + }, + { + "id": "ppshmag", + "//": "Audited with ImageJ.", + "looks_like": "mp5mag", + "type": "MAGAZINE", + "name": { "str": "PPSh 35-round magazine" }, + "description": "A 35-round box magazine for the PPSh-41.", + "weight": "312 g", + "volume": "184 ml", + "longest_side": "230 mm", + "price": "22 USD", + "price_postapoc": "2 USD 50 cent", + "material": [ "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "762x25" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762x25": 35 } } ] + }, { "id": "a180mag", "looks_like": "mp5mag", diff --git a/data/mods/BombasticPerks/perkdata/old_guns.json b/data/mods/BombasticPerks/perkdata/old_guns.json index 45df01214e5f3..3bff54ec2ba86 100644 --- a/data/mods/BombasticPerks/perkdata/old_guns.json +++ b/data/mods/BombasticPerks/perkdata/old_guns.json @@ -223,13 +223,6 @@ "name": { "str": "6-round trenchgun" }, "extend": { "flags": [ "OLD_GUN" ] } }, - { - "id": "ppsh", - "type": "GUN", - "copy-from": "ppsh", - "name": { "str": "PPSh-41 submachine gun" }, - "extend": { "flags": [ "OLD_GUN" ] } - }, { "id": "number4_mki", "type": "GUN", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 7a3abe596a31b..f171d885d6312 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -158,7 +158,6 @@ }, { "id": [ - "ppsh", "hk_mp5", "hk_mp5sd", "uzi", diff --git a/tests/ranged_balance_test.cpp b/tests/ranged_balance_test.cpp index 6afc3f84ca172..2d624603d5d87 100644 --- a/tests/ranged_balance_test.cpp +++ b/tests/ranged_balance_test.cpp @@ -354,7 +354,7 @@ TEST_CASE( "expert_shooter_accuracy", "[ranged] [balance]" ) test_fast_shooting( shooter, 60, 0.5 ); } SECTION( "an expert shooter with an excellent smg" ) { - arm_shooter( shooter, "ppsh", { "holo_sight" } ); + arm_shooter( shooter, "fn_p90", { "holo_sight" } ); test_shooting_scenario( shooter, 20, 30, 190 ); test_fast_shooting( shooter, 60, 0.5 ); } diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index 5abec9a375000..b4c37ca65f8c1 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -57,6 +57,7 @@ 'bigun', 'raging_judge', 'american_180', + 'ppsh', # Magazines 'a180mag', 'a180mag1', From 39a5183ea159403adee8384f4510a8d0997bb10c Mon Sep 17 00:00:00 2001 From: Holli Date: Sun, 9 Jun 2024 13:17:52 -0600 Subject: [PATCH 06/11] Update gg_firearms_migration.json --- data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 929d7b7e7a5df..2813519fd6e6f 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -180,7 +180,6 @@ "replace": "pistol_smg" }, { - "id": [ "ruger_1022" ], "id": [ "ruger_1022", "ruger_1022_auto", "ruger_charger_auto" ], "type": "MIGRATION", "replace": "pistol_tiny_rifle" From d28753618243df7c94edaed8144868c3a32f91e3 Mon Sep 17 00:00:00 2001 From: Holli Date: Fri, 14 Jun 2024 18:32:40 -0600 Subject: [PATCH 07/11] Readd shotgun gatling gun --- data/json/items/gun/shot.json | 25 ++++++++++++ .../obsoletion_and_migration_0.I/gun.json | 25 ------------ data/json/recipes/weapon/ranged.json | 38 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 1 + .../magazines/gg_magazines_blacklist.json | 13 ++++++- data/mods/TEST_DATA/item_demographics.json | 2 + tools/json_tools/generic_guns_validator.py | 1 - 7 files changed, 78 insertions(+), 27 deletions(-) diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 5c25510f77902..333b564151e7a 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -36,6 +36,31 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ], "melee_damage": { "bash": 6 } }, + { + "id": "bigun", + "copy-from": "shotgun_base", + "looks_like": "remington_870", + "type": "GUN", + "name": { "str": "12-gauge gatling gun" }, + "description": "An electrically driven six barrel gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", + "weight": "4980 g", + "volume": "4500 ml", + "longest_side": "110 cm", + "barrel_length": "762 mm", + "price": "1 kUSD 800 USD", + "price_postapoc": "17 USD 50 cent", + "to_hit": -2, + "material": [ "steel" ], + "dispersion": 855, + "durability": 8, + "modes": [ [ "DEFAULT", "burst", 6 ] ], + "energy_drain": "1 kJ", + "reload": 200, + "valid_mod_locations": [ [ "sights", 1 ], [ "rail mount", 1 ] ], + "flags": [ "MOUNTED_GUN", "USE_UPS" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ], + "melee_damage": { "bash": 9 } + }, { "id": "ksg", "copy-from": "shotgun_pump", diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json index 49d52127a5fdb..b5a64995a1347 100644 --- a/data/json/obsoletion_and_migration_0.I/gun.json +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -379,30 +379,5 @@ }, "flags": [ "RELOAD_ONE", "IRREMOVABLE" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 12 } } ] - }, - { - "id": "bigun", - "copy-from": "shotgun_base", - "looks_like": "remington_870", - "type": "GUN", - "name": { "str": "12-gauge gatling gun" }, - "description": "An electrically driven six barrel gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", - "weight": "4980 g", - "volume": "4500 ml", - "longest_side": "110 cm", - "barrel_length": "762 mm", - "price": "1 kUSD 800 USD", - "price_postapoc": "17 USD 50 cent", - "to_hit": -2, - "material": [ "steel" ], - "dispersion": 855, - "durability": 8, - "modes": [ [ "DEFAULT", "burst", 6 ] ], - "energy_drain": "1 kJ", - "reload": 200, - "valid_mod_locations": [ [ "sights", 1 ], [ "rail mount", 1 ] ], - "flags": [ "MOUNTED_GUN", "USE_UPS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "shotbelt_20" ] } ], - "melee_damage": { "bash": 9 } } ] diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 1829a1fbcc373..17adb337594ca 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -992,6 +992,44 @@ "decomp_learn": 0, "components": [ [ [ "m26_mass", 1 ], [ "m26_mass_mod", 1 ] ], [ [ "m26_mass_stock", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "MODERATE_EXERCISE", + "result": "bigun", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "fabrication", + "skills_required": [ [ "traps", 2 ], [ "mechanics", 5 ], [ "gun", 2 ] ], + "difficulty": 7, + "time": "12 h", + "book_learn": [ [ "manual_shotgun", 2 ] ], + "//": "160cm weld", + "using": [ [ "soldering_standard", 10 ], [ "welding_standard", 160 ] ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_welding_basic" }, + { "proficiency": "prof_gunsmithing_basic" }, + { "proficiency": "prof_gunsmithing_improv" } + ], + "qualities": [ + { "id": "SAW_M", "level": 1 }, + { "id": "SAW_M_FINE", "level": 1 }, + { "id": "SCREW_FINE", "level": 1 }, + { "id": "WRENCH_FINE", "level": 1 } + ], + "components": [ + [ [ "xlframe", 1 ] ], + [ [ "simple_crank", 1 ], [ "foot_crank", 1 ] ], + [ [ "sheet_metal_small", 12 ] ], + [ [ "pipe", 6 ] ], + [ [ "chain", 1 ] ], + [ [ "motor_tiny", 1 ] ], + [ [ "power_supply", 2 ] ], + [ [ "cable", 4 ] ], + [ [ "spring", 7 ] ], + [ [ "scrap", 2 ] ] + ] + }, { "type": "recipe", "activity_level": "MODERATE_EXERCISE", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 2813519fd6e6f..9a00b4813aace 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -415,6 +415,7 @@ "tavor_12", "aa_12", "benelli_tsa", + "bigun", "USAS_12" ], "type": "MIGRATION", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index e309e87f90e53..e410cfa3173bc 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -2,6 +2,17 @@ { "type": "ITEM_BLACKLIST", "whitelist": false, - "items": [ "m74_clip", "exodiisapramag5", "robofac_gun_40mm_10rd", "robofac_gun_40mm_5rd", "robofac_gun_40mm_3rd" ] + "items": [ + "m74_clip", + "exodiisapramag5", + "robofac_gun_40mm_10rd", + "robofac_gun_40mm_5rd", + "robofac_gun_40mm_3rd", + "a180mag", + "a180mag1", + "a180mag2", + "a180mag3", + "a180mag4" + ] } ] diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 0ad43e528fafb..6a2de1c52ae25 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -791,6 +791,7 @@ "weight": 26, "items": { "ashot": 1, + "bigun": 1, "lever_shotgun": 1, "ksg": 1, "mossberg_500": 1, @@ -1246,6 +1247,7 @@ "type": "shotguns", "weight": 27, "items": { + "bigun": 1, "combination_gun_shotgun": 1, "ksg": 1, "ksg_aux_shotgun": 1, diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index b4c37ca65f8c1..6c1ede54ef091 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -54,7 +54,6 @@ 'pneumatic_shotgun', 'rifle_223', 'ksg-25', - 'bigun', 'raging_judge', 'american_180', 'ppsh', From c99acc45333ba125c84a66d92806789cc85b13dc Mon Sep 17 00:00:00 2001 From: Holli Date: Fri, 14 Jun 2024 18:56:04 -0600 Subject: [PATCH 08/11] Lint --- data/mods/Generic_Guns/magazines/gg_magazines_migration.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index fa17eba602951..3876d54645fdf 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -407,3 +407,4 @@ "replace": "shot_speedloader" } ] + From f9784226c307005c93fd9a085b42317ceeefc260 Mon Sep 17 00:00:00 2001 From: Holli <78005870+Holli-Git@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:59:55 -0600 Subject: [PATCH 09/11] Update data/mods/Generic_Guns/magazines/gg_magazines_migration.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Generic_Guns/magazines/gg_magazines_migration.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 3876d54645fdf..fa17eba602951 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -407,4 +407,3 @@ "replace": "shot_speedloader" } ] - From 1dd22d1b57f127f04ae1127aee460f04ed090a22 Mon Sep 17 00:00:00 2001 From: David Seguin Date: Fri, 14 Jun 2024 21:43:24 -0400 Subject: [PATCH 10/11] Linting --- .../magazines/gg_magazines_migration.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index fa17eba602951..c7c3e489edccf 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -198,18 +198,7 @@ "replace": "pistol_speedloader" }, { - "id": [ - "mosquitomag", - "ruger1022bigmag", - "ruger1022mag", - "sw22mag", - "j22mag", - "wp22mag", - "kp32mag", - "cp33_mag", - "cp33_mag_50", - "ruger_mk4_mag" - ], + "id": [ "mosquitomag", "ruger1022bigmag", "ruger1022mag", "sw22mag", "j22mag", "wp22mag", "kp32mag", "cp33_mag", "cp33_mag_50", "ruger_mk4_mag" ], "type": "MIGRATION", "replace": "pistol_tiny_mag" }, From eb0f248f45120f619a49f6fb5c7e099119f202ef Mon Sep 17 00:00:00 2001 From: David Seguin Date: Fri, 14 Jun 2024 22:06:37 -0400 Subject: [PATCH 11/11] Update data/mods/Generic_Guns/magazines/gg_magazines_migration.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../magazines/gg_magazines_migration.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index c7c3e489edccf..fa17eba602951 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -198,7 +198,18 @@ "replace": "pistol_speedloader" }, { - "id": [ "mosquitomag", "ruger1022bigmag", "ruger1022mag", "sw22mag", "j22mag", "wp22mag", "kp32mag", "cp33_mag", "cp33_mag_50", "ruger_mk4_mag" ], + "id": [ + "mosquitomag", + "ruger1022bigmag", + "ruger1022mag", + "sw22mag", + "j22mag", + "wp22mag", + "kp32mag", + "cp33_mag", + "cp33_mag_50", + "ruger_mk4_mag" + ], "type": "MIGRATION", "replace": "pistol_tiny_mag" },