diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json index dc1c0090184b0..a6a9bccd696f2 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json @@ -1828,7 +1828,7 @@ { "item": "mossberg_590", "prob": 23 }, { "item": "mossberg_930", "prob": 8 }, { "item": "m1014", "prob": 2 }, - { "item": "remington_870_breacher", "prob": 2 } + { "item": "mossberg_590_shockwave", "prob": 2 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json index 7f5d63840449f..6f81d4ae3cfc9 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json @@ -185,18 +185,6 @@ "subtype": "collection", "entries": [ { "item": "axmc", "contents-item": "retool_axmc_308win" } ] }, - { - "id": "cz600", - "type": "item_group", - "subtype": "collection", - "entries": [ { "item": "cz600", "contents-item": "retool_cz600_223rem" } ] - }, - { - "id": "cz600_762", - "type": "item_group", - "subtype": "collection", - "entries": [ { "item": "cz600", "contents-item": "retool_cz600_762" } ] - }, { "id": "modular_deagle_357", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json index fcb571d3a6daf..928b3f5bd75a0 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json @@ -232,23 +232,6 @@ "on_overflow": "spill", "entries": [ { "item": "retool_axmc_308win" }, { "item": "ai_308mag_10", "charges": 0 }, { "group": "nested_retool_extras" } ] }, - { - "type": "item_group", - "id": "boxed_223rem_cz600kit", - "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", - "subtype": "collection", - "container-item": "box_retool", - "on_overflow": "spill", - "entries": [ { "item": "retool_cz600_223rem" }, { "item": "stanag10", "charges": 0 }, { "group": "nested_retool_extras" } ] - }, - { - "type": "item_group", - "id": "boxed_762_cz600kit", - "//": "a conversion kit packed along with an appropriate empty magazine and miscellaneous items.", - "subtype": "collection", - "container-item": "box_retool", - "entries": [ { "item": "retool_cz600_762" }, { "item": "bren2_762mag10", "charges": 0 }, { "group": "nested_retool_extras" } ] - }, { "type": "item_group", "id": "boxed_50ae_deaglekit", @@ -362,18 +345,6 @@ } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "boxed_cz600kits", - "//": "An item group for a specific weapon platform's possible conversion kits .", - "entries": [ - { - "distribution": [ { "group": "boxed_223rem_cz600kit", "prob": 30 }, { "group": "boxed_762_cz600kit", "prob": 25 } ], - "prob": 100 - } - ] - }, { "type": "item_group", "subtype": "collection", @@ -411,13 +382,6 @@ "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", "entries": [ { "group": "boxed_axmckits" }, { "group": "axmc" } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "nested_cz600_with_kits", - "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.", - "entries": [ { "group": "boxed_cz600kits" }, { "group": "cz600" } ] - }, { "type": "item_group", "subtype": "collection", @@ -435,8 +399,7 @@ "distribution": [ { "group": "boxed_ar15kits", "prob": 30 }, { "group": "boxed_mdrxkits", "prob": 15 }, - { "group": "boxed_axmckits", "prob": 5 }, - { "group": "boxed_cz600kits", "prob": 15 } + { "group": "boxed_axmckits", "prob": 5 } ], "prob": 100 } diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json index b4a173d1c7e22..31fef4e3156fd 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json @@ -313,19 +313,5 @@ "prob": 100 } ] - }, - { - "id": "nested_converted_cz600", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "//2": "An item group for a random, personally-converted weapon to spawn.", - "subtype": "collection", - "ammo": 100, - "entries": [ - { "group": "cz600_762", "charges": [ 0, 10 ] }, - { "item": "bren2_762mag10" }, - { "item": "bren2_762mag10", "prob": 50 }, - { "group": "on_hand_308" } - ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 947fc5cb0ae77..445a5a9d1b92a 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -378,7 +378,7 @@ "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ { "group": "nested_remington_870_express", "prob": 50 }, - { "group": "nested_remington_870_breacher", "prob": 20 }, + { "group": "nested_mossberg_590_shockwave", "prob": 20 }, { "group": "nested_mossberg_590", "prob": 50 }, { "group": "nested_m1014", "prob": 100 } ] 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 003af3828daed..19e961adbbf76 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -41,7 +41,6 @@ { "group": "nested_rough_rider_pistol", "prob": 61 }, { "group": "nested_rough_rider_pistol_9", "prob": 14 }, { "group": "nested_sig_mosquito", "prob": 65 }, - { "group": "nested_cp33", "prob": 16 }, { "group": "nested_ruger_mk4", "prob": 113 }, { "group": "nested_1911_22", "prob": 100 }, { "group": "nested_sw617", "prob": 46 }, @@ -121,10 +120,8 @@ { "group": "nested_p220_10", "prob": 35 }, { "group": "nested_xd_10", "prob": 85 }, { "group": "nested_witness_10", "prob": 10 }, - { "group": "nested_TDI_10", "prob": 183 }, { "group": "nested_glock_20", "prob": 121 }, - { "group": "nested_glock_29", "prob": 62 }, - { "group": "nested_sw_610", "prob": 34 } + { "group": "nested_glock_29", "prob": 62 } ] }, { @@ -140,11 +137,7 @@ { "type": "item_group", "id": "guns_pistol_common_57", - "items": [ - { "group": "nested_ruger_57", "prob": 100 }, - { "group": "nested_fn57", "prob": 13 }, - { "group": "nested_p50", "prob": 12 } - ] + "items": [ { "group": "nested_ruger_57", "prob": 100 }, { "group": "nested_fn57", "prob": 13 } ] }, { "type": "item_group", @@ -224,7 +217,6 @@ { "item": "ruger_lcr_22", "prob": 2, "charges": [ 0, -1 ] }, { "item": "ruger_mk4", "prob": 16, "charges": [ 0, -1 ] }, { "item": "1911_22", "prob": 20, "charges": [ 0, -1 ] }, - { "item": "cp33", "prob": 3, "charges": [ 0, -1 ] }, { "item": "glock_44", "prob": 13, "charges": [ 0, -1 ] }, { "item": "sw617", "prob": 8, "charges": [ 0, -1 ] } ] @@ -296,8 +288,6 @@ "type": "item_group", "id": "guns_pistol_common_everyday_carry_10mm", "items": [ - { "item": "sw_610", "prob": 3, "charges": [ 0, -1 ] }, - { "item": "sw_610", "prob": 5, "charges": [ 0, -1 ] }, { "item": "glock_40", "prob": 5, "charges": [ 0, -1 ] }, { "item": "m1911_10", "prob": 3, "charges": [ 0, -1 ] }, { "item": "p220_10", "prob": 4, "charges": [ 0, -1 ] }, @@ -370,7 +360,6 @@ { "item": "rough_rider_pistol", "prob": 61 }, { "item": "rough_rider_pistol_9", "prob": 14 }, { "item": "sig_mosquito", "prob": 65 }, - { "item": "cp33", "prob": 16 }, { "item": "ruger_mk4", "prob": 113 }, { "item": "1911_22", "prob": 100 }, { "item": "sw617", "prob": 46 }, @@ -462,16 +451,14 @@ { "item": "p220_10", "prob": 35 }, { "item": "xd_10", "prob": 85 }, { "item": "witness_10", "prob": 10 }, - { "item": "TDI_10", "prob": 183 }, { "item": "glock_20", "prob": 121 }, - { "item": "glock_29", "prob": 62 }, - { "item": "sw_610", "prob": 34 } + { "item": "glock_29", "prob": 62 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_57", - "items": [ { "item": "ruger_57", "prob": 100 }, { "item": "fn57", "prob": 13 }, { "item": "p50", "prob": 12 } ] + "items": [ { "item": "ruger_57", "prob": 100 }, { "item": "fn57", "prob": 13 } ] }, { "type": "item_group", @@ -556,7 +543,6 @@ { "group": "nested_bren2_556", "prob": 4 }, { "group": "nested_rdb_223", "prob": 44 }, { "group": "nested_mdrx_retool_223rem_civilian", "prob": 9 }, - { "group": "nested_cz600", "prob": 13 }, { "group": "nested_sl8", "prob": 3 }, { "group": "nested_sig_assault_rifle", "prob": 1 }, { "group": "nested_scar_16s", "prob": 14 }, @@ -591,7 +577,6 @@ "items": [ { "group": "nested_sks", "prob": 34 }, { "group": "nested_aksemi", "prob": 100 }, - { "group": "nested_bren2_762", "prob": 1 }, { "group": "nested_mk47", "prob": 26 }, { "group": "nested_ar15_retool_762", "prob": 5 } ] @@ -744,7 +729,6 @@ { "item": "rdb_223", "prob": 44 }, { "group": "mdrx_223", "prob": 4 }, { "group": "mdrx", "prob": 5 }, - { "group": "cz600", "prob": 13 }, { "item": "sl8", "prob": 3 }, { "item": "sig_assault_rifle", "prob": 1 }, { "item": "scar_16s", "prob": 14 }, @@ -780,7 +764,6 @@ { "item": "sks", "prob": 34 }, { "item": "aksemi", "prob": 100 }, { "item": "mk47", "prob": 26 }, - { "item": "bren2_762", "prob": 1 }, { "group": "ar15_762", "prob": 5 } ] }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json index 8e771c67aafba..6c9d3d658604e 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json @@ -271,7 +271,6 @@ { "group": "boxed_ruger_lcr_22", "prob": 2 }, { "group": "boxed_22_revolver", "prob": 75 }, { "group": "boxed_sig_mosquito", "prob": 65 }, - { "group": "boxed_cp33", "prob": 16 }, { "group": "boxed_ruger_mk4", "prob": 113 }, { "group": "boxed_1911_22", "prob": 100 }, { "group": "boxed_sw617", "prob": 46 }, @@ -325,13 +324,6 @@ "container-item": "box_pistol", "items": [ { "item": "glock_44" }, { "group": "firearm_box_extras" }, { "item": "glock44_mag", "count": [ 1, 2 ] } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "boxed_cp33", - "container-item": "box_pistol", - "items": [ { "item": "cp33" }, { "group": "firearm_box_extras" }, { "item": "cp33_mag", "count": [ 1, 2 ] } ] - }, { "type": "item_group", "subtype": "collection", @@ -656,8 +648,7 @@ { "group": "boxed_m1911_10", "prob": 30 }, { "group": "boxed_p220_10", "prob": 35 }, { "group": "boxed_xd_10", "prob": 85 }, - { "group": "boxed_witness_10", "prob": 10 }, - { "group": "boxed_sw_610", "prob": 34 } + { "group": "boxed_witness_10", "prob": 10 } ] }, { @@ -669,12 +660,7 @@ { "item": "glock_20mag_10", "count": [ 1, 2 ] }, { "group": "firearm_box_extras" }, { - "distribution": [ - { "item": "glock_40", "prob": 100 }, - { "item": "TDI_10", "prob": 183 }, - { "item": "glock_20", "prob": 121 }, - { "item": "glock_29", "prob": 62 } - ] + "distribution": [ { "item": "glock_40", "prob": 100 }, { "item": "glock_20", "prob": 121 }, { "item": "glock_29", "prob": 62 } ] } ] }, @@ -706,13 +692,6 @@ "container-item": "box_pistol", "items": [ { "item": "witness_10" }, { "group": "firearm_box_extras" }, { "item": "witness_mag_10", "count": [ 1, 2 ] } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "boxed_sw_610", - "container-item": "box_pistol", - "items": [ { "item": "sw_610" }, { "group": "firearm_box_extras" }, { "item": "40_speedloader6", "prob": 5 } ] - }, { "type": "item_group", "subtype": "collection", @@ -738,11 +717,7 @@ { "type": "item_group", "id": "guns_pistol_common_boxed_57", - "items": [ - { "group": "boxed_ruger_57", "prob": 100 }, - { "group": "boxed_fn57", "prob": 13 }, - { "group": "boxed_p50", "prob": 12 } - ] + "items": [ { "group": "boxed_ruger_57", "prob": 100 }, { "group": "boxed_fn57", "prob": 13 } ] }, { "type": "item_group", @@ -758,13 +733,6 @@ "container-item": "box_pistol", "items": [ { "item": "fn57" }, { "group": "firearm_box_extras" }, { "item": "fn57mag_10rd", "count": [ 1, 2 ] } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "boxed_p50", - "container-item": "box_pistol", - "items": [ { "item": "p50" }, { "group": "firearm_box_extras" }, { "item": "fnp90mag_10rd" } ] - }, { "type": "item_group", "subtype": "collection", @@ -972,7 +940,6 @@ { "item": "rdb_223", "prob": 44 }, { "group": "mdrx", "prob": 5 }, { "group": "mdrx_223", "prob": 4 }, - { "group": "cz600", "prob": 4 }, { "item": "sig_assault_rifle", "prob": 1 }, { "item": "scar_16s", "prob": 14 }, { "item": "iwi_tavor_x95_300blk", "prob": 27 }, @@ -1100,7 +1067,6 @@ "items": [ { "group": "boxed_sks", "prob": 34 }, { "group": "boxed_akmag", "prob": 126 }, - { "group": "boxed_bren2_762", "prob": 1 }, { "group": "boxed_ar15_762", "prob": 5 } ] }, @@ -1122,13 +1088,6 @@ { "distribution": [ { "item": "aksemi", "prob": 100 }, { "item": "mk47", "prob": 26 } ] } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "boxed_bren2_762", - "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, - "items": [ { "item": "bren2_762" }, { "group": "firearm_box_extras" }, { "item": "bren2_762mag10", "count": [ 1, 2 ] } ] - }, { "type": "item_group", "subtype": "collection", 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 446b29d6bd1b8..071942bee2c61 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 @@ -247,13 +247,6 @@ { "item": "ruger1022mag_110", "prob": 20 } ] }, - { - "type": "item_group", - "subtype": "distribution", - "id": "magazines_22_cp33", - "//": "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": "cp33_mag", "prob": 500 }, { "item": "cp33_mag_50", "prob": 100 } ] - }, { "type": "item_group", "subtype": "distribution", @@ -441,13 +434,6 @@ { "item": "akdrum75", "prob": 50 } ] }, - { - "type": "item_group", - "subtype": "distribution", - "id": "magazines_bren2762", - "//": "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": "bren2_762mag30", "prob": 500 }, { "item": "bren2_762mag10", "prob": 400 } ] - }, { "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 329723eb8e227..17bef8ec7467f 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json @@ -202,7 +202,6 @@ { "item": "500_speedloader5", "prob": 4 }, { "item": "38_speedloader6", "prob": 60 }, { "item": "38_speedloader", "prob": 20 }, - { "item": "40_speedloader6", "prob": 5 }, { "item": "44_speedloader6", "prob": 35 }, { "item": "454_speedloader5", "prob": 5 } ] 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 3e04b7bedcf6a..96adaeb62c39f 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 @@ -59,7 +59,6 @@ "//": "Collections of magazines for 10mm guns that are sold in gunstores, such as Glocks.", "items": [ { "group": "magazines_10mm_glock", "prob": 100 }, - { "item": "40_speedloader6", "prob": 16 }, { "item": "m1911_10mag", "prob": 3 }, { "item": "p220_10_mag", "prob": 21 }, { "item": "witness_mag_10", "prob": 13 }, @@ -74,7 +73,6 @@ "items": [ { "item": "glock_29mag", "prob": 39 }, { "item": "glock_20mag_10", "prob": 61 }, - { "item": "40_speedloader6", "prob": 16 }, { "item": "m1911_10mag", "prob": 3 }, { "item": "p220_10_mag", "prob": 21 }, { "item": "witness_mag_10", "prob": 13 }, @@ -89,7 +87,6 @@ "items": [ { "group": "magazines_22_ar", "prob": 8 }, { "group": "magazines_22_1022", "prob": 100 }, - { "group": "magazines_22_cp33", "prob": 5 }, { "item": "22_speedloader8", "prob": 1 }, { "item": "mosquitomag", "prob": 20 }, { "item": "wp22mag", "prob": 23 }, @@ -107,7 +104,6 @@ "items": [ { "item": "22_ar15mag_10", "prob": 8 }, { "item": "ruger1022mag", "prob": 100 }, - { "item": "cp33_mag", "prob": 5 }, { "item": "glock44_mag", "prob": 2 }, { "item": "22_speedloader8", "prob": 1 }, { "item": "mosquitomag", "prob": 20 }, @@ -310,7 +306,6 @@ "//": "Collections of magazines for 7.62x39 guns that can be found in gunstores.", "items": [ { "group": "magazines_akm", "prob": 100 }, - { "group": "magazines_bren2762", "prob": 44 }, { "group": "magazines_ar762", "prob": 19 }, { "item": "762x39_clip", "prob": 35 } ] @@ -322,7 +317,6 @@ "//": "Collections of magazines for 7.62x39 guns that can be found in gunstores, that are limited to 10 rounds or less.", "items": [ { "item": "akmag10", "prob": 100 }, - { "item": "bren2_762mag10", "prob": 44 }, { "group": "magazines_restricted_ar762", "prob": 19 }, { "item": "762x39_clip", "prob": 35 } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 28eeed48b9fd2..6565d9f303033 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -366,19 +366,6 @@ { "group": "on_hand_22" } ] }, - { - "id": "nested_cp33", - "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": "cp33", "charges": [ 0, 33 ] }, - { "item": "cp33_mag" }, - { "item": "cp33_mag", "prob": 50 }, - { "group": "on_hand_22" } - ] - }, { "id": "nested_ruger_mk4", "type": "item_group", @@ -426,14 +413,6 @@ "ammo": 100, "entries": [ { "item": "marlin60", "charges": [ 0, 14 ] }, { "group": "on_hand_22" } ] }, - { - "id": "nested_sw_610", - "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": "sw_610", "charges": [ 0, 6 ] }, { "group": "on_hand_10mm" } ] - }, { "id": "nested_sw_619", "type": "item_group", @@ -986,19 +965,6 @@ { "group": "on_hand_9mm" } ] }, - { - "id": "nested_TDI_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": "TDI_10", "charges": [ 0, 30 ] }, - { "item": "tdi_10mm_mag" }, - { "item": "tdi_10mm_mag", "prob": 50 }, - { "group": "on_hand_10mm" } - ] - }, { "id": "nested_m17", "type": "item_group", @@ -1905,14 +1871,6 @@ { "group": "on_hand_762R" } ] }, - { - "id": "nested_savage_111f", - "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": "savage_111f", "charges": [ 0, 3 ] }, { "group": "on_hand_308" } ] - }, { "id": "nested_sharps", "type": "item_group", @@ -2330,14 +2288,6 @@ "ammo": 100, "entries": [ { "item": "mossberg_500_410", "charges": [ 0, 5 ] }, { "group": "on_hand_410shot" } ] }, - { - "id": "nested_shotgun_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": "shotgun_410", "charges": [ 0, 1 ] }, { "group": "on_hand_410shot" } ] - }, { "id": "nested_shotgun_d", "type": "item_group", @@ -2523,14 +2473,6 @@ { "group": "on_hand_shot" } ] }, - { - "id": "nested_remington_870_breacher", - "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": "remington_870_breacher", "charges": [ 0, 4 ] }, { "group": "on_hand_shot" } ] - }, { "id": "nested_saiga_12", "type": "item_group", @@ -2544,19 +2486,6 @@ { "group": "on_hand_shot" } ] }, - { - "id": "nested_p50", - "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": "p50", "charges": [ 0, 10 ] }, - { "item": "fnp90mag_10rd" }, - { "item": "fnp90mag_10rd", "prob": 50 }, - { "group": "on_hand_57" } - ] - }, { "id": "nested_fn_ps90", "type": "item_group", @@ -2669,30 +2598,6 @@ { "group": "on_hand_300" } ] }, - { - "id": "nested_bren2_762", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "subtype": "collection", - "entries": [ - { "item": "bren2_762", "variant": "bren2_762", "charges": [ 0, 30 ] }, - { "item": "bren2_762mag30" }, - { "item": "bren2_762mag30", "prob": 50 }, - { "group": "on_hand_762" } - ] - }, - { - "id": "nested_805_bren", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "subtype": "collection", - "entries": [ - { "item": "bren2_762", "variant": "805_bren", "charges": [ 0, 30 ] }, - { "item": "bren2_762mag30" }, - { "item": "bren2_762mag30", "prob": 50 }, - { "group": "on_hand_762" } - ] - }, { "id": "nested_bren2_556", "type": "item_group", @@ -2773,18 +2678,6 @@ "ammo": 100, "entries": [ { "item": "ithaca37", "charges": [ 0, 5 ] }, { "group": "on_hand_shot" } ] }, - { - "id": "nested_cz600", - "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "subtype": "collection", - "entries": [ - { "group": "cz600", "charges": [ 0, 10 ] }, - { "item": "stanag10" }, - { "item": "stanag10", "prob": 50 }, - { "group": "on_hand_223" } - ] - }, { "id": "nested_ruger_arr", "type": "item_group", diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 35bbe56c3864e..fd114700a9369 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -225,7 +225,7 @@ { "item": "heavy_load_bearing_vest_breacher", "contents-group": "custom_light_lbv", - "contents-item": "remington_870_breacher" + "contents-item": "mossberg_590_shockwave" } ], "prob": 1 diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json index fa97a5578b8b2..a5c4cd033d3a5 100644 --- a/data/json/items/gun/10mm.json +++ b/data/json/items/gun/10mm.json @@ -1,42 +1,4 @@ [ - { - "id": "sw_610", - "copy-from": "gun_base_handgun_manual", - "looks_like": "sw_619", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "10mm/.40 revolver" }, - "description": "A classic six-shooter revolver chambered for 10mm and .40 rounds.", - "variant_type": "gun", - "variants": [ - { - "id": "sw_610", - "name": { "str": "S&W 610 revolver" }, - "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round." - } - ], - "ascii_picture": "sw_610", - "weight": "1420 g", - "volume": "754 ml", - "longest_side": "332 mm", - "barrel_length": "197 mm", - "//": "165mm + 32mm max OAL for 10mm. Revolvers just built different.", - "price": "740 USD", - "price_postapoc": "22 USD 50 cent", - "material": [ "steel", "wood" ], - "ammo": [ "10mm", "40" ], - "dispersion": 320, - "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ], - "clip_size": 6, - "pocket_data": [ - { - "pocket_type": "MAGAZINE", - "rigid": true, - "ammo_restriction": { "10mm": 6, "40": 6 }, - "allowed_speedloaders": [ "40_speedloader6" ] - } - ] - }, { "id": "glock_29", "copy-from": "gun_base_10mm_semi_pistol", @@ -231,39 +193,5 @@ "dispersion": 480, "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock mount", 1 ] ], "pocket_data": [ { "magazine_well": "81 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "xd_10_mag" ] } ] - }, - { - "id": "TDI_10", - "copy-from": "gun_base_10mm_semi_pistol", - "looks_like": "TDI", - "type": "ITEM", - "subtypes": [ "GUN" ], - "//": [ - "Yes, I know it's not really a glock smg.", - "It takes glock magazines, and it's own special one that I am also renaming to a glock magazine", - "so, I'm calling it a glock smg." - ], - "name": { "str": "Glock submachine gun" }, - "description": "A submachine gun chambered in 10mm, accepting Glock magazines.", - "variant_type": "gun", - "variants": [ - { - "id": "TDI_10", - "name": { "str": "Vector SDP 10mm pistol" }, - "description": "The Vector SDP is a delayed blowback \"pistol\" with a unique, downward reciprocating bolt that helps combat muzzle climb. This one is chambered in 10mm Auto." - } - ], - "weight": "2867 g", - "volume": "4386 ml", - "longest_side": "429 mm", - "price": "1 kUSD 429 USD", - "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock mount", 1 ] ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "magazine_well": "103 ml", - "item_restriction": [ "glock_20mag_10", "glock_20mag", "tdi_10mm_mag" ] - } - ] } ] diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index accbb9db32f2b..a06c1223cf658 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -238,48 +238,6 @@ "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "rail", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ], "pocket_data": [ { "magazine_well": "126 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "wp22mag" ] } ] }, - { - "id": "cp33", - "copy-from": "gun_base_22_semi_pistol", - "looks_like": "modular_ar_pistol", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "high capacity handgun" }, - "description": "A large capacity handgun, chambered in .22 and feeding from quad stack magazines. Used both recreationally and in competition.", - "variant_type": "gun", - "variants": [ - { - "id": "cp33", - "name": { "str": "CP33" }, - "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension. While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands." - } - ], - "weight": "669 g", - "volume": "525 ml", - "price": "495 USD", - "longest_side": "273 mm", - "barrel_length": "140 mm", - "material": [ "steel", "plastic", "aluminum" ], - "dispersion": 480, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "stock mount", 1 ] - ], - "durability": 6, - "pocket_data": [ - { - "rigid": false, - "magazine_well": "123 ml", - "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "cp33_mag", "cp33_mag_50" ] - } - ] - }, { "id": "ruger_mk4", "//": "Stats are from the 5.5 inch target version https://ruger.com/products/markIVTarget/specSheets/40101.html", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index dd6b9230d3d72..0904cf69c28b9 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -644,46 +644,6 @@ } ] }, - { - "id": "cz600", - "copy-from": "gun_base_rifle_manual", - "looks_like": "modular_ar15", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "bolt-action trail carbine" }, - "description": "Compact, svelte, and lightweight, this Leen bolt-action rifle packs the same features of larger sporting weapons into a backpack-sized package. Possessing an adjustable buttstock, a detachable magazine-based system, and a quick-swap barrel that can be exchanged to accommodate the firing of .223 Remington or 7.62x39mm Soviet ammunition, the weapon is a commendable backpacker or prepper rifle.", - "variant_type": "gun", - "variants": [ - { - "id": "cz600", - "name": { "str": "CZ 600 TRAIL rifle" }, - "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum. Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers." - } - ], - "weight": "1800 g", - "volume": "2500 ml", - "longest_side": "384 mm", - "//": "The size calculations are taken from a CZ 600 with a half-extended buttstock, sitting at 790 mm, between the minimum and maximum of 690 and 890 mm. In addition, the length of a 16-inch barrel has been deducted and will be made up for by the installable barrel assemblies.", - "price": "1 kUSD 155 USD", - "price_postapoc": "40 USD", - "material": [ "aluminum", "steel", "plastic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "NULL" ], - "dispersion": 150, - "built_in_mods": [ "adjustable_stock" ], - "valid_mod_locations": [ - [ "bore", 1 ], - [ "mechanism", 2 ], - [ "rail", 2 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock accessory", 2 ], - [ "stock", 1 ] - ], - "flags": [ "NO_TURRET", "EASY_CLEAN" ], - "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow." - }, { "id": "rdb_223", "copy-from": "gun_base_223_semi_rifle", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 5ad0196c60efc..abb2c2c6dd1e3 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -256,37 +256,6 @@ "description": "A semi-automatic civilian variant of the M60 machine gun, retaining the ability to be belt fed, an uncommon feature in civilian firearms.", "modes": [ [ "DEFAULT", "semi-auto", 1 ] ] }, - { - "id": "savage_111f", - "copy-from": "gun_base_rifle_manual", - "looks_like": "modular_ar15", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "Savage 111F rifle" }, - "description": "A very accurate rifle chambered for the powerful .308 round. Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.", - "weight": "3630 g", - "volume": "2875 ml", - "longest_side": "1041 mm", - "barrel_length": "559 mm", - "price": "530 USD", - "price_postapoc": "42 USD 50 cent", - "material": [ "steel", "plastic" ], - "ammo": [ "308" ], - "dispersion": 90, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "mechanism", 2 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "sling", 1 ], - [ "stock accessory", 1 ], - [ "stock mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "clip_size": 3, - "barrel_volume": "750 ml", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 3 } } ] - }, { "id": "scar_h", "copy-from": "scar_l", diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index 66f8df95e9772..b032867c753ab 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -1,23 +1,4 @@ [ - { - "id": "shotgun_410", - "copy-from": "shotgun_s", - "looks_like": "remington_870", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "Winchester M37 .410" }, - "description": "A single-shot break-action shotgun, chambered in .410 bore. Designed as a lower-recoil alternative to 12 gauge shotguns, it is light and easy to manufacture.", - "//": "remove shotgun variants", - "variants": [ ], - "weight": "2948 g", - "volume": "1748 ml", - "longest_side": "1152 mm", - "barrel_length": "660 mm", - "price_postapoc": "20 USD", - "blackpowder_tolerance": 80, - "ammo": [ "410shot" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "410shot": 1 } } ] - }, { "id": "mossberg_500_410", "copy-from": "gun_base_shotgun_manual", diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 0bc7acb0e13b6..12b6acf6e683e 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -64,34 +64,6 @@ ], "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "fnp90mag", "fnp90mag_10rd" ] } ] }, - { - "id": "p50", - "copy-from": "gun_base_57_semi_pistol", - "looks_like": "glock_17", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "high-capacity P90 handgun" }, - "description": "A large and retro-looking semi-automatic pistol firing the high-velocity 5.7x28mm cartridge, mainly constructed out of polymer-based materials. Making use of standard P90 50-round magazines which are inserted horizontally over the grip, the top of the gun swings forwards and away from the frame to facilitate reloading. If you were looking to add a touch of retro-futuristic spice to your new life in the ruins of New England, this firearm just might become your best friend.", - "variant_type": "gun", - "variants": [ - { - "id": "p50", - "name": { "str": "Kel-Tec P50 pistol" }, - "description": "Unique, adaptable, and extremely retro, the Kel-Tec P50 is a truly bizarre semi-automatic pistol. Having been regarded as possibly one of the most innovative firearms from Kel-Tec's entire line-up of guns, the P50 makes use of the high velocity 5.7x28mm cartridge, and feeds from standard FN P90 magazines. Boasting ambidextrous controls, an AR-15-like T-shaped charging handle, and a reload which involves swinging the receiver and barrel assemblies up and away from the frame to insert the magazine horizontally over the grip, this weapon lends a decidedly retro-futuristic touch to almost any situation." - } - ], - "weight": "1430 g", - "volume": "3230 ml", - "longest_side": "380 mm", - "barrel_length": "244 mm", - "price": "995 USD", - "material": [ "steel", "plastic" ], - "range": 3, - "dispersion": 380, - "reload": 500, - "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ] ], - "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "fnp90mag", "fnp90mag_10rd" ] } ] - }, { "id": "ruger_57", "copy-from": "gun_base_57_semi_pistol", diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 693701e979525..b3e60e7f34356 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -171,50 +171,5 @@ [ "underbarrel", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag10", "akmag20", "akmag30", "akmag40", "akdrum75" ] } ] - }, - { - "id": "bren2_762", - "copy-from": "gun_base_762_semi_rifle", - "looks_like": "modular_ar15", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "Bren 7.62mm carbine" }, - "description": "A semi-automatic clone of the Czech Republic's standard infantry carbine, sold for civilian sport shooting and recreational use, this modular rifle makes use of the 7.62x39mm Soviet cartridge and uses proprietary magazines.", - "variant_type": "gun", - "variants": [ - { - "id": "bren2_762", - "name": { "str": "CZ Bren 2 carbine" }, - "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former's features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table. Chambered for the 7.62x39mm Soviet cartridge, this particular weapon possesses a compact 11-inch barrel and is a civilian MS, 'modular semi-automatic,' model. Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles." - }, - { - "id": "805_bren", - "name": { "str": "CZ 805 Bren rifle" }, - "description": "Strongly resembling the FN SCAR, with features and ergonomics inspired by the AR-18, this semi-automatic rifle is a civilian clone of the Czech Republic's formerly standard infantry carbine and was produced by the same company. Discontinued in 2018, the rifle features an included muzzle break and adjustable folding buttstock, with this particular version being chambered in 7.62x39mm." - } - ], - "weight": "2870 g", - "volume": "4200 ml", - "//": "There's currently only pistol versions of this gun for sale in the US. This would be a good candidate for a pistol brace item that the survivor can replace with a real stock.", - "longest_side": "76 cm", - "barrel_length": "279 mm", - "price": "2 kUSD 155 USD", - "material": [ "steel", "aluminum", "plastic" ], - "dispersion": 140, - "barrel_volume": "175 ml", - "default_mods": [ "folding_stock", "muzzle_brake" ], - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock accessory", 1 ], - [ "stock mount", 1 ], - [ "underbarrel", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "bren2_762mag30", "bren2_762mag10" ] } ] } ] diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index fa6addff2c026..31cc1aa9e9983 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -496,46 +496,6 @@ "barrel_volume": "229 ml", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 4 } } ] }, - { - "id": "remington_870_breacher", - "copy-from": "remington_870", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "breaching shotgun" }, - "description": "This shotgun has a short barrel and no stock, and is set up for breaching doors. It is small enough to carry as a secondary weapon, but has fairly unpleasant recoil and no sights.", - "variant_type": "gun", - "variants": [ - { - "id": "remington_870_breacher", - "name": { "str": "Remington 870 MCS shotgun" }, - "description": "This Remington 870 Modular Combat System shotgun is currently set up for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights." - } - ], - "ascii_picture": "remington870mcs", - "weight": "2812 g", - "volume": "1284 ml", - "longest_side": "53 cm", - "barrel_length": "254 mm", - "looks_like": "remington_870", - "ranged_damage": { "damage_type": "bullet", "amount": -2 }, - "//": "dispersion should be 300 moa, but CDDA exaggerates dispersion.", - "sight_dispersion": 750, - "clip_size": 4, - "price": "538 USD", - "barrel_volume": "0 ml", - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock accessory", 1 ], - [ "stock mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 4 } } ] - }, { "id": "remington_870_express", "copy-from": "remington_870", @@ -821,45 +781,6 @@ ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 14 } } ] }, - { - "id": "winchester_1887", - "copy-from": "gun_base_shotgun_manual", - "type": "ITEM", - "subtypes": [ "GUN" ], - "name": { "str": "bootleg lever-action shotgun" }, - "description": "A lever-action shotgun with a very short barrel and no stock, with room for 6 rounds of 12 gauge shotshells. Likely a bootlegged replica of a pre-1900 firearm, it would pair nicely with a motorcycle jacket and a Harley Davidson, and seems ready to terminate your cataclysmic adversaries.", - "variant_type": "gun", - "variants": [ - { - "id": "winchester_1887", - "name": { "str": "1887 bootleg shotgun" }, - "description": "One of the first commercially successful repeating shotguns, the Winchester 1887 was specifically made lever-action at Winchester's request. Though later overshadowed in success by pump designs, the 1887 remains popular today. This one has a very short barrel, no stock, and would pair nicely with a motorcycle jacket and a Harley Davidson." - } - ], - "weight": "2994 g", - "volume": "1127 ml", - "longest_side": "708 mm", - "barrel_length": "470 mm", - "looks_like": "browning_blr", - "price": "1 kUSD 8 USD", - "price_postapoc": "22 USD 50 cent", - "material": [ "steel", "wood" ], - "dispersion": 860, - "durability": 6, - "clip_size": 6, - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "mechanism", 2 ], - [ "muzzle", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "sling", 1 ], - [ "stock accessory", 1 ], - [ "stock mount", 1 ], - [ "underbarrel mount", 1 ] - ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ] - }, { "id": "winchester_1897", "copy-from": "gun_base_shotgun_manual", diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index fe555a49497e3..71200db6eae63 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -826,110 +826,6 @@ "min_skills": [ [ "weapon", 1 ] ], "add_mod": [ [ "muzzle", 1 ] ] }, - { - "id": "retool_cz600_223rem", - "type": "ITEM", - "subtypes": [ "GUNMOD" ], - "name": { "str": "CZ .223 barrel-assembly", "str_pl": "CZ .223 barrel-assemblies" }, - "description": "This is a quick-detach .223-caliber barrel assembly and bolt-head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is capable of feeding ammunition from standard STANAG-style magazines.", - "weight": "1000 g", - "volume": "500 ml", - "longest_side": "406 mm", - "integral_volume": "500 ml", - "integral_weight": "1000 g", - "integral_longest_side": "406 mm", - "barrel_length": "406 mm", - "//": "Couldn't find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", - "price": "250 USD", - "price_postapoc": "10 USD", - "material": [ "steel" ], - "symbol": ":", - "color": "green", - "location": "bore", - "mod_targets": [ "cz600" ], - "install_time": "2 m", - "ammo_modifier": [ "223" ], - "magazine_adaptor": [ - [ - "223", - [ - "stanag30", - "stanag5", - "stanag5ranger", - "stanag10", - "stanag10ranger", - "stanag20", - "stanag20ranger", - "stanag30ranger", - "stanag40", - "stanag40ranger", - "stanag50", - "stanag60", - "stanag60drum", - "stanag90", - "stanag100", - "stanag100drum", - "stanag150", - "survivor223mag" - ] - ] - ], - "pocket_mods": [ - { - "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ - "stanag30", - "stanag5", - "stanag5ranger", - "stanag10", - "stanag10ranger", - "stanag20", - "stanag20ranger", - "stanag30ranger", - "stanag40", - "stanag40ranger", - "stanag50", - "stanag60", - "stanag60drum", - "stanag90", - "stanag100", - "stanag100drum", - "stanag150", - "survivor223mag" - ] - } - ], - "min_skills": [ [ "weapon", 1 ] ], - "add_mod": [ [ "muzzle", 1 ] ] - }, - { - "id": "retool_cz600_762", - "type": "ITEM", - "subtypes": [ "GUNMOD" ], - "name": { "str": "CZ 7.62x39mm barrel-assembly", "str_pl": "CZ 7.62x39mm barrel-assemblies" }, - "description": "This is a quick-detach 7.62mm barrel assembly and bolt head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is rendered compatible with 7.62x39mm CZ Bren 2 magazines.", - "weight": "1000 g", - "volume": "500 ml", - "longest_side": "406 mm", - "integral_volume": "500 ml", - "integral_weight": "1000 g", - "integral_longest_side": "406 mm", - "barrel_length": "406 mm", - "//": "Couldn't find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", - "price": "250 USD", - "price_postapoc": "10 USD", - "material": [ "steel" ], - "symbol": ":", - "color": "green", - "location": "bore", - "mod_targets": [ "cz600" ], - "install_time": "2 m", - "ammo_modifier": [ "762" ], - "magazine_adaptor": [ [ "762", [ "bren2_762mag10", "bren2_762mag30" ] ] ], - "pocket_mods": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "bren2_762mag10", "bren2_762mag30" ] } ], - "min_skills": [ [ "weapon", 1 ] ], - "add_mod": [ [ "muzzle", 1 ] ] - }, { "id": "retool_deagle_357", "type": "ITEM", diff --git a/data/json/items/gunmod/loading_port.json b/data/json/items/gunmod/loading_port.json index 1c011f9e49498..20c8fe0258b4d 100644 --- a/data/json/items/gunmod/loading_port.json +++ b/data/json/items/gunmod/loading_port.json @@ -43,7 +43,8 @@ "name": { "str": "speedloader chute, 4-round breaching shotgun" }, "description": "A metal ramp that is installed near a shotgun's feeding port to index speedloader tubes. This one is for 4-round breaching shotgun.", "copy-from": "arredondo_chute", - "mod_targets": [ "remington_870_breacher" ], + "mod_targets": [ ], + "//": "Will be fixed in future PR", "pocket_mods": [ { "pocket_type": "MAGAZINE", diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index 8e4ddf866afac..2f09f6ef6bfb3 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -80,7 +80,6 @@ "m203_mod", "m320_mod", "m320_mod_mod", - "M6_shotgun", "masterkey", "masterkey_mod", "m26_mass", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index 0e135b8b3935e..cee93fe410f7b 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -329,32 +329,6 @@ "description": "The M320 Grenade Launcher Module offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. It can be either attached to a rifle or combined with a buttstock for standalone use. This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] }, - { - "id": "M6_shotgun", - "copy-from": "underbarrel_base", - "type": "ITEM", - "subtypes": [ "GUN", "GUNMOD" ], - "name": { "str": "M6 Survival Gun shotgun" }, - "description": "The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's irremovable.", - "volume": "0 ml", - "price": "0 cent", - "price_postapoc": "0 cent", - "install_time": "0 s", - "material": [ "steel" ], - "symbol": ":", - "color": "light_red", - "location": "underbarrel", - "mod_targets": [ "rifle" ], - "flags": [ "RELOAD_EJECT", "ZERO_WEIGHT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 1 } } ], - "barrel_length": "470 mm", - "ammo": [ "shot" ], - "skill": "shotgun", - "range": 1, - "dispersion": 320, - "durability": 10, - "clip_size": 1 - }, { "id": "masterkey", "copy-from": "underbarrel_base", diff --git a/data/json/items/magazine/10mm.json b/data/json/items/magazine/10mm.json index f061fdb12efc4..7f2efbaef7c92 100644 --- a/data/json/items/magazine/10mm.json +++ b/data/json/items/magazine/10mm.json @@ -1,23 +1,4 @@ [ - { - "id": "40_speedloader6", - "//": "Values copied from .44 Speedloader.", - "looks_like": "38_speedloader", - "type": "ITEM", - "subtypes": [ "MAGAZINE" ], - "name": { "str": "10mm 6-round speedloader" }, - "description": "This speedloader can hold 6 rounds of .40 S&W or 10mm Auto and quickly reload a compatible revolver.", - "weight": "28 g", - "volume": "25 ml", - "price": "15 USD", - "price_postapoc": "1 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "40", "10mm" ], - "flags": [ "SPEEDLOADER" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40": 6, "10mm": 6 } } ] - }, { "id": "glock_20mag", "looks_like": "glock17_17", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index de9797d9d25f4..6fb08f692715d 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -361,60 +361,6 @@ "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 10 } } ] }, - { - "id": "cp33_mag", - "looks_like": "glock17_17", - "type": "ITEM", - "subtypes": [ "MAGAZINE" ], - "name": { "str": "high capacity 33 round magazine" }, - "description": "A 33-round capacity magazine for .22 ammunition, for use in a high capacity handgun.", - "variant_type": "gun", - "variants": [ - { - "id": "cp33_mag", - "name": { "str": "CP33 33-round magazine" }, - "description": "The CP33's magazine is a polymer body quad stack with 4 rows of .22 rounds, which gives it the ability to cram in 33 rounds into the magazine." - } - ], - "weight": "48 g", - "volume": "123 ml", - "longest_side": "126 mm", - "price": "51 USD 50 cent", - "price_postapoc": "2 USD", - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 33 } } ] - }, - { - "id": "cp33_mag_50", - "looks_like": "glock17_17", - "type": "ITEM", - "subtypes": [ "MAGAZINE" ], - "name": { "str": "high capacity 50 round magazine" }, - "description": "A 50-round capacity magazine for .22 ammunition, for use in a high capacity handgun.", - "variant_type": "gun", - "variants": [ - { - "id": "cp33_mag_50", - "name": { "str": "CP33 50-round magazine" }, - "description": "CP33 33-round magazine has the ability to accept extensions, and this one has a 17-round extension to bring the total up to a staggering 50 rounds of .22 ammunition." - } - ], - "weight": "84 g", - "volume": "186 ml", - "longest_side": "211 mm", - "price": "83 USD", - "price_postapoc": "3 USD", - "material": [ "plastic" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "22" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 50 } } ] - }, { "id": "ruger_mk4_mag", "looks_like": "glock17_17", diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json index 35fb64fed25de..11925686336a0 100644 --- a/data/json/items/magazine/762.json +++ b/data/json/items/magazine/762.json @@ -121,46 +121,6 @@ "mag_jam_mult": 2, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 75 } } ] }, - { - "id": "bren2_762mag30", - "//": "Audited with ImageJ.", - "looks_like": "stanag30", - "type": "ITEM", - "subtypes": [ "MAGAZINE" ], - "name": { "str": "Bren 2 30-round magazine" }, - "description": "A proprietary polymer box magazine, capable of containing 30 7.62x39mm rounds and compatible with the Czech Bren 2 carbine. Unlike conventional 7.62x39mm magazines, this one is inserted straight up into the magazine well rather than rocked in, in order to facilitate a bolt-hold open mechanism.", - "weight": "172 g", - "volume": "297 ml", - "longest_side": "200 mm", - "price": "31 USD 99 cent", - "price_postapoc": "2 USD 50 cent", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ] - }, - { - "id": "bren2_762mag10", - "//": "Comparison method used with 30rd magazine as the base. Length cut to 40% of 30rd for calculation.", - "looks_like": "stanag30", - "type": "ITEM", - "subtypes": [ "MAGAZINE" ], - "name": { "str": "Bren 2 10-round magazine" }, - "description": "A proprietary polymer box magazine, capable of containing 10 7.62x39mm rounds and compatible with the Czech Bren 2 carbine. Unlike conventional 7.62x39mm magazines, this one is inserted straight up into the magazine well rather than rocked in, in order to facilitate a bolt-hold open mechanism.", - "weight": "69 g", - "volume": "119 ml", - "longest_side": "80 mm", - "price": "22 USD 50 cent", - "price_postapoc": "1 USD", - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "light_gray", - "ammo_type": [ "762" ], - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 10 } } ] - }, { "id": "762_ar15mag_5rd", "//": "Dimensions and weight are from previous PR, not sure of methods.", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index b6581b9602c39..ea6cc7c31fbf2 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -358,7 +358,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", @@ -433,7 +432,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", @@ -488,7 +486,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", @@ -1833,7 +1830,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", @@ -3183,7 +3179,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", @@ -3229,7 +3224,6 @@ "m203_mod", "m320_mod_mod", "m320_mod", - "M6_shotgun", "m26_mass", "m26_mass_mod", "masterkey", diff --git a/data/json/mapgen/map_extras/grave.json b/data/json/mapgen/map_extras/grave.json index 84299a1dd7aec..410a6d2bad6fb 100644 --- a/data/json/mapgen/map_extras/grave.json +++ b/data/json/mapgen/map_extras/grave.json @@ -82,7 +82,7 @@ "place_item": [ { "item": "machete", "x": 0, "y": 1, "chance": 100 }, { "item": "usp_45", "x": 0, "y": 1, "chance": 100 }, - { "item": "remington_870_breacher", "x": 0, "y": 1, "chance": 100 }, + { "item": "mossberg_590_shockwave", "x": 0, "y": 1, "chance": 100 }, { "item": "holybook_bible1", "x": 0, "y": 1, "chance": 100 }, { "item": "sunglasses", "x": 0, "y": 1, "chance": 100 } ], diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index 4afc60ac8972f..5898353731487 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -266,7 +266,6 @@ { "item": "mossberg_500", "prob": 5, "charges": [ 0, 6 ] }, { "item": "remington_870", "prob": 5, "charges": [ 0, 5 ] }, { "item": "ruger_1022", "prob": 15, "charges": [ 0, 10 ] }, - { "item": "shotgun_410", "prob": 10, "charges": [ 0, 1 ] }, { "item": "shotgun_s", "prob": 10, "charges": [ 0, 1 ] }, { "item": "shotgun_d", "prob": 10, "charges": [ 0, 2 ] }, { "item": "sten", "prob": 20, "charges": [ 0, 32 ] }, diff --git a/data/json/npcs/NC_EVAC_BROKER.json b/data/json/npcs/NC_EVAC_BROKER.json index e8ba273110d18..423fe8b232d0d 100644 --- a/data/json/npcs/NC_EVAC_BROKER.json +++ b/data/json/npcs/NC_EVAC_BROKER.json @@ -24,7 +24,6 @@ "entries": [ { "item": "usp_45", "prob": 30 }, { "item": "sw_619", "prob": 30 }, - { "item": "sw_610", "prob": 30 }, { "item": "sw629", "prob": 5 }, { "item": "colt_anaconda_8", "prob": 2 }, { "item": "colt_anaconda_6", "prob": 3 }, diff --git a/data/json/npcs/NC_HUNTER.json b/data/json/npcs/NC_HUNTER.json index 97133640f6a6c..39691508b5e94 100644 --- a/data/json/npcs/NC_HUNTER.json +++ b/data/json/npcs/NC_HUNTER.json @@ -72,7 +72,7 @@ { "item": "ruger_1022", "prob": 10 }, { "item": "browning_blr", "prob": 10 }, { "item": "remington_700", "prob": 10 }, - { "item": "savage_111f", "prob": 5 }, + { "item": "remington_700_308", "prob": 5 }, { "item": "marlin_9a", "prob": 25 }, { "item": "m1903", "prob": 5 } ] diff --git a/data/json/npcs/NC_SCAVENGER.json b/data/json/npcs/NC_SCAVENGER.json index fafebc239da04..24bfcb415e930 100644 --- a/data/json/npcs/NC_SCAVENGER.json +++ b/data/json/npcs/NC_SCAVENGER.json @@ -24,7 +24,6 @@ "entries": [ { "item": "usp_45", "prob": 30 }, { "item": "sw_619", "prob": 30 }, - { "item": "sw_610", "prob": 30 }, { "item": "sw629", "prob": 5 }, { "item": "colt_anaconda_8", "prob": 2 }, { "item": "colt_anaconda_6", "prob": 3 }, diff --git a/data/json/obsoletion_and_migration_0.J/guns.json b/data/json/obsoletion_and_migration_0.J/guns.json index 7d97da89c735a..fdb8dd3c0c081 100644 --- a/data/json/obsoletion_and_migration_0.J/guns.json +++ b/data/json/obsoletion_and_migration_0.J/guns.json @@ -41,5 +41,206 @@ "clip_size": 1, "flags": [ "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 1 } } ] + }, + { + "id": "cz600", + "copy-from": "gun_base_rifle_manual", + "looks_like": "modular_ar15", + "type": "ITEM", + "subtypes": [ "GUN" ], + "name": { "str": "bolt-action trail carbine" }, + "description": "Compact, svelte, and lightweight, this Leen bolt-action rifle packs the same features of larger sporting weapons into a backpack-sized package. Possessing an adjustable buttstock, a detachable magazine-based system, and a quick-swap barrel that can be exchanged to accommodate the firing of .223 Remington or 7.62x39mm Soviet ammunition, the weapon is a commendable backpacker or prepper rifle.", + "variant_type": "gun", + "variants": [ + { + "id": "cz600", + "name": { "str": "CZ 600 TRAIL rifle" }, + "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum. Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers." + } + ], + "weight": "1800 g", + "volume": "2500 ml", + "longest_side": "384 mm", + "//": "The size calculations are taken from a CZ 600 with a half-extended buttstock, sitting at 790 mm, between the minimum and maximum of 690 and 890 mm. In addition, the length of a 16-inch barrel has been deducted and will be made up for by the installable barrel assemblies.", + "price": "1 kUSD 155 USD", + "price_postapoc": "40 USD", + "material": [ "aluminum", "steel", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "NULL" ], + "dispersion": 150, + "built_in_mods": [ "adjustable_stock" ], + "valid_mod_locations": [ + [ "bore", 1 ], + [ "mechanism", 2 ], + [ "rail", 2 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 2 ], + [ "stock", 1 ] + ], + "flags": [ "NO_TURRET", "EASY_CLEAN" ], + "//2": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow." + }, + { + "id": "retool_cz600_223rem", + "type": "ITEM", + "subtypes": [ "GUNMOD" ], + "name": { "str": "CZ .223 barrel-assembly", "str_pl": "CZ .223 barrel-assemblies" }, + "description": "This is a quick-detach .223-caliber barrel assembly and bolt-head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is capable of feeding ammunition from standard STANAG-style magazines.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "406 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "406 mm", + "barrel_length": "406 mm", + "//": "Couldn't find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", + "price": "250 USD", + "price_postapoc": "10 USD", + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "cz600" ], + "install_time": "2 m", + "ammo_modifier": [ "223" ], + "magazine_adaptor": [ + [ + "223", + [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + ] + ], + "pocket_mods": [ + { + "pocket_type": "MAGAZINE_WELL", + "item_restriction": [ + "stanag30", + "stanag5", + "stanag5ranger", + "stanag10", + "stanag10ranger", + "stanag20", + "stanag20ranger", + "stanag30ranger", + "stanag40", + "stanag40ranger", + "stanag50", + "stanag60", + "stanag60drum", + "stanag90", + "stanag100", + "stanag100drum", + "stanag150", + "survivor223mag" + ] + } + ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "retool_cz600_762", + "type": "ITEM", + "subtypes": [ "GUNMOD" ], + "name": { "str": "CZ 7.62x39mm barrel-assembly", "str_pl": "CZ 7.62x39mm barrel-assemblies" }, + "description": "This is a quick-detach 7.62mm barrel assembly and bolt head, installable within the frame of a CZ 600 rifle, and secured with three fasteners. With this assembly installed, a rifle is rendered compatible with 7.62x39mm CZ Bren 2 magazines.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "406 mm", + "integral_volume": "500 ml", + "integral_weight": "1000 g", + "integral_longest_side": "406 mm", + "barrel_length": "406 mm", + "//": "Couldn't find any information regarding weight and prices, so the numbers used here are broad guesses and are likely incorrect.", + "price": "250 USD", + "price_postapoc": "10 USD", + "material": [ "steel" ], + "symbol": ":", + "color": "green", + "location": "bore", + "mod_targets": [ "cz600" ], + "install_time": "2 m", + "ammo_modifier": [ "762" ], + "magazine_adaptor": [ [ "762", [ "akmag10", "akmag30" ] ] ], + "pocket_mods": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag10", "akmag30" ] } ], + "min_skills": [ [ "weapon", 1 ] ], + "add_mod": [ [ "muzzle", 1 ] ] + }, + { + "id": "sw_610", + "copy-from": "gun_base_handgun_manual", + "looks_like": "sw_619", + "type": "ITEM", + "subtypes": [ "GUN" ], + "name": { "str": "10mm/.40 revolver" }, + "description": "A classic six-shooter revolver chambered for 10mm and .40 rounds.", + "variant_type": "gun", + "variants": [ + { + "id": "sw_610", + "name": { "str": "S&W 610 revolver" }, + "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round." + } + ], + "ascii_picture": "sw_610", + "weight": "1420 g", + "volume": "754 ml", + "longest_side": "332 mm", + "barrel_length": "197 mm", + "//": "165mm + 32mm max OAL for 10mm. Revolvers just built different.", + "price": "740 USD", + "price_postapoc": "22 USD 50 cent", + "material": [ "steel", "wood" ], + "ammo": [ "10mm", "40" ], + "dispersion": 320, + "valid_mod_locations": [ [ "barrel", 1 ], [ "mechanism", 2 ], [ "sights mount", 1 ], [ "stock mount", 1 ] ], + "clip_size": 6, + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "ammo_restriction": { "10mm": 6, "40": 6 }, + "allowed_speedloaders": [ "40_speedloader6" ] + } + ] + }, + { + "id": "40_speedloader6", + "//": "Values copied from .44 Speedloader.", + "looks_like": "38_speedloader", + "type": "ITEM", + "subtypes": [ "MAGAZINE" ], + "name": { "str": "10mm 6-round speedloader" }, + "description": "This speedloader can hold 6 rounds of .40 S&W or 10mm Auto and quickly reload a compatible revolver.", + "weight": "28 g", + "volume": "25 ml", + "price": "15 USD", + "price_postapoc": "1 USD", + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "40", "10mm" ], + "flags": [ "SPEEDLOADER" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40": 6, "10mm": 6 } } ] } ] diff --git a/data/json/obsoletion_and_migration_0.J/migration_items.json b/data/json/obsoletion_and_migration_0.J/migration_items.json index 3870254bbb257..1ba4440af0c84 100644 --- a/data/json/obsoletion_and_migration_0.J/migration_items.json +++ b/data/json/obsoletion_and_migration_0.J/migration_items.json @@ -217,13 +217,78 @@ { "type": "MIGRATION", "id": "hk_mp5_10_semi", - "replace": "TDI_10" + "replace": "glock_40" }, { "type": "MIGRATION", "id": "mp5_10_mag", "replace": "tdi_10mm_mag" }, + { + "type": "MIGRATION", + "id": "TDI_10", + "replace": "glock_40" + }, + { + "type": "MIGRATION", + "id": "cp33", + "replace": "ruger_1022" + }, + { + "type": "MIGRATION", + "id": "cp33_mag", + "replace": "ruger1022mag_55" + }, + { + "type": "MIGRATION", + "id": "cp33_mag_50", + "replace": "ruger1022mag_55" + }, + { + "type": "MIGRATION", + "id": "p50", + "replace": "fn_ps90" + }, + { + "type": "MIGRATION", + "id": "M6_shotgun", + "replace": "u_shotgun" + }, + { + "type": "MIGRATION", + "id": "savage_111f", + "replace": "remington_700_308" + }, + { + "type": "MIGRATION", + "id": "shotgun_410", + "replace": "mossberg_500_410" + }, + { + "type": "MIGRATION", + "id": "winchester_1887", + "replace": "winchester_1897" + }, + { + "type": "MIGRATION", + "id": "remington_870_breacher", + "replace": "mossberg_590_shockwave" + }, + { + "type": "MIGRATION", + "id": "bren2_762", + "replace": "aksemi" + }, + { + "type": "MIGRATION", + "id": "bren2_762mag10", + "replace": "akmag10" + }, + { + "type": "MIGRATION", + "id": "bren2_762mag30", + "replace": "akmag30" + }, { "type": "MIGRATION", "id": "armguard_lightplate", diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json index 887db09d624c8..e4c448789c144 100644 --- a/data/json/starting_missions.json +++ b/data/json/starting_missions.json @@ -207,7 +207,7 @@ { "u_has_item": "remmington_700" }, { "u_has_item": "modular_ar15" }, { "u_has_item": "remington700_270" }, - { "u_has_item": "savage_111f" } + { "u_has_item": "remington_700_308" } ] }, "difficulty": 3, diff --git a/data/mods/BombasticPerks/perkdata/old_guns.json b/data/mods/BombasticPerks/perkdata/old_guns.json index aa82dee7e2418..2d72d9e2c165f 100644 --- a/data/mods/BombasticPerks/perkdata/old_guns.json +++ b/data/mods/BombasticPerks/perkdata/old_guns.json @@ -239,14 +239,6 @@ "name": { "str": "single barrel shotgun" }, "extend": { "flags": [ "OLD_GUN" ] } }, - { - "id": "winchester_1887", - "type": "ITEM", - "subtypes": [ "GUN" ], - "copy-from": "winchester_1887", - "name": { "str": "bootleg lever-action shotgun" }, - "extend": { "flags": [ "OLD_GUN" ] } - }, { "id": "winchester_1897", "type": "ITEM", @@ -271,14 +263,6 @@ "name": { "str": "M2HB Browning HMG" }, "extend": { "flags": [ "OLD_GUN" ] } }, - { - "id": "shotgun_410", - "type": "ITEM", - "subtypes": [ "GUN" ], - "copy-from": "shotgun_410", - "name": { "str": "Winchester M37 .410" }, - "extend": { "flags": [ "OLD_GUN" ] } - }, { "id": "mosin44", "type": "ITEM", diff --git a/data/mods/Defense_Mode/itemgroups.json b/data/mods/Defense_Mode/itemgroups.json index 3ea6945841923..4ce6bdcca91b1 100644 --- a/data/mods/Defense_Mode/itemgroups.json +++ b/data/mods/Defense_Mode/itemgroups.json @@ -35,7 +35,6 @@ { "item": "browning_blr" }, { "item": "ak47" }, { "group": "modular_m4a1" }, - { "item": "savage_111f" }, { "item": "hk_g3" }, { "item": "hk_g80" }, { "item": "exodii_plasma_projectile" }, diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 39db23224fa73..ee8b731ba0966 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -122,7 +122,6 @@ "fn57", "glock_17", "ruger_57", - "p50", "walther_ppq_9mm", "hptc9", "cz75", @@ -143,7 +142,6 @@ "sp2022", "ruger_charger", "hk_mp5_semi_pistol", - "TDI_10", "draco_9mm", "p365", "swbodyguard", @@ -224,7 +222,6 @@ "walther_p22", "walther_ppk", "pressin", - "cp33", "ruger_mk4", "rough_rider_pistol", "rough_rider_pistol_9", @@ -316,7 +313,6 @@ "win70", "browning_blr", "remington_700", - "savage_111f", "scar_17s", "steyr_scout", "M24", @@ -383,7 +379,6 @@ "mosin44", "famas", "aksemi", - "bren2_762", "805_bren", "bren2_556", "robofac_gun", @@ -437,7 +432,7 @@ "replace": "rocket_recoilless" }, { - "id": [ "lever_shotgun", "shotgun_d", "shotgun_triple", "shotgun_s", "winchester_1887", "pipe_shotgun", "winchester_1897" ], + "id": [ "lever_shotgun", "shotgun_d", "shotgun_triple", "shotgun_s", "pipe_shotgun", "winchester_1897" ], "type": "MIGRATION", "replace": "shot_double" }, @@ -472,7 +467,6 @@ }, { "id": [ - "shotgun_410", "mossberg_500_410", "benelli_sa", "ksg", @@ -489,7 +483,7 @@ "replace": "shot_pump" }, { - "id": [ "remington_870_breacher", "mossberg_590_shockwave" ], + "id": [ "mossberg_590_shockwave" ], "type": "MIGRATION", "replace": "shot_short_pump" }, diff --git a/data/mods/Generic_Guns/firearms/shot.json b/data/mods/Generic_Guns/firearms/shot.json index 4cd1f2fbc4198..588a457a7754c 100644 --- a/data/mods/Generic_Guns/firearms/shot.json +++ b/data/mods/Generic_Guns/firearms/shot.json @@ -34,7 +34,7 @@ }, { "id": "shot_short_pump", - "copy-from": "remington_870_breacher", + "copy-from": "mossberg_590_shockwave", "type": "ITEM", "subtypes": [ "GUN" ], "name": "short shotgun", diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json index f6b3d6fe14bc0..c1abab596bdd3 100644 --- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json +++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json @@ -5,7 +5,6 @@ "items": [ "llink", "dias", - "M6_shotgun", "ksg25_aux_shotgun", "combination_gun_shotgun", "belt_clip", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index e031cd67e7689..1f6db72e2d498 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -212,8 +212,6 @@ "wp22mag", "kp32mag", "lws32mag", - "cp33_mag", - "cp33_mag_50", "ruger_mk4_mag", "1911_22_mag", "sr22_mag", @@ -268,8 +266,6 @@ "762_ar15mag_20rd", "762_ar15mag_30rd", "ruger_arr_mag", - "bren2_762mag30", - "bren2_762mag10", "sl8mag", "blrmag", "m1918bigmag", diff --git a/data/mods/Sky_Island/upgrade_missions.json b/data/mods/Sky_Island/upgrade_missions.json index 590821c590c74..ef59d96304c52 100644 --- a/data/mods/Sky_Island/upgrade_missions.json +++ b/data/mods/Sky_Island/upgrade_missions.json @@ -2186,7 +2186,7 @@ [ [ "warptoken", 5 ] ], [ [ "carpentry_book", 1 ], [ "textbook_carpentry", 1 ] ], [ [ "hinge", 20 ] ], - [ [ "remington_870_breacher", 1 ], [ "shotgun_d", 3 ] ] + [ [ "mossberg_590_shockwave", 1 ], [ "shotgun_d", 3 ] ] ] }, { diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json index d6ddfe69bd455..f9f69fa484628 100644 --- a/data/mods/TEST_DATA/item_demographics.json +++ b/data/mods/TEST_DATA/item_demographics.json @@ -723,7 +723,6 @@ "ruger_lcr_22": 1, "sig_mosquito": 1, "walther_p22": 1, - "cp33": 1, "rio_bravo": 1, "ruger_1022_auto": 1, "ruger_mk4": 1, @@ -760,8 +759,7 @@ "retool_ar15_223rem_pistol": 1, "retool_mdrx_223rem": 1, "retool_mdrx_223rem_short": 1, - "retool_mdrx_223rem_medium": 1, - "retool_cz600_223rem": 1 + "retool_mdrx_223rem_medium": 1 } }, { @@ -795,16 +793,7 @@ { "type": "762", "weight": 34, - "items": { - "ak47": 1, - "sks": 1, - "aksemi": 1, - "mk47": 1, - "vz58_p": 1, - "bren2_762": 1, - "retool_ar15_762": 1, - "retool_cz600_762": 1 - } + "items": { "ak47": 1, "sks": 1, "aksemi": 1, "mk47": 1, "vz58_p": 1, "retool_ar15_762": 1 } }, { "type": "357mag", @@ -838,14 +827,12 @@ "remington_1100": 1, "browning_a5": 1, "ithaca37": 1, - "remington_870_breacher": 1, "remington_870_express": 1, "revolver_shotgun": 1, "saiga_12": 1, "shotgun_d": 1, "shotgun_s": 1, "tavor_12": 1, - "winchester_1887": 1, "winchester_1897": 1, "slamfire_shotgun": 1, "slamfire_shotgun_d": 1, @@ -862,7 +849,6 @@ "m1a": 1, "m240": 1, "m60": 1, - "savage_111f": 1, "scar_17s": 1, "scar_h": 1, "M24": 1, @@ -900,7 +886,7 @@ { "type": "3030", "weight": 5, "items": { "marlin_336_3030": 1, "winchester_94_3030": 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": { "shotgun_410": 1, "mossberg_500_410": 1 } }, + { "type": "410shot", "weight": 3, "items": { "mossberg_500_410": 1 } }, { "type": "300blk", "weight": 2, @@ -916,17 +902,7 @@ { "type": "10mm", "weight": 1, - "items": { - "glock_20": 1, - "glock_29": 1, - "glock_40": 1, - "m1911_10": 1, - "p220_10": 1, - "sw_610": 1, - "TDI_10": 1, - "witness_10": 1, - "xd_10": 1 - } + "items": { "glock_20": 1, "glock_29": 1, "glock_40": 1, "m1911_10": 1, "p220_10": 1, "witness_10": 1, "xd_10": 1 } }, { "type": "other", @@ -961,7 +937,6 @@ "kord": 1, "fn57": 1, "fn_p90": 1, - "p50": 1, "ruger_57": 1, "tokarev": 1, "rm103a_pistol": 1, @@ -1029,7 +1004,6 @@ "p226_357sig": 1, "p226_9mm": 1, "p365": 1, - "p50": 1, "pistol_flintlock": 1, "pressin": 1, "px4": 1, @@ -1048,13 +1022,11 @@ "sp2022": 1, "sr22": 1, "sw_500": 1, - "sw_610": 1, "sw617": 1, "sw_619": 1, "sw629": 1, "sw642": 1, "swbodyguard": 1, - "TDI_10": 1, "tokarev": 1, "usp_45": 1, "usp_9mm": 1, @@ -1066,7 +1038,6 @@ "walther_ppk": 1, "walther_ppq_45": 1, "walther_ppq_9mm": 1, - "winchester_1887": 1, "witness_10": 1, "xd_10": 1 } @@ -1086,10 +1057,8 @@ "axmc": 1, "bbgun": 1, "bren2_556": 1, - "bren2_762": 1, "browning_blr": 1, "combination_gun": 1, - "cz600": 1, "fn_fal": 1, "fn_ps90": 1, "garand": 1, @@ -1171,7 +1140,6 @@ "ruger_mini": 1, "rugerpcc": 1, "ruger_pr": 1, - "savage_111f": 1, "savage112": 1, "savage_rascal": 1, "scar_16s": 1, @@ -1225,7 +1193,6 @@ "m26_mass": 1, "m26_mass_mod": 1, "m26_mass_standalone": 1, - "M6_shotgun": 1, "masterkey": 1, "masterkey_mod": 1, "mossberg_500": 1, @@ -1236,11 +1203,9 @@ "pipe_double_shotgun": 1, "pipe_shotgun": 1, "remington_870": 1, - "remington_870_breacher": 1, "remington_870_express": 1, "revolver_shotgun": 1, "saiga_12": 1, - "shotgun_410": 1, "shotgun_d": 1, "shotgun_s": 1, "slamfire_shotgun": 1, diff --git a/data/mods/Xedra_Evolved/recipes/inventor/gun.json b/data/mods/Xedra_Evolved/recipes/inventor/gun.json index 1f5c605d126ae..b744efb1457cc 100644 --- a/data/mods/Xedra_Evolved/recipes/inventor/gun.json +++ b/data/mods/Xedra_Evolved/recipes/inventor/gun.json @@ -300,7 +300,6 @@ [ "m14ebr", 1 ], [ "M24", 1 ], [ "ak308", 1 ], - [ "savage_111f", 1 ], [ "scar_h", 1 ] ], [ @@ -310,7 +309,6 @@ [ "m14ebr", 1 ], [ "M24", 1 ], [ "ak308", 1 ], - [ "savage_111f", 1 ], [ "scar_h", 1 ] ], [ [ "pipe", 15 ] ], diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json index 9f542e107f516..f04c08f91eef1 100644 --- a/data/mods/classic_zombies/items/blacklists.json +++ b/data/mods/classic_zombies/items/blacklists.json @@ -29,7 +29,6 @@ "as50", "as50mag", "atomic_coffee", - "bren2_762", "bren2_556", "combat_exoskeleton_light_salvaged", "combat_exoskeleton_heavy", @@ -52,7 +51,6 @@ "ruger_pr", "rugerpcc", "sw617", - "cz600", "axmc", "savage112", "mrad_smr", @@ -89,8 +87,6 @@ "762_ar15mag_20rd", "762_ar15mag_30rd", "ruger_arr_mag", - "bren2_762mag30", - "bren2_762mag10", "ai_338mag", "ai_338mag_10", "ai_308mag_10", @@ -295,7 +291,6 @@ "recipe_caseless", "recon_mech_laser", "recon_mech_laser_single", - "remington_870_breacher", "resin_chunk", "rm103a_pistol", "rm120c", @@ -347,8 +342,6 @@ "gfy_1", "TDI", "tdi_mag", - "TDI_10", - "tdi_10mm_mag", "v29", "walther_ccp", "ccpmag", @@ -365,9 +358,6 @@ "xd_10", "xd_10_mag", "taurus_judge", - "cp33", - "cp33_mag", - "cp33_mag_50", "ruger_mk4", "ruger_mk4_mag", "sl8", diff --git a/tests/item_type_name_test.cpp b/tests/item_type_name_test.cpp index 3421d4c5e5b1b..cfaf54a1f7c35 100644 --- a/tests/item_type_name_test.cpp +++ b/tests/item_type_name_test.cpp @@ -7,7 +7,7 @@ // Test cases focused on item::type_name static const itype_id itype_blood( "blood" ); -static const itype_id itype_shotgun_410( "shotgun_410" ); +static const itype_id itype_shotgun_s( "shotgun_s" ); static const itype_id itype_test_block_of_cheese( "test_block_of_cheese" ); static const itype_id itype_test_book( "test_book" ); static const itype_id itype_test_food( "test_food" ); @@ -86,7 +86,7 @@ TEST_CASE( "item_name_pluralization", "[item][type_name][plural]" ) TEST_CASE( "custom_named_item", "[item][type_name][named]" ) { // Shop smart. Shop S-Mart. - item shotgun( itype_shotgun_410 ); + item shotgun( itype_shotgun_s ); shotgun.set_var( "name", "Boomstick" ); REQUIRE( shotgun.get_var( "name" ) == "Boomstick" );