diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 08916e49ae230..cabe9dabc992f 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -90,9 +90,8 @@ { "group": "guns_pistol_common", "prob": 162 }, { "group": "guns_rifle_common", "prob": 36 }, { "group": "guns_shotgun_common", "prob": 2 }, - { "group": "guns_pistol_obscure", "prob": 81 }, - { "group": "guns_rifle_obscure", "prob": 18 }, - { "group": "guns_shotgun_obscure", "prob": 1 }, + { "group": "guns_display_pieces", "prob": 20 }, + { "group": "guns_collectible", "prob": 2 }, { "group": "ammo_obscure", "prob": 40 }, { "group": "mags_common", "prob": 40 } ] diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index b13f6b5f2cc25..268640e236f10 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -207,9 +207,9 @@ "type": "item_group", "id": "pawn_guns", "items": [ - { "group": "guns_common", "prob": 100 }, - { "group": "guns_rare", "prob": 10 }, - { "group": "guns_obscure", "prob": 1 } + { "group": "guns_common_display", "prob": 100 }, + { "group": "guns_display_pieces", "prob": 1 }, + { "group": "guns_collectible", "prob": 1 } ] }, { diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json index ea091ac7832ac..3b0767b9dfdf9 100644 --- a/data/json/itemgroups/SUS/gunstore.json +++ b/data/json/itemgroups/SUS/gunstore.json @@ -8,21 +8,7 @@ "entries": [ { "group": "ammo_common_collection", "prob": 100 }, { "group": "ammo_rare_collection", "prob": 1 }, - { "group": "ammo_obscure_collection", "prob": 1 }, - { "group": "guns_rare_display", "prob": 1 } - ] - }, - { - "id": "SUS_gunstore_safe_obscure", - "type": "item_group", - "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "This group is for the contents of rare back of house safes.", - "subtype": "collection", - "entries": [ - { "group": "guns_pistol_obscure_display", "prob": 15 }, - { "collection": [ { "group": "guns_rifle_obscure_display" } ], "prob": 45 }, - { "collection": [ { "group": "guns_shotgun_obscure_display" } ], "prob": 1 }, - { "collection": [ { "group": "guns_smg_display" } ], "prob": 2 } + { "group": "ammo_obscure_collection", "prob": 1 } ] }, { @@ -80,12 +66,9 @@ "//2": "This group is for the contents of gunstore displaycases", "subtype": "distribution", "entries": [ - { "group": "guns_pistol_common_display", "prob": 60 }, - { "group": "guns_rifle_common_display", "prob": 20 }, - { "group": "guns_shotgun_common_display", "prob": 2 }, - { "group": "guns_pistol_rare_display", "prob": 30 }, - { "group": "guns_rifle_rare_display", "prob": 10 }, - { "group": "guns_shotgun_rare_display", "prob": 1 } + { "group": "guns_pistol_common_display", "prob": 90 }, + { "group": "guns_rifle_common_display", "prob": 30 }, + { "group": "guns_shotgun_common_display", "prob": 3 } ] }, { diff --git a/data/json/itemgroups/SUS/lodge.json b/data/json/itemgroups/SUS/lodge.json index 14476cd72818c..698114c061839 100644 --- a/data/json/itemgroups/SUS/lodge.json +++ b/data/json/itemgroups/SUS/lodge.json @@ -50,11 +50,7 @@ "type": "item_group", "//": "items found in a most dangerous game space", "subtype": "distribution", - "entries": [ - { "group": "guns_shotgun_common", "prob": 30 }, - { "group": "SUS_hunting_rifle", "prob": 20 }, - { "group": "guns_smg_rare", "prob": 15 } - ] + "entries": [ { "group": "guns_shotgun_common", "prob": 30 }, { "group": "SUS_hunting_rifle", "prob": 20 } ] }, { "id": "cannibal_food", 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 123415b83ccff..0dac59f08521e 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json @@ -75,7 +75,7 @@ "id": "ar15_50short", "type": "item_group", "subtype": "collection", - "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_50beowulf_short" } ] + "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_50beowulf_short" } ] }, { "id": "ar15_450", @@ -93,7 +93,7 @@ "id": "ar15_450short", "type": "item_group", "subtype": "collection", - "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_450_short" } ] + "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_450_short" } ] }, { "id": "ar15_762", 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 5231a55ab25af..b4a173d1c7e22 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 @@ -1,83 +1,155 @@ [ { - "id": "nested_ar15_retool_223rem", + "id": "nested_ar15_retool_223_20", "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 20 inch rifle barrel.", "subtype": "collection", "ammo": 100, "entries": [ - { - "distribution": [ - { "group": "ar15_223long", "charges": [ 0, 30 ], "prob": 8 }, - { "group": "ar15_223medium", "charges": [ 0, 30 ], "prob": 8 }, - { "group": "ar15_223short", "charges": [ 0, 30 ], "prob": 6 } - ], - "prob": 100 - }, + { "group": "ar15_223long", "charges": [ 0, 30 ] }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 }, { "group": "on_hand_223" } ] }, { - "id": "nested_ar15_retool_300blk", + "id": "nested_ar15_retool_223_16", "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 16 inch rifle barrel.", "subtype": "collection", "ammo": 100, "entries": [ - { - "distribution": [ - { "group": "ar15_300", "charges": [ 0, 30 ], "prob": 10 }, - { "group": "ar15_300medium", "charges": [ 0, 30 ], "prob": 8 }, - { "group": "ar15_300short", "charges": [ 0, 30 ], "prob": 6 } - ], - "prob": 100 - }, + { "group": "modular_ar15", "charges": [ 0, 30 ] }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_ar15_retool_223_14", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 14 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_223medium", "charges": [ 0, 30 ] }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_ar15_retool_223_10", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_223short", "charges": [ 0, 30 ] }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, + { + "id": "nested_ar15_retool_300_16", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 16 inch rifle barrel.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_300", "charges": [ 0, 30 ] }, { "item": "stanag30" }, { "item": "stanag30", "prob": 50 }, { "group": "on_hand_300BLK" } ] }, { - "id": "nested_ar15_retool_50beowulf", + "id": "nested_ar15_retool_300_10", "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.", "subtype": "collection", "ammo": 100, "entries": [ - { - "distribution": [ - { "group": "ar15_50", "charges": [ 0, 10 ], "prob": 10 }, - { "group": "ar15_50medium", "charges": [ 0, 10 ], "prob": 8 }, - { "group": "ar15_50short", "charges": [ 0, 10 ], "prob": 6 } - ], - "prob": 100 - }, + { "group": "ar15_300medium", "charges": [ 0, 30 ] }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_300BLK" } + ] + }, + { + "id": "nested_ar15_retool_50beowulf_18", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 18 inch rifle barrel.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_50", "charges": [ 0, 30 ] }, { "item": "50beowulf_ar15mag" }, { "item": "50beowulf_ar15mag", "prob": 50 }, { "group": "on_hand_50beowulf" } ] }, { - "id": "nested_ar15_retool_450bushmaster", + "id": "nested_ar15_retool_50beowulf_16", "type": "item_group", - "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", - "//2": "groups together all identical weapons rechambered for the same caliber and converted with different barrel-lengths.", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 16 inch rifle barrel.", "subtype": "collection", "ammo": 100, "entries": [ - { - "distribution": [ - { "group": "ar15_450", "charges": [ 0, 4 ], "prob": 10 }, - { "group": "ar15_450medium", "charges": [ 0, 4 ], "prob": 8 }, - { "group": "ar15_450short", "charges": [ 0, 4 ], "prob": 6 } - ], - "prob": 100 - }, + { "group": "ar15_50medium", "charges": [ 0, 30 ] }, + { "item": "50beowulf_ar15mag" }, + { "item": "50beowulf_ar15mag", "prob": 50 }, + { "group": "on_hand_50beowulf" } + ] + }, + { + "id": "nested_ar15_retool_50beowulf_7", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 7 inch rifle barrel, though keep in mind it's a pistol.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_50short", "charges": [ 0, 30 ] }, + { "item": "50beowulf_ar15mag" }, + { "item": "50beowulf_ar15mag", "prob": 50 }, + { "group": "on_hand_50beowulf" } + ] + }, + { + "id": "nested_ar15_retool_450bushmaster_18", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 18 inch rifle barrel.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_450", "charges": [ 0, 30 ] }, + { "item": "450_ar15mag" }, + { "item": "450_ar15mag", "prob": 50 }, + { "group": "on_hand_450" } + ] + }, + { + "id": "nested_ar15_retool_450bushmaster_10", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 10 inch rifle barrel, shouldn't really spawn outside of criminal/survivor locations.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_450medium", "charges": [ 0, 30 ] }, + { "item": "450_ar15mag" }, + { "item": "450_ar15mag", "prob": 50 }, + { "group": "on_hand_450" } + ] + }, + { + "id": "nested_ar15_retool_450bushmaster_7", + "type": "item_group", + "//": "This is a distribution for the gun, reasonable number of backup mags, and some ammo to repack. 7 inch rifle barrel, though keep in mind it's a pistol.", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "group": "ar15_450short", "charges": [ 0, 30 ] }, { "item": "450_ar15mag" }, { "item": "450_ar15mag", "prob": 50 }, { "group": "on_hand_450" } @@ -135,6 +207,23 @@ { "group": "on_hand_223" } ] }, + { + "id": "nested_mdrx_retool_223rem_civilian", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "//2": "A distribution that avoids NFA items (barrels under 16 inches)", + "subtype": "collection", + "ammo": 100, + "entries": [ + { + "distribution": [ { "group": "mdrx_223", "charges": [ 0, 30 ], "prob": 4 }, { "group": "mdrx", "charges": [ 0, 30 ], "prob": 5 } ], + "prob": 100 + }, + { "item": "stanag30" }, + { "item": "stanag30", "prob": 50 }, + { "group": "on_hand_223" } + ] + }, { "id": "nested_mdrx_retool_300blk", "type": "item_group", @@ -197,25 +286,6 @@ { "group": "on_hand_300" } ] }, - { - "type": "item_group", - "subtype": "collection", - "id": "nested_converted_ar15", - "//": "An item group for a random, personally-converted weapon to spawn.", - "entries": [ - { - "distribution": [ - { "group": "nested_ar15_retool_223rem", "prob": 30 }, - { "group": "nested_ar15_retool_300blk", "prob": 20 }, - { "group": "nested_ar15_retool_50beowulf", "prob": 15 }, - { "group": "nested_ar15_retool_450bushmaster", "prob": 15 }, - { "group": "nested_ar15_retool_762", "prob": 25 }, - { "group": "nested_ar15_retool_22", "prob": 15 } - ], - "prob": 100 - } - ] - }, { "type": "item_group", "subtype": "collection", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index fd2709f565a13..271aa87569936 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -2,6 +2,7 @@ { "type": "item_group", "id": "guns_pistol_common", + "magazine": 100, "//": "Pistols that are reasonably prolific amongst civilians, commonly owned and reliably obtainable by citizens and that are found in many locations.", "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ @@ -14,16 +15,21 @@ { "group": "guns_pistol_common_38", "prob": 11 }, { "group": "guns_pistol_common_44", "prob": 1 }, { "group": "guns_pistol_common_10mm", "prob": 1 }, - { "group": "guns_pistol_common_762_39", "prob": 1 }, - { "group": "guns_pistol_common_223", "prob": 17 }, - { "group": "guns_pistol_common_300", "prob": 10 }, - { "group": "guns_pistol_common_other", "prob": 39 } + { "group": "guns_pistol_common_762_39", "prob": 2 }, + { "group": "guns_pistol_common_223", "prob": 33 }, + { "group": "guns_pistol_common_300", "prob": 8 }, + { "group": "guns_pistol_common_57", "prob": 2 }, + { "group": "guns_pistol_common_32", "prob": 1 }, + { "group": "guns_pistol_common_45colt", "prob": 1 }, + { "group": "guns_pistol_common_38super", "prob": 1 }, + { "group": "guns_pistol_common_other", "prob": 2 } ] }, { "type": "item_group", "subtype": "distribution", "id": "guns_pistol_common_everyday_carry", + "magazine": 100, "//": "pistols with ammo loaded and ready for use but no additional magazines.", "items": [ { "group": "guns_pistol_common_everyday_carry_9mm", "prob": 92 }, @@ -35,7 +41,9 @@ { "group": "guns_pistol_common_everyday_carry_38", "prob": 8 }, { "group": "guns_pistol_common_everyday_carry_44", "prob": 1 }, { "group": "guns_pistol_common_everyday_carry_10mm", "prob": 1 }, - { "group": "guns_pistol_common_everyday_carry_other", "prob": 52 } + { "group": "guns_pistol_common_everyday_carry_32", "prob": 2 }, + { "group": "guns_pistol_common_everyday_carry_57", "prob": 2 }, + { "group": "guns_pistol_common_everyday_carry_38super", "prob": 2 } ] }, { @@ -44,77 +52,40 @@ "id": "guns_pistol_common_display", "//": "Empty and reasonably common pistols found exclusively in gun stores.", "items": [ - { "group": "guns_pistol_common_display_9mm", "prob": 78 }, - { "group": "guns_pistol_common_display_22", "prob": 78 }, - { "group": "guns_pistol_common_display_45", "prob": 23 }, + { "group": "guns_pistol_common_display_9mm", "prob": 74 }, + { "group": "guns_pistol_common_display_22", "prob": 64 }, + { "group": "guns_pistol_common_display_45", "prob": 20 }, { "group": "guns_pistol_common_display_380", "prob": 28 }, - { "group": "guns_pistol_common_display_40", "prob": 11 }, - { "group": "guns_pistol_common_display_357mag", "prob": 4 }, + { "group": "guns_pistol_common_display_40", "prob": 19 }, + { "group": "guns_pistol_common_display_357mag", "prob": 12 }, { "group": "guns_pistol_common_display_38", "prob": 11 }, { "group": "guns_pistol_common_display_44", "prob": 1 }, { "group": "guns_pistol_common_display_45colt", "prob": 5 }, { "group": "guns_pistol_common_display_10mm", "prob": 1 }, { "group": "guns_pistol_common_display_762_39", "prob": 1 }, { "group": "guns_pistol_common_display_223", "prob": 17 }, - { "group": "guns_pistol_common_display_300", "prob": 10 }, - { "group": "guns_pistol_common_display_other", "prob": 46 } - ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare", - "//": "Less common or prolific pistols that are still normally acquirable by civilians or that may need an NFA permit, i.e. integrally suppressed or stocked handguns. This includes those weapons used by police and paramilitary forces, and older handguns which are no longer in production but that are still reasonably common to find.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ - { "group": "guns_pistol_rare_9mm", "prob": 93 }, - { "group": "guns_pistol_rare_223", "prob": 1 }, - { "group": "guns_pistol_rare_45", "prob": 15 }, - { "group": "guns_pistol_rare_40", "prob": 6 }, - { "group": "guns_pistol_rare_357mag", "prob": 8 }, - { "group": "guns_pistol_rare_38", "prob": 1 }, - { "group": "guns_pistol_rare_44", "prob": 45 }, - { "group": "guns_pistol_rare_45colt", "prob": 30 }, - { "group": "guns_pistol_rare_10mm", "prob": 1 }, - { "group": "guns_pistol_rare_other", "prob": 45 } - ] - }, - { - "type": "item_group", - "subtype": "distribution", - "id": "guns_pistol_rare_display", - "//": "Empty uncommon pistols found exclusively at gun stores.", - "items": [ - { "group": "guns_pistol_rare_display_9mm", "prob": 63 }, - { "group": "guns_pistol_rare_display_45", "prob": 9 }, - { "group": "guns_pistol_rare_display_40", "prob": 7 }, - { "group": "guns_pistol_rare_display_357mag", "prob": 22 }, - { "group": "guns_pistol_rare_display_44", "prob": 20 }, - { "group": "guns_pistol_rare_display_45colt", "prob": 18 }, - { "group": "guns_pistol_rare_display_other", "prob": 176 } + { "group": "guns_pistol_common_display_300", "prob": 8 }, + { "group": "guns_pistol_common_display_57", "prob": 2 }, + { "group": "guns_pistol_common_display_32", "prob": 1 }, + { "group": "guns_pistol_common_display_38super", "prob": 1 }, + { "group": "guns_pistol_common_display_other", "prob": 2 } ] }, { "type": "item_group", "subtype": "distribution", "id": "guns_pistol_hunting_display", - "//": "Empty high-caliber pistols and revolvers found within hunting supply stores and related locations.", + "//": "Handguns used for hunting, anything from bunnies to bison. Unloaded and without magazines.", + "//2": "These numbers are mostly guesses and some scaled-down numbers. If there's better info on hunting calibers please change", "items": [ - { "item": "glock_20", "variant": "glock_20", "prob": 1 }, - { "item": "glock_40", "variant": "glock_40", "prob": 1 }, - { "item": "sw_610", "prob": 1 }, - { "item": "sw_619", "prob": 40 }, - { "item": "colt_python", "prob": 40 }, - { "item": "bfr", "prob": 10 }, - { "item": "raging_bull", "prob": 15 }, - { "item": "sw_500", "prob": 10 }, - { "group": "modular_deagle_357", "prob": 2 }, - { "group": "modular_deagle_44", "prob": 5 }, - { "group": "modular_deagle_50", "prob": 1 }, - { "group": "nested_deagle_with_kits", "prob": 1 }, - { "item": "sw629", "prob": 30 }, - { "item": "colt_anaconda_8", "prob": 11 }, - { "item": "colt_anaconda_6", "prob": 16 }, - { "item": "colt_anaconda_4", "prob": 5 } + { "group": "guns_pistol_common_display_22", "prob": 20 }, + { "group": "guns_pistol_common_display_44", "prob": 20 }, + { "group": "guns_pistol_common_display_357mag", "prob": 45 }, + { "group": "guns_pistol_common_display_10mm", "prob": 4 }, + { "item": "bfr", "prob": 4 }, + { "item": "raging_bull", "prob": 4 }, + { "item": "sw_500", "prob": 7 }, + { "group": "modular_deagle_50", "prob": 2 } ] }, { @@ -132,117 +103,59 @@ { "group": "nested_rm103a_pistol", "prob": 1 } ] }, - { - "type": "item_group", - "id": "guns_pistol_obscure", - "//": "Imported or otherwise very obscure pistols that are highly rare, but which are still, mostly, ownable by common civilian's, either normally or via an NFA permit. For example, reasonably modern and uncommon foreign military pistols and weapons capable of automatic forms of fire can be placed in this item group. Purely highly rare collector quality and historically valuable guns are handled elsewhere.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ - { "group": "nested_bfr", "prob": 100 }, - { "group": "nested_m1911-460", "prob": 3 }, - { "group": "nested_makarov", "prob": 100 }, - { "group": "nested_mauser_c96", "prob": 39, "contents-group": "c96_mods" }, - { "group": "nested_chiappa_rhino", "prob": 5 }, - { "group": "nested_pistol_flintlock", "prob": 150 }, - { "group": "nested_raging_bull", "prob": 100 }, - { "group": "nested_tokarev", "prob": 100 }, - { "group": "nested_walther_ppk", "prob": 100 }, - { "group": "guns_pistol_collectible", "prob": 1 } - ] - }, { "type": "item_group", "subtype": "distribution", - "id": "guns_pistol_obscure_display", - "//": "Very obscure pistols which are illegal to sell.", - "items": [ { "group": "guns_pistol_collectible", "prob": 1 }, { "item": "minidraco556", "prob": 30 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_collectible", - "//": "Highly rare or collectable factory-made pistols that are possible for civilians to own; only likely to show up in gun collections, museums or similar. Pistols that are of historic or collectors value and which fall under NFA regulations, i.e. pistols which are integrally suppressed, have a burst or fully-automatic capability, or have a non-detachable buttstock, can be placed within this item group. These weapons are always unloaded.", + "id": "guns_pistol_display_pieces", + "magazine": 100, + "//": "Pistols that are sought after but with little or no historical value. Think of magnum handguns, stuff made famous by movies, guns that \"look cool\". Should all be unloaded, but with magazines as these are display pieces.", "items": [ - { "item": "mauser_c96", "prob": 50, "contents-group": "c96_mods" }, - { "item": "colt_navy", "prob": 40 }, - { "item": "colt_army", "prob": 40 } + { "item": "colt_python", "prob": 30 }, + { "item": "chiappa_rhino", "prob": 20 }, + { "item": "colt_anaconda_4", "prob": 40 }, + { "item": "colt_anaconda_6", "prob": 20 }, + { "item": "colt_anaconda_8", "prob": 40 }, + { "group": "modular_deagle_357", "prob": 4, "charges": 0 }, + { "group": "modular_deagle_44", "prob": 20, "charges": 0 }, + { "group": "modular_deagle_50", "prob": 40, "charges": 0 }, + { "item": "draco", "prob": 10, "charges": 0 }, + { "item": "draco_mini", "prob": 30, "charges": 0 }, + { "item": "draco_micro", "prob": 40, "charges": 0 }, + { "item": "raging_bull", "prob": 20 }, + { "item": "taurus_judge", "prob": 10 }, + { "item": "hk_mp5_semi_pistol", "prob": 100, "charges": 0 }, + { "item": "sw_500", "prob": 50 }, + { "item": "bfr", "prob": 10 }, + { "item": "draco_9mm", "prob": 10, "charges": 0 } ] }, { "type": "item_group", - "id": "guns_pistol_improvised", - "//": "Makeshift or otherwise poor quality pistols.", - "items": [ { "item": "ashot", "prob": 1 }, { "item": "2_shot_special", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_smg_common", - "//": "Semi-auto civilian SMGs owned by citizens and found in many locations.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ { "group": "nested_mp40semi", "prob": 200 }, { "group": "nested_hk_mp5_semi_pistol", "prob": 70 } ] - }, - { - "type": "item_group", - "id": "guns_smg_common_worn", - "//": "Semi-auto civilian SMGs owned by citizens and found in many locations.", - "//2": "This is for worn items so ammo should be handled elsewhere so that mods can be added directly.", + "id": "guns_pistol_collectible", "items": [ - { "item": "mp40semi", "charges": [ 0, 32 ], "prob": 200 }, - { "item": "hk_mp5_semi_pistol", "charges": [ 0, 30 ], "prob": 70 } + { "item": "mauser_c96", "prob": 12, "contents-group": "c96_mods" }, + { "item": "colt_navy", "prob": 2 }, + { "item": "colt_army", "prob": 6 }, + { "item": "colt_saa", "variant": "colt_saa", "prob": 50 }, + { "item": "p08", "prob": 18 }, + { "item": "m1911", "prob": 65 }, + { "item": "makarov", "prob": 10 }, + { "item": "model_10_revolver", "prob": 20 }, + { "item": "tokarev", "prob": 6 } ] }, { "type": "item_group", - "subtype": "distribution", - "id": "guns_smg_common_display", - "//": "Empty Semi-auto civilian SMGs owned by citizens and found in many locations.", - "items": [ { "item": "mp40semi", "prob": 70 }, { "item": "hk_mp5_semi_pistol", "prob": 70 }, { "item": "TDI_10", "prob": 70 } ] - }, - { - "type": "item_group", - "id": "guns_smg_rare", - "//": "Less common SMGs including those only used by police/paramilitary forces.", + "id": "guns_nfa", + "//": "Fully automatic firearms. Should not spawn anywhere commonly.", "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ - { "group": "nested_calico", "prob": 30 }, - { "group": "nested_fn_p90", "prob": 10 }, - { "group": "nested_mp40", "prob": 185 }, - { "group": "nested_tommygun", "prob": 70 }, - { "group": "nested_sten", "prob": 100 }, - { "group": "nested_uzi", "prob": 100 }, - { "group": "nested_hk_mp5", "prob": 100 }, - { "group": "nested_hk_mp5sd", "prob": 5 }, - { "group": "nested_modular_ump_9", "prob": 10 }, - { "group": "nested_modular_ump_40", "prob": 10 }, - { "group": "nested_modular_ump_45", "prob": 10 }, - { "group": "nested_mac_10", "prob": 40 }, - { "group": "nested_mac_11", "prob": 20 }, - { "group": "nested_TDI", "prob": 10 }, - { "group": "nested_briefcase_smg", "prob": 5 }, - { "group": "nested_tec9", "prob": 50 } - ] - }, - { - "type": "item_group", - "id": "guns_smg_rare_display", - "subtype": "distribution", - "//": "Less common full-auto SMGS which are illegal to sell.", - "items": [ - { "item": "calico", "prob": 30 }, - { "item": "fn_p90", "prob": 10 }, - { "item": "mp40", "prob": 185 }, - { "item": "tommygun", "prob": 70 }, - { "item": "sten", "prob": 100 }, - { "item": "uzi", "prob": 100 }, - { "item": "hk_mp5", "prob": 100 }, - { "item": "hk_mp5sd", "prob": 5 }, - { "group": "modular_ump_9", "prob": 10 }, - { "group": "modular_ump_40", "prob": 10 }, - { "group": "modular_ump_45", "prob": 10 }, - { "item": "mac_10", "prob": 40 }, - { "item": "mac_11", "prob": 20 }, - { "item": "TDI", "prob": 10 }, - { "item": "briefcase_smg", "prob": 5 }, - { "item": "tec9", "prob": 50 } + { "group": "nested_m2carbine", "prob": 4 }, + { "group": "nested_hk_mp5", "prob": 5 }, + { "group": "nested_tommygun", "prob": 5 }, + { "group": "nested_uzi", "prob": 11 }, + { "group": "nested_mac_10", "prob": 9 }, + { "group": "nested_mac_11", "prob": 13 } ] }, { @@ -257,24 +170,6 @@ { "group": "nested_hk_mp5sd", "prob": 5 } ] }, - { - "type": "item_group", - "id": "guns_smg_obscure", - "subtype": "distribution", - "//": "Imported or otherwise very obscure SMGs.", - "items": [ { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ] - }, - { - "type": "item_group", - "id": "guns_smg_display", - "subtype": "distribution", - "//": "All variations of smgs weighted for rarity, for use in locked gun-safes", - "items": [ - { "group": "guns_smg_obscure", "prob": 10 }, - { "group": "guns_smg_rare_display", "prob": 30 }, - { "group": "guns_smg_common_display", "prob": 60 } - ] - }, { "type": "item_group", "id": "guns_smg_improvised", @@ -288,18 +183,32 @@ { "type": "item_group", "id": "guns_rifle_common", + "magazine": 100, "//": "Rifles commonly owned by citizens and found in many locations.", "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ - { "group": "guns_rifle_common_22", "prob": 30 }, - { "group": "guns_rifle_common_223", "prob": 40 }, - { "group": "guns_rifle_common_762", "prob": 6 }, - { "group": "guns_rifle_common_308", "prob": 1 }, - { "group": "guns_rifle_common_3006", "prob": 1 }, - { "group": "guns_rifle_common_762R", "prob": 2 }, - { "group": "guns_rifle_common_270win", "prob": 1 }, - { "group": "guns_rifle_common_380", "prob": 1 }, - { "group": "guns_rifle_common_other", "prob": 12 } + { "group": "guns_rifle_common_22", "prob": 1760 }, + { "group": "guns_rifle_common_223", "prob": 1000 }, + { "group": "guns_rifle_common_308", "prob": 320 }, + { "group": "guns_rifle_common_45acp", "prob": 271 }, + { "group": "guns_rifle_common_762", "prob": 230 }, + { "group": "guns_rifle_common_9mm", "prob": 180 }, + { "group": "guns_rifle_common_3006", "prob": 149 }, + { "group": "guns_rifle_common_44", "prob": 81 }, + { "group": "guns_rifle_common_762R", "prob": 70 }, + { "group": "guns_rifle_common_270win", "prob": 57 }, + { "group": "guns_rifle_common_300winmag", "prob": 32 }, + { "group": "guns_rifle_common_380", "prob": 24 }, + { "group": "guns_rifle_common_300blk", "prob": 19 }, + { "group": "guns_rifle_common_4570", "prob": 18 }, + { "group": "guns_rifle_common_30carbine", "prob": 17 }, + { "group": "guns_rifle_common_303", "prob": 16 }, + { "group": "guns_rifle_common_338", "prob": 14 }, + { "group": "guns_rifle_common_450", "prob": 3 }, + { "group": "guns_rifle_common_50beowulf", "prob": 3 }, + { "group": "guns_rifle_common_57", "prob": 3 }, + { "group": "guns_rifle_common_545", "prob": 3 }, + { "group": "guns_rifle_common_7mm_arisaka", "prob": 2 } ] }, { @@ -307,17 +216,7 @@ "id": "guns_rifle_common_worn", "//": "Rifles commonly owned by citizens and found in many locations.", "//2": "This is for worn items so ammo should be handled elsewhere so that mods can be added directly.", - "items": [ - { "group": "guns_rifle_common_worn_22", "prob": 29 }, - { "group": "guns_rifle_common_worn_223", "prob": 43 }, - { "group": "guns_rifle_common_worn_762", "prob": 7 }, - { "group": "guns_rifle_common_worn_308", "prob": 1 }, - { "group": "guns_rifle_common_worn_3006", "prob": 1 }, - { "group": "guns_rifle_common_worn_762R", "prob": 2 }, - { "group": "guns_rifle_common_worn_270win", "prob": 1 }, - { "group": "guns_rifle_common_worn_380", "prob": 1 }, - { "group": "guns_rifle_common_worn_other", "prob": 1 } - ] + "items": [ { "group": "guns_rifle_common_display", "charges": [ 1, 30 ] } ] }, { "type": "item_group", @@ -325,49 +224,58 @@ "id": "guns_rifle_common_display", "//": "Empty rifles commonly found in gun stores.", "items": [ - { "group": "guns_rifle_common_display_22", "prob": 130 }, - { "group": "guns_rifle_common_display_223", "prob": 390 }, - { "group": "guns_rifle_common_display_762", "prob": 85 }, - { "group": "guns_rifle_common_display_308", "prob": 1 }, - { "group": "guns_rifle_common_display_3006", "prob": 1 }, - { "group": "guns_rifle_common_display_270win", "prob": 10 }, - { "group": "guns_rifle_common_display_380", "prob": 1 }, - { "group": "guns_rifle_common_display_other", "prob": 36 } + { "group": "guns_rifle_common_display_22", "prob": 1760 }, + { "group": "guns_rifle_common_display_223", "prob": 1000 }, + { "group": "guns_rifle_common_display_308", "prob": 320 }, + { "group": "guns_rifle_common_display_45acp", "prob": 271 }, + { "group": "guns_rifle_common_display_762", "prob": 230 }, + { "group": "guns_rifle_common_display_9mm", "prob": 180 }, + { "group": "guns_rifle_common_display_3006", "prob": 149 }, + { "group": "guns_rifle_common_display_44", "prob": 81 }, + { "group": "guns_rifle_common_display_762R", "prob": 70 }, + { "group": "guns_rifle_common_display_270win", "prob": 57 }, + { "group": "guns_rifle_common_display_300winmag", "prob": 32 }, + { "group": "guns_rifle_common_display_380", "prob": 24 }, + { "group": "guns_rifle_common_display_300blk", "prob": 19 }, + { "group": "guns_rifle_common_display_4570", "prob": 18 }, + { "group": "guns_rifle_common_display_30carbine", "prob": 17 }, + { "group": "guns_rifle_common_display_303", "prob": 16 }, + { "group": "guns_rifle_common_display_338", "prob": 14 }, + { "group": "guns_rifle_common_display_450", "prob": 3 }, + { "group": "guns_rifle_common_display_50beowulf", "prob": 3 }, + { "group": "guns_rifle_common_display_57", "prob": 3 }, + { "group": "guns_rifle_common_display_545", "prob": 3 }, + { "group": "guns_rifle_common_display_7mm_arisaka", "prob": 2 } ] }, { "type": "item_group", - "id": "guns_rifle_rare", - "//": "Less common rifles including those only used by police/paramilitary forces.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", + "subtype": "distribution", + "id": "guns_rifle_display_pieces", + "magazine": 100, + "//": "Rifles that are sought after but with little or no historical value. Think of AKs, stuff made famous by movies, guns that \"look cool\". Should all be unloaded, but with magazines as these are display pieces.", "items": [ - { "group": "guns_rifle_rare_223", "prob": 210 }, - { "group": "guns_rifle_rare_762", "prob": 15 }, - { "group": "guns_rifle_rare_308", "prob": 194 }, - { "group": "guns_rifle_rare_3006", "prob": 35 }, - { "group": "guns_rifle_rare_44", "prob": 10 }, - { "group": "guns_rifle_rare_45", "prob": 21 }, - { "group": "guns_rifle_rare_762R", "prob": 27 }, - { "group": "guns_rifle_rare_300blk", "prob": 10 }, - { "group": "guns_rifle_rare_other", "prob": 94 } + { "item": "sl8", "prob": 20, "charges": 0 }, + { "item": "win70_458", "prob": 15 }, + { "item": "sig_assault_rifle", "prob": 4, "charges": 0 }, + { "item": "aksemi", "prob": 100, "charges": 0 } ] }, { "type": "item_group", "subtype": "distribution", - "id": "guns_rifle_rare_display", - "//": "Less common rifles found exclusively in gun stores.", + "id": "guns_rifle_collectible", + "//": "Rifles that are sought after, and that have historical value, such as M1 Garand, Mosin Nagant. These weapons are always unloaded.", "items": [ - { "group": "guns_rifle_rare_display_22", "prob": 34 }, - { "group": "guns_rifle_rare_display_223", "prob": 68 }, - { "group": "guns_rifle_rare_display_762", "prob": 1 }, - { "group": "guns_rifle_rare_display_308", "prob": 18 }, - { "group": "guns_rifle_rare_display_3006", "prob": 20 }, - { "group": "guns_rifle_rare_display_44", "prob": 10 }, - { "group": "guns_rifle_rare_display_45", "prob": 10 }, - { "group": "guns_rifle_rare_display_762R", "prob": 17 }, - { "group": "guns_rifle_rare_display_300blk", "prob": 15 }, - { "group": "guns_rifle_rare_display_other", "prob": 106 } + { "item": "type99", "prob": 2 }, + { "item": "type99_sniper", "prob": 2 }, + { "item": "smle_mk3", "prob": 16 }, + { "item": "garand", "prob": 80 }, + { "item": "m1carbine", "prob": 50 }, + { "item": "mosin91_30", "prob": 25 }, + { "item": "mosin44", "prob": 20 }, + { "item": "m1903", "prob": 60 }, + { "item": "number4_mki", "prob": 16 } ] }, { @@ -375,12 +283,23 @@ "subtype": "distribution", "id": "guns_rifle_hunting_display", "//": "Empty civilian hunting rifles found within hunting supply stores and other related locations.", + "//2": "These numbers are mostly guesses and some scaled-down numbers. If there's better info on hunting calibers please change", "items": [ - { "group": "guns_rifle_hunting_display_22", "prob": 20 }, - { "group": "guns_rifle_hunting_display_308", "prob": 25 }, - { "group": "guns_rifle_hunting_display_3006", "prob": 75 }, - { "group": "guns_rifle_hunting_display_270win", "prob": 30 }, - { "group": "guns_rifle_hunting_display_other", "prob": 93 } + { "group": "guns_rifle_common_display_22", "prob": 176 }, + { "group": "guns_rifle_common_display_223", "prob": 100 }, + { "group": "guns_rifle_common_display_308", "prob": 320 }, + { "group": "guns_rifle_common_display_762", "prob": 115 }, + { "group": "guns_rifle_common_display_3006", "prob": 149 }, + { "group": "guns_rifle_common_display_44", "prob": 8 }, + { "group": "guns_rifle_common_display_762R", "prob": 70 }, + { "group": "guns_rifle_common_display_270win", "prob": 57 }, + { "group": "guns_rifle_common_display_300winmag", "prob": 32 }, + { "group": "guns_rifle_common_display_4570", "prob": 18 }, + { "group": "guns_rifle_common_display_303", "prob": 16 }, + { "group": "guns_rifle_common_display_338", "prob": 14 }, + { "group": "guns_rifle_common_display_450", "prob": 3 }, + { "group": "guns_rifle_common_display_50beowulf", "prob": 3 }, + { "group": "guns_rifle_common_display_7mm_arisaka", "prob": 2 } ] }, { @@ -420,57 +339,6 @@ { "item": "plasma_gun", "prob": 10, "charges": [ 0, 25 ] } ] }, - { - "type": "item_group", - "id": "guns_rifle_obscure", - "subtype": "distribution", - "//": "Imported or otherwise very obscure rifles.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ - { "group": "nested_ak47", "prob": 100 }, - { "group": "nested_bfg50", "prob": 5 }, - { "group": "nested_carbine_flintlock", "prob": 140 }, - { "group": "nested_m60_semi", "prob": 10 }, - { "group": "nested_rifle_flintlock", "prob": 180 }, - { "group": "nested_steyr_aug", "prob": 40 }, - { "group": "nested_win70_458", "prob": 60 }, - { "group": "nested_sl8", "prob": 10 }, - { "group": "nested_arx160", "prob": 40 }, - { "group": "nested_psl", "prob": 10 }, - { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 }, - { "group": "nested_type99", "prob": 20 }, - { "group": "nested_type99_sniper", "prob": 5 }, - { "group": "nested_ak308", "prob": 25 }, - { "group": "nested_papm77", "prob": 15 } - ] - }, - { - "type": "item_group", - "id": "guns_rifle_obscure_display", - "//": "Imported or otherwise very obscure rifles, unloaded for storage in gunstore and unavailable for sale", - "subtype": "distribution", - "items": [ - { "item": "ak47", "prob": 30 }, - { "item": "m249_semi", "prob": 5 }, - { "item": "bfg50", "prob": 1 }, - { "item": "win70_458", "prob": 5 }, - { "item": "type99", "variant": "type99", "contents-group": "type99_mods", "prob": 5, "charges": 0 }, - { "item": "type99_sniper", "contents-item": "arisaka_monopod", "prob": 2, "charges": 0 }, - { "item": "m60_semi", "prob": 5 }, - { "item": "steyr_aug", "prob": 5 }, - { "group": "nested_sl8", "prob": 2 }, - { "item": "fn_fal_semi", "variant": "fal_dsa", "prob": 40 }, - { "item": "hk_g3", "prob": 40 }, - { "item": "m1918", "prob": 30 }, - { "group": "modular_m4a1", "prob": 45 }, - { "item": "m14ebr", "prob": 15 }, - { "item": "arx160", "prob": 10 }, - { "item": "hk417_13", "prob": 40 }, - { "item": "m2carbine", "prob": 5 }, - { "item": "ak308", "prob": 10 }, - { "item": "ak308", "variant": "papm77", "prob": 5 } - ] - }, { "type": "item_group", "id": "guns_rifle_improvised", @@ -480,25 +348,15 @@ { "type": "item_group", "id": "guns_shotgun_common", + "magazine": 100, "//": "Shotguns commonly owned by citizens and found in many locations.", "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", + "//3": "To-do, add in more 410 shotguns along with 20 gauge", "items": [ - { "group": "nested_mossberg_500", "prob": 33 }, - { "group": "nested_remington_870", "prob": 35 }, - { "group": "nested_mossberg_500_security", "prob": 17 }, - { "group": "nested_remington_870_express", "prob": 18 }, - { "group": "nested_browning_a5", "prob": 14 }, - { "group": "nested_benelli_m2", "prob": 17 }, - { "group": "nested_black_eagle", "prob": 37 }, - { "group": "nested_benelli_m2_tac", "prob": 12 }, - { "group": "nested_slp", "prob": 6 }, - { "group": "nested_ithaca37", "prob": 6 }, - { "group": "nested_remington_1100", "prob": 17 }, - { "group": "nested_mossberg_930", "prob": 15 }, - { "group": "nested_shotgun_410", "prob": 30 }, - { "group": "nested_shotgun_d", "prob": 30 }, - { "group": "nested_shotgun_triple", "prob": 2 }, - { "group": "nested_shotgun_s", "prob": 30 } + { "group": "12_gauge_semi", "prob": 48 }, + { "group": "12_gauge_pump", "prob": 34 }, + { "group": "12_gauge_break", "prob": 18 }, + { "group": "nested_shotgun_410", "prob": 5 } ] }, { @@ -506,126 +364,19 @@ "id": "guns_shotgun_common_worn", "//": "Shotguns commonly owned by citizens and found in many locations.", "//2": "ammo handled elsewhere so these can be worn.", - "items": [ - { "item": "mossberg_500", "prob": 33, "charges": [ 0, 6 ] }, - { "item": "remington_870", "prob": 35, "charges": [ 0, 5 ] }, - { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 17, "charges": [ 0, 6 ] }, - { "item": "remington_870_express", "prob": 18, "charges": [ 0, 6 ] }, - { "item": "remington_870", "variant": "browning_a5", "prob": 14, "charges": [ 0, 5 ] }, - { "item": "benelli_sa", "variant": "m2", "prob": 17, "charges": [ 0, 4 ] }, - { "item": "benelli_sa", "variant": "sbe", "prob": 37, "charges": [ 0, 4 ] }, - { - "item": "benelli_tsa", - "variant": "m2_tac", - "contents-item": [ "rail_mount" ], - "prob": 12, - "charges": [ 0, 6 ] - }, - { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 6, "charges": [ 0, 9 ] }, - { "item": "remington_870", "variant": "ithaca37", "prob": 6, "charges": [ 0, 5 ] }, - { "item": "remington_870", "variant": "remington_1100", "prob": 17, "charges": [ 0, 5 ] }, - { "item": "mossberg_930", "prob": 15, "charges": [ 0, 6 ] }, - { "item": "shotgun_410", "prob": 30, "charges": [ 0, 1 ] }, - { "item": "shotgun_d", "prob": 30, "charges": [ 0, 2 ] }, - { "item": "shotgun_s", "prob": 30 } - ] + "items": [ { "group": "guns_shotgun_common_display", "charges": [ 1, 8 ] } ] }, { "type": "item_group", "subtype": "distribution", "id": "guns_shotgun_common_display", "//": "Shotguns commonly owned by citizens and found in gun stores.", + "//2": "To-do, add in more 410 shotguns along with 20 gauge", "items": [ - { "item": "mossberg_500", "prob": 33 }, - { "item": "remington_870", "prob": 35 }, - { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 17 }, - { "item": "remington_870_express", "prob": 18 }, - { "item": "remington_870", "variant": "browning_a5", "prob": 14 }, - { "item": "benelli_sa", "variant": "m2", "prob": 17 }, - { "item": "benelli_sa", "variant": "sbe", "prob": 37 }, - { "item": "benelli_tsa", "variant": "m2_tac", "contents-item": [ "rail_mount" ], "prob": 12 }, - { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 6 }, - { "item": "mossberg_590m", "prob": 1 }, - { "item": "remington_870", "variant": "ithaca37", "prob": 6 }, - { "item": "remington_870", "variant": "remington_1100", "prob": 17 }, - { "item": "mossberg_930", "prob": 15 }, - { "item": "shotgun_410", "prob": 30 }, - { "item": "shotgun_d", "prob": 30 }, - { "item": "shotgun_s", "prob": 30 } - ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare", - "//": "Uncommon or rare shotguns in civilian possession.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "subtype": "distribution", - "entries": [ - { "group": "nested_ksg", "prob": 50 }, - { "group": "nested_dp_12", "prob": 3 }, - { "group": "nested_srm_1216", "prob": 2 }, - { "group": "nested_ar12_shotgun", "prob": 5 }, - { "group": "nested_gfy_1", "prob": 2 }, - { "group": "nested_tavor_12", "prob": 5 }, - { "group": "nested_m1014", "prob": 10 }, - { "group": "nested_slp", "prob": 10 }, - { "group": "nested_mossberg_590m", "prob": 2 } - ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_worn", - "//": "Uncommon or rare shotguns in civilian possession.", - "//2": "ammo handled elsewhere so these can be worn.", - "subtype": "distribution", - "entries": [ - { "item": "ksg", "prob": 50, "charges": [ 0, 7 ] }, - { "item": "srm_1216", "prob": 1, "charges": [ 0, 16 ] }, - { "item": "ar12_shotgun", "prob": 5, "charges": [ 0, -1 ] }, - { "item": "gfy_1", "prob": 2, "charges": [ 0, -1 ] }, - { "item": "dp_12", "prob": 2, "charges": [ 0, 14 ] }, - { "item": "tavor_12", "prob": 5, "charges": [ 0, 5 ] }, - { "item": "shotgun_triple", "prob": 1, "charges": [ 0, 3 ] }, - { "item": "mossberg_930", "variant": "m1014", "prob": 10, "charges": [ 0, 8 ] }, - { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10, "charges": [ 0, 9 ] }, - { "item": "mossberg_590m", "prob": 2, "charges": [ 0, 5 ] } - ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_display", - "subtype": "distribution", - "//": "Uncommon or rare shotguns found in gun stores.", - "entries": [ - { "item": "ksg", "prob": 25 }, - { "item": "tavor_12", "prob": 5 }, - { "item": "srm_1216", "prob": 3 }, - { "item": "ar12_shotgun", "prob": 5 }, - { "item": "gfy_1", "prob": 2 }, - { "item": "dp_12", "prob": 4 }, - { "item": "mossberg_930", "variant": "m1014", "prob": 10 }, - { "item": "mossberg_590", "variant": "slp", "contents-item": [ "rail_mount" ], "prob": 10 }, - { "item": "mossberg_590m", "prob": 2 } - ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_readied", - "subtype": "distribution", - "entries": [ - { "group": "guns_shotgun_rare_worn", "prob": 22, "contents-group": "sights_shotgun_readied" }, - { "item": "winchester_1887", "prob": 10, "charges": [ 0, 6 ] }, - { "item": "winchester_1897", "prob": 7, "charges": [ 0, 6 ] } - ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_static", - "subtype": "distribution", - "entries": [ - { "group": "guns_shotgun_rare_worn", "prob": 22, "contents-group": "sights_shotgun_static" }, - { "item": "winchester_1887", "prob": 10, "charges": [ 0, 6 ] }, - { "item": "winchester_1897", "prob": 7, "charges": [ 0, 6 ] } + { "group": "12_gauge_semi_display", "prob": 48 }, + { "group": "12_gauge_pump_display", "prob": 34 }, + { "group": "12_gauge_break_display", "prob": 18 }, + { "item": "shotgun_410", "prob": 5 } ] }, { @@ -640,25 +391,6 @@ { "group": "nested_m1014", "prob": 100 } ] }, - { - "type": "item_group", - "id": "guns_shotgun_obscure", - "//": "Imported or otherwise very obscure shotguns.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ { "group": "nested_saiga_12", "prob": 50 }, { "group": "nested_saiga_410", "prob": 40 } ] - }, - { - "type": "item_group", - "id": "guns_shotgun_obscure_display", - "subtype": "distribution", - "//": "Imported or otherwise very obscure shotguns, unloaded for storage in a gunstore, some violate AWA.", - "items": [ - { "item": "saiga_12", "prob": 25 }, - { "item": "winchester_1887", "prob": 10 }, - { "item": "winchester_1897", "prob": 20 }, - { "item": "saiga_410", "prob": 10 } - ] - }, { "type": "item_group", "id": "guns_shotgun_improvised", @@ -731,7 +463,6 @@ "items": [ { "group": "guns_pistol_common", "prob": 41 }, { "group": "guns_rifle_common", "prob": 57 }, - { "group": "guns_smg_common", "prob": 1 }, { "group": "guns_shotgun_common", "prob": 1 } ] }, @@ -745,50 +476,6 @@ { "group": "guns_shotgun_common_display", "prob": 1 } ] }, - { - "type": "item_group", - "id": "guns_rare", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ - { "group": "guns_pistol_rare", "prob": 41 }, - { "group": "guns_smg_rare", "prob": 1 }, - { "group": "guns_rifle_rare", "prob": 57 }, - { "group": "guns_shotgun_rare", "prob": 1 } - ] - }, - { - "type": "item_group", - "id": "guns_rare_display", - "subtype": "distribution", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ - { "group": "guns_pistol_rare_display", "prob": 41 }, - { "group": "guns_rifle_rare_display", "prob": 58 }, - { "group": "guns_shotgun_rare_display", "prob": 1 } - ] - }, - { - "type": "item_group", - "id": "guns_rare_static", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ - { "group": "guns_pistol_rare", "prob": 41 }, - { "group": "guns_smg_rare", "prob": 1 }, - { "group": "guns_rifle_rare", "prob": 57 }, - { "group": "guns_shotgun_rare_static", "prob": 1 } - ] - }, - { - "type": "item_group", - "id": "guns_rare_readied", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ - { "group": "guns_pistol_rare", "prob": 41 }, - { "group": "guns_smg_rare", "prob": 1 }, - { "group": "guns_rifle_rare", "prob": 57 }, - { "group": "guns_shotgun_rare_readied", "prob": 1 } - ] - }, { "type": "item_group", "id": "guns_milspec", @@ -803,21 +490,21 @@ }, { "type": "item_group", - "id": "guns_obscure", - "//": "Imported or otherwise very obscure guns of all types.", - "items": [ - { "group": "guns_pistol_obscure", "prob": 45 }, - { "group": "guns_smg_obscure", "prob": 1 }, - { "group": "guns_rifle_obscure", "prob": 53 }, - { "group": "guns_shotgun_obscure", "prob": 1 } - ] + "id": "guns_display_pieces", + "//": "Display pieces for guns that are more for decoration than actual purpose.", + "items": [ { "group": "guns_pistol_display_pieces", "prob": 80 }, { "group": "guns_rifle_display_pieces", "prob": 20 } ] + }, + { + "type": "item_group", + "id": "guns_collectible", + "//": "Historical guns that you may find at something like a gunshow.", + "items": [ { "group": "guns_pistol_collectible", "prob": 80 }, { "group": "guns_rifle_collectible", "prob": 20 } ] }, { "type": "item_group", "id": "guns_improvised", "//": "Makeshift or otherwise poor quality guns of all types.", "items": [ - { "group": "guns_pistol_improvised", "prob": 41 }, { "group": "guns_smg_improvised", "prob": 1 }, { "group": "guns_rifle_improvised", "prob": 56 }, { "group": "guns_shotgun_improvised", "prob": 1 } @@ -1694,43 +1381,26 @@ { "type": "item_group", "id": "guns_survival", - "//": "Guns typically carried by survivors, either improvised or thematically appropriate.", + "magazine": 100, + "//": "Guns typically carried by survivors, more focused on common semi-auto guns with commonly available ammo.", "items": [ - { "group": "guns_improvised", "prob": 50 }, - { "group": "modular_ar15", "prob": 13, "charges": [ 0, 30 ] }, - { "group": "ar_pistol", "prob": 7, "charges": [ 0, 30 ] }, - { "item": "mossberg_500", "prob": 2, "charges": [ 0, 6 ] }, - { "item": "remington_870", "prob": 2, "charges": [ 0, 5 ] }, - { "item": "benelli_sa", "variant": "m2", "prob": 2, "charges": [ 0, 4 ] }, - { "item": "benelli_sa", "variant": "sbe", "prob": 2, "charges": [ 0, 4 ] }, - { - "item": "benelli_tsa", - "variant": "m2_tac", - "contents-item": [ "rail_mount" ], - "prob": 1, - "charges": [ 0, 6 ] - }, - { "item": "remington_870", "variant": "ithaca37", "prob": 1, "charges": [ 0, 5 ] }, - { "group": "cz600", "prob": 5, "charges": [ 0, 10 ] }, - { "item": "ruger_1022", "prob": 7, "charges": [ 0, 10 ] }, - { "item": "shotgun_410", "prob": 1, "charges": [ 0, 1 ] }, - { "item": "shotgun_s", "prob": 1 }, - { "item": "shotgun_d", "prob": 1, "charges": [ 0, 2 ] }, - { "item": "sks", "prob": 1, "charges": [ 0, 10 ] }, - { "item": "aksemi", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "mosin44", "variant": "mosin44", "prob": 2, "charges": [ 0, 5 ] }, - { "item": "remington700_270", "prob": 1, "charges": [ 0, 4 ] }, - { "item": "ruger_m77", "prob": 1, "charges": [ 0, 4 ] }, - { "item": "ruger_arr", "prob": 1, "charges": [ 0, 3 ] }, - { "item": "remington_700", "prob": 4, "charges": [ 0, 4 ] }, - { "item": "bren2_762", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "bren2_556", "prob": 2, "charges": [ 0, 30 ] }, - { "group": "mdrx", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "garand", "prob": 1, "charges": [ 0, 8 ] }, - { "item": "mk47", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "ak556", "variant": "zpapm90", "prob": 1 }, - { "item": "colt_python", "prob": 1, "charges": [ 0, 6 ] } + { "item": "glock_17", "prob": 10, "charges": [ 0, 17 ] }, + { "item": "glock_19", "prob": 45, "charges": [ 0, 17 ] }, + { "item": "m9", "variant": "m9", "prob": 20, "charges": [ 0, 15 ] }, + { "item": "cz75", "prob": 30, "charges": [ 0, 16 ] }, + { "item": "m18", "prob": 15, "charges": [ 0, 17 ] }, + { "item": "ruger_mini", "prob": 40, "charges": [ 0, 30 ] }, + { "item": "rdb_223", "prob": 30, "charges": [ 0, 30 ] }, + { "item": "ruger_1022", "prob": 20, "charges": [ 0, 25 ] }, + { "group": "ar15_223long", "prob": 110, "charges": [ 0, 30 ] }, + { "group": "modular_ar15", "prob": 155, "charges": [ 0, 30 ] }, + { "group": "guns_rifle_common_display_762", "prob": 50, "charges": [ 0, 30 ] }, + { "group": "guns_rifle_common_display_308", "prob": 80, "charges": [ 0, 20 ] }, + { "group": "guns_rifle_common_display_3006", "prob": 25, "charges": [ 0, 8 ] }, + { "group": "guns_pistol_common_display_223", "prob": 25, "charges": [ 0, 30 ] }, + { "group": "guns_pistol_common_display_44", "prob": 15, "charges": [ 0, 8 ] }, + { "group": "guns_pistol_common_display_357mag", "prob": 15, "charges": [ 0, 9 ] }, + { "group": "guns_pistol_common_display_40", "prob": 25, "charges": [ 0, 20 ] } ] } ] 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 fb17f2a03d0f6..9f623b85007ac 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json @@ -2,90 +2,109 @@ { "type": "item_group", "id": "guns_pistol_common_9mm", - "//": "Pistols that are reasonably prolific amongst civilians, commonly owned and reliably obtainable by citizens and that are found in many locations.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ - { "group": "nested_glock_17", "prob": 12 }, - { "group": "nested_glock_19", "prob": 15 }, - { "group": "nested_m9", "prob": 11 }, - { "group": "nested_px4", "prob": 11 }, - { "group": "nested_hi_power_9mm", "prob": 2 }, - { "group": "nested_walther_ppq_9mm", "prob": 4 }, - { "group": "nested_cz75", "prob": 1 }, - { "group": "nested_kpf9", "prob": 13 }, - { "group": "nested_hptc9", "prob": 2 }, - { "group": "nested_walther_ccp", "prob": 7 } + "//": "Pistols that are able to be obtained legally, regardless of how rare they'd be. Numbers are based off of Gunbroker, and any prob of 100 is the base gun that the other ones are compared to.", + "//2": "Making the assumption any loaded gun will have additional ammo and mags with it. The rare/other itemgroups are to handle firearms that are too rare to show up as a whole number, but would still exist in some capacity.", + "items": [ + { "group": "nested_glock_17", "prob": 73 }, + { "group": "nested_glock_19", "prob": 100 }, + { "group": "nested_m9", "prob": 22 }, + { "group": "nested_px4", "prob": 5 }, + { "group": "nested_hi_power_9mm", "prob": 9 }, + { "group": "nested_walther_ppq_9mm", "prob": 8 }, + { "group": "nested_cz75", "prob": 65 }, + { "group": "nested_hptc9", "prob": 12 }, + { "group": "nested_walther_ccp", "prob": 2 }, + { "group": "nested_m18", "prob": 22 }, + { "group": "nested_m11", "prob": 6 }, + { "group": "nested_hk_mp5_semi_pistol", "prob": 10 }, + { "group": "nested_m17", "prob": 24 }, + { "group": "nested_p226_9mm", "prob": 73 }, + { "group": "nested_sp2022", "prob": 4 }, + { "group": "nested_usp_9mm", "prob": 38 }, + { "group": "nested_walther_p38", "prob": 9 }, + { "group": "guns_pistol_rare_9mm", "prob": 10 } ] }, { "type": "item_group", "id": "guns_pistol_common_22", "items": [ - { "group": "nested_walther_p22", "prob": 40 }, - { "group": "nested_ruger_lcr_22", "prob": 40 }, - { "group": "nested_rough_rider_pistol", "prob": 25 }, - { "group": "nested_rough_rider_pistol_9", "prob": 4 }, - { "group": "nested_sig_mosquito", "prob": 18 }, - { "group": "nested_cp33", "prob": 9 }, - { "group": "nested_ruger_mk4", "prob": 74 }, - { "group": "nested_ruger_charger", "prob": 1 }, - { "group": "nested_1911_22", "prob": 40 } + { "group": "nested_walther_p22", "prob": 45 }, + { "group": "nested_ruger_lcr_22", "prob": 2 }, + { "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_ruger_charger", "prob": 16 }, + { "group": "nested_1911_22", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_45", "items": [ - { "group": "nested_glock_21", "prob": 5 }, - { "group": "nested_m1911", "prob": 17 }, - { "group": "nested_walther_ppq_45", "prob": 2 }, - { "group": "nested_hptjhp", "prob": 1 } + { "group": "nested_glock_21", "prob": 14 }, + { "group": "nested_m1911", "prob": 100 }, + { "group": "nested_walther_ppq_45", "prob": 1 }, + { "group": "nested_hptjhp", "prob": 2 }, + { "group": "nested_usp_45", "prob": 4 } ] }, { "type": "item_group", "id": "guns_pistol_common_380", - "items": [ - { "group": "nested_kp3at", "prob": 10 }, - { "group": "nested_rugerlcp", "prob": 10 }, - { "group": "nested_hptcf380", "prob": 2 }, - { "group": "nested_taurus_spectrum", "prob": 6 } - ] + "items": [ { "group": "nested_rugerlcp", "prob": 231 }, { "group": "nested_hptcf380", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_40", "items": [ - { "group": "nested_glock_22", "prob": 10 }, - { "group": "nested_px4_40", "prob": 5 }, - { "group": "nested_hi_power_40", "prob": 2 }, - { "group": "nested_walther_ppq_40", "prob": 3 }, - { "group": "nested_hptjcp", "prob": 1 } + { "group": "nested_glock_22", "prob": 100 }, + { "group": "nested_px4_40", "prob": 20 }, + { "group": "nested_hi_power_40", "prob": 3 }, + { "group": "nested_hptjcp", "prob": 29 } ] }, { "type": "item_group", "id": "guns_pistol_common_357mag", "items": [ - { "group": "nested_sw_619", "prob": 3 }, - { "group": "nested_rp63", "prob": 3 }, - { "group": "nested_colt_python", "prob": 3 } + { "group": "nested_sw_619", "prob": 100 }, + { "group": "nested_rp63", "prob": 11 }, + { "group": "nested_colt_python", "prob": 96 }, + { "group": "nested_chiappa_rhino", "prob": 72 }, + { "group": "nested_modular_deagle_357", "prob": 38 } ] }, { "type": "item_group", "id": "guns_pistol_common_38", - "items": [ { "group": "nested_ruger_lcr_38", "prob": 5 }, { "group": "nested_model_10_revolver", "prob": 10 } ] + "items": [ { "group": "nested_ruger_lcr_38", "prob": 66 }, { "group": "nested_model_10_revolver", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_44", - "items": [ { "group": "nested_sw629", "prob": 5 }, { "group": "nested_colt_anaconda", "prob": 4 } ] + "items": [ + { "group": "nested_sw629", "prob": 100 }, + { "group": "nested_colt_anaconda", "prob": 47 }, + { "group": "nested_modular_deagle_44", "prob": 52 } + ] }, { "type": "item_group", "id": "guns_pistol_common_10mm", - "items": [ { "group": "nested_sw_610", "prob": 5 } ] + "items": [ + { "group": "nested_glock_40", "prob": 100 }, + { "group": "nested_m1911_10", "prob": 30 }, + { "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 } + ] }, { "type": "item_group", @@ -106,83 +125,127 @@ "id": "guns_pistol_common_300", "items": [ { "group": "nested_ar_pistol_300", "prob": 2 }, { "group": "nested_ar_pistol_300_long", "prob": 5 } ] }, + { + "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 } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_32", + "items": [ { "group": "nested_kp32", "prob": 100 }, { "group": "nested_walther_ppk", "prob": 71 } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_45colt", + "items": [ + { "group": "nested_raging_bull", "prob": 9 }, + { "group": "nested_taurus_judge", "prob": 100 }, + { "group": "nested_colt_saa", "prob": 26 }, + { "group": "nested_bond_410", "prob": 16 } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_38super", + "//": "Yes it's a bit stupid to have a separate group for just 1 gun but it makes it look nicer and organized", + "items": [ { "group": "nested_m1911a1_38super", "prob": 100 } ] + }, { "type": "item_group", "id": "guns_pistol_common_other", - "items": [ { "group": "nested_kp32", "prob": 5 }, { "group": "nested_taurus_judge", "prob": 3 } ] + "items": [ + { "group": "nested_glock_31", "prob": 42 }, + { "group": "nested_bfr", "prob": 5 }, + { "group": "nested_modular_deagle_50", "prob": 10 }, + { "group": "nested_sw_500", "prob": 29 }, + { "group": "nested_makarov", "prob": 7 }, + { "group": "nested_tokarev", "prob": 7 }, + { "group": "nested_ar15_retool_450bushmaster_7", "prob": 3 }, + { "group": "nested_ar15_retool_50beowulf_7", "prob": 1 } + ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_9mm", + "//": "If the gun is designed for conceal carry, such as being small, use prob from guns_pistol_common. If full sized, 10-20% of the original prob. This is an asspull but I know that full sized handguns are gonna be less commonly carried", "items": [ - { "item": "glock_17", "prob": 11, "charges": [ 0, -1 ] }, - { "item": "glock_19", "prob": 15, "charges": [ 0, -1 ] }, - { "item": "m9", "variant": "m9", "prob": 11, "charges": [ 0, -1 ] }, - { "item": "px4", "prob": 11, "charges": [ 0, -1 ] }, + { "item": "glock_17", "prob": 7, "charges": [ 0, -1 ] }, + { "item": "glock_19", "prob": 100, "charges": [ 0, -1 ] }, + { "item": "m9", "variant": "m9", "prob": 2, "charges": [ 0, -1 ] }, + { "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": 5, "charges": [ 0, -1 ] } + { "item": "walther_ccp", "prob": 2, "charges": [ 0, -1 ] }, + { "item": "m18", "prob": 22, "charges": [ 0, -1 ] }, + { "item": "m11", "prob": 6, "charges": [ 0, -1 ] }, + { "item": "m17", "prob": 5, "charges": [ 0, -1 ] }, + { "item": "p226_9mm", "prob": 11, "charges": [ 0, -1 ] }, + { "item": "sp2022", "prob": 4, "charges": [ 0, -1 ] }, + { "item": "usp_9mm", "prob": 6, "charges": [ 0, -1 ] }, + { "item": "walther_p38", "prob": 1, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_22", "items": [ - { "item": "sig_mosquito", "prob": 15, "charges": [ 0, -1 ] }, - { "item": "walther_p22", "prob": 30, "charges": [ 0, -1 ] }, - { "item": "ruger_lcr_22", "prob": 60, "charges": [ 0, -1 ] }, - { "item": "ruger_mk4", "prob": 130, "charges": [ 0, -1 ] }, - { "item": "1911_22", "prob": 20, "charges": [ 0, -1 ] } + { "item": "sig_mosquito", "prob": 6, "charges": [ 0, -1 ] }, + { "item": "walther_p22", "prob": 45, "charges": [ 0, -1 ] }, + { "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 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_45", "items": [ - { "item": "glock_21", "prob": 5, "charges": [ 0, -1 ] }, - { "item": "m1911", "prob": 17, "charges": [ 0, -1 ] }, - { "item": "walther_ppq_45", "prob": 2, "charges": [ 0, -1 ] }, - { "item": "hptjhp", "prob": 1, "charges": [ 0, -1 ] } + { "item": "glock_21", "prob": 2, "charges": [ 0, -1 ] }, + { "item": "m1911", "prob": 13, "charges": [ 0, -1 ] }, + { "item": "walther_ppq_45", "prob": 1, "charges": [ 0, -1 ] }, + { "item": "hptjhp", "prob": 1, "charges": [ 0, -1 ] }, + { "item": "usp_45", "prob": 1, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_380", - "items": [ - { "item": "kp3at", "prob": 10, "charges": [ 0, -1 ] }, - { "item": "rugerlcp", "prob": 10, "charges": [ 0, -1 ] }, - { "item": "hptcf380", "prob": 2, "charges": [ 0, -1 ] }, - { "item": "taurus_spectrum", "prob": 6, "charges": [ 0, -1 ] } - ] + "items": [ { "item": "rugerlcp", "prob": 231, "charges": [ 0, -1 ] }, { "item": "hptcf380", "prob": 15, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_40", "items": [ { "item": "glock_22", "prob": 10, "charges": [ 0, -1 ] }, - { "item": "px4_40", "prob": 5, "charges": [ 0, -1 ] }, - { "item": "hi_power_40", "prob": 2, "charges": [ 0, -1 ] }, - { "item": "walther_ppq_40", "prob": 3, "charges": [ 0, -1 ] }, - { "item": "hptjcp", "prob": 1, "charges": [ 0, -1 ] } + { "item": "px4_40", "prob": 20, "charges": [ 0, -1 ] }, + { "item": "hi_power_40", "prob": 1, "charges": [ 0, -1 ] }, + { "item": "hptjcp", "prob": 3, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_357mag", "items": [ - { "item": "sw_619", "prob": 5, "charges": [ 0, -1 ] }, - { "item": "rp63", "prob": 5, "charges": [ 0, -1 ] }, - { "item": "colt_python", "prob": 5, "charges": [ 0, -1 ] } + { "item": "sw_619", "prob": 10, "charges": [ 0, -1 ] }, + { "item": "rp63", "prob": 11, "charges": [ 0, -1 ] }, + { "item": "colt_python", "prob": 10, "charges": [ 0, -1 ] }, + { "item": "chiappa_rhino", "prob": 7, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_38", "items": [ - { "item": "ruger_lcr_38", "prob": 5, "charges": [ 0, -1 ] }, + { "item": "ruger_lcr_38", "prob": 66, "charges": [ 0, -1 ] }, { "item": "model_10_revolver", "prob": 10, "charges": [ 0, -1 ] } ] }, @@ -190,113 +253,170 @@ "type": "item_group", "id": "guns_pistol_common_everyday_carry_44", "items": [ - { "item": "sw629", "prob": 150, "charges": [ 0, -1 ] }, - { "item": "colt_anaconda_8", "prob": 33, "charges": [ 0, -1 ] }, - { "item": "colt_anaconda_6", "prob": 50, "charges": [ 0, -1 ] }, - { "item": "colt_anaconda_4", "prob": 16, "charges": [ 0, -1 ] } + { "item": "sw629", "prob": 10, "charges": [ 0, -1 ] }, + { "item": "colt_anaconda_6", "prob": 4, "charges": [ 0, -1 ] }, + { "item": "colt_anaconda_4", "prob": 12, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_everyday_carry_10mm", - "items": [ { "item": "sw_610", "prob": 5, "charges": [ 0, -1 ] } ] + "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 ] }, + { "item": "xd_10", "prob": 9, "charges": [ 0, -1 ] }, + { "item": "witness_10", "prob": 1, "charges": [ 0, -1 ] }, + { "item": "glock_20", "prob": 12, "charges": [ 0, -1 ] }, + { "item": "glock_29", "prob": 62, "charges": [ 0, -1 ] } + ] }, { "type": "item_group", - "id": "guns_pistol_common_everyday_carry_other", - "items": [ { "item": "kp32", "prob": 5, "charges": [ 0, -1 ] } ] + "id": "guns_pistol_common_everyday_carry_57", + "items": [ { "item": "ruger_57", "prob": 10, "charges": [ 0, -1 ] }, { "item": "fn57", "prob": 1, "charges": [ 0, -1 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_everyday_carry_32", + "items": [ { "item": "kp32", "prob": 10, "charges": [ 0, -1 ] }, { "item": "walther_ppk", "prob": 1, "charges": [ 0, -1 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_everyday_carry_45colt", + "items": [ + { "item": "taurus_judge", "prob": 10, "charges": [ 0, -1 ] }, + { "item": "colt_saa", "prob": 2, "charges": [ 0, -1 ] } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_everyday_carry_38super", + "items": [ { "item": "m1911a1_38super", "prob": 100, "charges": [ 0, -1 ] } ] }, { "type": "item_group", "id": "guns_pistol_common_display_9mm", "items": [ - { "item": "glock_17", "prob": 11 }, - { "item": "glock_19", "prob": 15 }, - { "item": "m9", "variant": "m9", "prob": 11 }, - { "item": "px4", "prob": 8 }, - { "item": "kpf9", "prob": 12 }, - { "item": "hi_power_9mm", "prob": 1 }, - { "item": "walther_ppq_9mm", "prob": 4 }, - { "item": "cz75", "prob": 6 }, - { "item": "walther_ccp", "prob": 6 }, - { "item": "hptc9", "prob": 2 } + { "item": "glock_17", "prob": 73 }, + { "item": "glock_19", "prob": 100 }, + { "item": "m9", "variant": "m9", "prob": 22 }, + { "item": "px4", "prob": 5 }, + { "item": "hi_power_9mm", "prob": 9 }, + { "item": "walther_ppq_9mm", "prob": 8 }, + { "item": "cz75", "prob": 65 }, + { "item": "walther_ccp", "prob": 2 }, + { "item": "hptc9", "prob": 12 }, + { "item": "m18", "prob": 22 }, + { "item": "m11", "prob": 6 }, + { "item": "hk_mp5_semi_pistol", "prob": 10 }, + { "item": "m17", "prob": 24 }, + { "item": "p226_9mm", "prob": 73 }, + { "item": "sp2022", "prob": 4 }, + { "item": "usp_9mm", "prob": 38 }, + { "item": "walther_p38", "prob": 9 }, + { "group": "guns_pistol_rare_display_9mm", "prob": 10 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_22", "items": [ - { "item": "sig_mosquito", "prob": 18 }, - { "item": "walther_p22", "prob": 42 }, - { "item": "ruger_lcr_22", "prob": 84 }, - { "item": "rough_rider_pistol", "prob": 28 }, - { "item": "rough_rider_pistol_9", "prob": 4 }, - { "item": "cp33", "prob": 14 }, - { "item": "ruger_mk4", "prob": 72 }, - { "item": "ruger_charger", "prob": 10 }, - { "item": "1911_22", "prob": 50 } + { "item": "walther_p22", "prob": 45 }, + { "item": "ruger_lcr_22", "prob": 2 }, + { "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": "ruger_charger", "prob": 16 }, + { "item": "1911_22", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_45", "items": [ - { "item": "glock_21", "prob": 5 }, - { "item": "m1911", "prob": 17 }, - { "item": "walther_ppq_45", "prob": 3 }, - { "item": "hptjhp", "prob": 1 } + { "item": "glock_21", "prob": 14 }, + { "item": "m1911", "prob": 100 }, + { "item": "walther_ppq_45", "prob": 1 }, + { "item": "hptjhp", "prob": 2 }, + { "item": "usp_45", "prob": 4 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_380", - "items": [ - { "item": "kp3at", "prob": 10 }, - { "item": "rugerlcp", "prob": 10 }, - { "item": "hptcf380", "prob": 2 }, - { "item": "taurus_spectrum", "prob": 6 } - ] + "items": [ { "item": "rugerlcp", "prob": 231 }, { "item": "hptcf380", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_40", "items": [ - { "item": "glock_22", "prob": 10 }, - { "item": "px4_40", "prob": 5 }, - { "item": "hi_power_40", "prob": 2 }, - { "item": "walther_ppq_40", "prob": 3 }, - { "item": "hptjcp", "prob": 1 } + { "item": "glock_22", "prob": 100 }, + { "item": "px4_40", "prob": 20 }, + { "item": "hi_power_40", "prob": 3 }, + { "item": "hptjcp", "prob": 29 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_357mag", - "items": [ { "item": "sw_619", "prob": 1 }, { "item": "rp63", "prob": 1 }, { "item": "colt_python", "prob": 2 } ] + "items": [ + { "item": "sw_619", "prob": 100 }, + { "item": "rp63", "prob": 11 }, + { "item": "colt_python", "prob": 96 }, + { "item": "chiappa_rhino", "prob": 72 }, + { "group": "modular_deagle_357", "prob": 38 } + ] }, { "type": "item_group", "id": "guns_pistol_common_display_38", - "items": [ { "item": "ruger_lcr_38", "prob": 5 }, { "item": "model_10_revolver", "prob": 10 } ] + "items": [ { "item": "ruger_lcr_38", "prob": 66 }, { "item": "model_10_revolver", "prob": 100 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_44", "items": [ - { "item": "sw629", "prob": 150 }, - { "item": "colt_anaconda_8", "prob": 33 }, - { "item": "colt_anaconda_6", "prob": 50 }, - { "item": "colt_anaconda_4", "prob": 16 } + { "item": "sw629", "prob": 100 }, + { "item": "colt_anaconda_8", "prob": 15 }, + { "item": "colt_anaconda_6", "prob": 24 }, + { "item": "colt_anaconda_4", "prob": 8 }, + { "group": "modular_deagle_44", "prob": 52 } ] }, { "type": "item_group", "id": "guns_pistol_common_display_45colt", - "items": [ { "item": "colt_saa", "prob": 5 } ] + "items": [ + { "item": "raging_bull", "prob": 9 }, + { "item": "taurus_judge", "prob": 100 }, + { "item": "colt_saa", "prob": 26 }, + { "item": "bond_410", "prob": 16 } + ] }, { "type": "item_group", "id": "guns_pistol_common_display_10mm", - "items": [ { "item": "sw_610", "prob": 5 } ] + "items": [ + { "item": "glock_40", "prob": 100 }, + { "item": "m1911_10", "prob": 30 }, + { "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 } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_display_57", + "items": [ { "item": "ruger_57", "prob": 100 }, { "item": "fn57", "prob": 13 }, { "item": "p50", "prob": 12 } ] }, { "type": "item_group", @@ -315,76 +435,38 @@ }, { "type": "item_group", - "id": "guns_pistol_common_display_other", - "items": [ { "item": "kp32", "prob": 5 }, { "item": "taurus_judge", "prob": 9 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_9mm", - "items": [ - { "group": "nested_90two", "prob": 20 }, - { "group": "nested_usp_9mm", "prob": 13 }, - { "group": "nested_p08", "prob": 7 }, - { "group": "nested_draco_9mm", "prob": 14 } - ] + "id": "guns_pistol_common_display_32", + "items": [ { "item": "kp32", "prob": 100 }, { "item": "walther_ppk", "prob": 71 } ] }, { "type": "item_group", - "id": "guns_pistol_rare_223", - "items": [ { "group": "nested_ar_pistol", "prob": 1 }, { "group": "nested_minidraco556", "prob": 1 } ] + "id": "guns_pistol_common_display_38super", + "items": [ { "item": "m1911a1_38super", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_pistol_rare_45", - "items": [ { "group": "nested_usp_45", "prob": 20 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_40", - "items": [ { "group": "nested_90two40", "prob": 2 }, { "group": "nested_sig_40", "prob": 10 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_357mag", - "items": [ { "group": "nested_chiappa_rhino", "prob": 5 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_38", - "items": [ { "group": "nested_model_10_revolver", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_44", - "items": [ { "group": "nested_sw629", "prob": 40 }, { "group": "nested_colt_anaconda", "prob": 30 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_45colt", - "items": [ { "group": "nested_bond_410", "prob": 15 }, { "group": "nested_colt_saa", "prob": 8 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_10mm", - "items": [ { "group": "nested_TDI_10", "prob": 1 } ] + "id": "guns_pistol_common_display_other", + "items": [ + { "item": "glock_31", "prob": 42 }, + { "item": "bfr", "prob": 5 }, + { "group": "modular_deagle_50", "prob": 10 }, + { "item": "sw_500", "prob": 29 }, + { "item": "makarov", "prob": 7 }, + { "item": "tokarev", "prob": 7 }, + { "group": "ar15_450short", "prob": 3 }, + { "group": "ar15_50short", "prob": 1 } + ] }, { "type": "item_group", - "id": "guns_pistol_rare_other", + "id": "guns_pistol_rare_9mm", "items": [ - { "group": "nested_m1911a1_38super", "prob": 20 }, - { "group": "nested_fn57", "prob": 10 }, - { "group": "nested_sig_p230", "prob": 45 }, - { "group": "nested_sw_500", "prob": 15 }, - { "group": "nested_walther_p38", "prob": 15 }, - { "group": "nested_raging_bull", "prob": 10 }, - { "group": "nested_m714", "prob": 8 }, - { "group": "nested_m1911-460", "prob": 5 }, - { "group": "nested_bfr", "prob": 10 }, - { "group": "nested_mauser_c96", "prob": 15 }, - { "group": "nested_makarov", "prob": 15 }, - { "group": "nested_tokarev", "prob": 15 }, - { "group": "nested_walther_ppk", "prob": 20 } + { "group": "nested_90two", "prob": 5 }, + { "group": "nested_p08", "prob": 13 }, + { "group": "nested_draco_9mm", "prob": 29 }, + { "group": "nested_mauser_c96", "prob": 11 }, + { "group": "nested_mp40semi", "prob": 1 }, + { "group": "nested_tec9", "prob": 1 } ] }, { @@ -392,115 +474,111 @@ "id": "guns_pistol_rare_display_9mm", "items": [ { "item": "m9", "variant": "90two", "prob": 5 }, - { "item": "usp_9mm", "prob": 48 }, - { "item": "p08", "prob": 5 }, - { "item": "draco_9mm", "prob": 21 } + { "item": "draco_9mm", "prob": 29 }, + { "item": "p08", "prob": 13 }, + { "item": "mauser_c96", "prob": 11 }, + { "item": "mp40semi", "prob": 1 }, + { "item": "tec9", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_pistol_rare_display_45", - "items": [ { "item": "usp_45", "prob": 9 } ] - }, - { - "type": "item_group", - "id": "guns_pistol_rare_display_40", - "items": [ { "item": "90two40", "prob": 2 }, { "item": "sig_40", "prob": 5 } ] + "id": "guns_rifle_common_22", + "items": [ + { "group": "nested_marlin_9a", "prob": 3 }, + { "group": "nested_ruger_1022", "prob": 100 }, + { "group": "nested_rossi_gallery", "prob": 11 }, + { "group": "nested_ar15_retool_22", "prob": 2 } + ] }, { "type": "item_group", - "id": "guns_pistol_rare_display_357mag", - "items": [ { "item": "chiappa_rhino", "prob": 5 }, { "group": "modular_deagle_357", "prob": 4 } ] + "id": "guns_rifle_common_223", + "items": [ + { "group": "nested_ar15_retool_223_20", "prob": 71 }, + { "group": "nested_ar15_retool_223_16", "prob": 263 }, + { "group": "nested_ruger_mini", "prob": 100 }, + { "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 } + ] }, { "type": "item_group", - "id": "guns_pistol_rare_display_44", + "id": "guns_rifle_common_308", "items": [ - { "item": "sw629", "prob": 150 }, - { "group": "modular_deagle_44", "prob": 100 }, - { "item": "colt_anaconda_8", "prob": 33 }, - { "item": "colt_anaconda_6", "prob": 50 }, - { "item": "colt_anaconda_4", "prob": 16 } + { "group": "nested_ar10", "prob": 89 }, + { "group": "nested_m1a", "prob": 100 }, + { "group": "nested_rfb_308", "prob": 6 }, + { "group": "nested_fn_fal", "prob": 5 }, + { "group": "nested_hk_g3", "prob": 1 }, + { "group": "nested_ak308", "prob": 20 }, + { "group": "nested_steyr_scout", "prob": 6 } ] }, { "type": "item_group", - "id": "guns_pistol_rare_display_45colt", - "items": [ { "item": "bond_410", "prob": 10 }, { "item": "colt_saa", "prob": 8 } ] + "//": "Currently the only 45 acp rifle we have is quite rare. Will be fixed soon", + "id": "guns_rifle_common_45acp", + "items": [ { "group": "nested_hk_usc45", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_pistol_rare_display_other", + "id": "guns_rifle_common_762", "items": [ - { "item": "m1911a1_38super", "prob": 25 }, - { "item": "fn57", "prob": 3 }, - { "item": "sig_p230", "prob": 15 }, - { "item": "sw_500", "prob": 15 }, - { "item": "walther_p38", "prob": 10 }, - { "item": "raging_bull", "prob": 10 }, - { "item": "mauser_m714", "prob": 15 }, - { "item": "m1911-460", "prob": 10 }, - { "item": "bfr", "prob": 10 }, - { "item": "mauser_c96", "prob": 15 }, - { "item": "makarov", "prob": 8 }, - { "item": "tokarev", "prob": 5 }, - { "item": "walther_ppk", "prob": 8 }, - { "group": "modular_deagle_50", "prob": 4 }, - { "group": "nested_deagle_with_kits", "prob": 2 }, - { "group": "modular_deagle_complete", "prob": 1 } + { "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 } ] }, { "type": "item_group", - "id": "guns_rifle_common_22", - "items": [ { "group": "nested_marlin_9a", "prob": 8 }, { "group": "nested_ruger_1022", "prob": 28 } ] - }, - { - "type": "item_group", - "id": "guns_rifle_common_223", - "items": [ - { "group": "nested_ar_pistol", "prob": 1 }, - { "group": "nested_ar15", "prob": 15 }, - { "group": "nested_ruger_mini", "prob": 1 }, - { "group": "nested_ak556", "prob": 2 }, - { "group": "nested_bren2_556", "prob": 1 }, - { "group": "nested_rdb_223", "prob": 1 }, - { "group": "nested_mdrx", "prob": 1 }, - { "group": "nested_cz600", "prob": 1 } - ] + "id": "guns_rifle_common_9mm", + "items": [ { "group": "nested_ksub2000", "prob": 100 }, { "group": "nested_cx4", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_common_762", + "id": "guns_rifle_common_3006", "items": [ - { "group": "nested_sks", "prob": 1 }, - { "group": "nested_aksemi", "prob": 2 }, - { "group": "nested_bren2_762", "prob": 1 } + { "group": "nested_browning_blr", "prob": 4 }, + { "group": "nested_remington_700", "prob": 243 }, + { "group": "nested_ruger_m77", "prob": 62 }, + { "group": "nested_garand", "prob": 100 }, + { "group": "nested_m1903", "prob": 26 } ] }, { "type": "item_group", - "id": "guns_rifle_common_308", - "items": [ { "group": "nested_ar10", "prob": 1 }, { "group": "nested_m1a", "prob": 1 } ] + "id": "guns_rifle_common_44", + "items": [ { "group": "nested_henry_big_boy", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_3006", + "id": "guns_rifle_common_762R", "items": [ - { "group": "nested_browning_blr", "prob": 1 }, - { "group": "nested_remington_700", "prob": 4 }, - { "group": "nested_ruger_m77", "prob": 1 } + { "group": "nested_mosin44", "prob": 23 }, + { "group": "nested_mosin91_30", "prob": 100 }, + { "group": "nested_psl", "prob": 13 } ] }, { "type": "item_group", - "id": "guns_rifle_common_762R", - "items": [ { "group": "nested_mosin44", "prob": 1 }, { "group": "nested_mosin91_30", "prob": 1 } ] + "id": "guns_rifle_common_270win", + "items": [ { "group": "nested_remington700_270", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_270win", - "items": [ { "group": "nested_remington700_270", "prob": 1 } ] + "id": "guns_rifle_common_300winmag", + "items": [ + { "group": "nested_weatherby_5", "prob": 100 }, + { "group": "nested_ruger_pr", "prob": 40 }, + { "group": "nested_win70", "prob": 27 } + ] }, { "type": "item_group", @@ -509,375 +587,290 @@ }, { "type": "item_group", - "id": "guns_rifle_common_other", - "items": [ - { "group": "nested_converted_ar15", "prob": 6 }, - { "group": "nested_converted_mdrx", "prob": 1 }, - { "group": "nested_converted_cz600", "prob": 1 }, - { "group": "nested_1895sbl", "prob": 1 }, - { "group": "nested_win70", "prob": 1 }, - { "group": "nested_ruger_arr", "prob": 1 }, - { "group": "nested_m1carbine", "prob": 1 } - ] + "id": "guns_rifle_common_300blk", + "items": [ { "group": "nested_ar15_retool_300_16", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_22", - "items": [ - { "item": "marlin_9a", "prob": 8, "charges": [ 0, 19 ] }, - { "item": "ruger_1022", "prob": 28, "charges": [ 0, 10 ] }, - { "item": "rossi_gallery", "prob": 12, "charges": [ 0, 19 ] } - ] + "id": "guns_rifle_common_4570", + "items": [ { "group": "nested_sharps", "prob": 100 }, { "group": "nested_1895sbl", "prob": 67 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_223", - "items": [ - { "item": "ruger_mini", "prob": 1, "charges": [ 0, 5 ] }, - { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "ak556", "variant": "zpapm90", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "bren2_556", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "mdrx", "prob": 1, "charges": [ 0, 30 ] }, - { "group": "cz600", "prob": 1, "charges": [ 0, 10 ] }, - { "item": "ak556", "variant": "zpapm90", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "rdb_223", "prob": 1, "charges": [ 0, 30 ] }, - { "group": "modular_ar15", "prob": 15, "charges": [ 0, 30 ] } - ] + "id": "guns_rifle_common_30carbine", + "items": [ { "group": "nested_m1carbine", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_762", - "items": [ - { "item": "sks", "prob": 1, "charges": [ 0, 10 ] }, - { "item": "aksemi", "prob": 2, "charges": [ 0, 30 ] }, - { "item": "bren2_762", "prob": 1, "charges": [ 0, 30 ] }, - { "item": "mk47", "prob": 1, "charges": [ 0, 30 ] } - ] + "id": "guns_rifle_common_303", + "//": "To-do: convert enfields into variants", + "items": [ { "group": "nested_number4", "prob": 100 }, { "group": "nested_mk3", "prob": 56 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_308", - "items": [ { "item": "ar10", "prob": 1, "charges": [ 0, 20 ] }, { "item": "m1a", "prob": 1, "charges": [ 0, 5 ] } ] + "id": "guns_rifle_common_338", + "items": [ { "group": "nested_mrad_smr", "prob": 100 }, { "group": "nested_savage112", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_3006", - "items": [ - { "item": "browning_blr", "prob": 1, "charges": [ 0, 4 ] }, - { "item": "remington_700", "prob": 4, "charges": [ 0, 4 ] }, - { "item": "ruger_m77", "prob": 1, "charges": [ 0, 4 ] }, - { "item": "garand", "prob": 1, "charges": [ 0, 8 ] } - ] + "id": "guns_rifle_common_450", + "items": [ { "group": "nested_ar15_retool_450bushmaster_18", "prob": 100 }, { "group": "nested_ruger_arr", "prob": 97 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_762R", + "id": "guns_rifle_common_50beowulf", "items": [ - { "item": "mosin44", "variant": "mosin44", "prob": 1, "charges": [ 0, 5 ] }, - { "item": "mosin91_30", "variant": "mosin91_30", "prob": 1, "charges": [ 0, 5 ] } + { "group": "nested_ar15_retool_50beowulf_18", "prob": 26 }, + { "group": "nested_ar15_retool_50beowulf_16", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_270win", - "items": [ { "item": "remington700_270", "prob": 1, "charges": [ 0, 4 ] } ] + "id": "guns_rifle_common_57", + "items": [ { "group": "nested_fn_ps90", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_380", - "items": [ { "item": "hpt3895", "prob": 1, "charges": [ 0, 10 ] } ] + "id": "guns_rifle_common_545", + "items": [ { "group": "nested_ak74", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_common_worn_other", - "items": [ - { "item": "ruger_arr", "prob": 1, "charges": [ 0, 3 ] }, - { "item": "win70", "prob": 1, "charges": [ 0, 3 ] }, - { "item": "1895sbl", "prob": 1, "charges": [ 0, 6 ] }, - { "item": "m1carbine", "prob": 1, "charges": [ 0, 15 ] }, - { "item": "varmint_airgun", "prob": 1, "charges": [ 0, 1 ] } - ] + "id": "guns_rifle_common_7mm_arisaka", + "//": "To-do: Convert sniper into variant", + "items": [ { "group": "nested_type99", "prob": 100 }, { "group": "nested_type99_sniper", "prob": 4 } ] }, { "type": "item_group", "id": "guns_rifle_common_display_22", - "items": [ { "item": "ruger_1022", "prob": 160 }, { "item": "rossi_gallery", "prob": 18 } ] - }, - { - "type": "item_group", - "id": "guns_rifle_common_display_223", "items": [ - { "item": "ak556", "prob": 15 }, - { "item": "ak556", "variant": "zpapm90", "prob": 10 }, - { "item": "bren2_556", "prob": 10 }, - { "item": "ak556", "variant": "zpapm90", "prob": 10 }, - { "group": "modular_ar15", "prob": 45 }, - { "item": "ruger_mini", "prob": 9 }, - { "group": "mdrx", "prob": 10 }, - { "group": "cz600", "prob": 10 }, - { "group": "nested_ar15_with_kits", "prob": 15 }, - { "group": "nested_mdrx_with_kits", "prob": 10 }, - { "group": "nested_cz600_with_kits", "prob": 10 }, - { "item": "rdb_223", "prob": 30 } + { "item": "ruger_1022", "prob": 100 }, + { "item": "rossi_gallery", "prob": 11 }, + { "item": "marlin_9a", "prob": 3 }, + { "group": "ar15_22", "prob": 2 } ] }, { "type": "item_group", - "id": "guns_rifle_common_display_762", + "id": "guns_rifle_common_display_223", "items": [ - { "item": "sks", "prob": 20 }, - { "item": "aksemi", "prob": 15 }, - { "item": "mk47", "prob": 10 }, - { "item": "bren2_762", "prob": 6 } + { "group": "ar15_223long", "prob": 71 }, + { "group": "modular_ar15", "prob": 263 }, + { "item": "ruger_mini", "prob": 100 }, + { "item": "bren2_556", "prob": 4 }, + { "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 } ] }, { "type": "item_group", "id": "guns_rifle_common_display_308", "items": [ - { "item": "ar10", "prob": 35 }, - { "item": "m1a", "prob": 30 }, - { "item": "M24", "prob": 5 }, - { "item": "savage_111f", "prob": 10 } + { "item": "ar10", "prob": 89 }, + { "item": "m1a", "prob": 100 }, + { "item": "rfb_308", "prob": 7 }, + { "item": "fn_fal_semi", "prob": 5 }, + { "item": "hk_g3", "prob": 1 }, + { "item": "ak308", "prob": 20 }, + { "item": "steyr_scout", "prob": 6 } ] }, { "type": "item_group", - "id": "guns_rifle_common_display_3006", - "items": [ { "item": "remington_700", "prob": 45 }, { "item": "ruger_m77", "prob": 10 } ] - }, - { - "type": "item_group", - "id": "guns_rifle_common_display_270win", - "items": [ { "item": "remington700_270", "prob": 25 } ] - }, - { - "type": "item_group", - "id": "guns_rifle_common_display_380", - "items": [ { "item": "hpt3895", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_rifle_common_display_other", - "items": [ - { "item": "ruger_arr", "prob": 10 }, - { "item": "weatherby_5", "prob": 1 }, - { "item": "sharps", "prob": 10 }, - { "item": "varmint_airgun", "prob": 5 }, - { "item": "savage112", "prob": 10 } - ] + "//": "Currently the only 45 acp rifle we have is quite rare. Will be fixed soon", + "id": "guns_rifle_common_display_45acp", + "items": [ { "item": "hk_usc45", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_223", + "id": "guns_rifle_common_display_762", "items": [ - { "group": "nested_m249_semi", "prob": 5 }, - { "group": "nested_m4_carbine", "prob": 45 }, - { "group": "nested_m16_auto_rifle", "prob": 25 }, - { "group": "nested_zpapm90", "prob": 1 }, - { "group": "nested_zpap85", "prob": 1 }, - { "group": "nested_mdrx", "prob": 30 }, - { "group": "nested_sl8", "prob": 35 }, - { "group": "nested_sig_assault_rifle", "prob": 25 } + { "item": "sks", "prob": 34 }, + { "item": "aksemi", "prob": 100 }, + { "item": "mk47", "prob": 26 }, + { "item": "bren2_762", "prob": 1 }, + { "group": "ar15_762", "prob": 5 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_762", - "items": [ { "group": "nested_805_bren", "prob": 15 } ] + "id": "guns_rifle_common_display_9mm", + "items": [ { "item": "ksub2000", "prob": 100 }, { "item": "cx4", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_308", + "id": "guns_rifle_common_display_3006", "items": [ - { "group": "nested_fn_fal", "prob": 80 }, - { "group": "nested_hk_g3", "prob": 40 }, - { "group": "nested_m14ebr", "prob": 15 }, - { "group": "nested_savage_111f", "prob": 15 }, - { "group": "nested_M24", "prob": 15 }, - { "group": "nested_hk417_13", "prob": 40 }, - { "group": "nested_rfb_308", "prob": 5 }, - { "group": "nested_steyr_scout", "prob": 5 } + { "item": "browning_blr", "prob": 4 }, + { "item": "remington_700", "prob": 243 }, + { "item": "ruger_m77", "prob": 62 }, + { "item": "garand", "prob": 100 }, + { "item": "m1903", "prob": 26 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_3006", - "items": [ - { "group": "nested_m1903", "prob": 15 }, - { "group": "nested_m1918", "prob": 30 }, - { "group": "nested_remington_700", "prob": 20 } - ] + "id": "guns_rifle_common_display_44", + "items": [ { "item": "henry_big_boy", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_44", - "items": [ { "group": "nested_henry_big_boy", "prob": 10 } ] + "id": "guns_rifle_common_display_762R", + "items": [ { "item": "mosin44", "prob": 23 }, { "item": "mosin91_30", "prob": 100 }, { "item": "psl", "prob": 13 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_45", - "items": [ { "group": "nested_hk_usc45", "prob": 20 }, { "group": "nested_greasegun", "prob": 1 } ] + "id": "guns_rifle_common_display_270win", + "items": [ { "item": "remington700_270", "prob": 25 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_762R", - "items": [ - { "group": "nested_mosin44_ebr", "prob": 10 }, - { "group": "nested_mosin91_30_ebr", "prob": 20 }, - { "group": "nested_psl", "prob": 5 } - ] + "id": "guns_rifle_common_display_300winmag", + "items": [ { "item": "weatherby_5", "prob": 100 }, { "item": "ruger_pr", "prob": 40 }, { "item": "win70", "prob": 27 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_300blk", - "items": [ { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 } ] + "id": "guns_rifle_common_display_380", + "items": [ { "item": "hpt3895", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_other", - "items": [ - { "group": "nested_mk3", "prob": 10 }, - { "group": "nested_number4", "prob": 10 }, - { "group": "nested_ak74", "prob": 18 }, - { "group": "nested_aks74", "prob": 10 }, - { "group": "nested_sharps", "prob": 15 }, - { "group": "nested_weatherby_5", "prob": 1 }, - { "group": "nested_savage112", "prob": 15 }, - { "group": "nested_mrad_smr", "prob": 6 }, - { "group": "nested_axmc", "prob": 6 }, - { "group": "nested_converted_axmc", "prob": 3 } - ] + "id": "guns_rifle_common_display_300blk", + "items": [ { "group": "ar15_300", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_22", - "items": [ { "item": "marlin_9a", "prob": 36 } ] + "id": "guns_rifle_common_display_4570", + "items": [ { "item": "sharps", "prob": 100 }, { "item": "1895sbl", "prob": 67 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_223", - "items": [ - { "group": "mdrx", "prob": 10 }, - { "group": "nested_ar15_with_kits", "prob": 19 }, - { "group": "nested_mdrx_with_kits", "prob": 10 }, - { "group": "nested_sig_assault_rifle", "prob": 3 }, - { "group": "nested_sl8", "prob": 4 } - ] + "id": "guns_rifle_common_display_30carbine", + "items": [ { "item": "m1carbine", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_762", - "items": [ { "group": "nested_805_bren", "prob": 15 } ] + "id": "guns_rifle_common_display_303", + "//": "To-do: convert enfields into variants", + "items": [ { "item": "number4_mki", "prob": 100 }, { "item": "smle_mk3", "prob": 56 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_308", - "items": [ - { "item": "fn_fal_semi", "prob": 80 }, - { "item": "hk_g3", "prob": 40 }, - { "item": "m14ebr", "prob": 15 }, - { "item": "savage_111f", "prob": 15 }, - { "item": "M24", "prob": 15 }, - { "item": "hk417_13", "prob": 40 }, - { "item": "rfb_308", "prob": 5 }, - { "item": "steyr_scout", "prob": 10 } - ] + "id": "guns_rifle_common_display_338", + "items": [ { "item": "mrad_smr", "prob": 100 }, { "item": "savage112", "prob": 1 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_3006", - "items": [ - { "item": "m1903", "prob": 15, "charges": 0 }, - { "item": "browning_blr", "prob": 10 }, - { "item": "garand", "prob": 10 } - ] + "id": "guns_rifle_common_display_450", + "items": [ { "group": "ar15_450", "prob": 100 }, { "item": "ruger_arr", "prob": 97 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_44", - "items": [ { "group": "nested_henry_big_boy", "prob": 10 } ] + "id": "guns_rifle_common_display_50beowulf", + "items": [ { "group": "ar15_50", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_45", - "items": [ { "item": "hk_usc45", "prob": 10 } ] + "id": "guns_rifle_common_display_57", + "items": [ { "item": "fn_ps90", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_762R", - "items": [ - { "item": "mosin44", "variant": "mosin44_ebr", "contents-group": "mosin_mods", "prob": 1, "charges": 0 }, - { "item": "mosin91_30", "variant": "mosin91_30_ebr", "contents-group": "mosin_mods", "prob": 1, "charges": 0 }, - { "item": "mosin44", "variant": "mosin44", "prob": 10 }, - { "item": "mosin91_30", "variant": "mosin91_30", "prob": 10 } - ] + "id": "guns_rifle_common_display_545", + "items": [ { "item": "ak74_semi", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_300blk", - "items": [ { "item": "iwi_tavor_x95_300blk", "prob": 15 } ] + "id": "guns_rifle_common_display_7mm_arisaka", + "//": "To-do: Convert sniper into variant", + "items": [ { "item": "type99", "prob": 100 }, { "item": "type99_sniper", "prob": 4 } ] }, { "type": "item_group", - "id": "guns_rifle_rare_display_other", + "id": "12_gauge_semi", "items": [ - { "item": "smle_mk3", "prob": 10, "charges": 0 }, - { "item": "number4_mki", "prob": 10, "charges": 0 }, - { "item": "type99", "variant": "type99", "contents-group": "type99_mods", "prob": 3, "charges": 0 }, - { "item": "type99_sniper", "contents-item": "arisaka_monopod", "prob": 1, "charges": 0 }, - { "item": "1895sbl", "prob": 10 }, - { "item": "ruger_pr", "prob": 10 }, - { "item": "carbine_flintlock", "prob": 1 }, - { "item": "rifle_flintlock", "prob": 1 }, - { "item": "win70", "prob": 10 }, - { "item": "ak74_semi", "variant": "ak74_fixed", "prob": 6, "charges": 0 }, - { - "item": "ak74_semi", - "variant": "ak74_folding", - "contents-group": "ak74_folding_mods", - "prob": 4, - "charges": 0 - }, - { "item": "m1carbine", "prob": 10 }, - { "item": "mrad_smr", "prob": 10 }, - { "group": "axmc", "prob": 10 }, - { "group": "nested_axmc_with_kits", "prob": 10 } + { "group": "nested_benelli_m2", "prob": 45 }, + { "group": "nested_black_eagle", "prob": 65 }, + { "group": "nested_remington_1100", "prob": 85 }, + { "group": "nested_browning_a5", "prob": 100 }, + { "group": "nested_benelli_m2_tac", "prob": 24 }, + { "group": "nested_slp", "prob": 1 }, + { "group": "nested_mossberg_930", "prob": 31 }, + { "group": "nested_m1014", "prob": 11 }, + { "group": "nested_saiga_12", "prob": 28 }, + { "group": "nested_tavor_12", "prob": 53 }, + { "group": "nested_gfy_1", "prob": 17 }, + { "group": "nested_srm_1216", "prob": 2 }, + { "group": "nested_ar12_shotgun", "prob": 254 } ] }, { "type": "item_group", - "id": "guns_rifle_hunting_display_22", - "items": [ { "item": "ruger_1022", "prob": 20 } ] + "id": "12_gauge_pump", + "items": [ + { "group": "nested_mossberg_500", "prob": 100 }, + { "group": "nested_mossberg_500_security", "prob": 10 }, + { "group": "nested_winchester_1897", "prob": 17 }, + { "group": "nested_remington_870_express", "prob": 43 }, + { "group": "nested_remington_870", "prob": 49 }, + { "group": "nested_ithaca37", "prob": 28 }, + { "group": "nested_mossberg_590", "prob": 170 }, + { "group": "nested_mossberg_590m", "prob": 34 }, + { "group": "nested_ksg", "prob": 78 }, + { "group": "nested_dp_12", "prob": 25 } + ] }, { "type": "item_group", - "id": "guns_rifle_hunting_display_308", - "items": [ { "item": "ar10", "prob": 10 }, { "item": "savage_111f", "prob": 10 }, { "item": "steyr_scout", "prob": 5 } ] + "id": "12_gauge_break", + "items": [ + { "group": "nested_shotgun_s", "prob": 11 }, + { "group": "nested_shotgun_d", "prob": 87 }, + { "group": "nested_shotgun_triple", "prob": 1 } + ] }, { "type": "item_group", - "id": "guns_rifle_hunting_display_3006", - "items": [ { "item": "browning_blr", "prob": 10 }, { "item": "remington_700", "prob": 40 }, { "item": "ruger_m77", "prob": 25 } ] + "id": "12_gauge_semi_display", + "items": [ + { "item": "benelli_sa", "variant": "m2", "prob": 45 }, + { "item": "benelli_sa", "variant": "sbe", "prob": 65 }, + { "item": "remington_870", "variant": "remington_1100", "prob": 85 }, + { "item": "remington_870", "variant": "browning_a5", "prob": 100 }, + { "item": "benelli_tsa", "variant": "m2_tac", "prob": 24 }, + { "item": "mossberg_590", "variant": "slp", "prob": 1 }, + { "item": "mossberg_930", "variant": "mossberg_930", "prob": 31 }, + { "item": "mossberg_930", "variant": "m1014", "prob": 11 }, + { "item": "saiga_12", "prob": 28 }, + { "item": "tavor_12", "prob": 53 }, + { "item": "gfy_1", "prob": 17 }, + { "item": "srm_1216", "prob": 2 }, + { "item": "ar12_shotgun", "prob": 254 } + ] }, { "type": "item_group", - "id": "guns_rifle_hunting_display_270win", - "items": [ { "item": "remington700_270", "prob": 30 } ] + "id": "12_gauge_pump_display", + "items": [ + { "item": "mossberg_500", "prob": 100 }, + { "item": "benelli_tsa", "variant": "mossberg_500_security", "prob": 10 }, + { "item": "winchester_1897", "prob": 17 }, + { "item": "remington_870_express", "prob": 43 }, + { "item": "remington_870", "variant": "remington_870", "prob": 49 }, + { "item": "remington_870", "variant": "ithaca37", "prob": 28 }, + { "item": "mossberg_590", "variant": "mossberg_590", "prob": 170 }, + { "item": "mossberg_590m", "prob": 34 }, + { "item": "ksg", "prob": 78 }, + { "item": "dp_12", "prob": 25 } + ] }, { "type": "item_group", - "id": "guns_rifle_hunting_display_other", - "items": [ - { "item": "ruger_pr", "prob": 10 }, - { "item": "win70", "prob": 15 }, - { "item": "1895sbl", "prob": 10 }, - { "item": "varmint_airgun", "prob": 5 }, - { "item": "ruger_arr", "prob": 25 }, - { "item": "weatherby_5", "prob": 1 }, - { "item": "savage112", "prob": 5 }, - { "group": "ar15_50", "prob": 10 }, - { "group": "ar15_450", "prob": 12 } - ] + "id": "12_gauge_break_display", + "items": [ { "item": "shotgun_s", "prob": 11 }, { "item": "shotgun_d", "prob": 87 }, { "item": "shotgun_triple", "prob": 1 } ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index b3c01e9c908a4..48b1b21c1128d 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -364,6 +364,45 @@ { "group": "on_hand_357sig" } ] }, + { + "id": "nested_p226_9mm", + "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": "p226_357sig", "charges": [ 0, 15 ] }, + { "item": "p226mag_15rd_9x19mm" }, + { "item": "p226mag_15rd_9x19mm", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, + { + "id": "nested_p226_9mm", + "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": "p226_9mm", "charges": [ 0, 15 ] }, + { "item": "p226mag_15rd_9x19mm" }, + { "item": "p226mag_15rd_9x19mm", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, + { + "id": "nested_sp2022", + "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": "sp2022", "charges": [ 0, 15 ] }, + { "item": "sp2022mag_15rd_9mm" }, + { "item": "sp2022mag_15rd_9mm", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, { "id": "nested_p320_357sig", "type": "item_group", @@ -948,6 +987,18 @@ { "group": "on_hand_9mm" } ] }, + { + "id": "nested_m11", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "entries": [ + { "item": "m11", "charges": [ 0, 13 ] }, + { "item": "p228mag_13rd_9x19mm" }, + { "item": "p228mag_13rd_9x19mm", "prob": 50 }, + { "group": "on_hand_9mm" } + ] + }, { "id": "nested_glock_18c", "type": "item_group", @@ -1618,6 +1669,19 @@ { "group": "on_hand_762" } ] }, + { + "id": "nested_mk47", + "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": "mk47", "charges": [ 0, 30 ] }, + { "item": "akmag30" }, + { "item": "akmag30", "prob": 50 }, + { "group": "on_hand_762" } + ] + }, { "id": "nested_m16_auto_rifle", "type": "item_group", @@ -2112,7 +2176,7 @@ "//": "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", "charges": [ 0, 5 ] }, { "group": "on_hand_shot" } ] + "entries": [ { "item": "remington_870", "variant": "remington_870", "charges": [ 0, 5 ] }, { "group": "on_hand_shot" } ] }, { "id": "nested_mossberg_500_security", @@ -2122,6 +2186,14 @@ "ammo": 100, "entries": [ { "item": "benelli_tsa", "variant": "mossberg_500_security", "charges": [ 0, 6 ] }, { "group": "on_hand_shot" } ] }, + { + "id": "nested_winchester_1897", + "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": "winchester_1897", "charges": [ 0, 6 ] }, { "group": "on_hand_shot" } ] + }, { "id": "nested_remington_870_express", "type": "item_group", @@ -2152,7 +2224,7 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "mossberg_930", "charges": [ 0, 6 ] }, { "group": "on_hand_shot" } ] + "entries": [ { "item": "mossberg_930", "variant": "mossberg_930", "charges": [ 0, 6 ] }, { "group": "on_hand_shot" } ] }, { "id": "nested_shotgun_410", @@ -2331,7 +2403,7 @@ "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, - "entries": [ { "item": "mossberg_590", "charges": [ 0, 9 ] }, { "group": "on_hand_shot" } ] + "entries": [ { "item": "mossberg_590", "variant": "mossberg_590", "charges": [ 0, 9 ] }, { "group": "on_hand_shot" } ] }, { "id": "nested_mossberg_590m", @@ -2461,6 +2533,19 @@ { "group": "on_hand_30carbine" } ] }, + { + "id": "nested_m2carbine", + "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": "m2carbine", "charges": [ 0, 15 ] }, + { "item": "m1carbinemag" }, + { "item": "m1carbinebigmag", "prob": 50 }, + { "group": "on_hand_30carbine" } + ] + }, { "id": "nested_ak556", "type": "item_group", @@ -2698,7 +2783,7 @@ { "item": "steyr_scout_mag" }, { "item": "steyr_scout_mag", "prob": 50 }, { "item": "steyr_scout_mag", "prob": 50 }, - { "group": "on_hand_450" } + { "group": "on_hand_308" } ] }, { diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json index 7d74a721a546b..a54ab8276f7b0 100644 --- a/data/json/itemgroups/stashes.json +++ b/data/json/itemgroups/stashes.json @@ -131,7 +131,7 @@ "subtype": "collection", "entries": [ { "group": "bugout_first_aid", "prob": 50 }, - { "group": "bugout_small_gun", "prob": 45 }, + { "group": "guns_pistol_common", "prob": 45 }, { "group": "bugout_food", "prob": 50 }, { "group": "bugout_water", "prob": 50 }, { "group": "bugout_bad_pack", "prob": 100 } @@ -162,7 +162,7 @@ "on_overflow": "spill", "entries": [ { "group": "bugout_first_aid", "count": 1, "prob": 90 }, - { "group": "bugout_small_gun", "prob": 70 }, + { "group": "guns_pistol_common", "prob": 70 }, { "group": "bugout_long_gun", "prob": 20 }, { "group": "bugout_food", "prob": 50, "count": [ 1, 3 ] }, { "group": "bugout_water", "prob": 50, "count": [ 1, 3 ] }, @@ -185,33 +185,19 @@ { "group": "full_ipok", "prob": 50 } ] }, - { - "type": "item_group", - "id": "bugout_small_gun", - "subtype": "distribution", - "//": "a handgun of some kind.", - "entries": [ { "group": "guns_pistol_common", "prob": 100 }, { "group": "guns_pistol_rare", "prob": 10 } ] - }, { "type": "item_group", "id": "bugout_long_gun", "subtype": "distribution", "//": "a long weapon of some kind.", - "entries": [ - { "group": "guns_smg_common", "prob": 10 }, - { "group": "guns_smg_rare", "prob": 2 }, - { "group": "guns_rifle_common", "prob": 100 }, - { "group": "guns_rifle_rare", "prob": 20 }, - { "group": "guns_shotgun_common", "prob": 2 }, - { "group": "guns_shotgun_rare", "prob": 1 } - ] + "entries": [ { "group": "guns_rifle_common", "prob": 120 }, { "group": "guns_shotgun_common", "prob": 3 } ] }, { "type": "item_group", "id": "bugout_gun", "subtype": "distribution", "//": "a gun or two of some kind.", - "entries": [ { "group": "bugout_small_gun", "prob": 100 }, { "group": "bugout_long_gun", "prob": 20 } ] + "entries": [ { "group": "guns_pistol_common", "prob": 100 }, { "group": "bugout_long_gun", "prob": 20 } ] }, { "type": "item_group", diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json index 1f66c5ad87202..fd78a689a9b3c 100644 --- a/data/json/mapgen/basement/basement_guns.json +++ b/data/json/mapgen/basement/basement_guns.json @@ -48,8 +48,8 @@ }, "furniture": { "#": "f_counter", "]": "f_bookcase", "h": "f_chair", "s": "f_gunsafe_ml", "{": "f_rack" }, "place_loot": [ - { "group": "guns_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 }, - { "group": "guns_rare", "x": 7, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "guns_common", "x": 6, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "guns_common", "x": 7, "y": 2, "chance": 20, "magazine": 100 }, { "group": "mags_common", "x": 8, "y": 2, "chance": 20 }, { "group": "guns_common", "x": 9, "y": 2, "chance": 100, "magazine": 100 }, { "group": "mags_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, @@ -57,9 +57,9 @@ { "group": "guns_common", "x": 12, "y": 2, "chance": 100, "magazine": 100 }, { "group": "mags_common", "x": 13, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, { "group": "guns_common", "x": 14, "y": 2, "chance": 100, "magazine": 100 }, - { "group": "guns_rare", "x": 15, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "guns_common", "x": 15, "y": 2, "chance": 20, "magazine": 100 }, { "group": "mags_common", "x": 16, "y": 2, "chance": 70, "repeat": [ 1, 2 ] }, - { "group": "guns_rare_static", "x": 17, "y": 2, "chance": 30, "magazine": 100 }, + { "group": "guns_common", "x": 17, "y": 2, "chance": 30, "magazine": 100 }, { "group": "ammo_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "ammo_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "ammo_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, @@ -74,7 +74,7 @@ { "group": "ammo_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "book_gunref", "x": 14, "y": [ 10, 11 ], "chance": 60 }, { "group": "gunmod_common", "x": 4, "y": 11, "chance": 100 }, - { "group": "guns_obscure", "x": 6, "y": 11, "chance": 10, "ammo": 100, "magazine": 100 }, + { "group": "guns_common", "x": 6, "y": 11, "chance": 10, "ammo": 100, "magazine": 100 }, { "group": "tools_common", "x": 20, "y": 12, "chance": 100 }, { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 10 }, { "group": "gunmod_rare", "x": 19, "y": 13, "chance": 100 } diff --git a/data/json/mapgen/basement/basement_meth.json b/data/json/mapgen/basement/basement_meth.json index 1c0fd3af7b2a5..0e1851cb4596c 100644 --- a/data/json/mapgen/basement/basement_meth.json +++ b/data/json/mapgen/basement/basement_meth.json @@ -232,7 +232,7 @@ { "group": "home_hw", "x": 13, "y": 20, "chance": 40, "repeat": [ 1, 3 ] }, { "group": "home_hw", "x": 21, "y": [ 12, 13 ], "chance": 40, "repeat": [ 1, 3 ] }, { "group": "home_hw", "x": [ 21, 22 ], "y": 5, "chance": 40, "repeat": [ 1, 3 ] }, - { "group": "guns_shotgun_rare_readied", "x": 21, "y": 14, "chance": 10 } + { "group": "guns_shotgun_common", "x": 21, "y": 14, "chance": 10 } ], "place_item": [ { "x": 11, "y": 10, "item": "towel" }, { "x": 21, "y": 14, "item": "wrench" } ], "place_monster": [ { "monster": "mon_zombie", "x": [ 13, 14 ], "y": [ 11, 17 ], "chance": 90, "repeat": [ 1, 3 ] } ] diff --git a/data/json/mapgen/house/house24.json b/data/json/mapgen/house/house24.json index 0ab5f3835fd5b..03eed1703028d 100644 --- a/data/json/mapgen/house/house24.json +++ b/data/json/mapgen/house/house24.json @@ -125,7 +125,7 @@ { "chance": 50, "item": "clothing_female", "x": 6, "y": 4 }, { "chance": 50, "item": "clothing_female", "x": 7, "y": 4 }, { "chance": 30, "item": "clothing_glasses", "x": 3, "y": 14 }, - { "chance": 10, "item": "guns_pistol_rare", "x": 8, "y": 16 }, + { "chance": 10, "item": "guns_pistol_common", "x": 8, "y": 16 }, { "chance": 70, "item": "crate_winter", "x": 14, "y": 5 }, { "chance": 20, "repeat": 2, "item": "book_school", "x": 5, "y": 14 }, { "chance": 80, "item": "crate_kitchen", "x": 11, "y": 14 }, @@ -192,7 +192,7 @@ { "chance": 20, "repeat": 2, "item": "book_survival", "x": 8, "y": 15 }, { "chance": 25, "item": "barbecue", "x": 3, "y": 16 }, { "chance": 25, "item": "fancyfurs", "x": [ 6, 7 ], "y": 20 }, - { "chance": 25, "item": "guns_obscure", "x": 21, "y": 7 }, + { "chance": 25, "item": "guns_common", "x": 21, "y": 7 }, { "chance": 50, "repeat": 2, "item": "clothing_male", "x": 21, "y": 11 }, { "chance": 25, "item": "clothing_work_hat", "x": 21, "y": 16 }, { "chance": 30, "repeat": 2, "item": "female_underwear_top", "x": 5, "y": 18 }, diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json index d6633802c264e..8eacb9302323a 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_big_z-1.json @@ -63,7 +63,7 @@ { "item": "fridgesnacks", "chance": 60, "repeat": [ 2, 10 ] } ], "l": [ - { "item": "guns_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "guns_pistol_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_common", "chance": 20, "repeat": 5 }, { "item": "ammo_pistol_rare", "chance": 20, "repeat": [ 5, 10 ] } ] diff --git a/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json b/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json index 1e6eebc6b20a3..26a3692b8a27d 100644 --- a/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json +++ b/data/json/mapgen/lab/lab_surface/lab_surface_big_z1.json @@ -172,7 +172,7 @@ ], "l": { "item": "cleaning", "chance": 70, "repeat": [ 1, 8 ] }, "L": [ - { "item": "guns_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "guns_pistol_common", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "mags_common", "chance": 40, "repeat": 5 }, { "item": "ammo_pistol_rare", "chance": 40, "repeat": [ 5, 10 ] } ], diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index e92a8d5216132..a0c305e8b1a46 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -1466,18 +1466,10 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1536,18 +1528,10 @@ "furniture": { "%": "f_rack_wood", "$": "f_rack_wood", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1606,18 +1590,10 @@ "furniture": { "%": "f_locker", "$": "f_locker", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1675,18 +1651,10 @@ "furniture": { "%": "f_locker", "$": "f_locker", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3761,18 +3729,10 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3846,18 +3806,10 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3931,18 +3883,10 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -4016,18 +3960,10 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } - ], - "$": [ - { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, - { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 3 ] }, + { "item": "guns_shotgun_common", "chance": 2, "magazine": 100, "repeat": [ 1, 2 ] } ], + "$": [ { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 5 ] } ], ",": [ { "item": "mags_common", "chance": 60, "repeat": [ 1, 6 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, diff --git a/data/json/mapgen/nested/strip_mall_nested.json b/data/json/mapgen/nested/strip_mall_nested.json index 06b713bb1dce8..1c3f7bdda5c14 100644 --- a/data/json/mapgen/nested/strip_mall_nested.json +++ b/data/json/mapgen/nested/strip_mall_nested.json @@ -917,7 +917,7 @@ "items": { ".": { "item": "trash", "chance": 4 }, "w": { "item": "stash_wood", "chance": 100, "repeat": [ 2, 3 ] }, - "b": { "item": "small_bugout", "chance": 50 } + "b": { "item": "guns_pistol_common", "chance": 50 } }, "place_signs": [ { "signage": "FOR LEASE", "x": 10, "y": 21 } ], "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 8, 14 ], "y": [ 2, 9 ], "repeat": [ 2, 3 ] } ], @@ -1013,7 +1013,7 @@ ".": { "item": "trash", "chance": 5 }, "m": { "item": "bed", "chance": 75 }, "w": { "item": "stash_wood", "chance": 100, "repeat": [ 2, 3 ] }, - "T": [ { "item": "bugout_food", "chance": 25 }, { "item": "bugout_small_gun", "chance": 25 } ], + "T": [ { "item": "bugout_food", "chance": 25 }, { "item": "guns_pistol_common", "chance": 25 } ], "b": [ { "item": "small_bugout", "chance": 30 }, { "item": "medium_bugout", "chance": 20 }, diff --git a/data/json/mapgen/prison/prison_alcatraz.json b/data/json/mapgen/prison/prison_alcatraz.json index b5eaa4bef51fc..25f184cd11dc8 100644 --- a/data/json/mapgen/prison/prison_alcatraz.json +++ b/data/json/mapgen/prison/prison_alcatraz.json @@ -203,7 +203,7 @@ ], "palettes": [ "prison_base_palette", "roof_palette" ], "terrain": { "_": "t_thconc_floor", "(": "t_metal_railing" }, - "items": { "L": { "item": "guns_rifle_rare", "chance": 50 } }, + "items": { "L": { "item": "nested_m1a", "chance": 100 } }, "item": { ".": { "item": "feces_bird", "chance": 2 } }, "monster": { "_": { "monster": "mon_zombie_cop", "chance": 10 }, "#": { "monster": "mon_zombie_cop", "chance": 5 } } } diff --git a/data/json/mapgen/river_shipwreck.json b/data/json/mapgen/river_shipwreck.json index 98a3987508465..9da5715986326 100644 --- a/data/json/mapgen/river_shipwreck.json +++ b/data/json/mapgen/river_shipwreck.json @@ -56,7 +56,7 @@ "r": "f_console_broken", "A": "f_safe_l" }, - "place_loot": [ { "group": "guns_pistol_rare", "x": 24, "y": 5, "chance": 70, "ammo": 95, "magazine": 100 } ], + "place_loot": [ { "group": "guns_pistol_common", "x": 24, "y": 5, "chance": 70, "ammo": 95, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_RAZORCLAW", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.4 }, { "monster": "GROUP_RAZORCLAW", "x": [ 26, 45 ], "y": [ 2, 21 ], "density": 0.4 } diff --git a/data/json/mapgen/shooting_range.json b/data/json/mapgen/shooting_range.json index 7bae5c4be383b..d411b904171cb 100644 --- a/data/json/mapgen/shooting_range.json +++ b/data/json/mapgen/shooting_range.json @@ -102,10 +102,8 @@ { "chance": 75, "item": "guns_milspec", "x": 5, "y": 4 }, { "chance": 5, "item": "ammo_smg_common", "x": 12, "y": 9 }, { "chance": 5, "item": "ammo_smg_common", "x": 9, "y": 9 }, - { "chance": 5, "item": "guns_smg_common", "x": 11, "y": 9 }, - { "chance": 5, "item": "guns_smg_common", "x": 8, "y": 9 }, - { "chance": 10, "item": "guns_pistol_common", "x": 5, "y": 9 }, - { "chance": 5, "item": "guns_pistol_common", "x": 2, "y": 9 }, + { "chance": 15, "item": "guns_pistol_common", "x": 5, "y": 9 }, + { "chance": 10, "item": "guns_pistol_common", "x": 2, "y": 9 }, { "chance": 25, "item": "office", "x": [ 3, 4 ], "y": 4 } ], "place_item": [ { "chance": 100, "item": "american_flag", "x": 7, "y": 2 } ], diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json index 07f51c7fcea43..1b2379926ff41 100644 --- a/data/json/mapgen_palettes/gunstore.json +++ b/data/json/mapgen_palettes/gunstore.json @@ -118,7 +118,7 @@ "item": { "/": { "item": "american_flag" } }, "items": { "X": { "item": "SUS_gunstore_safe", "chance": 50, "repeat": [ 10, 20 ] }, - "O": { "item": "SUS_gunstore_safe_obscure", "chance": 75, "repeat": [ 3, 6 ] }, + "O": { "item": "guns_common_display", "chance": 75, "repeat": [ 3, 6 ] }, "s": { "item": "SUS_gunstore_crate", "chance": 80, "repeat": [ 1, 3 ] }, "S": { "item": "SUS_gunstore_crate", "chance": 50, "repeat": [ 1, 3 ] }, "`": { "item": "SUS_gunstore_looted_floor", "chance": 20, "repeat": [ 1, 2 ] }, diff --git a/data/json/mapgen_palettes/isolated_artisans.json b/data/json/mapgen_palettes/isolated_artisans.json index 9394a06ea2014..767f2d7d55bb3 100644 --- a/data/json/mapgen_palettes/isolated_artisans.json +++ b/data/json/mapgen_palettes/isolated_artisans.json @@ -112,7 +112,7 @@ ], "d": [ { "item": "SUS_gunstore_safe", "chance": 5, "repeat": [ 0, 5 ] }, - { "item": "SUS_gunstore_safe_obscure", "chance": 5, "repeat": [ 0, 5 ] } + { "item": "guns_common_display", "chance": 5, "repeat": [ 0, 5 ] } ], "T": [ { "item": "guns_common_display", "chance": 20, "repeat": [ 0, 1 ] }, diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json index 9c9b08068c3bc..529489caa6436 100644 --- a/data/json/monsterdrops/zombie_survivor.json +++ b/data/json/monsterdrops/zombie_survivor.json @@ -166,7 +166,6 @@ "distribution": [ { "group": "guns_pistol_common", "prob": 100 }, { "group": "guns_rifle_common_worn", "prob": 20, "contents-item": "shoulder_strap" }, - { "group": "guns_smg_common_worn", "prob": 5, "contents-item": "shoulder_strap" }, { "group": "guns_shotgun_common_worn", "prob": 40, "contents-item": "shoulder_strap_simple" } ], "prob": 24 diff --git a/data/json/npcs/hells_raiders/classes.json b/data/json/npcs/hells_raiders/classes.json index 38a44e94f2fd7..57dcca7488433 100644 --- a/data/json/npcs/hells_raiders/classes.json +++ b/data/json/npcs/hells_raiders/classes.json @@ -124,16 +124,9 @@ "subtype": "distribution", "//": "Stuff a fenceman from the Hell's Raiders might sell.", "entries": [ - { "group": "guns_pistol_common", "prob": 75 }, - { "group": "guns_pistol_rare", "prob": 50 }, - { "group": "guns_pistol_obscure", "prob": 30 }, - { "group": "guns_pistol_improvised", "prob": 95 }, + { "group": "guns_pistol_common", "prob": 270 }, { "group": "guns_smg_improvised", "prob": 90 }, - { "group": "guns_smg_common", "prob": 70 }, - { "group": "guns_smg_rare", "prob": 50 }, - { "group": "guns_smg_obscure", "prob": 10 }, - { "group": "guns_rifle_common", "prob": 65 }, - { "group": "guns_rifle_rare", "prob": 40 }, + { "group": "guns_rifle_common", "prob": 175 }, { "group": "ammo_pistol_common", "prob": 75 }, { "group": "ammo_pistol_rare", "prob": 50 }, { "group": "ammo_pistol_obscure", "prob": 30 }, diff --git a/data/mods/Aftershock/itemgroups/item_groups.json b/data/mods/Aftershock/itemgroups/item_groups.json index 1b49e32e82dd6..6ffa7e507402e 100644 --- a/data/mods/Aftershock/itemgroups/item_groups.json +++ b/data/mods/Aftershock/itemgroups/item_groups.json @@ -316,12 +316,7 @@ "type": "item_group", "id": "guns_ganger", "//": "Guns commonly carried by gangers and underworld types.", - "items": [ - { "group": "guns_pistol_common", "prob": 100 }, - { "group": "guns_improvised", "prob": 20 }, - { "group": "guns_cop", "prob": 5 }, - { "group": "guns_pistol_obscure", "prob": 40 } - ] + "items": [ { "group": "guns_pistol_common", "prob": 100 }, { "group": "guns_cop", "prob": 5 } ] }, { "id": "crate_sports", diff --git a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json index 940ca6648d2c7..df371efa0f605 100644 --- a/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json +++ b/data/mods/Aftershock/itemgroups/weapons/weapon_expansion_groups.json @@ -2,34 +2,28 @@ { "//": "This file adds Aftershock weapons to vanilla groups. To be deleted once the total conversion gets going.", "type": "item_group", - "id": "guns_pistol_rare", - "copy-from": "guns_pistol_rare", - "extend": { "items": [ { "item": "afs_seyfert_84K", "prob": 15, "charges": [ 0, 20 ] } ] } + "id": "guns_pistol_common", + "copy-from": "guns_pistol_common", + "extend": { "items": [ { "item": "afs_seyfert_84K", "prob": 3, "charges": [ 0, 20 ] } ] } }, { "type": "item_group", - "id": "guns_pistol_rare_display", - "copy-from": "guns_pistol_rare_display", - "extend": { "items": [ { "item": "afs_seyfert_84K", "prob": 15, "charges": 0 } ] } + "id": "guns_pistol_common_display", + "copy-from": "guns_pistol_common_display", + "extend": { "items": [ { "item": "afs_seyfert_84K", "prob": 3, "charges": 0 } ] } }, { "type": "item_group", - "id": "guns_pistol_obscure", - "copy-from": "guns_pistol_obscure", - "extend": { "items": [ { "item": "afs_seyfert_84K", "prob": 50, "charges": [ 0, 20 ] } ] } - }, - { - "type": "item_group", - "id": "guns_rifle_rare_display", - "copy-from": "guns_rifle_rare_display", + "id": "guns_rifle_common_display", + "copy-from": "guns_rifle_common_display", "extend": { "items": [ { "item": "afs_gibrifle", "prob": 1, "charges": 0 }, { "item": "afs_Accipitermg", "prob": 1, "charges": 0 } ] } }, { "type": "item_group", - "id": "guns_rifle_rare", - "copy-from": "guns_rifle_rare", + "id": "guns_rifle_common", + "copy-from": "guns_rifle_common", "extend": { "items": [ { "item": "afs_gibrifle", "prob": 25, "charges": [ 0, 30 ] }, diff --git a/data/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json b/data/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json index e64adf5fd8dfa..f332ee3b78adf 100644 --- a/data/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json +++ b/data/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json @@ -189,7 +189,6 @@ "items": [ { "group": "NC_CYBERNINJA_melee", "prob": 100 }, { "group": "guns_smg_milspec", "prob": 40 }, - { "group": "guns_pistol_obscure", "prob": 30 }, { "group": "guns_rifle_milspec", "prob": 30 } ] }, diff --git a/data/mods/Backrooms/itemgroups.json b/data/mods/Backrooms/itemgroups.json index 8f5b3c33dbfa6..87ccd54e3c993 100644 --- a/data/mods/Backrooms/itemgroups.json +++ b/data/mods/Backrooms/itemgroups.json @@ -107,9 +107,7 @@ { "group": "ammo_shotgun_common", "prob": 75 }, { "group": "ammo_shotgun_reloaded", "prob": 100 }, { "group": "mags_common", "prob": 130 }, - { "group": "guns_pistol_common", "prob": 10 }, - { "group": "guns_pistol_improvised", "prob": 20 }, - { "group": "guns_smg_common", "prob": 5 }, + { "group": "guns_pistol_common", "prob": 35 }, { "group": "guns_smg_improvised", "prob": 10 }, { "group": "guns_rifle_common", "prob": 5 }, { "group": "guns_rifle_improvised", "prob": 10 }, @@ -171,14 +169,9 @@ { "group": "ammo_pistol_common", "prob": 200 }, { "group": "ammo_rifle_common", "prob": 175 }, { "group": "ammo_shotgun_common", "prob": 200 }, - { "group": "guns_pistol_common", "prob": 60 }, - { "group": "guns_pistol_rare", "prob": 25 }, - { "group": "guns_smg_common", "prob": 50 }, - { "group": "guns_smg_rare", "prob": 20 }, - { "group": "guns_rifle_common", "prob": 40 }, - { "group": "guns_rifle_rare", "prob": 15 }, - { "group": "guns_shotgun_common", "prob": 60 }, - { "group": "guns_shotgun_rare", "prob": 25 }, + { "group": "guns_pistol_common", "prob": 120 }, + { "group": "guns_rifle_common", "prob": 100 }, + { "group": "guns_shotgun_common", "prob": 85 }, { "group": "mags_common", "prob": 435 }, { "group": "mags_milspec", "prob": 100 }, { "group": "ammo_launcher_grenade", "prob": 20 }, @@ -199,9 +192,7 @@ { "group": "ammo_rifle_reloaded", "prob": 100 }, { "group": "ammo_shotgun_common", "prob": 90 }, { "group": "ammo_shotgun_reloaded", "prob": 125 }, - { "group": "guns_pistol_common", "prob": 25 }, - { "group": "guns_pistol_improvised", "prob": 50 }, - { "group": "guns_smg_common", "prob": 15 }, + { "group": "guns_pistol_common", "prob": 90 }, { "group": "guns_smg_improvised", "prob": 30 }, { "group": "guns_rifle_common", "prob": 15 }, { "group": "guns_rifle_improvised", "prob": 25 }, diff --git a/data/mods/Defense_Mode/npcs.json b/data/mods/Defense_Mode/npcs.json index 43150d192f2ce..7645ab1583892 100644 --- a/data/mods/Defense_Mode/npcs.json +++ b/data/mods/Defense_Mode/npcs.json @@ -227,21 +227,12 @@ "type": "item_group", "subtype": "collection", "entries": [ - { "group": "guns_pistol_common", "prob": 75 }, - { "group": "guns_pistol_rare", "prob": 50 }, - { "group": "guns_pistol_obscure", "prob": 30 }, - { "group": "guns_pistol_improvised", "prob": 95 }, - { "group": "guns_shotgun_common", "prob": 75 }, - { "group": "guns_shotgun_rare", "prob": 50 }, - { "group": "guns_shotgun_obscure", "prob": 30 }, + { "group": "guns_pistol_common", "prob": 210 }, + { "group": "guns_shotgun_common", "prob": 155 }, { "group": "guns_shotgun_milspec", "prob": 95 }, { "group": "guns_shotgun_improvised", "prob": 90 }, { "group": "guns_smg_improvised", "prob": 90 }, - { "group": "guns_smg_common", "prob": 70 }, - { "group": "guns_smg_rare", "prob": 50 }, - { "group": "guns_smg_obscure", "prob": 10 }, - { "group": "guns_rifle_common", "prob": 65 }, - { "group": "guns_rifle_rare", "prob": 40 }, + { "group": "guns_rifle_common", "prob": 105 }, { "group": "ammo_pistol_common", "prob": 75 }, { "group": "ammo_pistol_rare", "prob": 50 }, { "group": "ammo_pistol_obscure", "prob": 30 }, diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json index e6bfd13a35a19..e4cb9531ad13a 100644 --- a/data/mods/Magiclysm/itemgroups/itemgroups.json +++ b/data/mods/Magiclysm/itemgroups/itemgroups.json @@ -116,13 +116,13 @@ }, { "type": "item_group", - "id": "guns_pistol_rare", - "copy-from": "guns_pistol_rare", + "id": "guns_pistol_common", + "copy-from": "guns_pistol_common", "extend": { "items": [ - { "item": "wand_magic_missile_minor", "prob": 35, "charges": [ 12, 34 ] }, - { "item": "wand_fireball_minor", "prob": 25, "charges": [ 3, 24 ] }, - { "item": "m47a1", "prob": 25, "charges": [ 0, 6 ] } + { "item": "wand_magic_missile_minor", "prob": 6, "charges": [ 12, 34 ] }, + { "item": "wand_fireball_minor", "prob": 4, "charges": [ 3, 24 ] }, + { "item": "m47a1", "prob": 4, "charges": [ 0, 6 ] } ] } }, diff --git a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json index 0246a7369cbfb..d89504ee75baf 100644 --- a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json +++ b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json @@ -63,7 +63,7 @@ { "item": "fridgesnacks", "chance": 60, "repeat": [ 2, 10 ] } ], "l": [ - { "item": "guns_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "guns_pistol_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_common", "chance": 20, "repeat": 5 }, { "item": "ammo_pistol_rare", "chance": 20, "repeat": [ 5, 10 ] } ] diff --git a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json index 90203795be4c9..2d5def6f94d43 100644 --- a/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json +++ b/data/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json @@ -172,7 +172,7 @@ ], "l": { "item": "cleaning", "chance": 70, "repeat": [ 1, 8 ] }, "L": [ - { "item": "guns_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "guns_pistol_common", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "mags_common", "chance": 40, "repeat": 5 }, { "item": "ammo_pistol_rare", "chance": 40, "repeat": [ 5, 10 ] } ], diff --git a/data/mods/No_Hope/item_groups.json b/data/mods/No_Hope/item_groups.json index c0378770347f4..d267a2e37a33d 100644 --- a/data/mods/No_Hope/item_groups.json +++ b/data/mods/No_Hope/item_groups.json @@ -355,7 +355,7 @@ "magazine": 100, "ammo": 90, "items": [ - { "group": "guns_rare_readied", "prob": 35 }, + { "group": "guns_common", "prob": 35 }, { "item": "mask_filter", "prob": 20 }, { "group": "ammo_pocket_batteries_full", "prob": 15 }, { "item": "radio", "prob": 10 }, diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json index af5fa141e01aa..e67818aeb2b7e 100644 --- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json +++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json @@ -973,7 +973,7 @@ "item": { "/": { "item": "american_flag" } }, "items": { "X": { "item": "SUS_gunstore_safe", "chance": 20 }, - "O": { "item": "SUS_gunstore_safe_obscure", "chance": 25 }, + "O": { "item": "guns_common_display", "chance": 25 }, "s": { "item": "SUS_gunstore_crate", "chance": 25 }, "S": { "item": "SUS_gunstore_crate", "chance": 5 }, "`": { "item": "SUS_gunstore_looted_floor", "chance": 20, "repeat": [ 1, 2 ] }, diff --git a/data/mods/innawood/itemgroups/guns.json b/data/mods/innawood/itemgroups/guns.json index fd3242e9c285a..96e92040cb878 100644 --- a/data/mods/innawood/itemgroups/guns.json +++ b/data/mods/innawood/itemgroups/guns.json @@ -5,12 +5,6 @@ "//": "Pistols that are reasonably prolific amongst civilians, commonly owned and reliably obtainable by citizens and that are found in many locations.", "items": [ { "group": "guns_pistol_improvised", "prob": 35 } ] }, - { - "type": "item_group", - "id": "guns_pistol_rare", - "//": "Less common or prolific pistols that are still normally acquirable by civilians or that may need an NFA permit, i.e. integrally suppressed or stocked handguns. This includes those weapons used by police and paramilitary forces, and older handguns which are no longer in production but that are still reasonably common to find.", - "items": [ { "group": "guns_pistol_improvised", "prob": 35 } ] - }, { "type": "item_group", "id": "guns_pistol_milspec", @@ -18,52 +12,12 @@ "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", "items": [ { "group": "guns_pistol_improvised", "prob": 35 } ] }, - { - "type": "item_group", - "id": "guns_pistol_obscure", - "//": "Imported or otherwise very obscure pistols that are highly rare, but which are still, mostly, ownable by common civilian's, either normally or via an NFA permit. For example, reasonably modern and uncommon foreign military pistols and weapons capable of automatic forms of fire can be placed in this item group. Purely highly rare collector quality and historically valuable guns are handled elsewhere.", - "items": [ { "group": "guns_pistol_improvised", "prob": 35 } ] - }, { "type": "item_group", "id": "guns_pistol_improvised", "//": "Makeshift or otherwise poor quality pistols.", "items": [ { "item": "pistol_flintlock", "prob": 100 } ] }, - { - "type": "item_group", - "id": "guns_smg_common", - "//": "Semi-auto civilian SMGs owned by citizens and found in many locations.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ { "group": "guns_smg_improvised", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_smg_common_worn", - "//": "Semi-auto civilian SMGs owned by citizens and found in many locations.", - "//2": "This is for worn items so ammo should be handled elsewhere so that mods can be added directly.", - "items": [ { "group": "guns_smg_improvised", "prob": 1 } ] - }, - { - "type": "item_group", - "subtype": "distribution", - "id": "guns_smg_common_display", - "//": "Empty Semi-auto civilian SMGs owned by citizens and found in many locations.", - "items": [ { "group": "guns_smg_improvised", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_smg_rare", - "//": "Less common SMGs including those only used by police/paramilitary forces.", - "items": [ { "group": "guns_smg_improvised", "prob": 1 } ] - }, - { - "type": "item_group", - "id": "guns_smg_obscure", - "subtype": "distribution", - "//": "Imported or otherwise very obscure SMGs.", - "items": [ { "group": "guns_smg_improvised", "prob": 1 } ] - }, { "type": "item_group", "id": "guns_smg_improvised", @@ -84,12 +38,6 @@ "//2": "This is for worn items so ammo should be handled elsewhere so that mods can be added directly.", "items": [ { "group": "guns_rifle_improvised", "prob": 22 } ] }, - { - "type": "item_group", - "id": "guns_rifle_rare", - "//": "Less common rifles including those only used by police/paramilitary forces.", - "items": [ { "group": "guns_rifle_improvised", "prob": 22 } ] - }, { "type": "item_group", "id": "guns_rifle_milspec", @@ -127,40 +75,12 @@ "//": "Shotguns commonly owned by citizens and found in many locations.", "items": [ { "group": "guns_shotgun_improvised", "prob": 22 } ] }, - { - "type": "item_group", - "id": "guns_shotgun_rare", - "//": "Uncommon or rare shotguns in civilian possession.", - "subtype": "distribution", - "items": [ { "group": "guns_shotgun_improvised", "prob": 22 } ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_worn", - "//": "Uncommon or rare shotguns in civilian possession.", - "//2": "ammo handled elsewhere so these can be worn.", - "subtype": "distribution", - "items": [ { "group": "guns_shotgun_improvised", "prob": 22 } ] - }, - { - "type": "item_group", - "id": "guns_shotgun_rare_readied", - "subtype": "distribution", - "items": [ { "group": "guns_shotgun_improvised", "prob": 22 } ] - }, { "type": "item_group", "id": "guns_shotgun_milspec", "//": "Military shotguns currently in service.", "items": [ { "group": "guns_shotgun_improvised", "prob": 20 } ] }, - { - "type": "item_group", - "id": "guns_shotgun_obscure", - "//": "Imported or otherwise very obscure shotguns.", - "//2": "Making the assumption any loaded gun will have additional ammo and mags with it.", - "items": [ { "group": "guns_shotgun_improvised", "prob": 50 } ] - }, { "type": "item_group", "id": "guns_shotgun_improvised", @@ -199,32 +119,18 @@ }, { "type": "item_group", - "id": "guns_rare", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ { "group": "guns_improvised", "prob": 100 } ] - }, - { - "type": "item_group", - "id": "guns_rare_static", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", - "items": [ { "group": "guns_improvised", "prob": 100 } ] - }, - { - "type": "item_group", - "id": "guns_rare_readied", - "//": "Less common guns of all types including those only used by police/paramilitary forces.", + "id": "guns_milspec", + "//": "Military specification guns of all types.", "items": [ { "group": "guns_improvised", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_milspec", - "//": "Military specification guns of all types.", + "id": "guns_display_pieces", "items": [ { "group": "guns_improvised", "prob": 100 } ] }, { "type": "item_group", - "id": "guns_obscure", - "//": "Imported or otherwise very obscure guns of all types.", + "id": "guns_collectible", "items": [ { "group": "guns_improvised", "prob": 100 } ] }, {