diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json index 7f87157f6bbd1..163a805f7ec45 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json @@ -166,7 +166,7 @@ { "type": "item_group", "id": "c96_mods", - "//": "Default possible mods for the C96 and M714.", + "//": "Default possible mods for the C96.", "subtype": "distribution", "entries": [ { "item": "stock_mauser", "prob": 40 } ] }, 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 31998bb3fb67e..e99517d20a4a7 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -180,7 +180,6 @@ { "item": "px4", "prob": 5, "charges": [ 0, -1 ] }, { "item": "hi_power_9mm", "prob": 2, "charges": [ 0, -1 ] }, { "item": "walther_ppq_9mm", "prob": 4, "charges": [ 0, -1 ] }, - { "item": "kpf9", "prob": 24, "charges": [ 0, -1 ] }, { "item": "hptc9", "prob": 2, "charges": [ 0, -1 ] }, { "item": "cz75", "prob": 7, "charges": [ 0, -1 ] }, { "item": "walther_ccp", "prob": 2, "charges": [ 0, -1 ] }, @@ -540,7 +539,7 @@ { "type": "item_group", "id": "guns_rifle_common_9mm", - "items": [ { "group": "nested_ksub2000", "prob": 100 }, { "group": "nested_cx4", "prob": 1 } ] + "items": [ { "group": "nested_ksub2000", "prob": 100 } ] }, { "type": "item_group", @@ -701,7 +700,7 @@ { "type": "item_group", "id": "guns_rifle_common_display_9mm", - "items": [ { "item": "ksub2000", "prob": 100 }, { "item": "cx4", "prob": 1 } ] + "items": [ { "item": "ksub2000", "prob": 100 } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json index ec0ce5be751d4..b08661aa59a18 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json @@ -177,13 +177,6 @@ "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", "items": [ { "item": "p08mag_8rd", "prob": 500 }, { "item": "p08mag_32rd", "prob": 3 } ] }, - { - "type": "item_group", - "subtype": "distribution", - "id": "magazines_9mm_mauser", - "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", - "items": [ { "item": "mausermag_10rd", "prob": 500 }, { "item": "mausermag_20rd", "prob": 50 } ] - }, { "type": "item_group", "subtype": "distribution", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json index 747d843928f36..17b14be71bb79 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json @@ -59,9 +59,6 @@ { "item": "ppq9mag_10rd", "prob": 1, "charges": [ 0, 10 ] }, { "item": "ppq9mag_15rd", "prob": 1, "charges": [ 0, 15 ] }, { "item": "ppq9mag_17rd", "prob": 1, "charges": [ 0, 17 ] }, - { "item": "ppq40mag_10rd", "prob": 1, "charges": [ 0, 10 ] }, - { "item": "ppq40mag_12rd", "prob": 1, "charges": [ 0, 12 ] }, - { "item": "ppq40mag_14rd", "prob": 1, "charges": [ 0, 14 ] }, { "item": "ppq45mag", "prob": 1, "charges": [ 0, 12 ] } ] }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json index a67b60eeab738..aeb399ab5c8e3 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json @@ -224,7 +224,6 @@ "items": [ { "group": "magazines_9mm_calico", "prob": 1 }, { "group": "magazines_9mm_luger", "prob": 60 }, - { "group": "magazines_9mm_mauser", "prob": 20 }, { "group": "magazines_9mm_mp40", "prob": 60 }, { "group": "magazines_9mm_sten", "prob": 40 }, { "group": "magazines_9mm_tec9", "prob": 60 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index f84aeac3952ff..0aae2f73ee8a5 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -155,19 +155,6 @@ { "group": "on_hand_10mm" } ] }, - { - "id": "nested_STI_DS_10", - "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": "STI_DS_10", "charges": [ 0, 7 ] }, - { "item": "2011_17_mag" }, - { "item": "2011_17_mag", "prob": 50 }, - { "group": "on_hand_10mm" } - ] - }, { "id": "nested_m9", "type": "item_group", @@ -325,19 +312,6 @@ { "item": "38_speedloader6", "prob": 50 } ] }, - { - "id": "nested_taurus_spectrum", - "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": "taurus_spectrum", "charges": [ 0, 6 ] }, - { "item": "taurus_spectrum_mag" }, - { "item": "taurus_spectrum_mag", "prob": 50 }, - { "group": "on_hand_380" } - ] - }, { "id": "nested_p220_10", "type": "item_group", @@ -429,19 +403,6 @@ { "group": "on_hand_32" } ] }, - { - "id": "nested_kp3at", - "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": "kp3at", "charges": [ 0, 6 ] }, - { "item": "kp3atmag" }, - { "item": "kp3atmag", "prob": 50 }, - { "group": "on_hand_380" } - ] - }, { "id": "nested_rugerlcp", "type": "item_group", @@ -455,19 +416,6 @@ { "group": "on_hand_380" } ] }, - { - "id": "nested_kpf9", - "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": "kpf9", "charges": [ 0, 7 ] }, - { "item": "kpf9mag" }, - { "item": "kpf9mag", "prob": 50 }, - { "group": "on_hand_9mm" } - ] - }, { "id": "nested_hi_power_9mm", "type": "item_group", @@ -520,19 +468,6 @@ { "group": "on_hand_9mm" } ] }, - { - "id": "nested_walther_ppq_40", - "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": "walther_ppq_40", "charges": [ 0, 14 ] }, - { "item": "ppq40mag_10rd" }, - { "item": "ppq40mag_10rd", "prob": 50 }, - { "group": "on_hand_40" } - ] - }, { "id": "nested_walther_ppq_45", "type": "item_group", @@ -689,19 +624,6 @@ { "group": "on_hand_9mm" } ] }, - { - "id": "nested_90two40", - "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": "90two40", "charges": [ 0, 12 ] }, - { "item": "90two40mag" }, - { "item": "90two40mag", "prob": 50 }, - { "group": "on_hand_40" } - ] - }, { "id": "nested_bond_410", "type": "item_group", @@ -825,19 +747,6 @@ { "group": "on_hand_40" } ] }, - { - "id": "nested_sig_p230", - "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": "sig_p230", "charges": [ 0, 8 ] }, - { "item": "sigp230mag" }, - { "item": "sigp230mag", "prob": 50 }, - { "group": "on_hand_32" } - ] - }, { "id": "nested_sw_500", "type": "item_group", @@ -1505,19 +1414,6 @@ { "group": "on_hand_300BLK" } ] }, - { - "id": "nested_cx4", - "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": "cx4", "charges": [ 0, 15 ] }, - { "item": "m9mag" }, - { "item": "m9mag", "prob": 50 }, - { "group": "on_hand_9mm" } - ] - }, { "id": "nested_ksub2000", "type": "item_group", @@ -2149,19 +2045,6 @@ "ammo": 100, "entries": [ { "item": "win70_458", "charges": [ 0, 3 ] }, { "group": "on_hand_458wm" } ] }, - { - "id": "nested_arx160", - "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": "arx160", "charges": [ 0, 30 ] }, - { "item": "akmag10" }, - { "item": "akmag10", "prob": 50 }, - { "group": "on_hand_762" } - ] - }, { "id": "nested_mossberg_500", "type": "item_group", @@ -2456,19 +2339,6 @@ { "group": "on_hand_shot" } ] }, - { - "id": "nested_saiga_410", - "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": "saiga_410", "charges": [ 0, 10 ] }, - { "item": "saiga410mag_10rd" }, - { "item": "saiga410mag_10rd", "prob": 50 }, - { "group": "on_hand_410shot" } - ] - }, { "id": "nested_p50", "type": "item_group", @@ -2508,18 +2378,6 @@ { "group": "on_hand_57" } ] }, - { - "id": "nested_m714", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "subtype": "collection", - "entries": [ - { "item": "mauser_m714", "charges": [ 0, 20 ] }, - { "item": "mausermag_20rd" }, - { "item": "mausermag_20rd", "prob": 50 }, - { "group": "on_hand_9mm" } - ] - }, { "id": "nested_m1carbine", "type": "item_group", @@ -2559,19 +2417,6 @@ { "group": "on_hand_223" } ] }, - { - "id": "nested_minidraco556", - "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": "minidraco556", "charges": [ 0, 30 ] }, - { "item": "zpap85mag" }, - { "item": "zpap85mag", "prob": 50 }, - { "group": "on_hand_223" } - ] - }, { "id": "nested_ak308", "type": "item_group", @@ -2585,32 +2430,6 @@ { "group": "on_hand_308" } ] }, - { - "id": "nested_zpapm90", - "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": "ak556", "variant": "zpapm90", "charges": [ 0, 30 ] }, - { "item": "zpap85mag" }, - { "item": "zpap85mag", "prob": 50 }, - { "group": "on_hand_223" } - ] - }, - { - "id": "nested_zpap85", - "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": "minidraco556", "variant": "zpap85", "charges": [ 0, 30 ] }, - { "item": "zpap85mag" }, - { "item": "zpap85mag", "prob": 50 }, - { "group": "on_hand_223" } - ] - }, { "id": "nested_papm77", "type": "item_group", diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json index e4dbbb9e0046d..795ef3df2a1d8 100644 --- a/data/json/items/gun/10mm.json +++ b/data/json/items/gun/10mm.json @@ -322,39 +322,5 @@ "min_cycle_recoil": 675, "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "103 ml", "item_restriction": [ "glock_20mag", "tdi_10mm_mag" ] } ] - }, - { - "id": "STI_DS_10", - "copy-from": "pistol_base", - "looks_like": "m1911_10", - "type": "GUN", - "name": { "str": "double-stack 10mm 1911 pistol" }, - "description": "An updated version of the M1911 pistol, chambered in 10mm Auto, that uses double-stack magazines for greater capacity.", - "variant_type": "gun", - "variants": [ - { - "id": "STI_DS_10", - "name": { "str": "STI Tactical 2011 DS 10mm pistol" }, - "description": "A next-gen model of the venerable 1911, ready to win World War Z. Modernized and manufactured by Staccato, sporting a double-stack magwell, sleek solid-steel frame, and ergonomic grip; favored by certain dog-loving assassins. This model is chambered in 10mm Auto.", - "weight": 1 - } - ], - "weight": "1191 g", - "volume": "430 ml", - "longest_side": "231 mm", - "barrel_length": "127 mm", - "price": "2 kUSD 699 USD", - "price_postapoc": "30 USD", - "material": [ "steel" ], - "symbol": "(", - "color": "dark_gray", - "ammo": "10mm", - "dispersion": 460, - "durability": 6, - "min_cycle_recoil": 570, - "blackpowder_tolerance": 48, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "pocket_data": [ { "magazine_well": "60 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "2011_17_mag", "2011_22_mag" ] } ], - "melee_damage": { "bash": 12 } } ] diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index d472f95f1e200..4b63d0a27da96 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -577,50 +577,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "zpap85mag" ] } ], "melee_damage": { "bash": 12 } }, - { - "id": "minidraco556", - "copy-from": "pistol_base", - "looks_like": "modular_ar15", - "type": "GUN", - "name": { "str": "ZPAP AK-style pistol" }, - "description": "A civilian AK pattern rifle, chambered in 5.56x45 NATO. This one is shorter and without a stock.", - "variant_type": "gun", - "variants": [ - { - "id": "zpap85", - "name": { "str": "ZPAP 85 rifle" }, - "description": "A Serbian-made AK pattern rifle made by Zastava in 5.56x45mm NATO. To avoid import restrictions, Zastava USA has added a number of American-made parts. This one is shorter and without a stock." - } - ], - "weight": "2563 g", - "volume": "1286 ml", - "longest_side": "48 cm", - "barrel_length": "254 mm", - "price": "725 USD", - "price_postapoc": "25 USD", - "to_hit": -5, - "material": [ "steel", "wood" ], - "color": "brown", - "ammo": [ "223" ], - "dispersion": 240, - "durability": 7, - "min_cycle_recoil": 1350, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "bore", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "sling", 1 ], - [ "stock mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "zpap85mag" ] } ], - "melee_damage": { "bash": 8 } - }, { "id": "mdrx", "copy-from": "rifle_semi", diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 3b228276ea8fc..3766db9ec84d7 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -1,50 +1,4 @@ [ - { - "id": "sig_p230", - "looks_like": "glock_17", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "P230 pistol" }, - "description": "The SIG Sauer P230 is a small, semi-automatic handgun chambered in .32 ACP. Due to its small dimensions, it was often carried as a backup weapon.", - "weight": "460 g", - "volume": "312 ml", - "longest_side": "194 mm", - "barrel_length": "91 mm", - "price": "430 USD", - "price_postapoc": "10 USD", - "to_hit": -1, - "material": [ "steel", "wood" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "32" ], - "skill": "pistol", - "dispersion": 480, - "durability": 8, - "min_cycle_recoil": 135, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], - "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "sigp230mag" ] } ], - "melee_damage": { "bash": 8 } - }, { "id": "walther_ppk", "looks_like": "glock_17", diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index 7fd069f7373a5..d8d3df0b08458 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -18,23 +18,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mac11mag" ] } ], "melee_damage": { "bash": 5 } }, - { - "id": "kp3at", - "copy-from": "kp32", - "type": "GUN", - "name": { "str": "Kel-Tec P-3AT pistol" }, - "description": "Essentially a slightly scaled up Kel-Tec P-32 in .380 ACP, the ever popular P-3AT offers better ballistics in a small, concealable lightweight package. Handling leaves something to be desired due to snappier recoil and diminutive controls.", - "ascii_picture": "P3AT", - "weight": "218 g", - "volume": "163 ml", - "longest_side": "150 mm", - "barrel_length": "70 mm", - "price": "250 USD", - "price_postapoc": "17 USD 50 cent", - "ammo": [ "380" ], - "min_cycle_recoil": 270, - "pocket_data": [ { "magazine_well": "44 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "kp3atmag" ] } ] - }, { "id": "rugerlcp", "copy-from": "pistol_backup", @@ -87,32 +70,9 @@ ], "melee_damage": { "bash": 8 } }, - { - "id": "taurus_spectrum", - "copy-from": "pistol_backup", - "looks_like": "glock_17", - "type": "GUN", - "name": { "str": "Taurus Spectrum pistol" }, - "description": "A .380 subcompact pistol. Designed for concealed carry and built from high-quality, durable materials.", - "weight": "283 g", - "volume": "187 ml", - "longest_side": "137 mm", - "barrel_length": "71 mm", - "price": "640 USD", - "price_postapoc": "12 USD 50 cent", - "material": [ "steel", "aluminum" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "380" ], - "dispersion": 480, - "durability": 7, - "min_cycle_recoil": 225, - "pocket_data": [ { "magazine_well": "74 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "taurus_spectrum_mag" ] } ], - "melee_damage": { "bash": 8 } - }, { "id": "hpt3895", - "looks_like": "cx4", + "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".380 ACP pistol-caliber carbine" }, "description": "A pistol-caliber carbine chambered in .380 ACP. It is more powerful and accurate than an equivalent pistol but the .380 ACP round is nonetheless fairly weak. Accepts 10-round magazines, which are not shared with any .380 ACP pistol unlike many other similar pistol-caliber carbines.", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index fde60e47deba8..61c606dc58fa0 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -1,28 +1,4 @@ [ - { - "id": "90two40", - "copy-from": "pistol_base", - "looks_like": "glock_17", - "type": "GUN", - "name": { "str": "Beretta 90-two .40 S&W" }, - "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large part to the polymer underbarrel rail cover. This one is chambered in .40 S&W.", - "weight": "905 g", - "volume": "554 ml", - "longest_side": "250 mm", - "barrel_length": "125 mm", - "price": "650 USD", - "price_postapoc": "20 USD", - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "40" ], - "range": 1, - "dispersion": 480, - "durability": 7, - "min_cycle_recoil": 504, - "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "90two40mag" ] } ], - "melee_damage": { "bash": 8 } - }, { "id": "glock_22", "looks_like": "glock_17", @@ -204,36 +180,6 @@ "pocket_data": [ { "magazine_well": "185 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "bhp40mag" ] } ], "melee_damage": { "bash": 8 } }, - { - "id": "walther_ppq_40", - "copy-from": "pistol_base", - "looks_like": "glock_17", - "type": "GUN", - "name": { "str": "Walther PPQ .40 S&W" }, - "description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in .40 S&W.", - "weight": "625 g", - "volume": "440 ml", - "longest_side": "215 mm", - "barrel_length": "106 mm", - "price": "725 USD", - "price_postapoc": "20 USD", - "material": [ "plastic", "steel" ], - "color": "dark_gray", - "ammo": [ "40" ], - "dispersion": 480, - "durability": 9, - "min_cycle_recoil": 504, - "flags": [ "ALLOWS_BODY_BLOCK" ], - "weapon_category": [ "AUTOMATIC_PISTOLS" ], - "pocket_data": [ - { - "magazine_well": "200 ml", - "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "ppq40mag_10rd", "ppq40mag_12rd", "ppq40mag_14rd" ] - } - ], - "melee_damage": { "bash": 8 } - }, { "id": "hptjcp", "copy-from": "pistol_base", diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index 38f46cd7b5738..7aa425acf11f5 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -1,27 +1,4 @@ [ - { - "id": "saiga_410", - "copy-from": "shotgun_base", - "looks_like": "remington_870", - "type": "GUN", - "name": { "str": "Saiga-410" }, - "description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK-47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.", - "weight": "3400 g", - "volume": "5762 ml", - "longest_side": "1171 mm", - "barrel_length": "470 mm", - "price": "1 kUSD 890 USD", - "price_postapoc": "70 USD", - "to_hit": -1, - "material": [ "steel", "plastic" ], - "dispersion": 395, - "durability": 7, - "barrel_volume": "750 ml", - "ammo": [ "410shot" ], - "flags": [ "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "saiga410mag_10rd", "saiga410mag_30rd" ] } ], - "melee_damage": { "bash": 12 } - }, { "id": "shotgun_410", "copy-from": "shotgun_s", diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 1fa61a411f06c..150585a2ee270 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -45,55 +45,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] } ], "melee_damage": { "bash": 12 } }, - { - "id": "arx160", - "copy-from": "rifle_auto", - "looks_like": "modular_ar15", - "type": "GUN", - "name": { "str": "Beretta AK rifle" }, - "//": "Total unloaded weight of gun 3000 grams. Current weight of folding stock 200 grams.", - "description": "This rifle was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world. This version is chambered for 7.62x39mm.", - "variant_type": "gun", - "variants": [ - { - "id": "arx160", - "name": { "str": "Beretta ARX-160 rifle" }, - "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world. This version is chambered for 7.62x39mm." - } - ], - "weight": "3080 g", - "volume": "6323 ml", - "longest_side": "91 cm", - "barrel_length": "406 mm", - "price": "4 kUSD 500 USD", - "price_postapoc": "45 USD", - "to_hit": -1, - "material": [ "steel" ], - "color": "blue", - "ammo": [ "762" ], - "dispersion": 160, - "durability": 9, - "min_cycle_recoil": 1832, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "barrel_volume": "250 ml", - "default_mods": [ "folding_stock" ], - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "bayonet lug", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "stock accessory", 2 ], - [ "underbarrel", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40" ] } ], - "melee_damage": { "bash": 11 } - }, { "id": "sks", "copy-from": "rifle_semi", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 3a509198a7fbb..7648073c68bf7 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -55,68 +55,6 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "calicomag", "calicomag_100rd" ] } ], "melee_damage": { "bash": 9 } }, - { - "id": "cx4", - "looks_like": "modular_ar15", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "M9 pistol-caliber carbine" }, - "description": "Designed to be a companion rifle with provided M9 handguns, this compact and light weight pistol-caliber carbine makes use of the same 9x19mm magazines. Originally intended for use by law enforcement units, this style of small caliber, semi-automatic carbine failed to achieve the same level of popularity as regular and more potent rifles. However, despite being inadequate for their original purpose, before the Cataclysm these modestly sized weapons still found a home in sport shooting and self-defense civilian roles.", - "variant_type": "gun", - "variants": [ - { - "id": "cx4", - "name": { "str": "Cx4 Storm carbine" }, - "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns." - } - ], - "weight": "2575 g", - "volume": "4458 ml", - "longest_side": "762 mm", - "barrel_length": "423 mm", - "price": "900 USD", - "price_postapoc": "40 USD", - "to_hit": -1, - "material": [ "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "9mm" ], - "skill": "rifle", - "range": 6, - "ranged_damage": { "damage_type": "bullet", "amount": 2 }, - "dispersion": 180, - "durability": 10, - "min_cycle_recoil": 450, - "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", 1 ], - [ "underbarrel", 1 ] - ], - "faults": [ - "fault_gun_blackpowder", - "fault_gun_dirt", - "fault_gun_chamber_spent", - "fault_fail_to_feed", - "fault_stovepipe", - "fault_double_feed" - ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "m9bigmag", "m9mag_10rd", "m9mag", "m9mag_17rd", "m9mag_18rd", "m9mag_20rd", "m9mag_32rd", "m9mag_35rd" ] - } - ], - "melee_damage": { "bash": 8 } - }, { "id": "glock_19", "copy-from": "pistol_base", @@ -438,28 +376,6 @@ ], "melee_damage": { "bash": 8 } }, - { - "id": "mauser_m714", - "copy-from": "mauser_c96", - "type": "GUN", - "name": { "str": "reproduction Mauser pistol" }, - "description": "A modern take on the original Mauser design, this variant is chambered for 9x19mm cartridges and, unlike its elder brother, the pre-1900 Mauser Broomhandle, this firearm feeds from detachable box magazines. Whilst it features surplus Mauser parts in its construction, the frame of the pistol is of relatively modern manufacture.", - "variant_type": "gun", - "variants": [ - { - "id": "mauser_m714", - "name": { "str": "M714 Broomhandle pistol" }, - "description": "Recognized the world over as one of the first practical self-loading pistols, the Mauser C96 and its derivatives are nearly universally regarded as some of the most classic and rugged guns in history, with the model being praised as a true marvel of industrial craftsmanship. However, what rests before you is not an original production C96, but rather a modern American spin on the original Mauser recipe. Feeding from detachable box magazines rather than an internal clip, the M714 is crafted out of a mix of modern and surplus parts, being chambered for 9x19mm rounds, with some other models being offered in the Mauser's own 7.63x25mm cartridge." - } - ], - "weight": "1070 g", - "volume": "615 ml", - "price": "900 USD", - "price_postapoc": "5 USD", - "pocket_data": [ - { "magazine_well": "60 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "mausermag_20rd", "mausermag_10rd" ] } - ] - }, { "id": "mp40", "copy-from": "smg_base", @@ -932,24 +848,6 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], "built_in_mods": [ "barrel_ported" ] }, - { - "id": "kpf9", - "copy-from": "kp32", - "type": "GUN", - "name": { "str": "Kel-Tec PF-9 pistol" }, - "description": "The Kel-Tec PF-9 remains one of the most popular backup pistols due to its history of reliability, affordability, and concealability. Chambered in 9x19mm, recoil is best described as unpleasant, and follow-up shots are difficult to place quickly.", - "weight": "357 g", - "volume": "357ml", - "longest_side": "149mm", - "barrel_length": "79 mm", - "ranged_damage": { "damage_type": "bullet", "amount": -1 }, - "price": "180 USD", - "price_postapoc": "20 USD", - "ammo": [ "9mm" ], - "min_cycle_recoil": 450, - "pocket_data": [ { "magazine_well": "65 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "kpf9mag", "kpf9mag_8rd" ] } ], - "melee_damage": { "bash": 2 } - }, { "id": "m11", "copy-from": "pistol_base", diff --git a/data/json/items/gunmod/accessories.json b/data/json/items/gunmod/accessories.json index 8e7058c00d026..a9db848486d5b 100644 --- a/data/json/items/gunmod/accessories.json +++ b/data/json/items/gunmod/accessories.json @@ -130,7 +130,7 @@ "symbol": ":", "color": "light_gray", "location": "belt clip", - "mod_targets": [ "rugerlcp", "kp32", "kp3at", "kpf9" ], + "mod_targets": [ "rugerlcp", "kp32" ], "flags": [ "IS_ARMOR", "SKINTIGHT", "WATER_FRIENDLY" ] } ] diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json index eefe4c30887ad..723e3ec399cfb 100644 --- a/data/json/items/gunmod/stock.json +++ b/data/json/items/gunmod/stock.json @@ -170,14 +170,14 @@ "material": [ "wood" ], "color": "brown", "location": "stock mount", - "mod_targets": [ "mauser_c96", "mauser_m714" ], + "mod_targets": [ "mauser_c96" ], "min_skills": [ [ "weapon", 1 ] ], "pocket_data": [ { "pocket_type": "CONTAINER", "holster": true, "rigid": true, - "item_restriction": [ "mauser_c96", "mauser_m714" ], + "item_restriction": [ "mauser_c96" ], "max_contains_volume": "650 ml", "max_contains_weight": "1815 g", "max_item_length": "32 cm", diff --git a/data/json/items/magazine/10mm.json b/data/json/items/magazine/10mm.json index adb1e89a1e93f..6d5837f774e9e 100644 --- a/data/json/items/magazine/10mm.json +++ b/data/json/items/magazine/10mm.json @@ -195,41 +195,5 @@ "ammo_type": [ "10mm" ], "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 15 } } ] - }, - { - "id": "2011_17_mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "2011 10mm 17-round magazine" }, - "description": "A lightweight, 17-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.", - "weight": "70 g", - "volume": "110 ml", - "longest_side": "140 mm", - "price": "100 USD", - "price_postapoc": "1 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "10mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 17 } } ] - }, - { - "id": "2011_22_mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "2011 10mm 22-round magazine" }, - "description": "A lightweight, 22-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.", - "weight": "85 g", - "volume": "125 ml", - "longest_side": "170 mm", - "price": "100 USD", - "price_postapoc": "1 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "10mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 22 } } ] } ] diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json index 7c67d3127ec06..77859e3d503ad 100644 --- a/data/json/items/magazine/32.json +++ b/data/json/items/magazine/32.json @@ -18,25 +18,6 @@ "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "32": 8 } } ] }, - { - "id": "sigp230mag", - "//": ".380 magazine audited with ImageJ and scaled down for 32. Weight using ratio method.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "P230 8-round magazine" }, - "description": "A factory specification 8-round magazine for the SIG Sauer P230.", - "weight": "51 g", - "volume": "26 ml", - "longest_side": "105 mm", - "price": "19 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "32" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "32": 8 } } ] - }, { "id": "kp32mag", "//": "Audited with ImageJ. Weight using ratio method.", diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json index 23d0b186661d8..4cb2f9aeb0eb8 100644 --- a/data/json/items/magazine/380.json +++ b/data/json/items/magazine/380.json @@ -1,42 +1,4 @@ [ - { - "id": "kp3atmag", - "//": "Previously audited, longest_side estimated.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "P-3AT 6-round magazine" }, - "description": "A standard 6-round steel box magazine for the Kel-Tec P-3AT.", - "weight": "60 g", - "volume": "44 ml", - "longest_side": "9 cm", - "price": "19 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "380" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "380": 6 } } ] - }, - { - "id": "fn1910mag", - "//": "Audited with ImageJ, weight estimated.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "FN 1910 6-round magazine" }, - "description": "A standard 6-round steel box magazine for the FN 1910. It looks a bit old.", - "weight": "40 g", - "volume": "33 ml", - "longest_side": "93 mm", - "price": "35 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "380" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "380": 6 } } ] - }, { "id": "rugerlcpmag", "//": "Audited with ImageJ, weight estimated.", @@ -120,24 +82,5 @@ "name": { "str": "Hi-Point 3895 10-round magazine" }, "description": "A 10-round steel box magazine for use with the Hi-Point 3895 pistol-caliber carbine. Does not fit the Hi-Point CF-380 pistol.", "copy-from": "hptcf380mag_10rd" - }, - { - "id": "taurus_spectrum_mag", - "//": "Audited with comparison.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "Taurus Spectrum 6-round magazine" }, - "description": "A compact, 6-round steel box magazine for use with the Taurus Spectrum.", - "weight": "36 g", - "volume": "30 ml", - "longest_side": "9 cm", - "price": "34 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "380" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "380": 6 } } ] } ] diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index a9c4e88112016..0ccea93f86834 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -1,24 +1,4 @@ [ - { - "id": "90two40mag", - "//": "Audited with ImageJ. Weight from spec sheet.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "90-two .40 S&W 12-round magazine" }, - "description": "A magazine for the 92 and 96 series of Beretta handguns, this one is for .40 S&W and can hold 12 rounds.", - "weight": "95 g", - "volume": "77 ml", - "longest_side": "12 cm", - "price": "32 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "40" ], - "reload_time": 140, - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 12 } } ] - }, { "id": "glock40bigmag", "//": "Audited with ImageJ. Weight from 15rd mag ratio.", @@ -163,63 +143,6 @@ "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 10 } } ] }, - { - "id": "ppq40mag_10rd", - "//": "Copied from .45 PPQ.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "PPQ .40 S&W 10-round magazine" }, - "description": "A 10-round steel box magazine for the Walther PPQ .40 S&W.", - "weight": "80 g", - "volume": "105 ml", - "longest_side": "128 mm", - "price": "40 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "40" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 10 } } ] - }, - { - "id": "ppq40mag_12rd", - "//": "Copied from .45 PPQ, then 1.1x.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "PPQ .40 S&W 12-round magazine" }, - "description": "A 12-round steel box magazine for the Walther PPQ .40 S&W.", - "weight": "88 g", - "volume": "116 ml", - "longest_side": "128 mm", - "price": "44 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "40" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 12 } } ] - }, - { - "id": "ppq40mag_14rd", - "//": "Copied from .45 PPQ, then 1.2x.", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "PPQ .40 S&W 14-round magazine" }, - "description": "A 14-round steel box magazine for the Walther PPQ .40 S&W.", - "weight": "96 g", - "volume": "126 ml", - "longest_side": "128 mm", - "price": "48 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "40" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 14 } } ] - }, { "id": "hptjcpmag", "//": "Copied from .45 High-Point JHP magazine.", diff --git a/data/json/items/magazine/410shot.json b/data/json/items/magazine/410shot.json deleted file mode 100644 index 9f44ea673edd1..0000000000000 --- a/data/json/items/magazine/410shot.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "id": "saiga410mag_10rd", - "//": "Audited with ImageJ. Weight from comparison.", - "looks_like": "shotbelt_20", - "type": "MAGAZINE", - "name": { "str": "Saiga-410 10-round magazine" }, - "description": "A removable plastic box magazine for the Saiga-410 shotgun. Holds 10 shells.", - "weight": "178 g", - "volume": "407 ml", - "price": "45 USD", - "price_postapoc": "1 USD", - "material": [ "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "410shot" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "410shot": 10 } } ] - }, - { - "id": "saiga410mag_30rd", - "//": "Audited with ImageJ. Weight from comparison.", - "looks_like": "shotbelt_20", - "type": "MAGAZINE", - "name": { "str": "Saiga-410 30-round drum magazine" }, - "description": "A removable plastic drum magazine for the Saiga-410 shotgun. Holds 30 shells.", - "weight": "340 g", - "volume": "777 ml", - "price": "110 USD", - "price_postapoc": "5 USD", - "material": [ "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "410shot" ], - "reload_time": 130, - "mag_jam_mult": 2, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "410shot": 30 } } ] - } -] diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index a4abba130ac8d..41109ba8ebd66 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -515,42 +515,6 @@ "flags": [ "SPEEDLOADER" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "9mm": 10 } } ] }, - { - "id": "mausermag_10rd", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "Mauser 10-round magazine" }, - "description": "A 10-round box magazine for Mauser pistols, specifically variants made to use a detachable magazine.", - "weight": "64 g", - "volume": "86 ml", - "longest_side": "15 cm", - "price": "30 USD", - "price_postapoc": "1 USD", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "9mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 10 } } ] - }, - { - "id": "mausermag_20rd", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "Mauser 20-round magazine" }, - "description": "A 20-round box magazine for Mauser pistols, specifically variants made to use a detachable magazine.", - "weight": "82 g", - "volume": "168 ml", - "longest_side": "22 cm", - "price": "50 USD", - "price_postapoc": "1 USD 50 cent", - "material": [ "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "9mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 20 } } ] - }, { "id": "mp40mag_32rd", "looks_like": "stanag30", @@ -1006,42 +970,6 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 100 } } ] }, - { - "id": "kpf9mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "PF-9 7-round magazine" }, - "description": "A standard 7-round steel box magazine for the Kel-Tec PF-9.", - "weight": "59 g", - "volume": "32 ml", - "longest_side": "95 mm", - "price": "19 USD", - "price_postapoc": "1 USD", - "material": [ "steel", "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "9mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 7 } } ] - }, - { - "id": "kpf9mag_8rd", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "PF-9 8-round magazine" }, - "description": "A standard steel box magazine with magazine extension installed, for use with the Kel-Tec PF-9. Holds a total of 8 rounds and provides a better grip for the shooter when loaded.", - "weight": "70 g", - "volume": "38 ml", - "longest_side": "105 mm", - "price": "20 USD", - "price_postapoc": "1 USD 10 cent", - "material": [ "steel", "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "9mm" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 8 } } ] - }, { "id": "p226mag_10rd_9x19mm", "type": "MAGAZINE", diff --git a/data/json/npcs/isolated_road/isolated_road_cody_prototype.json b/data/json/npcs/isolated_road/isolated_road_cody_prototype.json index b5539d8d2134c..c29567cb8702c 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_prototype.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_prototype.json @@ -220,28 +220,8 @@ "id": "TALK_BLACKSMITH_PRESSIN", "//": "Pressin Pistol Knife", "type": "talk_topic", - "dynamic_line": "The Pressin was a self defense weapon for politicians in Spain. It was a small breach loaded handheld pistol that could fit in a glasses case and be fired subtly. I figure that we can improve on the design by adding a retracting blade while keeping the surprise shots. To get this working I'm gonna need a .32 gun like a SIG Sauer P230, Kel-Tec P-32, or a Walther PPK. I'll also need a switchblade, 20 merch, and a week.", + "dynamic_line": "The Pressin was a self defense weapon for politicians in Spain. It was a small breach loaded handheld pistol that could fit in a glasses case and be fired subtly. I figure that we can improve on the design by adding a retracting blade while keeping the surprise shots. To get this working I'm gonna need a .32 gun like a Kel-Tec P-32, or a Walther PPK. I'll also need a switchblade, 20 merch, and a week.", "responses": [ - { - "text": "[P230, switchblade, 20 merch] See you in a week.", - "condition": { - "and": [ - { "u_has_items": { "item": "sig_p230", "count": 1 } }, - { "u_has_items": { "item": "switchblade", "count": 1 } }, - { "u_has_items": { "item": "FMCNote", "count": 20 } } - ] - }, - "effect": [ - { "u_consume_item": "sig_p230", "count": 1, "popup": true }, - { "u_consume_item": "switchblade", "count": 1, "popup": true }, - { "u_consume_item": "FMCNote", "count": 20, "popup": true }, - { "u_add_faction_trust": 1 }, - { "math": [ "u_timer_artisans_u_waiting_on_prototype", "=", "time('now')" ] }, - { "u_add_var": "dialogue_artisans_blacksmith_crafting", "value": "yes" }, - { "u_add_var": "dialogue_artisans_u_current_project", "value": "pressin" } - ], - "topic": "TALK_BLACKSMITH_SERVICES" - }, { "text": "[PPK, switchblade, 20 merch] See you in a week.", "condition": { diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json index f23ee93658d17..510a43c1fc587 100644 --- a/data/json/obsoletion_and_migration_0.I/gun.json +++ b/data/json/obsoletion_and_migration_0.I/gun.json @@ -1029,5 +1029,66 @@ "name": { "str": "modified RM121 aux shotgun" }, "description": "The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic caseless shotgun, which can be mounted under the barrel of many rifles. Accepts RMSA10 box magazines. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] + }, + { + "id": "saiga_410", + "copy-from": "shotgun_base", + "looks_like": "remington_870", + "type": "GUN", + "name": { "str": "Saiga-410" }, + "description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK-47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.", + "weight": "3400 g", + "volume": "5762 ml", + "longest_side": "1171 mm", + "barrel_length": "470 mm", + "price": "1 kUSD 890 USD", + "price_postapoc": "70 USD", + "to_hit": -1, + "material": [ "steel", "plastic" ], + "dispersion": 395, + "durability": 7, + "barrel_volume": "750 ml", + "ammo": [ "410shot" ], + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "saiga410mag_10rd", "saiga410mag_30rd" ] } ], + "melee_damage": { "bash": 12 } + }, + { + "id": "saiga410mag_10rd", + "//": "Audited with ImageJ. Weight from comparison.", + "looks_like": "shotbelt_20", + "type": "MAGAZINE", + "name": { "str": "Saiga-410 10-round magazine" }, + "description": "A removable plastic box magazine for the Saiga-410 shotgun. Holds 10 shells.", + "weight": "178 g", + "volume": "407 ml", + "price": "45 USD", + "price_postapoc": "1 USD", + "material": [ "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "410shot" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "410shot": 10 } } ] + }, + { + "id": "saiga410mag_30rd", + "//": "Audited with ImageJ. Weight from comparison.", + "looks_like": "shotbelt_20", + "type": "MAGAZINE", + "name": { "str": "Saiga-410 30-round drum magazine" }, + "description": "A removable plastic drum magazine for the Saiga-410 shotgun. Holds 30 shells.", + "weight": "340 g", + "volume": "777 ml", + "price": "110 USD", + "price_postapoc": "5 USD", + "material": [ "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "410shot" ], + "reload_time": 130, + "mag_jam_mult": 2, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "410shot": 30 } } ] } ] 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 20dd942a6175c..ca2bdce27fa18 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -1997,5 +1997,130 @@ "id": "wire_barbed_baseball", "type": "MIGRATION", "replace": "baseball" + }, + { + "id": "cx4", + "type": "MIGRATION", + "replace": "m9" + }, + { + "id": "STI_DS_10", + "type": "MIGRATION", + "replace": "glock_20" + }, + { + "id": "2011_22_mag", + "type": "MIGRATION", + "replace": "tdi_10mm_mag" + }, + { + "id": "2011_17_mag", + "type": "MIGRATION", + "replace": "tdi_10mm_mag" + }, + { + "id": "kp3at", + "type": "MIGRATION", + "replace": "rugerlcp" + }, + { + "id": "kp3atmag", + "type": "MIGRATION", + "replace": "rugerlcpmag" + }, + { + "id": "fn1910mag", + "type": "MIGRATION", + "replace": "hptcf380mag_8rd" + }, + { + "id": "kpf9", + "type": "MIGRATION", + "replace": "glock_19" + }, + { + "id": "kpf9mag", + "type": "MIGRATION", + "replace": "glockmag" + }, + { + "id": "kpf9mag_8rd", + "type": "MIGRATION", + "replace": "glockmag" + }, + { + "id": "mauser_m714", + "type": "MIGRATION", + "replace": "glock_19" + }, + { + "id": "mausermag_20rd", + "type": "MIGRATION", + "replace": "glock17_22" + }, + { + "id": "mausermag_10rd", + "type": "MIGRATION", + "replace": "glockmag" + }, + { + "id": "taurus_spectrum", + "type": "MIGRATION", + "replace": "rugerlcp" + }, + { + "id": "taurus_spectrum_mag", + "type": "MIGRATION", + "replace": "rugerlcpmag" + }, + { + "id": "minidraco556", + "type": "MIGRATION", + "replace": "ak556" + }, + { + "id": "arx160", + "type": "MIGRATION", + "replace": "ak47" + }, + { + "id": "walther_ppq_40", + "type": "MIGRATION", + "replace": "glock_22" + }, + { + "id": "ppq40mag_10rd", + "type": "MIGRATION", + "replace": "glock40mag" + }, + { + "id": "ppq40mag_12rd", + "type": "MIGRATION", + "replace": "glock40mag" + }, + { + "id": "ppq40mag_14rd", + "type": "MIGRATION", + "replace": "glock40mag" + }, + { + "id": "90two40", + "type": "MIGRATION", + "replace": "glock_22" + }, + { + "id": "90two40mag", + "type": "MIGRATION", + "replace": "glock40mag" + }, + { + "id": "sig_p230", + "type": "MIGRATION", + "replace": "walther_ppk" + }, + { + "id": "sigp230mag", + "type": "MIGRATION", + "replace": "ppkmag" } ] diff --git a/data/mods/Defense_Mode/itemgroups.json b/data/mods/Defense_Mode/itemgroups.json index 250ebe3dbdfda..e930b98e6fe70 100644 --- a/data/mods/Defense_Mode/itemgroups.json +++ b/data/mods/Defense_Mode/itemgroups.json @@ -27,7 +27,6 @@ { "item": "crossbow" }, { "item": "marlin_9a" }, { "item": "hk_mp5" }, - { "item": "taurus_spectrum" }, { "group": "modular_deagle_44" }, { "item": "m1911" }, { "item": "hk_ump45" }, diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 85b197956dfb0..3bb10756cd62e 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -100,10 +100,8 @@ { "id": [ "p320_357sig", - "kp3at", "rugerlcp", "hptcf380", - "taurus_spectrum", "sig_40", "hptjcp", "m1911", @@ -116,7 +114,6 @@ "usp_9mm", "p08", "mauser_c96", - "mauser_m714", "m17", "hi_power_9mm", "p226_357sig", @@ -124,25 +121,21 @@ "walther_p38", "walther_ccp", "makarov", - "STI_DS_10", "m1911a1_38super", "glock_22", "civilian_cop_glock22", "hi_power_40", - "walther_ppq_40", "tommygun", "usp_45", "fn57", "glock_17", "ruger_57", - "kpf9", "p50", "walther_ppq_9mm", "hptc9", "cz75", "90two", "px4", - "90two40", "px4_40", "glock_29", "glock_20", @@ -162,7 +155,7 @@ "replace": "pistol_medium" }, { - "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895", "draco_9mm" ], + "id": [ "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895", "draco_9mm" ], "type": "MIGRATION", "replace": "pistol_pcc" }, @@ -211,7 +204,6 @@ "ruger_lcr_22", "sig_mosquito", "walther_p22", - "sig_p230", "walther_ppk", "pressin", "cp33", @@ -334,7 +326,6 @@ "mdrx_300", "mdrx_308", "mdrx_308medium", - "arx160", "l_bak_223", "mosin91_30", "m249_semi", @@ -378,10 +369,7 @@ "m1carbine", "m2carbine", "ak556", - "minidraco556", "ak308", - "zpapm90", - "zpap85", "papm77", "rfb_308", "rdb_223" diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json index f7eb3ab1f5087..a24506cd5b466 100644 --- a/data/mods/Generic_Guns/firearms/pistol.json +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -47,7 +47,7 @@ }, { "id": "pistol_pcc", - "copy-from": "cx4", + "copy-from": "m1carbine", "type": "GUN", "name": "survivalist carbine", "ammo": [ "ammo_pistol" ], diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index aa1868da7e63b..4c666380d4527 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -7,15 +7,11 @@ { "id": [ "ppkmag", - "sigp230mag", "p226mag_12rd_357sig", "p320mag_13rd_357sig", - "kp3atmag", - "fn1910mag", "rugerlcpmag", "hptcf380mag_8rd", "hptcf380mag_10rd", - "taurus_spectrum_mag", "m1911mag_10rd_38super", "m9mag", "m9mag_10rd", @@ -24,13 +20,8 @@ "m9mag_20rd", "makarovmag", "glock40mag", - "2011_17_mag", - "2011_22_mag", "sig40mag", "bhp40mag", - "ppq40mag_10rd", - "ppq40mag_12rd", - "ppq40mag_14rd", "hptjcpmag", "m1911mag", "usp45mag", @@ -46,8 +37,6 @@ "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd", - "kpf9mag", - "kpf9mag_8rd", "p320mag_10rd_9x19mm", "p320mag_17rd_9x19mm", "p320mag_21rd_9x19mm", @@ -64,15 +53,12 @@ "cz75mag_20rd", "p08mag_8rd", "clip9mm_10rd", - "mausermag_10rd", - "mausermag_20rd", "ccpmag", "ccpmag_9rd", "px4mag", "px4mag_10rd", "px4mag_15rd", "px4mag_20rd", - "90two40mag", "px4_40mag", "glock_20mag", "glock_21mag", diff --git a/data/mods/TEST_DATA/expected_dps_data/guns_dps.json b/data/mods/TEST_DATA/expected_dps_data/guns_dps.json index aad1fb7e8bf91..e4e343880ec36 100644 --- a/data/mods/TEST_DATA/expected_dps_data/guns_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/guns_dps.json @@ -34,18 +34,14 @@ "rm103a_pistol": 6.48, "tokarev": 6.51, "walther_ppq_45": 5.41, - "taurus_spectrum": 6.59, "modular_deagle": 6.65, "raging_bull": 6.65, "walther_ppk": 6.66, - "sig_p230": 6.66, "modular_ar15": 6.85, "m1911-460": 7.19, "m1911a1_38super": 7.19, "m1911": 7.19, - "STI_DS_10": 7.19, "walther_ppq_9mm": 5.49, - "walther_ppq_40": 5.49, "sw629": 5.51, "m1911_10": 7.4, "pressin": 9.67, diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index 97692f5fb9064..be141260f17fc 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -651,7 +651,6 @@ "usp_9mm": 1, "uzi": 1, "glock_17": 1, - "kpf9": 1, "m11": 1, "m17": 1, "p226_9mm": 1, @@ -664,8 +663,7 @@ "walther_ccp": 1, "colt_ro635": 1, "bt_apc9k": 1, - "calico": 1, - "cx4": 1 + "calico": 1 } }, { @@ -693,6 +691,7 @@ "type": "223", "weight": 125, "items": { + "ak556": 1, "ar15": 1, "famas": 1, "scar_l": 1, @@ -707,8 +706,6 @@ "sig_assault_rifle": 1, "sl8": 1, "steyr_aug": 1, - "ak556": 1, - "minidraco556": 1, "bren2_556": 1, "rdb_223": 1, "iwi_tavor_x95_300blk": 1 @@ -737,13 +734,12 @@ { "type": "380", "weight": 48, - "items": { "mac_11": 1, "kp3at": 1, "rugerlcp": 1, "hptcf380": 1, "taurus_spectrum": 1, "rifle_380": 1, "hpt3895": 1 } + "items": { "mac_11": 1, "rugerlcp": 1, "hptcf380": 1, "rifle_380": 1, "hpt3895": 1 } }, { "type": "40", "weight": 40, "items": { - "90two40": 1, "glock_22": 1, "px4_40": 1, "rifle_40": 1, @@ -751,7 +747,6 @@ "smg_40": 1, "surv_six_shooter": 1, "hi_power_40": 1, - "walther_ppq_40": 1, "hptjcp": 1 } }, @@ -760,7 +755,6 @@ "weight": 34, "items": { "ak47": 1, - "arx160": 1, "sks": 1, "aksemi": 1, "draco": 1, @@ -844,7 +838,7 @@ { "type": "45colt", "weight": 8, "items": { "colt_saa": 1, "bond_410": 1, "taurus_judge": 1 } }, { "type": "762R", "weight": 4, "items": { "mosin44": 1, "mosin91_30": 1, "psl": 1 } }, { "type": "270win", "weight": 3, "items": { "remington700_270": 1 } }, - { "type": "410shot", "weight": 3, "items": { "saiga_410": 1, "shotgun_410": 1 } }, + { "type": "410shot", "weight": 3, "items": { "shotgun_410": 1 } }, { "type": "300blk", "weight": 2, "items": { "sig_mcx_rattler_sbr": 1 } }, { "type": "123ln", "weight": 1, "items": { "pamd68": 1, "pamd71z": 1 } }, { @@ -874,7 +868,6 @@ "smle_mk3": 1, "number4_mki": 1, "m1carbine": 1, - "sig_p230": 1, "skorpion_61": 1, "walther_ppk": 1, "kp32": 1, @@ -935,7 +928,6 @@ "items": { "1911_22": 1, "2_shot_special": 1, - "90two40": 1, "ashot": 1, "bfr": 1, "bond_410": 1, @@ -967,8 +959,6 @@ "hptjcp": 1, "hptjhp": 1, "kp32": 1, - "kp3at": 1, - "kpf9": 1, "m11": 1, "m17": 1, "m18": 1, @@ -979,8 +969,6 @@ "m9": 1, "makarov": 1, "mauser_c96": 1, - "mauser_m714": 1, - "minidraco556": 1, "model_10_revolver": 1, "modular_ar_pistol": 1, "chiappa_rhino": 1, @@ -1008,7 +996,6 @@ "rough_rider_pistol_9": 1, "sig_40": 1, "sig_mosquito": 1, - "sig_p230": 1, "sp2022": 1, "surv_hand_cannon": 1, "surv_six_shooter": 1, @@ -1016,7 +1003,6 @@ "sw_610": 1, "sw_619": 1, "sw629": 1, - "taurus_spectrum": 1, "TDI_10": 1, "tokarev": 1, "usp_45": 1, @@ -1027,7 +1013,6 @@ "walther_p22": 1, "walther_p38": 1, "walther_ppk": 1, - "walther_ppq_40": 1, "walther_ppq_45": 1, "walther_ppq_9mm": 1, "winchester_1887": 1, @@ -1060,7 +1045,6 @@ "ar15_50medium": 1, "ar15_50short": 1, "ar15_762": 1, - "arx160": 1, "as50": 1, "axmc": 1, "axmc_300": 1, @@ -1072,7 +1056,6 @@ "bren2_762": 1, "browning_blr": 1, "combination_gun": 1, - "cx4": 1, "cz600": 1, "cz600_762": 1, "famas": 1, @@ -1233,7 +1216,6 @@ "remington_870_express": 1, "revolver_shotgun": 1, "saiga_12": 1, - "saiga_410": 1, "shotgun_410": 1, "shotgun_d": 1, "shotgun_s": 1, diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json index 0f8d0ae14c0d9..4472b00ef4725 100644 --- a/data/mods/TEST_DATA/legacy_to_hit.json +++ b/data/mods/TEST_DATA/legacy_to_hit.json @@ -18,8 +18,8 @@ "advanced_gpnvg", "airsoft_helmet", "ak308", - "ak47", "ak556", + "ak47", "ak74_semi", "aksemi", "alloy_plate", @@ -60,7 +60,6 @@ "art_snake", "art_sphere", "art_spiral", - "arx160", "as50", "atgm_launcher", "awl_bone", @@ -219,7 +218,6 @@ "cured_pelt", "curling_iron", "cuvettes", - "cx4", "cz600", "damaged_shelter_kit", "debug_gun_no_mag_well", @@ -460,7 +458,6 @@ "military_explosive_half_barrel_bomb_act", "military_explosive_pipebomb", "military_nvg", - "minidraco556", "mininuke", "minireactor", "modern_handguard", @@ -568,8 +565,8 @@ "ruger_mini", "rugerlcp", "runner_bag", - "saiga_12", "saiga_410", + "saiga_12", "sail", "santa_beard", "sapra", @@ -603,7 +600,6 @@ "shovel", "shuttlecock", "sig_assault_rifle", - "sig_p230", "silver_watch", "sks", "sleeping_bag", diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json index b51820edd81e2..675cfefb2dbcb 100644 --- a/data/mods/classic_zombies/items/blacklists.json +++ b/data/mods/classic_zombies/items/blacklists.json @@ -24,11 +24,8 @@ "8x40_50_mag", "8x40_500_mag", "m9", - "90two40", - "90two40mag", "alien_pod_resin", "arm", - "arx160", "as50", "as50mag", "atomic_coffee", @@ -197,7 +194,6 @@ "btmp9mag_9x19mm_30", "btmp9mag_9x19mm_50rd", "coilgun", - "cx4", "emp_gun", "fetus", "gatling_mech_laser", @@ -239,13 +235,7 @@ "iv_purifier", "iwi_tavor_x95_300blk", "kord", - "kp3at", - "kp3atmag", - "kpf9", - "kpf9mag", - "kpf9mag_8rd", "ksg", - "ksg-25", "ksub2000", "laser_rifle", "leg", @@ -344,9 +334,6 @@ "saiga_12", "saiga10mag", "saiga30mag", - "saiga_410", - "saiga410mag_10rd", - "saiga410mag_30rd", "scar_h", "sig_assault_rifle", "sig_mcx_rattler_sbr", @@ -356,8 +343,6 @@ "sp2022mag_15rd_9mm", "sw_500", "500_speedloader5", - "taurus_spectrum", - "taurus_spectrum_mag", "tavor_12", "dp_12", "srm_1216", @@ -374,10 +359,6 @@ "ccpmag_9rd", "walther_p22", "wp22mag", - "walther_ppq_40", - "ppq40mag_10rd", - "ppq40mag_12rd", - "ppq40mag_14rd", "walther_ppq_45", "ppq45mag", "walther_ppq_9mm", @@ -385,7 +366,6 @@ "ppq9mag_15rd", "ppq9mag_17rd", "wine_mycus", - "STI_DS_10", "xd_10", "xd_10_mag", "taurus_judge",