diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json index 3b0767b9dfdf9..8b8524e64d418 100644 --- a/data/json/itemgroups/SUS/gunstore.json +++ b/data/json/itemgroups/SUS/gunstore.json @@ -122,5 +122,69 @@ { "item": "ballistic_vest_esapi", "prob": 5 }, { "item": "aim_game", "prob": 35 } ] + }, + { + "id": "SUS_gunstore_hearing", + "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 gear that protects hearing. Should have more items like proper ear muffs, but needs to be added.", + "subtype": "distribution", + "entries": [ + { "item": "blister_pack", "contents-item": "powered_earmuffs", "prob": 10 }, + { "item": "blister_pack", "contents-item": "powered_earplugs", "prob": 1 }, + { "item": "bag_plastic_small", "contents-item": "ear_plugs", "prob": 90 } + ] + }, + { + "id": "SUS_gunstore_optics_packaged", + "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 optics, such as red dots or scopes that are in their containers.", + "subtype": "distribution", + "entries": [ + { "item": "box_small", "contents-item": "holo_sight", "prob": 100 }, + { "item": "box_small", "contents-item": "pistol_scope", "prob": 8 }, + { "item": "box_small", "contents-item": "red_dot_sight", "prob": 800 }, + { "item": "box_small", "contents-item": "rifle_scope", "prob": 1000 }, + { "item": "box_small", "contents-item": "rifle_scope_high_end_mount", "prob": 15 }, + { "item": "box_small", "contents-item": "acog_scope", "prob": 12 }, + { "item": "box_small", "contents-item": "holo_magnifier", "prob": 10 }, + { "item": "box_small", "contents-item": "hybrid_sight_4x", "prob": 3 } + ] + }, + { + "id": "SUS_gunstore_optics_display", + "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 optics, such as red dots or scopes that are for display.", + "subtype": "distribution", + "entries": [ + { "item": "holo_sight", "prob": 100 }, + { "item": "pistol_scope", "prob": 8 }, + { "item": "red_dot_sight", "prob": 800 }, + { "item": "rifle_scope", "prob": 1000 }, + { "item": "rifle_scope_high_end_mount", "prob": 15 }, + { "item": "acog_scope", "prob": 12 }, + { "item": "holo_magnifier", "prob": 10 }, + { "item": "hybrid_sight_4x", "prob": 3 } + ] + }, + { + "id": "SUS_gunstore_carry_gear", + "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 gear such as holsters, intended to help carry a gun.", + "subtype": "distribution", + "entries": [ + { "item": "holster", "prob": 60 }, + { "item": "sholster", "prob": 25 }, + { "item": "bholster", "prob": 20 }, + { "item": "bbholster", "prob": 10 }, + { "item": "suspenders_holster", "prob": 8 }, + { "item": "tactical_holster", "prob": 25 }, + { "item": "shoulder_holster", "prob": 12 }, + { "item": "bootstrap", "prob": 15 }, + { "item": "nylon_holster", "prob": 120 } + ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json new file mode 100644 index 0000000000000..03e70b34a8fd5 --- /dev/null +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunstore_guns.json @@ -0,0 +1,1428 @@ +[ + { + "type": "item_group", + "subtype": "collection", + "id": "firearm_box_extras", + "items": [ { "item": "gun_manual" }, { "item": "gun_lock" } ] + }, + { + "type": "item_group", + "subtype": "distribution", + "id": "stanag_restricted", + "//": "This is for magazines with varying amounts <10, and lots of interchangability. If it's used in 3 or more guns it's best to have it as a group like this.", + "//1": "Magazines should be 10 or less rounds, both to comply with MA firearm law, and also because it's just a cool balancing thing. If not possible, lowest capacity.", + "//2": "If a gun has more than 1 magazine that's less than 10 rounds, make the one that is default the most common, and if not, then make closest to 10 the most common.", + "//3": "Eg, a 1911 would have 7 rounds be the most common magazine, while an M1A would have 10 rounds be the most common.", + "items": [ { "item": "stanag5", "count": [ 1, 2 ], "prob": 10 }, { "item": "stanag10", "count": [ 1, 2 ], "prob": 90 } ] + }, + { + "type": "item_group", + "id": "guns_common_boxed", + "items": [ + { "group": "guns_pistol_common_boxed", "prob": 90 }, + { "group": "guns_rifle_common_boxed", "prob": 30 }, + { "group": "guns_shotgun_common_boxed", "prob": 3 } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed", + "items": [ + { "group": "guns_pistol_common_boxed_9mm", "prob": 74 }, + { "group": "guns_pistol_common_boxed_22", "prob": 64 }, + { "group": "guns_pistol_common_boxed_45", "prob": 20 }, + { "group": "guns_pistol_common_boxed_380", "prob": 28 }, + { "group": "guns_pistol_common_boxed_40", "prob": 19 }, + { "group": "guns_pistol_common_boxed_357mag", "prob": 12 }, + { "group": "guns_pistol_common_boxed_38", "prob": 11 }, + { "group": "guns_pistol_common_boxed_44", "prob": 1 }, + { "group": "guns_pistol_common_boxed_45colt", "prob": 5 }, + { "group": "guns_pistol_common_boxed_10mm", "prob": 1 }, + { "group": "guns_pistol_common_boxed_762_39", "prob": 1 }, + { "group": "guns_pistol_common_boxed_223", "prob": 17 }, + { "group": "guns_pistol_common_boxed_300", "prob": 8 }, + { "group": "guns_pistol_common_boxed_57", "prob": 2 }, + { "group": "guns_pistol_common_boxed_32", "prob": 1 }, + { "group": "guns_pistol_common_boxed_38super", "prob": 1 }, + { "group": "guns_pistol_common_boxed_other", "prob": 2 } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_9mm", + "items": [ + { "group": "boxed_glock_17", "prob": 73 }, + { "group": "boxed_glock_19", "prob": 100 }, + { "group": "boxed_m9", "prob": 22 }, + { "group": "boxed_px4", "prob": 5 }, + { "group": "boxed_hi_power_9mm", "prob": 9 }, + { "group": "boxed_walther_ppq_9mm", "prob": 8 }, + { "group": "boxed_cz75", "prob": 65 }, + { "group": "boxed_walther_ccp", "prob": 2 }, + { "group": "boxed_hptc9", "prob": 12 }, + { "group": "boxed_m18m17", "prob": 48 }, + { "group": "boxed_m11", "prob": 6 }, + { "group": "boxed_hk_mp5_semi_pistol", "prob": 10 }, + { "group": "boxed_p226_9mm", "prob": 73 }, + { "group": "boxed_sp2022", "prob": 4 }, + { "group": "boxed_usp_9mm", "prob": 38 }, + { "group": "boxed_guns_pistol_rare_9mm", "prob": 10 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_glock_17", + "container-item": "box_pistol", + "items": [ { "item": "glock_17" }, { "group": "firearm_box_extras" }, { "item": "glock17_17", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_glock_19", + "container-item": "box_pistol", + "items": [ { "item": "glock_19" }, { "group": "firearm_box_extras" }, { "item": "glockmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m9", + "container-item": "box_pistol", + "items": [ { "item": "m9" }, { "group": "firearm_box_extras" }, { "item": "m9mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_px4", + "container-item": "box_pistol", + "items": [ { "item": "px4" }, { "group": "firearm_box_extras" }, { "item": "px4mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hi_power_9mm", + "container-item": "box_pistol", + "items": [ { "item": "hi_power_9mm" }, { "group": "firearm_box_extras" }, { "item": "bhp9mag_13rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_walther_ppq_9mm", + "container-item": "box_pistol", + "items": [ { "item": "walther_ppq_9mm" }, { "group": "firearm_box_extras" }, { "item": "ppq9mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_cz75", + "container-item": "box_pistol", + "items": [ { "item": "cz75" }, { "group": "firearm_box_extras" }, { "item": "cz75mag_16rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_walther_ccp", + "container-item": "box_pistol", + "entries": [ + { "item": "walther_ccp" }, + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "ccpmag", "count": [ 1, 2 ], "prob": 40 }, { "item": "ccpmag_9rd", "count": [ 1, 2 ], "prob": 60 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hptc9", + "container-item": "box_pistol", + "entries": [ + { "item": "hptc9" }, + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "hptc9mag_8rd", "count": [ 1, 2 ], "prob": 40 }, + { "item": "hptc9mag_10rd", "count": [ 1, 2 ], "prob": 60 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m18m17", + "container-item": "box_pistol", + "//": "If a gun shares the same magazine or has an internal magazine, it should be grouped together in one group with spawn weights adjusted both in the by caliber groups and the specific guns group", + "entries": [ + { "item": "p320mag_10rd_9x19mm", "count": [ 1, 2 ] }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "m18", "prob": 22 }, { "item": "m17", "prob": 24 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m11", + "container-item": "box_pistol", + "items": [ { "item": "m11" }, { "group": "firearm_box_extras" }, { "item": "p228mag_13rd_9x19mm", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hk_mp5_semi_pistol", + "container-item": "box_pistol", + "items": [ { "item": "hk_mp5_semi_pistol" }, { "group": "firearm_box_extras" }, { "item": "mp5mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_p226_9mm", + "container-item": "box_pistol", + "items": [ { "item": "p226_9mm" }, { "group": "firearm_box_extras" }, { "item": "p226mag_10rd_9x19mm", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sp2022", + "container-item": "box_pistol", + "items": [ { "item": "sp2022" }, { "group": "firearm_box_extras" }, { "item": "sp2022mag_10rd_9mm", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_usp_9mm", + "container-item": "box_pistol", + "items": [ { "item": "usp_9mm" }, { "group": "firearm_box_extras" }, { "item": "usp9mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "boxed_guns_pistol_rare_9mm", + "items": [ + { + "item": "box_longarm", + "variant": "box_longarm_handgun", + "contents-group": "firearm_box_extras", + "contents-item": [ "draco_9mm", "glockmag" ], + "prob": 29 + }, + { + "item": "box_pistol", + "contents-group": "firearm_box_extras", + "contents-item": [ "p08", "p08mag_8rd" ], + "prob": 13 + }, + { + "item": "box_pistol", + "contents-group": "firearm_box_extras", + "contents-item": [ "mauser_c96", "clip9mm_10rd" ], + "prob": 11 + }, + { + "item": "box_longarm", + "variant": "box_longarm_handgun", + "contents-group": "firearm_box_extras", + "contents-item": [ "mp40semi", "mp40mag_32rd" ], + "prob": 1 + }, + { + "item": "box_pistol", + "contents-group": "firearm_box_extras", + "contents-item": [ "tec9", "tec9mag_10rd" ], + "prob": 1 + } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_22", + "items": [ + { "group": "boxed_walther_p22", "prob": 45 }, + { "group": "boxed_ruger_lcr_22", "prob": 2 }, + { "group": "boxed_22_revolver", "prob": 75 }, + { "group": "boxed_sig_mosquito", "prob": 65 }, + { "group": "boxed_cp33", "prob": 16 }, + { "group": "boxed_ruger_mk4", "prob": 113 }, + { "group": "boxed_ruger_charger", "prob": 16 }, + { "group": "boxed_1911_22", "prob": 100 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_walther_p22", + "container-item": "box_pistol", + "items": [ { "item": "walther_p22" }, { "group": "firearm_box_extras" }, { "item": "wp22mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_lcr_22", + "container-item": "box_pistol", + "items": [ { "item": "ruger_lcr_22" }, { "group": "firearm_box_extras" }, { "item": "22_speedloader8", "prob": 5 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_22_revolver", + "container-item": "box_pistol", + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "rough_rider_pistol", "prob": 61 }, { "item": "rough_rider_pistol_9", "prob": 14 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sig_mosquito", + "container-item": "box_pistol", + "items": [ { "item": "sig_mosquito" }, { "group": "firearm_box_extras" }, { "item": "mosquitomag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_cp33", + "container-item": "box_pistol", + "items": [ { "item": "cp33" }, { "group": "firearm_box_extras" }, { "item": "cp33_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_mk4", + "container-item": "box_pistol", + "items": [ { "item": "ruger_mk4" }, { "group": "firearm_box_extras" }, { "item": "ruger_mk4_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_charger", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "items": [ { "item": "ruger_charger" }, { "group": "firearm_box_extras" }, { "item": "ruger1022mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_1911_22", + "container-item": "box_pistol", + "items": [ { "item": "1911_22" }, { "group": "firearm_box_extras" }, { "item": "1911_22_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_45", + "items": [ + { "group": "boxed_glock_21", "prob": 14 }, + { "group": "boxed_m1911", "prob": 100 }, + { "group": "boxed_walther_ppq_45", "prob": 1 }, + { "group": "boxed_hptjhp", "prob": 2 }, + { "group": "boxed_usp_45", "prob": 4 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_glock_21", + "container-item": "box_pistol", + "items": [ { "item": "glock_21" }, { "group": "firearm_box_extras" }, { "item": "glock_21mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m1911", + "container-item": "box_pistol", + "items": [ + { "item": "m1911" }, + { "group": "firearm_box_extras" }, + { "item": "m1911mag", "count": [ 1, 2 ] }, + { "item": "m1911bigmag", "prob": 10 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_walther_ppq_45", + "container-item": "box_pistol", + "items": [ { "item": "walther_ppq_45" }, { "group": "firearm_box_extras" }, { "item": "ppq45mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hptjhp", + "container-item": "box_pistol", + "items": [ { "item": "hptjhp" }, { "group": "firearm_box_extras" }, { "item": "hptjhpmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_usp_45", + "container-item": "box_pistol", + "items": [ { "item": "usp_45" }, { "group": "firearm_box_extras" }, { "item": "usp45mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_380", + "items": [ { "group": "boxed_rugerlcp", "prob": 231 }, { "group": "boxed_hptcf380", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_rugerlcp", + "container-item": "box_pistol", + "items": [ { "item": "rugerlcp" }, { "group": "firearm_box_extras" }, { "item": "rugerlcpmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hptcf380", + "container-item": "box_pistol", + "entries": [ + { "item": "hptcf380" }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "hptcf380mag_8rd", "prob": 80 }, { "item": "hptcf380mag_10rd", "prob": 20 } ] } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_40", + "items": [ + { "group": "boxed_glock_22", "prob": 100 }, + { "group": "boxed_px4_40", "prob": 20 }, + { "group": "boxed_hi_power_40", "prob": 3 }, + { "group": "boxed_hptjcp", "prob": 29 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_glock_22", + "container-item": "box_pistol", + "items": [ { "item": "glock_22" }, { "group": "firearm_box_extras" }, { "item": "glock40mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_px4_40", + "container-item": "box_pistol", + "items": [ { "item": "px4_40" }, { "group": "firearm_box_extras" }, { "item": "px4_40mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hi_power_40", + "container-item": "box_pistol", + "items": [ { "item": "hi_power_40" }, { "group": "firearm_box_extras" }, { "item": "bhp40mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hptjcp", + "container-item": "box_pistol", + "items": [ { "item": "hptjcp" }, { "group": "firearm_box_extras" }, { "item": "hptjcpmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_357mag", + "items": [ + { "group": "boxed_357_revolver", "prob": 179 }, + { "group": "boxed_sw_619", "prob": 100 }, + { "group": "boxed_deagle_357", "prob": 38 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_357_revolver", + "container-item": "box_pistol", + "entries": [ + { "item": "38_speedloader6", "prob": 5 }, + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "rp63", "prob": 11 }, { "item": "colt_python", "prob": 96 }, { "item": "chiappa_rhino", "prob": 72 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sw_619", + "container-item": "box_pistol", + "items": [ { "item": "sw_619" }, { "group": "firearm_box_extras" }, { "item": "38_speedloader", "prob": 5 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_deagle_357", + "container-item": "box_pistol", + "items": [ { "group": "modular_deagle_357" }, { "group": "firearm_box_extras" }, { "item": "deaglemag_357", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_38", + "items": [ { "group": "boxed_ruger_lcr_38", "prob": 66 }, { "group": "boxed_model_10_revolver", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_lcr_38", + "container-item": "box_pistol", + "items": [ { "item": "ruger_lcr_38" }, { "group": "firearm_box_extras" }, { "item": "38_speedloader5", "prob": 5 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_model_10_revolver", + "container-item": "box_pistol", + "items": [ { "item": "model_10_revolver" }, { "group": "firearm_box_extras" }, { "item": "38_speedloader6", "prob": 5 } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_44", + "items": [ { "group": "boxed_44_revolver", "prob": 147 }, { "group": "boxed_deagle_44", "prob": 8 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_44_revolver", + "container-item": "box_pistol", + "entries": [ + { "item": "44_speedloader6", "prob": 5 }, + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "sw629", "prob": 100 }, + { "item": "colt_anaconda_8", "prob": 15 }, + { "item": "colt_anaconda_6", "prob": 24 }, + { "item": "colt_anaconda_4", "prob": 8 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_deagle_44", + "container-item": "box_pistol", + "items": [ { "group": "modular_deagle_44" }, { "group": "firearm_box_extras" }, { "item": "deaglemag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_45colt", + "items": [ + { "group": "boxed_410_revolver", "prob": 109 }, + { "group": "boxed_colt_saa", "prob": 26 }, + { "group": "boxed_bond_410", "prob": 16 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_410_revolver", + "container-item": "box_pistol", + "entries": [ + { "item": "454_speedloader5", "prob": 5 }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "raging_bull", "prob": 9 }, { "item": "taurus_judge", "prob": 100 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_colt_saa", + "container-item": "box_pistol", + "items": [ { "item": "colt_saa" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_bond_410", + "container-item": "box_pistol", + "items": [ { "item": "bond_410" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_10mm", + "items": [ + { "group": "boxed_10mm_glocks", "prob": 466 }, + { "group": "boxed_m1911_10", "prob": 30 }, + { "group": "boxed_p220_10", "prob": 35 }, + { "group": "boxed_xd_10", "prob": 85 }, + { "group": "boxed_witness_10", "prob": 10 }, + { "group": "boxed_sw_610", "prob": 34 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_10mm_glocks", + "container-item": "box_pistol", + "entries": [ + { "item": "glock_20mag", "count": [ 1, 2 ] }, + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "glock_40", "prob": 100 }, + { "item": "TDI_10", "prob": 183 }, + { "item": "glock_20", "prob": 121 }, + { "item": "glock_29", "prob": 62 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m1911_10", + "container-item": "box_pistol", + "items": [ { "item": "m1911_10" }, { "group": "firearm_box_extras" }, { "item": "m1911_10mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_p220_10", + "container-item": "box_pistol", + "items": [ { "item": "p220_10" }, { "group": "firearm_box_extras" }, { "item": "p220_10_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_xd_10", + "container-item": "box_pistol", + "items": [ { "item": "xd_10" }, { "group": "firearm_box_extras" }, { "item": "xd_10_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_witness_10", + "container-item": "box_pistol", + "items": [ { "item": "witness_10" }, { "group": "firearm_box_extras" }, { "item": "witness_mag_10", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sw_610", + "container-item": "box_pistol", + "items": [ { "item": "sw_610" }, { "group": "firearm_box_extras" }, { "item": "40_speedloader6", "prob": 5 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_pistol_common_boxed_762_39", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "entries": [ + { "item": "akmag10", "count": [ 1, 2 ] }, + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "draco", "prob": 10 }, { "item": "draco_mini", "prob": 5 }, { "item": "draco_micro", "prob": 8 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_pistol_common_boxed_223", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "entries": [ + { "group": "stanag_restricted" }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "group": "ar_pistol", "prob": 8 }, { "group": "ar_pistol_long", "prob": 10 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_pistol_common_boxed_300", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "entries": [ + { "group": "stanag_restricted" }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "group": "ar_pistol_300", "prob": 2 }, { "group": "ar_pistol_300_long", "prob": 5 } ] } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_57", + "items": [ + { "group": "boxed_ruger_57", "prob": 100 }, + { "group": "boxed_fn57", "prob": 13 }, + { "group": "boxed_p50", "prob": 12 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_57", + "container-item": "box_pistol", + "items": [ { "item": "ruger_57" }, { "group": "firearm_box_extras" }, { "item": "ruger_57_10_round_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_fn57", + "container-item": "box_pistol", + "items": [ { "item": "fn57" }, { "group": "firearm_box_extras" }, { "item": "fn57mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_p50", + "container-item": "box_pistol", + "items": [ { "item": "p50" }, { "group": "firearm_box_extras" }, { "item": "fnp90mag" } ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_32", + "items": [ { "group": "boxed_kp32", "prob": 100 }, { "group": "boxed_walther_ppk", "prob": 71 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_kp32", + "container-item": "box_pistol", + "items": [ { "item": "kp32" }, { "group": "firearm_box_extras" }, { "item": "kp32mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_walther_ppk", + "container-item": "box_pistol", + "items": [ { "item": "walther_ppk" }, { "group": "firearm_box_extras" }, { "item": "ppkmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_pistol_common_boxed_38super", + "container-item": "box_pistol", + "items": [ + { "item": "m1911a1_38super" }, + { "group": "firearm_box_extras" }, + { "item": "m1911mag_10rd_38super", "count": [ 1, 2 ] } + ] + }, + { + "type": "item_group", + "id": "guns_pistol_common_boxed_other", + "items": [ + { "group": "boxed_glock_31", "prob": 42 }, + { "group": "boxed_bfr", "prob": 5 }, + { "group": "boxed_deagle_50", "prob": 10 }, + { "group": "boxed_sw_500", "prob": 29 }, + { "group": "boxed_makarov", "prob": 7 }, + { "group": "boxed_tokarev", "prob": 7 }, + { "group": "boxed_ar15_450short", "prob": 3 }, + { "group": "boxed_ar15_50short", "prob": 1 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_glock_31", + "container-item": "box_pistol", + "items": [ { "item": "glock_31" }, { "group": "firearm_box_extras" }, { "item": "glock40mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_bfr", + "container-item": "box_pistol", + "items": [ { "item": "bfr" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_deagle_50", + "container-item": "box_pistol", + "items": [ { "group": "modular_deagle_50" }, { "group": "firearm_box_extras" }, { "item": "deaglemag_50", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sw_500", + "container-item": "box_pistol", + "items": [ { "item": "sw_500" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_makarov", + "container-item": "box_pistol", + "items": [ { "item": "makarov" }, { "group": "firearm_box_extras" }, { "item": "makarovmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_tokarev", + "container-item": "box_pistol", + "items": [ { "item": "tokarev" }, { "group": "firearm_box_extras" }, { "item": "tokarevmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_450short", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "items": [ { "group": "ar15_450short" }, { "group": "firearm_box_extras" }, { "item": "450_ar15mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_50short", + "container-item": { "item": "box_longarm", "variant": "box_longarm_handgun" }, + "items": [ { "group": "ar15_50short" }, { "group": "firearm_box_extras" }, { "item": "50beowulf_ar15mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed", + "items": [ + { "group": "guns_rifle_common_boxed_22", "prob": 1760 }, + { "group": "guns_rifle_common_boxed_223", "prob": 1000 }, + { "group": "guns_rifle_common_boxed_308", "prob": 320 }, + { "group": "guns_rifle_common_boxed_45acp", "prob": 271 }, + { "group": "guns_rifle_common_boxed_762", "prob": 230 }, + { "group": "guns_rifle_common_boxed_9mm", "prob": 180 }, + { "group": "guns_rifle_common_boxed_3006", "prob": 149 }, + { "group": "guns_rifle_common_boxed_357", "prob": 108 }, + { "group": "guns_rifle_common_boxed_44", "prob": 81 }, + { "group": "guns_rifle_common_boxed_762R", "prob": 70 }, + { "group": "guns_rifle_common_boxed_270win", "prob": 57 }, + { "group": "guns_rifle_common_boxed_300winmag", "prob": 32 }, + { "group": "guns_rifle_common_boxed_380", "prob": 24 }, + { "group": "guns_rifle_common_boxed_300blk", "prob": 19 }, + { "group": "guns_rifle_common_boxed_4570", "prob": 18 }, + { "group": "guns_rifle_common_boxed_30carbine", "prob": 17 }, + { "group": "guns_rifle_common_boxed_303", "prob": 16 }, + { "group": "guns_rifle_common_boxed_338", "prob": 14 }, + { "group": "guns_rifle_common_boxed_450", "prob": 3 }, + { "group": "guns_rifle_common_boxed_50beowulf", "prob": 3 }, + { "group": "guns_rifle_common_boxed_57", "prob": 3 }, + { "group": "guns_rifle_common_boxed_545", "prob": 3 }, + { "group": "guns_rifle_common_boxed_7mm_arisaka", "prob": 2 } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_22", + "items": [ + { "group": "boxed_internal_magazine_22", "prob": 60 }, + { "group": "boxed_ruger_1022", "prob": 100 }, + { "group": "boxed_ar15_22", "prob": 2 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_internal_magazine_22", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "marlin_9a", "prob": 3 }, + { "item": "rossi_gallery", "prob": 11 }, + { "item": "rio_bravo", "prob": 15 }, + { "item": "henry_golden_boy", "prob": 31 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_1022", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ruger_1022" }, { "group": "firearm_box_extras" }, { "item": "ruger1022mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_22", + "on_overflow": "spill", + "//": "on_overflow field is here to allow it to pass tests until #79341 is merged. Please remove once fixed", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "group": "ar15_22" }, { "group": "firearm_box_extras" }, { "item": "22_ar15mag_10", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_223", + "items": [ + { "group": "boxed_stanag_223", "prob": 423 }, + { "group": "boxed_ruger_mini", "prob": 100 }, + { "group": "boxed_sl8", "prob": 3 }, + { "group": "boxed_ak556", "prob": 19 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_stanag_223", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { "group": "stanag_restricted" }, + { + "distribution": [ + { "group": "ar15_223long", "prob": 71 }, + { "group": "modular_ar15", "prob": 263 }, + { "item": "bren2_556", "prob": 4 }, + { "item": "rdb_223", "prob": 44 }, + { "group": "mdrx", "prob": 5 }, + { "group": "mdrx_223", "prob": 4 }, + { "group": "cz600", "prob": 4 }, + { "item": "sig_assault_rifle", "prob": 1 }, + { "item": "iwi_tavor_x95_300blk", "prob": 27 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_mini", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "ruger_mini" }, + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "ruger5", "count": [ 1, 2 ], "prob": 10 }, { "item": "ruger10", "count": [ 1, 2 ], "prob": 90 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sl8", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "sl8" }, { "group": "firearm_box_extras" }, { "item": "sl8mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ak556", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ak556" }, { "group": "firearm_box_extras" }, { "item": "zpap85mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_308", + "items": [ + { "group": "boxed_ar10", "prob": 89 }, + { "group": "boxed_m1a", "prob": 100 }, + { "group": "boxed_falmag", "prob": 11 }, + { "group": "boxed_hk_g3", "prob": 1 }, + { "group": "boxed_ak308", "prob": 20 }, + { "group": "boxed_steyr_scout", "prob": 6 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar10", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ar10" }, { "group": "firearm_box_extras" }, { "item": "ar10mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m1a", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "m1a" }, { "group": "firearm_box_extras" }, { "item": "m14smallmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_falmag", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "falmag", "count": [ 1, 2 ] }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "rfb_308", "prob": 6 }, { "item": "fn_fal_semi", "prob": 5 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hk_g3", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "hk_g3" }, { "group": "firearm_box_extras" }, { "item": "g3mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ak308", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ak308" }, { "group": "firearm_box_extras" }, { "item": "papm77mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_steyr_scout", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "steyr_scout" }, { "group": "firearm_box_extras" }, { "item": "steyr_scout_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_45acp", + "items": [ { "group": "boxed_hk_usc45", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hk_usc45", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "hk_usc45" }, { "group": "firearm_box_extras" }, { "item": "usc10mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_762", + "items": [ + { "group": "boxed_sks", "prob": 34 }, + { "group": "boxed_akmag", "prob": 126 }, + { "group": "boxed_bren2_762", "prob": 1 }, + { "group": "boxed_ar15_762", "prob": 5 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_sks", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "sks" }, { "group": "firearm_box_extras" }, { "item": "762x39_clip", "count": [ 0, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_akmag", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "akmag10", "count": [ 1, 2 ] }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "aksemi", "prob": 100 }, { "item": "mk47", "prob": 26 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_bren2_762", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "bren2_762" }, { "group": "firearm_box_extras" }, { "item": "bren2_762mag10", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_762", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "ar15_762" }, + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "762_ar15mag_5rd", "count": [ 1, 2 ], "prob": 10 }, + { "item": "762_ar15mag_10rd", "count": [ 1, 2 ], "prob": 90 } + ] + } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_9mm", + "items": [ { "group": "boxed_ksub2000", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ksub2000", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ksub2000" }, { "group": "firearm_box_extras" }, { "item": "glockmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_3006", + "items": [ + { "group": "boxed_browning_blr", "prob": 4 }, + { "group": "boxed_internal_magazine_3006", "prob": 305 }, + { "group": "boxed_garand", "prob": 100 }, + { "group": "boxed_m1903", "prob": 26 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_browning_blr", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "browning_blr" }, { "group": "firearm_box_extras" }, { "item": "blrmag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_internal_magazine_3006", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "remington_700", "prob": 243 }, { "item": "ruger_m77", "prob": 62 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_garand", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "garand" }, { "group": "firearm_box_extras" }, { "item": "garandclip", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m1903", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "m1903" }, { "group": "firearm_box_extras" }, { "item": "3006_clip", "count": [ 0, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_357", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "uberti_1873", "prob": 100 }, + { "item": "rossi_r92_357_16", "prob": 18 }, + { "item": "rossi_r92_357_20", "prob": 37 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_44", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "item": "henry_big_boy", "prob": 100 }, + { "item": "rossi_r92_44_16", "prob": 185 }, + { "item": "rossi_r92_44_20", "prob": 121 } + ] + } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_762R", + "items": [ { "group": "boxed_mosin", "prob": 123 }, { "group": "boxed_psl", "prob": 13 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_mosin", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "762R_clip", "count": [ 0, 2 ] }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "mosin44", "prob": 23 }, { "item": "mosin91_30", "prob": 100 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_psl", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "psl" }, + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "pslmag5", "count": [ 1, 2 ], "prob": 10 }, { "item": "pslmag10", "count": [ 1, 2 ], "prob": 90 } ] + } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_270win", + "items": [ { "group": "boxed_remington700_270", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_remington700_270", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "remington700_270" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_300winmag", + "items": [ { "group": "boxed_internal_magazine_300winmag", "prob": 127 }, { "group": "boxed_ruger_pr", "prob": 40 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_internal_magazine_300winmag", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "weatherby_5", "prob": 100 }, { "item": "win70", "prob": 27 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_pr", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ruger_pr" }, { "group": "firearm_box_extras" }, { "item": "ruger_pr_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_380", + "items": [ { "group": "boxed_hpt3895", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_hpt3895", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "hpt3895" }, { "group": "firearm_box_extras" }, { "item": "hpt3895mag_10rd", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_300blk", + "items": [ { "group": "boxed_ar15_300", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_300", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "group": "ar15_300" }, { "group": "firearm_box_extras" }, { "group": "stanag_restricted" } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_4570", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "sharps", "prob": 100 }, { "item": "1895sbl", "prob": 67 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_30carbine", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "m1carbine" }, { "group": "firearm_box_extras" }, { "item": "m1carbinemag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_303", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "entries": [ + { "item": "enfield_303mag", "count": [ 1, 2 ] }, + { "item": "clip303_5rd", "count": [ 0, 2 ] }, + { "group": "firearm_box_extras" }, + { "distribution": [ { "item": "number4_mki", "prob": 100 }, { "item": "smle_mk3", "prob": 53 } ] } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_338", + "items": [ { "group": "boxed_mrad_smr", "prob": 100 }, { "group": "boxed_savage112", "prob": 1 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_mrad_smr", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "mrad_smr" }, { "group": "firearm_box_extras" }, { "item": "mrad_338lapua_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_savage112", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "savage112" }, { "group": "firearm_box_extras" } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_450", + "items": [ { "group": "boxed_ar15_450", "prob": 100 }, { "group": "boxed_ruger_arr", "prob": 97 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ar15_450", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "group": "ar15_450" }, { "group": "firearm_box_extras" }, { "item": "450_ar15mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_ruger_arr", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ruger_arr" }, { "group": "firearm_box_extras" }, { "item": "ruger_arr_mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_50beowulf", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "group": "ar15_50" }, { "group": "firearm_box_extras" }, { "item": "50beowulf_ar15mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_57", + "items": [ { "group": "boxed_fn_ps90", "prob": 100 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_fn_ps90", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "fn_ps90" }, { "group": "firearm_box_extras" }, { "item": "fnp90mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "guns_rifle_common_boxed_545", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "ak74_semi" }, { "group": "firearm_box_extras" }, { "item": "ak74mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_rifle_common_boxed_7mm_arisaka", + "items": [ { "group": "boxed_type99", "prob": 100 }, { "group": "boxed_type99_sniper", "prob": 4 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_type99", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "type99" }, { "group": "firearm_box_extras" }, { "item": "clip_77mm_arisaka", "count": [ 0, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_type99_sniper", + "container-item": { "item": "box_longarm", "variant": "box_longarm_rifle" }, + "items": [ { "item": "type99_sniper" }, { "group": "firearm_box_extras" }, { "item": "clip_77mm_arisaka", "count": [ 0, 2 ] } ] + }, + { + "type": "item_group", + "id": "guns_shotgun_common_boxed", + "items": [ + { "group": "12_gauge_semi_boxed", "prob": 48 }, + { "group": "12_gauge_pump_boxed", "prob": 34 }, + { "group": "12_gauge_break_boxed", "prob": 18 }, + { "group": "boxed_410", "prob": 5 } + ] + }, + { + "type": "item_group", + "id": "12_gauge_semi_boxed", + "items": [ + { "group": "12_gauge_semi_internal_magazine_boxed", "prob": 415 }, + { "group": "boxed_saiga_12", "prob": 28 }, + { "group": "boxed_m1919_mag", "prob": 271 }, + { "group": "boxed_srm_1216", "prob": 2 } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "12_gauge_semi_internal_magazine_boxed", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "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": "tavor_12", "prob": 53 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_saiga_12", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "items": [ { "item": "saiga_12" }, { "group": "firearm_box_extras" }, { "item": "saiga10mag", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_m1919_mag", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "entries": [ + { "group": "firearm_box_extras" }, + { "item": "mka_1919_5", "count": [ 1, 2 ] }, + { "distribution": [ { "item": "gfy_1", "prob": 17 }, { "item": "ar12_shotgun", "prob": 254 } ] } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_srm_1216", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "items": [ { "item": "srm_1216" }, { "group": "firearm_box_extras" }, { "item": "srm_1216_mag_16", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "id": "12_gauge_pump_boxed", + "items": [ { "group": "12_gauge_pump_internal_magazine_boxed", "prob": 520 }, { "group": "boxed_mossberg_590m", "prob": 34 } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "12_gauge_pump_internal_magazine_boxed", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ + { "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": "ksg", "prob": 78 }, + { "item": "dp_12", "prob": 25 } + ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_mossberg_590m", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "items": [ { "item": "mossberg_590m" }, { "group": "firearm_box_extras" }, { "item": "mossberg_590m_mag_5", "count": [ 1, 2 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "12_gauge_break_boxed", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "entries": [ + { "group": "firearm_box_extras" }, + { + "distribution": [ { "item": "shotgun_s", "prob": 11 }, { "item": "shotgun_d", "prob": 87 }, { "item": "shotgun_triple", "prob": 1 } ] + } + ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "boxed_410", + "//": "Yes this is a bad name. We only have one 410 shotgun right now anyways so it can be changed once there's more.", + "container-item": { "item": "box_longarm", "variant": "box_longarm_shotgun" }, + "items": [ { "item": "shotgun_410" }, { "group": "firearm_box_extras" } ] + } +] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json index b08661aa59a18..628013fe70bbc 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazine_collections_by_guns.json @@ -101,6 +101,13 @@ { "item": "hptc9mag_15rd", "prob": 30 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "magazines_restricted_9mm_hipoint_c9", + "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", + "items": [ { "item": "hptc9mag_8rd", "prob": 500 }, { "item": "hptc9mag_10rd", "prob": 100 } ] + }, { "type": "item_group", "subtype": "distribution", @@ -119,13 +126,6 @@ "//": "Collections of magazine for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", "items": [ { "item": "sp2022mag_10rd_9mm", "prob": 500 }, { "item": "sp2022mag_15rd_9mm", "prob": 400 } ] }, - { - "type": "item_group", - "subtype": "distribution", - "id": "magazines_9mm_p38", - "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", - "items": [ { "item": "p38mag", "prob": 500 } ] - }, { "type": "item_group", "subtype": "distribution", @@ -331,6 +331,18 @@ { "item": "stanag150", "prob": 1 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "magazines_restricted_stanag", + "//": "Collections of magazines for STANAG guns. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", + "items": [ + { "item": "stanag5", "prob": 300 }, + { "item": "stanag5ranger", "prob": 100 }, + { "item": "stanag10", "prob": 350 }, + { "item": "stanag10ranger", "prob": 115 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -345,6 +357,13 @@ { "item": "ruger100", "prob": 10 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "magazines_restricted_mini14", + "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", + "items": [ { "item": "ruger5", "prob": 300 }, { "item": "ruger10", "prob": 400 } ] + }, { "type": "item_group", "subtype": "distribution", @@ -449,6 +468,13 @@ { "item": "762_ar15mag_30rd", "prob": 300 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "magazines_restricted_ar762", + "//": "Collections of magazines for the gun. Rough estimates of 1:2 for restricted to regular, 1:10 ratio of extended to regular, and 1:100 ratio of drums/very extended to regular.", + "items": [ { "item": "762_ar15mag_5rd", "prob": 200 }, { "item": "762_ar15mag_10rd", "prob": 400 } ] + }, { "type": "item_group", "subtype": "distribution", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json index 17b14be71bb79..a5e6680a242b1 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines.json @@ -110,7 +110,7 @@ "type": "item_group", "subtype": "distribution", "id": "mags_common", - "//": "Collections of magazines for guns that are common place, can be found in houses, gunstores, anywhere where you'd expect to find magazines. Weighted by caliber.", + "//": "Collections of magazines for guns that ignore magazine limits. Shouldn't be found in places such as gunstores, and should only be found in private areas like homes. Weighted by caliber.", "items": [ { "group": "common_magazines_9mm", "prob": 209 }, { "group": "common_magazines_10mm", "prob": 9 }, @@ -140,6 +140,46 @@ { "item": "m1911mag_10rd_38super", "prob": 2 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "mags_common_restricted", + "//": "Collections of magazines for guns that are common place and follow the magazine limit law, specifically 10 round magazines or under, unless a lower capacity mag is not yet implemented, then just lowest capacity.", + "items": [ + { "group": "common_magazines_restricted_9mm", "prob": 209 }, + { "group": "common_magazines_restricted_10mm", "prob": 9 }, + { "group": "common_magazines_restricted_22lr", "prob": 204 }, + { "item": "m1carbinemag", "prob": 1 }, + { "group": "common_magazines_32", "prob": 44 }, + { "group": "common_magazines_38", "prob": 34 }, + { "group": "common_magazines_restricted_40sw", "prob": 40 }, + { "group": "common_magazines_44", "prob": 15 }, + { "group": "common_magazines_restricted_45", "prob": 49 }, + { "group": "common_magazines_restricted_57", "prob": 4 }, + { "group": "common_magazines_restricted_223", "prob": 125 }, + { "item": "enfield_303mag", "prob": 19 }, + { "group": "common_magazines_restricted_308", "prob": 25 }, + { "group": "common_magazines_380", "prob": 48 }, + { "group": "common_magazines_restricted_762", "prob": 34 }, + { "group": "common_magazines_762R", "prob": 4 }, + { "group": "common_magazines_3006", "prob": 8 }, + { "group": "common_magazines_450", "prob": 1 }, + { "group": "common_magazines_restricted_12", "prob": 8 }, + { "group": "uncommon_magazines", "prob": 3 }, + { "item": "ak74mag", "prob": 1 }, + { "item": "500_speedloader5", "prob": 1 }, + { "item": "ruger_pr_mag", "prob": 1 }, + { "item": "454_speedloader5", "prob": 25 }, + { "item": "50beowulf_ar15mag", "prob": 2 }, + { "item": "m1911mag_10rd_38super", "prob": 2 } + ] + }, + { + "type": "item_group", + "id": "mags_common_restricted_packaged", + "//": "Gun magazines in blister packages", + "items": [ { "item": "blister_pack", "contents-group": "mags_common_restricted" } ] + }, { "type": "item_group", "subtype": "distribution", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json index aeb399ab5c8e3..bd6db639b1bc2 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines/magazines_by_caliber.json @@ -20,10 +20,34 @@ { "group": "magazines_9mm_ccp", "prob": 5 }, { "group": "magazines_9mm_sp2022", "prob": 10 }, { "group": "magazines_9mm_mp5", "prob": 19 }, - { "group": "magazines_9mm_p38", "prob": 14 }, + { "item": "p38mag", "prob": 14 }, { "group": "magazines_9mm_apc9", "prob": 5 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_9mm", + "//": "Collections of magazines for 9mm guns that are sold in gunstores, such as Glocks, M9s, that are limited to 10 rounds or less so that they can be sold in gunstores. If 10 round or less magazines aren't present, use the lowest current capacity magazine.", + "items": [ + { "item": "glock17_17", "prob": 48 }, + { "item": "glockmag", "prob": 52 }, + { "item": "m9mag_10rd", "prob": 20 }, + { "item": "px4mag_10rd", "prob": 20 }, + { "item": "usp9mag_10rd", "prob": 20 }, + { "item": "p226mag_10rd_9x19mm", "prob": 40 }, + { "item": "p320mag_10rd_9x19mm", "prob": 60 }, + { "item": "bhp9mag_13rd", "prob": 18 }, + { "item": "ppq9mag_10rd", "prob": 15 }, + { "group": "magazines_restricted_9mm_hipoint_c9", "prob": 30 }, + { "item": "cz75mag_16rd", "prob": 40 }, + { "group": "magazines_9mm_ccp", "prob": 5 }, + { "item": "sp2022mag_10rd_9mm", "prob": 10 }, + { "item": "mp5mag_10rd", "prob": 19 }, + { "item": "p38mag", "prob": 14 }, + { "item": "btmp9mag_9x19mm_10rd", "prob": 5 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -38,6 +62,21 @@ { "item": "xd_10_mag", "prob": 19 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_10mm", + "//": "Collections of magazines for 10mm guns that are sold in gunstores, such as Glocks, that are limited to 10 rounds or less.", + "items": [ + { "item": "glock_29mag", "prob": 39 }, + { "item": "glock_20mag", "prob": 61 }, + { "item": "40_speedloader6", "prob": 16 }, + { "item": "m1911_10mag", "prob": 3 }, + { "item": "p220_10_mag", "prob": 21 }, + { "item": "witness_mag_10", "prob": 13 }, + { "item": "xd_10_mag", "prob": 19 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -54,6 +93,22 @@ { "item": "1911_22_mag", "prob": 26 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_22lr", + "//": "Collections of magazines for .22 LR guns that are sold in gunstores, such as 10/22s, Ruger Standards, that are limited to 10 rounds or less.", + "items": [ + { "item": "22_ar15mag_10", "prob": 8 }, + { "item": "ruger1022mag", "prob": 100 }, + { "item": "cp33_mag", "prob": 5 }, + { "item": "22_speedloader8", "prob": 1 }, + { "item": "mosquitomag", "prob": 20 }, + { "item": "wp22mag", "prob": 23 }, + { "item": "ruger_mk4_mag", "prob": 39 }, + { "item": "1911_22_mag", "prob": 26 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -92,6 +147,18 @@ { "item": "hptjcpmag", "prob": 30 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_40sw", + "//": "Collections of magazines for 40 S&W guns that are sold in gunstores, such as the Glock 22, that are limited to 10 rounds or less.", + "items": [ + { "item": "glock40mag", "prob": 100 }, + { "item": "px4_40mag", "prob": 21 }, + { "item": "bhp40mag", "prob": 3 }, + { "item": "hptjcpmag", "prob": 30 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -114,6 +181,21 @@ { "item": "hptjhpmag", "prob": 103 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_45", + "//": "Collections of magazines for 45 ACP guns that are sold in gunstores, such as Glocks, 1911s, that are limited to 10 rounds or less.", + "items": [ + { "item": "glock_21mag", "prob": 100 }, + { "item": "thompson_mag", "prob": 21 }, + { "item": "usc10mag", "prob": 18 }, + { "group": "magazines_45_1911", "prob": 1107 }, + { "item": "usp45mag", "prob": 30 }, + { "item": "ppq45mag", "prob": 5 }, + { "item": "hptjhpmag", "prob": 103 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -125,6 +207,17 @@ { "item": "fnp90mag", "prob": 115 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_57", + "//": "Collections of magazines for 5.7mm guns that can be found in gunstores, that are limited to 10 rounds or less.", + "items": [ + { "item": "ruger_57_10_round_mag", "prob": 100 }, + { "item": "fn57mag", "prob": 13 }, + { "item": "fnp90mag", "prob": 115 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -137,6 +230,18 @@ { "item": "sl8mag", "prob": 4 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_223", + "//": "Collections of magazines for 223/556 guns that can be found in gunstores, that are limited to 10 rounds or less.", + "items": [ + { "group": "magazines_restricted_stanag", "prob": 1007 }, + { "group": "magazines_restricted_mini14", "prob": 100 }, + { "item": "augmag_10rd", "prob": 28 }, + { "item": "sl8mag", "prob": 4 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -159,6 +264,21 @@ { "item": "steyr_scout_mag", "prob": 16 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_308", + "//": "Collections of magazines for 308 guns that can be found in gunstores, that are limited to 10 rounds or less.", + "items": [ + { "item": "falmag", "prob": 25 }, + { "item": "g3mag", "prob": 19 }, + { "item": "m14smallmag", "prob": 300 }, + { "item": "papm77mag_10rd", "prob": 39 }, + { "item": "scarhmag", "prob": 49 }, + { "item": "ar10mag_10rd", "prob": 100 }, + { "item": "steyr_scout_mag", "prob": 16 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -182,6 +302,18 @@ { "item": "762x39_clip", "prob": 35 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_762", + "//": "Collections of magazines for 7.62x39 guns that can be found in gunstores, that are limited to 10 rounds or less.", + "items": [ + { "item": "akmag10", "prob": 100 }, + { "item": "bren2_762mag10", "prob": 44 }, + { "group": "magazines_restricted_ar762", "prob": 19 }, + { "item": "762x39_clip", "prob": 35 } + ] + }, { "type": "item_group", "subtype": "distribution", @@ -216,6 +348,19 @@ { "item": "srm_1216_mag_16", "prob": 2 } ] }, + { + "type": "item_group", + "subtype": "distribution", + "id": "common_magazines_restricted_12", + "//": "Collections of magazines for 12 gauge guns that can be found in gunstores, that are limited to 5 rounds or less as detachable shotgun magazines have a limit of 5.", + "items": [ + { "item": "saiga10mag", "prob": 6 }, + { "group": "magazines_shot_speedloaders", "prob": 20 }, + { "item": "mossberg_590m_mag_5", "prob": 8 }, + { "item": "mka_1919_5", "prob": 100 }, + { "item": "srm_1216_mag_16", "prob": 2 } + ] + }, { "type": "item_group", "subtype": "distribution", diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index 1d327505691a0..2839ae3ee007c 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -1475,5 +1475,22 @@ "flags": [ "TRADER_AVOID" ], "weight": "120 g", "volume": "200 ml" + }, + { + "id": "gun_manual", + "type": "BOOK", + "name": { "str_sp": "firearm safety and instruction manual" }, + "description": "A booklet full of a bunch of information about a firearm, including how one is operated, how to take apart and clean the gun, and myriad of safety precautions.", + "weight": "72 g", + "volume": "60 ml", + "price": "0 USD", + "price_postapoc": "1 USD", + "material": [ "paper" ], + "symbol": "?", + "looks_like": "mag_guns", + "color": "light_gray", + "intelligence": 4, + "time": "10 m", + "melee_damage": { "bash": 1 } } ] diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index 0a2e4dd847150..f49fc2d1a0c4b 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -248,6 +248,32 @@ "symbol": ")", "color": "light_gray" }, + { + "id": "blister_pack", + "type": "GENERIC", + "category": "container", + "name": { "str": "blister pack" }, + "looks_like": "bag_plastic", + "description": "A blister pack is a sort of packaging that has a thick plastic case attached to a sheet of cardboard, allowing easy viewing of a product while keeping it protected. Known for being an absolute pain to open.", + "weight": "200 g", + "volume": "200 ml", + "price": "0 cent", + "price_postapoc": "0 cent", + "material": [ "plastic", "cardboard" ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "transparent": true, + "max_contains_volume": "10 L", + "max_contains_weight": "10 kg", + "max_item_length": "100 cm", + "moves": 400 + } + ], + "symbol": ")", + "color": "light_gray", + "flags": [ "COLLAPSE_CONTENTS", "NO_RELOAD" ] + }, { "id": "bag_garbage", "type": "GENERIC", @@ -1393,6 +1419,82 @@ "symbol": ")", "color": "brown" }, + { + "id": "box_longarm", + "type": "GENERIC", + "category": "container", + "//": "Roughly based on https://www.amazon.ca/Boxes-Fast-BF14442FOL-Corrugated-Cardboard/dp/B077BZHDYF", + "name": { "str": "longarm cardboard box", "str_pl": "longarm cardboard cardboard boxes" }, + "looks_like": "box_small", + "description": "An elongated cardboard box, meant to contain a longarm such as a shotgun or rifle.", + "ascii_picture": "box_oversize", + "weight": "600 g", + "volume": "40 L", + "longest_side": "135 cm", + "price": "10 USD", + "price_postapoc": "20 cent", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "38 L", + "max_contains_weight": "30 kg", + "max_item_length": "130 cm" + } + ], + "material": [ "cardboard" ], + "symbol": ")", + "color": "brown", + "variant_type": "generic", + "variants": [ + { + "id": "box_longarm_rifle", + "name": { "str": "rifle box", "str_pl": "rifle boxes" }, + "description": "Judging by the print on the packaging, this one is meant for a rifle.", + "append": true + }, + { + "id": "box_longarm_shotgun", + "name": { "str": "shotgun box", "str_pl": "shotgun boxes" }, + "description": "Judging by the print on the packaging, this one is meant for a shotgun.", + "append": true + }, + { + "id": "box_longarm_handgun", + "name": { "str": "large handgun box", "str_pl": "large handgun boxes" }, + "description": "Despite the size of the box, this one seems to be intended for an oversized handgun.", + "append": true + } + ] + }, + { + "id": "box_pistol", + "type": "GENERIC", + "name": { "str": "handgun case" }, + "//": "Based on https://www.pelican.com/ca/en/product/cases/medium-pistol-case/vault/v200/", + "description": "A hard plastic case with a foam interior, meant to store handguns along with any extra accessories.", + "weight": "2300 g", + "volume": "15750 ml", + "longest_side": "516 mm", + "price": "100 USD", + "price_postapoc": "50 cent", + "material": [ "plastic" ], + "symbol": "[", + "looks_like": "briefcase", + "color": "light_gray", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "max_contains_volume": "13 L", + "max_contains_weight": "30 kg", + "max_item_length": "437 mm", + "moves": 200 + } + ], + "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 5 } + }, { "id": "box_compact_wood", "type": "GENERIC", diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json index 3bc592b8d6716..700803fa4629c 100644 --- a/data/json/items/fluff.json +++ b/data/json/items/fluff.json @@ -1869,5 +1869,20 @@ "price_postapoc": "5 cent", "flags": [ "FRAGILE_MELEE" ], "melee_damage": { "bash": 3 } + }, + { + "type": "GENERIC", + "id": "gun_lock", + "name": { "str": "gun cable lock" }, + "//": "Stats from a 10/22 lock I had laying about. If the length or volume seems weird, the cable doesn't fold all the way so it's an odd shape.", + "description": "A set with a key and a small lock, resembling a padlock if the shackle was replaced by a steel cable. This design allows the cable to fit into the chamber of a firearm and lock, preventing the firearm from functioning. An import part of gun safety, it is required by law to be sold with any firearm.", + "weight": "83 g", + "volume": "53 ml", + "longest_side": "9 cm", + "color": "black", + "symbol": "P", + "material": [ "steel", "plastic" ], + "price": "14 USD 99 cent", + "price_postapoc": "5 cent" } ] diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json index 8ee58edb0d774..c57a7b04b71a5 100644 --- a/data/json/items/gun/338lapua.json +++ b/data/json/items/gun/338lapua.json @@ -49,7 +49,7 @@ ], "weight": "5470 g", "volume": "3000 ml", - "longest_side": "1264 mm", + "longest_side": "1222 mm", "barrel_length": "660 mm", "price": "1 kUSD 109 USD", "price_postapoc": "8 USD", diff --git a/data/json/mapgen/gunsmith.json b/data/json/mapgen/gunsmith.json deleted file mode 100644 index 6b0e7cd2b59e3..0000000000000 --- a/data/json/mapgen/gunsmith.json +++ /dev/null @@ -1,185 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gun_4" ], - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "___________________'''/'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''''", - "''''''''''''''''''''''''", - "'##::::##::::##+##:::::'", - "'#y..KKKKKK...^.^#dddd:'", - "':y..............D...d:'", - "':y..vvvvvv...CC.######'", - "':y..YYYYYY...Ca.FFFFF#'", - "':y...........Cr.....F#'", - "'#y..QQQQQQ...?VLLLL.F#'", - "'#||||||||||D|||||||D|#'", - "'#CCCCCCC|<|.|nA^.l|.s#'", - "'#CA...AC|D|.|nA..l|.s:'", - "'+...A...D...D.....D.s:'", - "'#H.CCC.H|ss.|CCfgg|.s#'", - "'#H.UUU.H###+######|D|#'", - "'#H.UUU.H#''''''''#r.^#'", - "'#H.....H#'''''ww'#q.&#'", - "'##::#::##'''''ww'#####'", - "'''''''''''''''ww'''''''" - ], - "palettes": [ "gun_store_palette" ], - "terrain": { "V": "t_thconc_floor", "H": "t_thconc_floor", "u": "t_thconc_floor", ";": "t_thconc_floor", "w": "t_sidewalk" }, - "set": [ { "point": "terrain", "id": "t_region_tree_fruit", "x": 22, "y": [ 1, 4 ], "chance": 30, "repeat": [ 1, 2 ] } ], - "furniture": { "V": "f_gunsafe_ml", "H": "f_locker", "U": "f_rack" }, - "items": { "V": { "item": "ammo_reloaded", "chance": 80, "repeat": [ 10, 20 ] } }, - "place_loot": [ - { "group": "tools_common", "x": [ 3, 6 ], "y": 15, "chance": 30, "repeat": [ 3, 6 ] }, - { "group": "tools_blacksmith", "x": [ 5, 6 ], "y": 15, "chance": 60, "repeat": [ 1, 2 ] }, - { "group": "ammo_parts", "x": [ 4, 6 ], "y": [ 19, 20 ], "chance": 60, "repeat": [ 4, 12 ] }, - { "item": "forge", "x": 4, "y": 18, "chance": 30 }, - { "item": "puller", "x": 5, "y": 18, "chance": 75 }, - { "item": "press", "x": 6, "y": 18, "chance": 75 }, - { "item": "welder", "x": 7, "y": 15, "chance": 30 }, - { "item": "goggles_welding", "x": 7, "y": 15, "chance": 30 }, - { "group": "cash_register_random", "x": 14, "y": [ 10, 12 ] } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": "s_gun_2ndfloor_4", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ---------------------- ", - " -....................- ", - " -....................- ", - " -.....%%%%%%%%%%%%...- ", - " -.....%__rrrrrr__%...- ", - " -.....%__________%...- ", - " -.....%______C_C_%...- ", - " -.ffff%%+%%___CC_%...- ", - " -.fAA.+__>%__C___%4..- ", - " -.f...%___%____w_%...- ", - " -.f^ff%%%%%%%%%%%%...- ", - " -....................- ", - " -.......---------5...- ", - " -.X.....- -.=.- ", - " -.....:.- -...- ", - " --------- ----- ", - " " - ], - "palettes": [ "roof_palette" ], - "terrain": { "r": "t_floor", "C": "t_floor", "w": "t_floor", "%": "t_wall_w", "^": "t_chaingate_l", "+": "t_door_metal_pickable" }, - "items": { "C": { "item": "ammo_common", "chance": 30 }, "r": { "item": "tools_blacksmith", "chance": 30 } } - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": "s_gun_roof_4", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ------------ ", - " -..........- ", - " -..........- ", - " -.......&..- ", - " -..........- ", - " -..........5 ", - " -..........- ", - " ------------ ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "roof_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gun_4_looted" ], - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - "___________________'''/'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''@'", - "___*___*___*___*___'''''", - "''''''''''''''''''''''''", - "'##::::##::::##+##:::::'", - "'#m``mmmmmm```^`^#pppp:'", - "':m``````````````D```p:'", - "':m``mmmmmm```CC`######'", - "':m``mmmmmm```Ca`MMMMM#'", - "':m```````````Cr`````M#'", - "'#m``mmmmmm```?eMMMM`M#'", - "'#||||||||||D|||||||D|#'", - "'#CCCCCCC|<|`|nA^`M|`S#'", - "'#CA```AC|D|`|nA``M|`S:'", - "'+```A```D```D`````D`S:'", - "'#M`CCC`M|SS`|CCfgg|`S#'", - "'#M`mmm`M###+######|D|#'", - "'#M`mmm`M#''''''''#r`^#'", - "'#M````.M#'''''ww'#q`&#'", - "'##::#::##'''''ww'#####'", - "'''''''''''''''ww'''''''" - ], - "palettes": [ "gun_store_palette" ], - "terrain": { "V": "t_thconc_floor", "H": "t_thconc_floor", "u": "t_thconc_floor", ";": "t_thconc_floor", "w": "t_sidewalk" }, - "set": [ { "point": "terrain", "id": "t_region_tree_fruit", "x": 22, "y": [ 1, 4 ], "chance": 30, "repeat": [ 1, 2 ] } ], - "nested": { - "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, - "m": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, - "M": { "chunks": [ [ "destroyed_furniture", 50 ], [ "null", 80 ] ] }, - "C": { "chunks": [ [ "destroyed_furniture", 85 ], [ "null", 90 ] ] }, - "V": { "chunks": [ [ "destroyed_furniture", 75 ], [ "null", 80 ] ] }, - "A": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "E": { "chunks": [ [ "destroyed_furniture", 45 ], [ "null", 90 ] ] }, - "a": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "^": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "n": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "p": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "S": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "?": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "&": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "q": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "r": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "D": { "chunks": [ [ "damaged_door_nested", 50 ], [ "destroyed_door_nested", 100 ], [ "null", 75 ] ] }, - ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 25 ], [ "null", 75 ] ] }, - "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, - "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, - "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - }, - "place_loot": [ { "group": "cash_register_random_ransacked", "x": 14, "y": [ 10, 12 ] } ] - } - } -] diff --git a/data/json/mapgen/nested/gunstore_nested.json b/data/json/mapgen/nested/gunstore_nested.json new file mode 100644 index 0000000000000..16b60718071d7 --- /dev/null +++ b/data/json/mapgen/nested/gunstore_nested.json @@ -0,0 +1,450 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_occupied_a", + "object": { + "mapgensize": [ 18, 18 ], + "rotation": [ 0, 3 ], + "rows": [ + ",,''''''''''''''''", + "'CCCCCCCC'''''''''", + "##:::##+##########", + "!dddddjjj/3$dIa4ga", + "SG..../...3.dI.../", + ".G....gA..3tdIa../", + "!g..Annn..dttIIIPI", + ".g/...A...dttD...A", + "..........ddcI...n", + "SG...........D...A", + "Gg.i.iK....GdI...q", + "...i.iK....GdIK/Y/", + ".g.i.i.....KdIYYjY", + "............A###+#", + "Gg..........A+ www", + "Gg....BBBSIID# w ", + "G......G.SIo.# x", + "S.Sttt.SSSI&q#xxxx" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 5, 13 ], "y": [ 5, 13 ] } ], + "palettes": [ "gunstore_palette_occupied" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_barricaded_a", + "object": { + "mapgensize": [ 18, 18 ], + "rotation": [ 0, 3 ], + "rows": [ + ",,''''''''''''''''", + "'CCCCCCCC'''''''''", + "##:::##+##########", + "!gggggjjj$3.hIBBBB", + "S.........3.gIB..B", + "!0...iJ...3.gIB..F", + "!....iJ...H..III+I", + "S....i!...H..D...E", + "S....i!...kHcI...n", + "S............D...f", + "S.YK.ii.J...hIn..q", + "!.Yt.ii.J...hInA.r", + "S.Yt.ii.J...hInA.l", + "S.Oo.ii.J....###+#", + "!.Oo.ii.J....+wwwx", + "!.Oo.ii.!.IID#wxxx", + "S.........I..#xx..", + "SS!!SSS!S!I&q#...." + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "nested": { "0": { "chunks": [ [ "gunstore_barricaded_safes_a", 50 ], [ "gunstore_barricaded_handloading_a", 50 ] ] } }, + "palettes": [ "gunstore_palette_unlooted" ], + "place_loot": [ { "group": "SUS_gunstore_optics_display", "x": 10, "y": 8, "repeat": [ 10, 20 ] } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_a", + "object": { + "mapgensize": [ 18, 18 ], + "rotation": [ 0, 3 ], + "rows": [ + ",,''''''''''''''''", + "''''''''''''''''''", + "##:::##+##########", + "!gggggjjj$3.gI1 ", + "S.........3.gI ", + "!0...iJ...3.gI ", + "!....iJ...H..I ", + "S....i!...H..D...A", + "S....i!...kHcI...n", + "S............D...f", + "S.YK.ii.J...hIn..q", + "!.Yt.ii.J...hInA.r", + "S.Yt.ii.J...hInA.l", + "S.Oo.ii.J....###+#", + "!.Oo.ii.J....+...w", + "!.Oo.ii.!.IID#....", + "S.........I..#w...", + "SS!!SSS!S!I&q#w..." + ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 16 ], "y": [ 4, 16 ] } ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ], + "nested": { + "0": { "chunks": [ [ "gunstore_looted_safes_a", 50 ], [ "gunstore_looted_handloading_a", 50 ] ] }, + "1": { "chunks": [ [ "gunstore_looted_storage_a", 1 ], [ "gunstore_unlooted_storage_a", 1 ] ] }, + ".": { "chunks": [ [ "gunstore_looted_floor", 4 ], [ "null", 20 ] ] } + }, + "place_loot": [ { "group": "SUS_gunstore_optics_display", "x": 10, "y": 8, "repeat": [ 0, 2 ] } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_ransacked_a", + "object": { + "mapgensize": [ 18, 18 ], + "rotation": [ 0, 3 ], + "rows": [ + ",,''''''''''''''''", + "''''''''''''''''''", + "##:::##+##########", + "!gggggjjj$3.gIBBBB", + "S.........3.gIB..B", + "!0...iJ...3.gIB..F", + "!....iJ...H..III+I", + "S....i!...H..D...A", + "S....i!...kHcI...n", + "S............D...f", + "S.YK.ii.J...hIn..q", + "!.Yt.ii.J...hInA.r", + "S.Yt.ii.J...hInA.l", + "S.Oo.ii.J....###+#", + "!.Oo.ii.J....+...w", + "!.Oo.ii.!.IID#....", + "S.........I..#w...", + "SS!!SSS!S!I&q#w..." + ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 16 ], "y": [ 4, 16 ], "repeat": [ 1, 2 ] } ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ], + "nested": { + "0": { "chunks": [ [ "gunstore_looted_safes_a", 50 ], [ "gunstore_looted_handloading_a", 50 ] ] }, + "g": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "h": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "H": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "Y": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 23 ] ] }, + "i": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 15 ] ] }, + "J": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 20 ] ] }, + "t": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 30 ] ] }, + "O": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 20 ] ] }, + "o": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 35 ] ] }, + "K": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 30 ] ] }, + "!": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 30 ] ] }, + "S": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 30 ] ] }, + ".": { "chunks": [ [ "gunstore_looted_floor", 10 ], [ "null", 20 ] ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_occupied_b", + "object": { + "mapgensize": [ 21, 21 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCCCCCCCCCCCC ", + "#:#:####+##::####### ", + ".....IdGGGUUUUG....# ", + ".....IdA....G.....GI ", + ".....Id...t.......U+.", + ".....Id...t.....333I.", + ".....Id.........3.dI.", + ".....Id.....t...d.i:.", + ".EEE.Id...ttt...d.i:.", + "IIDIIII.........3.iI.", + ".UUU.......t....c.dI.", + ".....I..iiii....3.dI.", + "IDIDII..iiii...IIIII.", + "&.I.&I.........D../I.", + "qoI.qIdddddddddI..aI.", + "IIIIIIIIIIIIIIII..nI.", + "q.IttnnnA/Igggii..nI.", + "&.D..AA...D......./I+", + "###l....n.Ia.......D.", + "wC+A..fpppIgGGa.i.aI.", + "wC###################" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "place_monsters": [ { "monster": "GROUP_PREPPER_HOUSE", "x": [ 6, 20 ], "y": [ 7, 20 ] } ], + "palettes": [ "gunstore_palette_occupied" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_barricaded_b", + "object": { + "mapgensize": [ 21, 21 ], + "rotation": [ 0, 3 ], + "rows": [ + "CCCCCCCCCCCCCC ", + "#:#:####+##::####### ", + "..A..It............# ", + ".EE..It............I ", + ".....It..JJJJ......+.", + "EE.EEIO..JJJJ...333I.", + "AA.AAIo.........3.HI.", + "EE.EEIo..iiii...H.i:.", + "AA.AAIo..iiii...H.i:.", + "IIDIIII.........3.iI.", + ".........iiii...c.gI.", + ".....I...iiii...3.gI.", + "IDIDII.........IIIII.", + "&.I.&I.........D...I.", + "q.I.qIggggghhhhI...I.", + "IIIIIIIIIIIIIIII...I.", + "q.I..nnnA.IBBBF....I.", + "&.D..AA...D........I+", + "###l....n.I........D.", + "wC+...fpppIBBBBBBBBI.", + "wC###################" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_unlooted" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_b", + "object": { + "mapgensize": [ 21, 21 ], + "rotation": [ 0, 3 ], + "rows": [ + " ", + "#:#:####+##::####### ", + "..A..It............# ", + ".EE..It............I ", + ".....It..JJJJ......+.", + "EE.EEIO..JJJJ...333I.", + "AA.AAIo.........3.HI.", + "EE.EEIo..iiii...H.i:.", + "AA.AAIo..iiii...H.i:.", + "IIDIIII.........3.iI.", + ".........iiii...c.gI.", + ".....I...iiii...3.gI.", + "IDIDII.........IIIII.", + "&.I.&I.........D...I.", + "q.I.qIggggghhhhI...I.", + "IIIIIIIIIIIIIIII...I.", + "q.I..nnnA.IBBBF....I.", + "&.D..AA...D........I+", + "###l....n.I........D.", + "w +...fpppIBBBBBBBBI.", + "w ###################" + ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 7, 20 ] } ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ], + "nested": { ".": { "chunks": [ [ "gunstore_looted_floor", 4 ], [ "null", 20 ] ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_ransacked_b", + "object": { + "mapgensize": [ 21, 21 ], + "rotation": [ 0, 3 ], + "rows": [ + " ", + "#:#:####+##::####### ", + "..A..It............# ", + ".EE..It............I ", + ".....It..JJJJ......+.", + "EE.EEIO..JJJJ...333I.", + "AA.AAIo.........3.HI.", + "EE.EEIo..iiii...H.i:.", + "AA.AAIo..iiii...H.i:.", + "IIDIIII.........3.iI.", + ".........iiii...c.gI.", + ".....I...iiii...3.gI.", + "IDIDII.........IIIII.", + "&.I.&I.........D...I.", + "q.I.qIggggghhhhI...I.", + "IIIIIIIIIIIIIIII...I.", + "q.I..nnnA.IBBBF....I.", + "&.D..AA...D........I+", + "###l....n.I........D.", + "w +...fpppIBBBBBBBBI.", + "w ###################" + ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 7, 20 ], "repeat": [ 1, 2 ] } ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ], + "nested": { + "g": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "h": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "H": { "chunks": [ [ "no_items_concrete_floor", 50 ], [ "null", 50 ] ] }, + "i": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 15 ] ] }, + "J": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 20 ] ] }, + "t": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 30 ] ] }, + "O": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 20 ] ] }, + "o": { "chunks": [ [ "destroyed_furniture_concrete_floor", 10 ], [ "no_items_concrete_floor", 60 ], [ "null", 35 ] ] }, + ".": { "chunks": [ [ "gunstore_looted_floor", 10 ], [ "null", 20 ] ] } + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_floor", + "object": { + "mapgensize": [ 1, 1 ], + "place_items": [ + { "item": "casings", "x": 0, "y": 0, "chance": 40 }, + { "item": "trash", "x": 0, "y": 0, "chance": 30 }, + { "item": "ammo_pistol_common", "x": 0, "y": 0, "chance": 5 }, + { "item": "ammo_rifle_common", "x": 0, "y": 0, "chance": 5 } + ], + "place_item": [ + { "item": "glass_shard", "x": 0, "y": 0, "chance": 15, "repeat": [ 1, 8 ] }, + { "item": "cardboard", "x": 0, "y": 0, "chance": 10, "repeat": [ 1, 3 ] }, + { "item": "paper", "x": 0, "y": 0, "chance": 5 } + ], + "place_fields": [ { "field": "fd_blood", "x": 0, "y": 0, "intensity": 2, "age": 10, "chance": 20 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_barricaded_safes_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + ".LL.", + ".LL.", + ".//.", + ".44." + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_unlooted" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_barricaded_handloading_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + ".``.", + ".``.", + ".``.", + ".33." + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_unlooted" ], + "place_item": [ { "item": "press", "x": 1, "y": 3 }, { "item": "press", "x": 2, "y": 3 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_safes_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + ".LL.", + ".LL.", + ".//.", + ".44." + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_handloading_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + ".``.", + ".``.", + ".``.", + ".33." + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ], + "place_item": [ { "item": "press", "x": [ 1, 2 ], "y": 3, "chance": 20 } ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_looted_storage_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "BBBB", + "B..B", + "B..F", + "II+I" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_looted" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "gunstore_unlooted_storage_a", + "object": { + "mapgensize": [ 4, 4 ], + "rotation": [ 0, 3 ], + "rows": [ + "BBBB", + "B..B", + "B..F", + "II+I" + ], + "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ], + "palettes": [ "gunstore_palette_unlooted" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "destroyed_furniture_concrete_floor", + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "a" ], + "terrain": { "a": "t_thconc_floor" }, + "flags": [ "DISMANTLE_ALL_BEFORE_PLACING_TERRAIN" ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "no_items_concrete_floor", + "object": { + "mapgensize": [ 1, 1 ], + "rows": [ "#" ], + "terrain": { "#": "t_thconc_floor" }, + "flags": [ "ERASE_ITEMS_BEFORE_PLACING_TERRAIN" ] + } + } +] diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index d872d72bb44b8..5902ce15eb33a 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -2,45 +2,64 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "s_gun" ], + "om_terrain": [ "s_gun_a" ], "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",/____________________',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,###:::########:::###',", - ",,#F?C..vvvKKK..dddLL#',", - ",,#XaC..............L#',", - ",,#F.C...............+',", - ",,#F....YYYYYY..LLLLL#,,", - ",,#|||D||||||||||||||#,,", - ",,#&q|.|lll.AnA.r|sss#,,", - ",,#r.D.D.........D.ss#,,", - ",,#|||D|||||||||||.ss#,,", - ",;#N=n==n==n==n==|.||#,,", - ",,#N=============|.D<#,,", - ",,WWWRWWRWWRWWRW=W+###,,", - ",,W==============W.www,,", - ",,W==============W....,,", - ",,W..............W,,,,,,", - ",,W..T..T..T..T..W,,,,,,", - ",,WxxxxxxxxxxxxxxW,,,,,,", - ",,WWWWWWWWWWWWWWWW,,,,,," + ",,,,,,,,,,',,,,,,,,,,,,,", + ",,,,,,,,,,',,,,,,,,,,,,,", + ",,,,,,,,,,',,,,,,,,,,,,,", + ",,,,,,,,,,'/,,,,,,,,,,,,", + ",,,0,'''''''''''''''''''", + ",,# #,'", + ",## ##'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# #,'", + ",,# ### ###'", + ",,# ....#,'", + ",,# #....(''", + ",,# #....%,,", + ",,# #....%,,", + ",#################%%%%,,", + ",,#,,,,,,,,,,,,,#,,,,,,," ], - "palettes": [ "gun_store_palette" ], - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ], - "terrain": { ";": "t_region_groundcover_urban", "/": "t_region_groundcover_urban" }, - "place_loot": [ { "group": "cash_register_random", "x": 5, "y": [ 7, 9 ] } ] + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 2 ], "chance": 2, "repeat": 2 } ], + "terrain": { + "'": "t_sidewalk", + "/": "t_region_groundcover_urban", + ",": "t_region_groundcover_urban", + "#": "t_brick_wall", + "(": "t_chaingate_c", + "%": "t_chainfence", + ".": "t_thconc_floor_no_roof" + }, + "furniture": { "/": "f_flagpole" }, + "nested": { + "0": { + "chunks": [ + [ "gunstore_barricaded_a", 15 ], + [ "gunstore_occupied_a", 5 ], + [ "gunstore_looted_a", 60 ], + [ "gunstore_ransacked_a", 20 ] + ] + } + }, + "place_item": [ { "item": "american_flag", "x": 11, "y": 3, "chance": 100 } ], + "place_loot": [ { "group": "cash_register_random", "x": 13, "y": [ 7, 9 ] } ] } }, { "type": "mapgen", "method": "json", - "om_terrain": "s_gun_roof", + "om_terrain": "s_gun_a_roof", "object": { "fill_ter": "t_flat_roof", "rows": [ @@ -49,28 +68,27 @@ " ", " ", " ", - " ", - " -------------------- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..X...............- ", - " -..................- ", - " -..................- ", - " -..................- ", - " 5..............####- ", - " -..............+_v#- ", - " -..............####- ", - " -..................- ", - " -..............----- ", - " -..............- ", - " -..............- ", - " -..............- ", - " ---------------- " + " ---------------------- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -...X................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -....................- ", + " -...............------ ", + " -...............- ", + " -...............- ", + " -...............- ", + " -...............- ", + " 5---------------- " ], - "palettes": [ "roof_palette", "parametrized_walls_palette" ], - "terrain": { "+": "t_door_metal_pickable", "_": "t_thconc_floor" }, + "palettes": [ "roof_palette" ], "place_nested": [ { "chunks": [ @@ -78,9 +96,7 @@ [ "roof_2x2_utilities_b", 15 ], [ "roof_2x2_utilities_c", 5 ], [ "roof_2x2_utilities_d", 30 ], - [ "roof_2x2_utilities", 30 ], - [ "roof_2x2_golf", 10 ], - [ "roof_3x3_wine", 10 ] + [ "roof_2x2_utilities", 30 ] ], "x": [ 4, 15 ], "y": [ 8, 9 ] @@ -89,10 +105,8 @@ "chunks": [ [ "null", 20 ], [ "roof_4x4_party", 5 ], - [ "roof_4x4_holdout", 15 ], [ "roof_4x4_utility", 40 ], [ "roof_4x4_utility_1", 10 ], - [ "roof_6x6_survivor", 20 ], [ "roof_6x6_utility", 20 ] ], "x": [ 4, 10 ], @@ -104,174 +118,98 @@ { "type": "mapgen", "method": "json", - "om_terrain": "s_gun_upper_roof", - "object": { - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ---- ", - " -..- ", - " ---- ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "roof_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gun_looted" ], - "//": "Looted version of s_gun. Uses same roof as s_gun.", + "om_terrain": [ [ "s_gun_b_store", "s_gun_b_range" ] ], "object": { "fill_ter": "t_thconc_floor", "rows": [ - ",/____________________',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,*___*___*___*___*___',", - ",,###:::########:::###',", - ",,#M?C``mmmmmm``pppmm#',", - ",,#eaC``````````````m#',", - ",,#M`C```````````````+',", - ",,#M````mmmmmm``mmmmm#,,", - ",,#|||D||||||||||||||#,,", - ",,#&q|`|MMM`AnA`r|SSS#,,", - ",,#r`D`D`````````D`SS#,,", - ",,#|||D|||||||||||`SS#,,", - ",;#M=n==n==n==n==|`||#,,", - ",,#M=============|`D<#,,", - ",,WWWCWWCWWCWWCW=W+###,,", - ",,W==============W.www,,", - ",,W==============W....,,", - ",,W..............W,,,,,,", - ",,W..T..T..T..T..W,,,,,,", - ",,WxxxxxxxxxxxxxxW,,,,,,", - ",,WWWWWWWWWWWWWWWW,,,,,," + ",,,,,,',,,,,,,,,,,,,,',,,,,,,,,,,,,,,,,,,,,,,,,,", + ",,,,,,',,,,,,,,,,,,,/',,,,,,,,,,,,,,,,,,,,,,,,,,", + ",,,0'''''''''''''''''',,,,,,,,,,,,,,,,,,,,,,,,,,", + ",,# #,,,,,,,,,,,,,,,,,,,,,,,,,", + ",,# ########################,,", + ",,# MMMMMMMMMMMMMMMMMMMMMM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# ==3= TUM#,,", + ",,# ==I= UM#,,", + ",,# r==3= TUM#,,", + ",,# M==I= UM#,,", + ",,# MNNI= TUM#,,", + ",,%'' MMMMMMMMMMMMMMMMMMMMM#,,", + ",,%''#########################################,,", + ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,," ], - "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_region_groundcover_urban", "w": "t_pavement", "/": "t_region_groundcover_urban" }, + "palettes": [ "gunstore_palette_unlooted" ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 1 ], "chance": 2, "repeat": 2 } ], "nested": { - "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, - "m": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, - "M": { "chunks": [ [ "destroyed_furniture", 50 ], [ "null", 80 ] ] }, - "C": { "chunks": [ [ "destroyed_furniture", 85 ], [ "null", 90 ] ] }, - "V": { "chunks": [ [ "destroyed_furniture", 75 ], [ "null", 80 ] ] }, - "A": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "E": { "chunks": [ [ "destroyed_furniture", 45 ], [ "null", 90 ] ] }, - "a": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "^": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "n": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "p": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "S": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "?": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "T": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "&": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "q": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "r": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, - "D": { "chunks": [ [ "damaged_door_nested", 50 ], [ "destroyed_door_nested", 100 ], [ "null", 75 ] ] }, - ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 100 ], [ "null", 95 ] ] }, - "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, - "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } + "0": { + "chunks": [ + [ "gunstore_occupied_b", 5 ], + [ "gunstore_barricaded_b", 15 ], + [ "gunstore_looted_b", 60 ], + [ "gunstore_ransacked_b", 20 ] + ] + } }, - "place_loot": [ { "group": "cash_register_random_ransacked", "x": 5, "y": [ 7, 9 ] } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gun_1" ], - "//": "Home defense gun store", - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",'''''''''''''''''''''',", - ",'@@@@@@@/'''''@@@@@@@',", - ",'##:::##''''''##:::##',", - ",'#^...?:'''''':?...^#',", - ",'#..a..:'''''':..a..#',", - ",'#.nnn.:'''''':.nnn.#',", - ",'#.....#::++::#.....#',", - ",'#..................#',", - ",'#..................#',", - ",'#....KKK....YYY....#',", - ",'#....vvv....YYY....#',", - "''#^................^#',", - "'##....LLL....LLL....#',", - "'$#....LLL....LLL....#',", - "'##..................#',", - "''#..................#',", - ",'#|D|D|ZZ||||ZZ||D||#',", - ",'#&.|.|FFFFFFFF|..aE#',", - ",'#..|.D........D..aE#',", - ",'#qr|<|FFFFFFFF|ll.r#;,", - ",'#################+##',", - ",'''''''''''''''''''''',", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,," - ], - "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_sidewalk" }, + "terrain": { + "0": "t_sidewalk", + "'": "t_sidewalk", + "/": "t_region_groundcover_urban", + ",": "t_region_groundcover_urban", + "#": "t_brick_wall", + "(": "t_chaingate_c", + "%": "t_chainfence", + ".": "t_thconc_floor_no_roof" + }, + "furniture": { "/": "f_flagpole" }, + "place_item": [ { "item": "american_flag", "x": 20, "y": 1 }, { "item": "broom", "x": 26, "y": 19 } ], "place_loot": [ - { "group": "cash_register_random", "x": [ 4, 6 ], "y": 5 }, - { "group": "cash_register_random", "x": [ 17, 19 ], "y": 5 } + { "group": "cash_register_random", "x": [ 19 ], "y": 13 }, + { "group": "cash_register_random", "x": [ 19, 21 ], "y": 7 } ] } }, { "type": "mapgen", "method": "json", - "om_terrain": "s_gun_roof_1", + "om_terrain": [ [ "s_gun_b_roof", "s_gun_b_range_roof" ] ], "object": { "fill_ter": "t_flat_roof", "rows": [ - " ", - " ", - " ------- ------- ", - " -.....- -.....- ", - " -.....- -.....- ", - " -.....- -.....- ", - " -.....--------.....- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -..................- ", - " -.####.............- ", - " -.+_v#.............- ", - " -.####.............5 ", - " -------------------- ", - " ", - " ", - " " + " ", + " ", + " ", + " --------------------- ", + " -...................------------------------ ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -..........................................- ", + " -------------------------------------------- ", + " " ], - "palettes": [ "roof_palette", "parametrized_walls_palette" ], - "terrain": { "+": "t_door_metal_pickable", "_": "t_thconc_floor" }, + "palettes": [ "roof_palette" ], "place_nested": [ { "chunks": [ @@ -282,261 +220,20 @@ [ "roof_2x2_utilities", 30 ] ], "x": [ 4, 15 ], - "y": [ 7, 8 ] + "y": [ 8, 9 ] }, { "chunks": [ [ "null", 20 ], [ "roof_4x4_party", 5 ], - [ "roof_4x4_holdout", 15 ], [ "roof_4x4_utility", 40 ], [ "roof_4x4_utility_1", 10 ], - [ "roof_6x6_survivor", 20 ], [ "roof_6x6_utility", 20 ] ], - "x": [ 4, 13 ], - "y": 12 - } - ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": "s_gun_upper_roof_1", - "object": { - "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ---- ", - " -..- ", - " ---- ", - " ", - " ", - " ", - " " - ], - "palettes": [ "roof_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gun_2" ], - "//": "Public holdout based on Home Defense Gunstore. Uses same roof as s_gunstore_1.", - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",'''''''''''''''''''''',", - ",'@@,,@@@/'''''@@@@@@@',", - ",'##:::##''''''##:::##',", - ",'#MMMM`:'''''':MMMM^#',", - ",'#MaaM`:'''''':M``r`#',", - ",'#`EM``:'''''':C````#',", - ",'#`````#::++::#C````#',", - ",'#`r````aCMMCa``````#',", - ",'#``````````````````#',", - ",'#```````````M``````#',", - ",'#````M`````````````#',", - "''#^````````````````^#',", - "'##```````mmmm```````#',", - "'$#``````mm``mm``````#',", - "'##`````mm```````````#',", - "''#````mm``M`M`mmM`M`#',", - ",'#|D|D|ZZ||||ZZ||D||#',", - ",'#&`|`|````M```|M`C`#',", - ",'#^`|`D``r`````D`A`V#',", - ",'#qr|<|m``M``M`|`MEA#',", - ",'#################+##',", - ",'''''''''''''''''''''',", - ",,,,,,,,,,,,,,,,,,,,,,,,", - ",,,,,,,,,,,,,,,,,,,,,,,," - ], - "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_sidewalk" }, - "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true } }, - "nested": { - "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, - "m": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, - "$": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, - "M": { "chunks": [ [ "destroyed_furniture", 50 ], [ "null", 80 ] ] }, - "C": { "chunks": [ [ "destroyed_furniture", 85 ], [ "null", 90 ] ] }, - "V": { "chunks": [ [ "destroyed_furniture", 75 ], [ "null", 80 ] ] }, - "A": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "E": { "chunks": [ [ "destroyed_furniture", 45 ], [ "null", 90 ] ] }, - "a": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "?": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "^": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "&": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "q": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "r": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "D": { "chunks": [ [ "damaged_door_nested", 50 ], [ "destroyed_door_nested", 100 ], [ "null", 75 ] ] }, - ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 25 ], [ "null", 75 ] ] }, - "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, - "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - }, - "place_monster": [ { "monster": "mon_zombie_cop", "x": 18, "y": 14 } ] - } - }, - { - "method": "json", - "om_terrain": "s_gun_3", - "type": "mapgen", - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,/,,,,,,,,,,'',,,,,,,,,", - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,,,,##::##:#++#:####,,,", - ",,,,,#Xr?Cvv^....LLL#,,,", - ",,,,,#F..d.........L#,,,", - ",,,,,#F.aC..YY.KK..L#,,,", - ",,,,;#F.....YY.KK..L#,,,", - ",,####||||||||D|||||#,,,", - ",,#r.AnA..D.....D..A#,,,", - ",,#l.....s|.||D||.E?#,,,", - ",,#l.sssss|.|&rq|O.A#,,,", - ",,#||||||||D||||||||#,,,", - ",,#N==n===n==n===n=N#,,,", - ",,#=================#,,,", - ",,W.WWRWWWWRWWWWRWW.W,,,", - ",,W=================W,,,", - ",,W=================W,,,", - ",,W.................W,,,", - ",,W.................W,,,", - ",,W...T....T....T...W,,,", - ",,WxxxxxxxxxxxxxxxxxW,,,", - ",,WWWWWWWWWWWWWWWWWWW,,," - ], - "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_region_groundcover_urban", "/": "t_region_groundcover_urban" }, - "place_loot": [ { "group": "cash_register_random", "x": 9, "y": 7 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": "s_gun_roof_3", - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ", - " ", - " ", - " ", - " ---------------- ", - " -..............- ", - " -..............- ", - " -..............- ", - " -..............- ", - " ---5..............- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " -.................- ", - " ------------------- " - ], - "palettes": [ "roof_palette" ], - "place_nested": [ - { - "chunks": [ - [ "null", 20 ], - [ "roof_2x2_utilities_b", 15 ], - [ "roof_2x2_utilities_c", 5 ], - [ "roof_2x2_utilities_d", 40 ], - [ "roof_2x2_utilities", 50 ] - ], - "x": [ 7, 17 ], - "y": [ 6, 10 ] + "x": [ 24, 40 ], + "y": [ 12, 16 ] } ] } - }, - { - "method": "json", - "om_terrain": "s_gun_3_looted", - "type": "mapgen", - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,/,,,,,,,,,,'',,,,,,,,,", - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,,,,,,,,,,,,'',,,,,,,,,", - ",,,,,##::##:#++#:####,,,", - ",,,,,#er?Cmm^````mmm#,,,", - ",,,,,#M``p`````````m#,,,", - ",,,,,#M`aC``mm`mm``m#,,,", - ",,,,;#M`````mm`mm``m#,,,", - ",,####||||||||D|||||#,,,", - ",,#r.AnA``D`````D``A#,,,", - ",,#M`````S|`||D||`E?#,,,", - ",,#M`SSSSS|`|&rq|e`A#,,,", - ",,#||||||||D||||||||#,,,", - ",,#N==n===n==n===n=N#,,,", - ",,#=================#,,,", - ",,W=WWCWWWWCWWWWCWW=W,,,", - ",,W=================W,,,", - ",,W=================W,,,", - ",,W.................W,,,", - ",,W.................W,,,", - ",,W...T....T....T...W,,,", - ",,WxxxxxxxxxxxxxxxxxW,,,", - ",,WWWWWWWWWWWWWWWWWWW,,," - ], - "palettes": [ "gun_store_palette" ], - "terrain": { ";": "t_region_groundcover_urban", "/": "t_region_groundcover_urban" }, - "nested": { - "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, - "m": { "chunks": [ [ "destroyed_furniture", 40 ], [ "null", 80 ] ] }, - "M": { "chunks": [ [ "destroyed_furniture", 50 ], [ "null", 80 ] ] }, - "C": { "chunks": [ [ "destroyed_furniture", 85 ], [ "null", 90 ] ] }, - "V": { "chunks": [ [ "destroyed_furniture", 75 ], [ "null", 80 ] ] }, - "A": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "E": { "chunks": [ [ "destroyed_furniture", 45 ], [ "null", 90 ] ] }, - "a": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "^": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "n": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "p": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "S": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "?": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "T": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "&": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "q": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, - "r": { "chunks": [ [ "destroyed_furniture", 10 ], [ "null", 90 ] ] }, - "D": { "chunks": [ [ "damaged_door_nested", 50 ], [ "destroyed_door_nested", 100 ], [ "null", 75 ] ] }, - ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 25 ], [ "null", 75 ] ] }, - "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, - "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 75 ] ] }, - "`": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - }, - "place_loot": [ { "group": "cash_register_random_ransacked", "x": 9, "y": 7 } ] - } } ] diff --git a/data/json/mapgen/store/s_gunstore.json b/data/json/mapgen/store/s_gunstore.json deleted file mode 100644 index 770262a90ce20..0000000000000 --- a/data/json/mapgen/store/s_gunstore.json +++ /dev/null @@ -1,243 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gunstore" ], - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",###::##::##::###'''''/,", - ";# #'''''',", - ",# +'''''',", - ",# ## # KKvv####::###", - ",# LL L YYYY#N N#", - ",# LL L D :", - ",# LL L # n n n #", - ",# LL # CC C#-W-W-W-#", - ",# LL L d FWRWRWRWDW", - ",# LL L 3a FW======.W", - ",# LL L d FW======.W", - ",# ## # 3a FW.......W", - ",# dr XW.......W", - ",#|D||D||||||D|W.......W", - ",#r |l |<|EEO rW.......W", - ",#^ |l |D|EA EWT.T.T..W", - ",#q&| |?A AEWxxxxxxxW", - ",#||| |||D||WWWWWWWWW", - ",#ss %#.''''ww'", - ",#ss !.'''''''", - ",#s !.'''''''", - ",#ss !.'''''''", - ",#sss !.'''''''", - ",###############.'''''''" - ], - "palettes": [ "gun_store_palette" ], - "terrain": { - "%": "t_gates_mech_control", - "!": "t_door_metal_locked", - "w": "t_sidewalk", - "R": "t_thconc_y", - "-": "t_thconc_y", - "v": "t_thconc_y", - "K": "t_thconc_y", - "Y": "t_thconc_y", - "L": "t_thconc_r", - "=": "t_thconc_warning", - "T": "t_thconc_warning", - ".": "t_thconc_warning", - "x": "t_thconc_warning" - }, - "place_nested": [ { "chunks": [ [ "null", 100 ], [ "npc_survivor_gunstore", 35 ] ], "x": 0, "y": 0 } ], - "items": { - "=": { "item": "casings", "chance": 50 }, - "-": { "item": "casings", "chance": 50 }, - "3": { "item": "cash_register_random" } - } - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gunstore_2ndfloor" ], - "object": { - "fill_ter": "t_floor", - "rows": [ - "`###Ю#####Ю##Ю###```````", - "`#@@ y|D @@#```````", - "^#@@ I|d @@#```````", - "`Ю hI| #-------", - "`# D|b h R#......-", - "`#db y|y E II T#......-", - "`#|||+|||+||||||#......-", - "`#T |66__F#......-", - "`Юy HHAA _____1#......-", - "`#x Hff _____5Ю......-", - "`Юx H A |____2#......-", - "`# |Y74O3#......-", - "`#|+||E ||||||#......-", - "`#__S|RRL + A #......-", - "`ЮB_8||||(|NNq y#^.....-", - "`#B__+t|> #######......-", - "`########(#}g.{........-", - "`-.........{..}---------", - "`-.).......}}}}-````````", - "`-.............-````````", - "`-.............-````````", - "`-....u........-````````", - "`-.............-````````", - "`---------------````````" - ], - "palettes": [ "parametrized_linoleum_palette", "standard_domestic_palette" ], - "terrain": { - "Ю": "t_window_bars_alarm", - "(": "t_door_metal_pickable", - "-": "t_gutter", - ".": "t_flat_roof", - ")": "t_flat_roof", - "u": "t_flat_roof", - ":": "t_flat_roof", - "g": "t_flat_roof", - "`": "t_open_air", - "_": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "Y": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "1": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "2": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "3": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "4": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "5": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "6": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "7": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "8": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "O": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "F": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "B": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "S": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "t": { "param": "linoleum_color", "fallback": "t_linoleum_white" }, - "{": "t_chaingate_c", - "}": "t_chainfence" - }, - "furniture": { ":": [ "f_indoor_plant", "f_indoor_plant_y" ], ";": "f_gunsafe_ml", ")": "f_TV_antenna" }, - "place_loot": [ { "item": "television", "x": 2, "y": 9 }, { "item": "stereo", "x": 2, "y": 10, "chance": 100 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gunstore_roof" ], - "object": { - "fill_ter": "t_flat_roof", - "rows": [ - " ---------------- ", - " 5..............- ", - " -..............- ", - " -..............- ", - " -...A..........- ", - " -..............- ", - " -..............- ", - " -X..........A.&- ", - " -..............- ", - " -..............- ", - " -..............- ", - " -..............- ", - " -..............- ", - " -.=............- ", - " -..............5 ", - " -........------- ", - " ---------- ", - " ", - " ", - " ", - " ", - " ", - " ", - " " - ], - "palettes": [ "roof_palette" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "s_gunstore_looted" ], - "object": { - "fill_ter": "t_thconc_floor", - "rows": [ - ",###::##::##::###'''''/,", - ";# #'''''',", - ",# +'''''',", - ",# ## # mmmm####::###", - ",# mm m mmmm#M M#", - ",# mm m D :", - ",# mm m # n n n #", - ",# mm # CC C#-W-W-W-#", - ",# mm m d MWRWRWRWDW", - ",# mm m Ca MW======.W", - ",# mm m d MW======.W", - ",# ## # Ca MW.......W", - ",# dr XW.......W", - ",#|D||D||||||D|W.......W", - ",#r |M |<|EEe rW.......W", - ",#^ |M |D|EA EWT.T.T..W", - ",#q&| |?A AEWxxxxxxxW", - ",#||| |||D||WWWWWWWWW", - ";#SS %#.''''ww'", - ",#SS S !.'''''''", - ",#S S !.'''''''", - ",#SS SS !.'''''''", - ",#SSS !.'''''''", - ",###############.'''''''" - ], - "palettes": [ "gun_store_palette" ], - "terrain": { - "%": "t_gates_mech_control", - "!": "t_door_metal_locked", - "w": "t_sidewalk", - "R": "t_thconc_y", - "-": "t_thconc_y", - "v": "t_thconc_y", - "K": "t_thconc_y", - "Y": "t_thconc_y", - "L": "t_thconc_r", - "=": "t_thconc_warning", - "T": "t_thconc_warning", - ".": "t_thconc_warning", - "x": "t_thconc_warning" - }, - "nested": { - "#": { "chunks": [ [ "general_graffiti", 15 ], [ "null", 75 ] ] }, - "m": { "chunks": [ [ "destroyed_furniture_gunstore", 40 ], [ "null", 80 ] ] }, - "$": { "chunks": [ [ "destroyed_furniture_gunstore", 40 ], [ "null", 80 ] ] }, - "M": { "chunks": [ [ "destroyed_furniture_gunstore", 50 ], [ "null", 80 ] ] }, - "C": { "chunks": [ [ "destroyed_furniture_gunstore", 85 ], [ "null", 90 ] ] }, - "A": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "E": { "chunks": [ [ "destroyed_furniture_gunstore", 45 ], [ "null", 90 ] ] }, - "a": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "^": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "n": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "p": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "S": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "?": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "T": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "&": { "chunks": [ [ "destroyed_furniture_gunstore", 10 ], [ "null", 90 ] ] }, - "q": { "chunks": [ [ "destroyed_furniture_gunstore", 20 ], [ "null", 80 ] ] }, - "r": { "chunks": [ [ "destroyed_furniture_gunstore", 10 ], [ "null", 90 ] ] }, - "D": { "chunks": [ [ "damaged_door_nested", 50 ], [ "destroyed_door_nested", 100 ], [ "null", 100 ] ] }, - ":": { "chunks": [ [ "damaged_window_bars_nested", 75 ], [ "destroyed_window_bars_nested", 25 ], [ "null", 100 ] ] }, - "e": { "chunks": [ [ "looted_gunsafe_nested", 25 ], [ "jammed_gunsafe_nested", 75 ], [ "null", 95 ] ] }, - "+": { "chunks": [ [ "destroyed_metal_door_nested", 90 ], [ "null", 100 ] ] }, - " ": { "chunks": [ [ "corpse_blood_casings_1x1", 4 ], [ "null", 20 ] ] } - }, - "items": { "3": { "item": "cash_register_ransacked" } } - } - }, - { - "type": "mapgen", - "method": "json", - "nested_mapgen_id": "npc_survivor_gunstore", - "object": { - "faction_owner": [ { "id": "no_faction", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], - "mapgensize": [ 23, 23 ], - "place_npcs": [ { "class": "NPC_gun_store_survivor", "x": 13, "y": [ 10, 12 ] } ] - } - } -] diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json index 1f3ac7c07a198..aabc74ecba677 100644 --- a/data/json/mapgen_palettes/gunstore.json +++ b/data/json/mapgen_palettes/gunstore.json @@ -1,154 +1,285 @@ [ { "type": "palette", - "id": "gun_store_palette", - "//": " P, U, S, h, F, e, |, o, k, z, c, and > are all still available for more terrain or furniture", - "palettes": [ "parametrized_walls_palette" ], + "id": "gunstore_palette_unlooted", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_wall_w", 1 ], [ "t_wall_gray", 1 ], [ "t_wall_black", 1 ] ] } + } + }, "toilets": { "&": { } }, "terrain": { - "q": "t_thconc_floor", - "&": "t_thconc_floor", - ":": "t_window_bars_alarm", - "+": [ [ "t_door_metal_pickable", 90 ], [ "t_door_metal_o", 5 ], [ "t_door_metal_c", 15 ] ], - "D": [ [ "t_door_o", 40 ], [ "t_door_c", 40 ], [ "t_door_locked_interior", 20 ] ], - ",": [ [ "t_region_groundcover_urban", 100 ], [ "t_region_shrub", 10 ] ], - "@": "t_region_shrub_decorative", - "u": "t_region_shrub", - "B": "t_region_groundcover_barren", + "C": "t_sidewalk", + "D": "t_door_c", + "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" }, + "j": "t_carpet_concrete_red", + "M": "t_concrete_wall", + "P": "t_door_metal_o", + "u": "t_thconc_floor", + "x": "t_thconc_floor_no_roof", + "Z": "t_bars", + "#": "t_brick_wall", + ":": "t_window_bars_curtains", + "+": "t_door_metal_pickable", + ",": "t_region_groundcover_urban", "'": "t_sidewalk", - "/": "t_sidewalk", - "C": "t_thconc_floor", - "`": "t_thconc_floor", ".": "t_thconc_floor", - "a": "t_thconc_floor", - "?": "t_thconc_floor", - "l": "t_thconc_floor", - "E": "t_thconc_floor", - "d": "t_thconc_floor", - "^": "t_thconc_floor", - "Q": "t_thconc_floor", - "x": "t_thconc_floor", - "X": "t_thconc_floor", - "A": "t_thconc_floor", - "r": "t_thconc_floor", - "R": "t_thconc_floor", - "m": "t_thconc_floor", - "M": "t_thconc_floor", - "T": "t_thconc_floor", - "N": "t_thconc_floor", - "n": "t_thconc_floor", - "K": "t_thconc_floor", - "G": "t_thconc_floor", - "g": "t_thconc_floor", - "f": "t_thconc_floor", - "L": "t_thconc_floor", - "y": "t_thconc_floor", - "Y": "t_thconc_floor", - "v": "t_thconc_floor", - "=": "t_thconc_floor", - "_": "t_pavement", - "*": "t_pavement_y", - "<": "t_stairs_up", ";": "t_gutter_downspout", - "W": "t_strconc_wall", - "Z": "t_bars" + "(": "t_chaingate_c", + "%": "t_chainfence" }, "furniture": { - "$": "f_atm_off", - "C": "f_counter", - "R": "f_counter", - "3": "f_counter", - "a": "f_stool", - "?": "f_console_broken", - "d": [ [ "f_displaycase", 65 ], [ "f_displaycase_o", 35 ] ], - "p": "f_displaycase_b", - "n": "f_table", + "A": "f_chair", + "B": "f_utility_shelf", + "C": "f_sandbag_half", + "c": "f_counter_gate_c", + "d": "f_displaycase_o", "E": "f_desk", - "^": "f_indoor_plant", - "l": "f_locker", + "e": "f_gunsafe_o", + "F": "f_utility_shelf", + "f": "f_fridge", + "G": "f_rack", + "g": "f_displaycase", + "H": "f_displaycase", + "h": "f_displaycase", + "i": "f_rack", + "J": "f_rack", + "K": "f_rack", + "k": "f_displaycase", + "L": "f_gunsafe_c", + "l": "f_rack_coat", "N": "f_locker", - "M": "f_locker", - "m": "f_rack", - "Y": "f_rack", - "y": "f_rack", - "F": "f_locker", + "n": "f_table", + "O": "f_rack", + "o": "f_rack", + "p": "f_sofa", "Q": "f_rack", - "K": "f_rack", - "L": [ [ "f_rack_l", 65 ], [ "f_rack", 35 ] ], - "G": "f_rack", - "v": "f_rack", "q": "f_sink", + "R": "f_counter", "r": "f_trashcan", - "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], "S": "f_crate_o", - "A": "f_chair", + "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], "T": "f_target", + "t": "f_rack", + "v": "f_rack", "w": "f_dumpster", - "X": [ [ "f_gunsafe_ml", 90 ], [ "f_gunsafe_o", 10 ] ], - "e": "f_gunsafe_o", - "O": [ [ "f_gunsafe_ml", 90 ], [ "f_gunsafe_o", 10 ] ], - "x": "f_sandbag_wall", - "g": "f_sofa", - "f": "f_fridge", - "/": "f_flagpole" + "x": "f_sandbag_half", + "Y": "f_rack", + "y": "f_rack", + "3": "f_counter", + "4": "f_foot_locker_aluminum", + "$": [ [ "f_atm_off", 5 ], [ "f_null", 95 ] ], + "?": "f_console_broken", + "^": "f_indoor_plant", + "!": "f_cardboard_box", + "/": "f_locker", + "|": "f_locker", + "`": "f_rack" }, - "item": { "/": { "item": "american_flag" } }, + "item": { "F": { "item": "gun_lock", "repeat": [ 5, 20 ] }, "U": { "item": "shredded_rubber", "repeat": [ 200, 500 ] } }, "items": { - "X": { "item": "SUS_gunstore_safe", "chance": 50, "repeat": [ 10, 20 ] }, - "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 ] }, - "m": { "item": "SUS_gunstore_looted_storage", "chance": 20, "repeat": [ 1, 2 ] }, - "M": { "item": "SUS_gunstore_looted_storage", "chance": 20, "repeat": [ 1, 2 ] }, - "d": { "item": "SUS_gunstore_displaycase", "chance": 95 }, - "p": { "item": "SUS_gunstore_displaycase", "chance": 55 }, + "B": { "item": "guns_common_boxed", "repeat": [ 3, 12 ] }, + "E": { "item": "office_mess", "repeat": 3, "chance": 20 }, + "f": { "item": "fridgesnacks", "repeat": 10, "chance": 35 }, + "g": { "item": "guns_rifle_common_display", "repeat": [ 1, 5 ] }, + "H": { "item": "guns_pistol_common_display", "repeat": [ 1, 5 ] }, + "h": { "item": "guns_shotgun_common_display", "repeat": [ 1, 5 ] }, + "i": { + "item": { + "entries": [ + { "group": "ammo_pistol_common", "prob": 100 }, + { "group": "ammo_pistol_rare", "prob": 20 }, + { "group": "ammo_rifle_common", "prob": 100 }, + { "group": "ammo_rifle_rare", "prob": 20 }, + { "group": "ammo_shotgun_common", "prob": 10 } + ] + }, + "repeat": [ 4, 10 ] + }, + "J": { "item": "mags_common_restricted_packaged", "repeat": [ 8, 20 ] }, "K": { "item": { - "//": "gun books kept on racks in the FoH", "subtype": "collection", - "entries": [ { "group": "book_gunref", "prob": 5 }, { "group": "book_gunmags", "prob": 80 } ] + "entries": [ { "group": "book_gunref", "prob": 50 }, { "group": "book_gunmags", "prob": 80 } ] }, - "repeat": 3, + "repeat": 12, "chance": 75 }, - "F": { + "l": { "item": "unisex_coat_rack", "repeat": 4, "chance": 75 }, + "N": { "item": "ear_protection", "repeat": [ 2, 8 ] }, + "n": { "item": { - "//": "civilian magazines kept on racks behind the counter in the FoH", - "subtype": "collection", - "entries": [ { "group": "mags_common", "prob": 70 }, { "group": "mags_common", "prob": 30 } ] + "subtype": "distribution", + "//": "moderate chance of snacks and mags on tables", + "entries": [ + { "group": "vending_food_items", "prob": 40 }, + { "group": "vending_drink_items", "prob": 40 }, + { "group": "book_gunmags", "prob": 10 } + ] }, - "repeat": 15, - "chance": 65 + "chance": 30 }, - "Y": { "item": "SUS_gunstore_gear", "chance": 90, "repeat": [ 1, 4 ] }, + "O": { "item": "SUS_gunstore_optics_packaged", "repeat": [ 8, 16 ] }, + "o": { "item": "SUS_gunstore_hearing", "repeat": [ 12, 20 ] }, + "Q": { "item": "ammo_casings_gunsmith_bulk", "repeat": 15, "chance": 35 }, + "r": { "item": "trash", "repeat": 5, "chance": 45 }, + "s": { "item": "SUS_gunstore_crate", "chance": 80, "repeat": [ 1, 3 ] }, + "S": { "item": "SUS_gunstore_crate", "chance": 50, "repeat": [ 1, 3 ] }, + "t": { "item": "SUS_gunstore_carry_gear", "repeat": [ 12, 15 ] }, "v": { "item": { - "//": "gun mods kept on racks in the FoH", "subtype": "collection", "entries": [ { "group": "gunmod_common", "prob": 70 }, { "group": "gunmod_rare", "prob": 30 } ] }, "repeat": [ 3, 6 ], "chance": 60 }, - "l": { + "w": { "item": "trash", "repeat": 30, "chance": 45 }, + "Y": { "item": "SUS_gunstore_gear", "chance": 90, "repeat": [ 1, 4 ] }, + "=": { "item": "casings", "repeat": 100, "chance": 10 }, + "`": { "item": "ammo_casings_gunsmith_bulk", "repeat": [ 12, 15 ] } + } + }, + { + "type": "palette", + "id": "gunstore_palette_looted", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_wall_w", 1 ], [ "t_wall_gray", 1 ], [ "t_wall_black", 1 ] ] } + } + }, + "toilets": { "&": { } }, + "terrain": { + "C": "t_sidewalk", + "D": "t_door_c", + "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" }, + "j": "t_carpet_concrete_red", + "W": "t_strconc_wall", + "x": "t_thconc_floor_no_roof", + "Z": "t_bars", + "#": "t_brick_wall", + ":": "t_window_bars_domestic", + "+": [ [ "t_door_metal_o", 60 ], [ "t_door_metal_c", 40 ] ], + ",": "t_region_groundcover_urban", + "'": "t_sidewalk", + ".": "t_thconc_floor", + ";": "t_gutter_downspout", + "(": "t_chaingate_c", + "%": "t_chainfence" + }, + "furniture": { + "A": "f_chair", + "B": "f_utility_shelf", + "C": "f_sandbag_half", + "c": "f_counter_gate_c", + "d": "f_displaycase_o", + "E": "f_desk", + "e": "f_gunsafe_o", + "F": "f_utility_shelf", + "f": "f_fridge", + "G": "f_rack", + "g": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "H": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "h": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "i": "f_rack", + "J": "f_rack", + "K": "f_rack", + "k": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "L": [ [ "f_gunsafe_o", 40 ], [ "f_gunsafe_c", 50 ], [ "f_gunsafe_mj", 10 ] ], + "l": "f_rack_coat", + "M": "f_locker", + "m": "f_rack", + "N": "f_locker", + "n": "f_table", + "O": "f_rack", + "o": "f_rack", + "p": "f_sofa", + "Q": "f_rack", + "q": "f_sink", + "R": "f_counter", + "r": "f_trashcan", + "S": "f_crate_o", + "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], + "T": "f_target", + "t": "f_rack", + "v": "f_rack", + "w": "f_dumpster", + "x": "f_sandbag_half", + "Y": "f_rack", + "y": "f_rack", + "3": "f_counter", + "4": "f_foot_locker_aluminum", + "$": [ [ "f_atm_off", 5 ], [ "f_null", 95 ] ], + "?": "f_console_broken", + "^": "f_indoor_plant", + "!": "f_cardboard_box", + "/": "f_locker", + "|": "f_locker", + "`": "f_rack" + }, + "item": { "F": { "item": "gun_lock", "repeat": [ 5, 20 ] } }, + "items": { + "B": { "item": "guns_common_boxed", "chance": 15 }, + "E": { "item": "office_mess", "repeat": 3, "chance": 20 }, + "g": { "item": "guns_rifle_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "H": { "item": "guns_pistol_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "h": { "item": "guns_shotgun_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "i": { + "item": { + "entries": [ + { "group": "ammo_pistol_common", "prob": 100 }, + { "group": "ammo_pistol_rare", "prob": 20 }, + { "group": "ammo_rifle_common", "prob": 100 }, + { "group": "ammo_rifle_rare", "prob": 20 }, + { "group": "ammo_shotgun_common", "prob": 10 } + ] + }, + "repeat": [ 0, 3 ], + "chance": 40 + }, + "J": { "item": "mags_common_restricted_packaged", "repeat": [ 3, 6 ], "chance": 50 }, + "K": { "item": { - "//": "workers items that were placed in lockers before the CATA, kept in the BoH", "subtype": "collection", - "entries": [ { "group": "unisex_coat_rack" } ] + "entries": [ { "group": "book_gunref", "prob": 50 }, { "group": "book_gunmags", "prob": 80 } ] }, - "repeat": 2, - "chance": 75 + "repeat": 4, + "chance": 40 }, - "N": { + "l": { "item": "unisex_coat_rack", "repeat": 4, "chance": 75 }, + "N": { "item": "ear_protection", "repeat": [ 2, 8 ] }, + "n": { "item": { - "//": "ear protection kept in the proximity of store gun ranges", + "subtype": "distribution", + "//": "moderate chance of snacks and mags on tables", + "entries": [ + { "group": "vending_food_items", "prob": 40 }, + { "group": "vending_drink_items", "prob": 40 }, + { "group": "book_gunmags", "prob": 10 } + ] + }, + "chance": 30 + }, + "O": { "item": "SUS_gunstore_optics_packaged", "repeat": [ 3, 5 ], "chance": 60 }, + "o": { "item": "SUS_gunstore_hearing", "repeat": [ 10, 16 ] }, + "Q": { "item": "ammo_casings_gunsmith_bulk", "repeat": 15, "chance": 35 }, + "r": { "item": "trash", "repeat": 5, "chance": 45 }, + "s": { "item": "SUS_gunstore_crate", "chance": 80, "repeat": [ 1, 3 ] }, + "S": { "item": "SUS_gunstore_crate", "chance": 50, "repeat": [ 1, 3 ] }, + "t": { "item": "SUS_gunstore_carry_gear", "repeat": [ 5, 7 ], "chance": 60 }, + "v": { + "item": { + "//": "gun mods kept on racks in the FoH", "subtype": "collection", - "entries": [ { "group": "ear_protection", "prob": 30 } ] + "entries": [ { "group": "gunmod_common", "prob": 70 }, { "group": "gunmod_rare", "prob": 30 } ] }, - "repeat": 8, - "chance": 75 + "repeat": [ 3, 6 ], + "chance": 60 }, + "w": { "item": "trash", "repeat": 30, "chance": 45 }, + "Y": { "item": "SUS_gunstore_gear", "chance": 60, "repeat": [ 1, 4 ] }, "y": { "item": { "//": "gunsmithing tools kept on racks", @@ -158,87 +289,161 @@ "repeat": 5, "chance": 50 }, - "L": { + "=": { "item": "casings", "repeat": 100, "chance": 10 }, + "`": { "item": "ammo_casings_gunsmith_bulk", "repeat": [ 6, 8 ] } + } + }, + { + "type": "palette", + "id": "gunstore_palette_occupied", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_wall_w", 1 ], [ "t_wall_gray", 1 ], [ "t_wall_black", 1 ] ] } + } + }, + "toilets": { "&": { } }, + "terrain": { + "C": "t_sidewalk", + "D": "t_door_c", + "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" }, + "j": "t_carpet_concrete_red", + "P": "t_door_metal_o", + "U": "t_thconc_floor", + "W": "t_strconc_wall", + "x": "t_thconc_floor_no_roof", + "Z": "t_bars", + "#": "t_brick_wall", + ":": "t_window_bars_curtains", + "+": "t_door_metal_interior_locked", + ",": "t_region_groundcover_urban", + "'": "t_sidewalk", + ".": "t_thconc_floor", + ";": "t_gutter_downspout", + "(": "t_chaingate_c", + "%": "t_chainfence" + }, + "traps": { "a": [ "tr_cot" ] }, + "furniture": { + "A": "f_chair", + "B": "f_utility_shelf", + "C": "f_sandbag_half", + "c": "f_counter_gate_c", + "d": "f_displaycase_o", + "E": "f_desk", + "F": "f_utility_shelf", + "f": "f_fridge", + "G": "f_rack", + "g": "f_rack", + "i": "f_rack", + "j": "f_gunsafe_c", + "K": "f_locker", + "l": "f_rack_coat", + "M": "f_locker", + "m": "f_rack", + "N": "f_locker", + "n": "f_table", + "O": "f_rack", + "o": "f_crate_o", + "p": "f_sofa", + "Q": "f_rack", + "q": "f_sink", + "R": "f_counter", + "r": "f_trashcan", + "S": "f_crate_o", + "T": "f_target", + "U": "f_sandbag_half", + "v": "f_rack", + "w": "f_dumpster", + "x": "f_sandbag_half", + "Y": "f_rack", + "y": "f_rack", + "3": "f_counter", + "4": "f_foot_locker_aluminum", + "$": [ [ "f_atm_off", 5 ], [ "f_null", 95 ] ], + "?": "f_console_broken", + "^": "f_indoor_plant", + "!": "f_cardboard_box", + "/": "f_locker" + }, + "items": { + "B": { "item": "guns_common_boxed", "repeat": [ 9, 20 ] }, + "E": { "item": "office_mess", "repeat": 3, "chance": 20 }, + "f": { "item": "fridgesnacks", "repeat": 10, "chance": 35 }, + "g": { "item": "cannedfood", "repeat": [ 40, 150 ] }, + "i": { "item": { - "//": "locked racks for all common gun type of civilian firearms", - "subtype": "collection", - "entries": [ { "group": "guns_common_display" } ] + "entries": [ + { "group": "ammo_pistol_common", "prob": 100 }, + { "group": "ammo_pistol_rare", "prob": 20 }, + { "group": "ammo_rifle_common", "prob": 100 }, + { "group": "ammo_rifle_rare", "prob": 20 }, + { "group": "ammo_shotgun_common", "prob": 10 } + ] }, - "repeat": [ 1, 3 ], - "chance": 80 - }, - "f": { - "item": { "//": "rec room fridge", "subtype": "collection", "entries": [ { "group": "fridgesnacks" } ] }, - "repeat": 10, - "chance": 35 + "repeat": [ 4, 10 ] }, - "R": { + "K": { "item": "guns_pistol_common", "repeat": [ 6, 10 ] }, + "n": { "item": { - "//": "counters used for shooting at the gun range, chance of spawning any loaded common firearm as well as spent brass", "subtype": "collection", - "entries": [ { "group": "guns_common_display", "prob": 25 }, { "group": "casings", "prob": 50 } ] - }, - "repeat": 3, - "chance": 80 + "entries": [ { "group": "silverware", "count": [ 2, 4 ] }, { "group": "dinnerware", "count": [ 1, 2 ] } ] + } }, - "r": { - "item": { "//": "contents of trashcans in store", "subtype": "collection", "entries": [ { "group": "trash" } ] }, - "repeat": 5, - "chance": 45 - }, - "w": { - "item": { "//": "contents of dumpsters", "subtype": "collection", "entries": [ { "group": "trash" } ] }, - "repeat": 30, - "chance": 45 - }, - "Q": { + "O": { "item": "SUS_gunstore_optics_packaged", "repeat": [ 8, 16 ] }, + "o": { "item": { "subtype": "collection", - "//": "bulk casing on racks in the FoH", - "entries": [ { "group": "ammo_casings_gunsmith_bulk" } ] - }, - "repeat": 15, - "chance": 35 + "entries": [ + { "group": "SUS_gunstore_hearing", "count": [ 12, 20 ] }, + { "group": "SUS_gunstore_carry_gear", "count": [ 6, 8 ] }, + { "item": "blister_pack", "count": [ 14, 30 ] }, + { "group": "trash", "count": [ 60, 100 ] } + ] + } }, - "=": { + "t": { "item": { "subtype": "collection", - "//": "spent casings scattered around shooting ranges", - "entries": [ { "group": "casings" } ] + "entries": [ + { "item": "pipe", "count": [ 12, 18 ], "prob": 80 }, + { "item": "2x4", "count": [ 6, 8 ], "prob": 80 }, + { "item": "nail", "count": [ 1, 3 ], "prob": 60 }, + { "item": "pipe_fittings", "count": [ 4, 6 ], "prob": 40 }, + { "item": "sheet_metal", "count": [ 8, 10 ], "prob": 70 }, + { "item": "splinter", "count": [ 1, 2 ], "prob": 30 } + ] }, - "repeat": 1, - "chance": 50 + "repeat": [ 0, 3 ] }, - "C": { + "w": { "item": { - "subtype": "distribution", - "//": "low chance of snacks and gun mags on counters", + "subtype": "collection", "entries": [ - { "group": "vending_food_items", "prob": 33 }, - { "group": "vending_drink_items", "prob": 33 }, - { "group": "book_gunmags", "prob": 33 } + { "group": "trash" }, + { "item": "cup_plastic", "prob": 5 }, + { "item": "can_food_big", "prob": 10 }, + { "item": "can_food", "prob": 10 }, + { "item": "can_medium", "prob": 30 } ] }, - "repeat": 2, - "chance": 15 + "repeat": 30, + "chance": 45 }, - "n": { + ".": { "item": { - "subtype": "distribution", - "//": "moderate chance of snacks and mags on tables", + "subtype": "collection", "entries": [ - { "group": "vending_food_items", "prob": 33 }, - { "group": "vending_drink_items", "prob": 33 }, - { "group": "book_gunmags", "prob": 33 } + { "item": "wrapper", "prob": 60 }, + { "item": "bag_plastic_small", "prob": 20 }, + { "item": "cup_plastic", "prob": 5 }, + { "item": "can_food_big", "prob": 10 }, + { "item": "can_food", "prob": 10 }, + { "item": "can_medium", "prob": 30 }, + { "item": "splinter", "prob": 10 } ] }, - "repeat": 2, - "chance": 30 - }, - "E": { - "item": { "subtype": "collection", "//": "items on store desks", "entries": [ { "group": "office_mess" } ] }, - "repeat": 3, - "chance": 20 + "chance": 15 } } } diff --git a/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json b/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json index 77011bb3b1c76..b60ad49f48903 100644 --- a/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json +++ b/data/json/obsoletion_and_migration_0.I/obsolete_overmap_terrain.json @@ -282,5 +282,156 @@ "slimepit": "slimepit_z-2_north", "slimepit_down": "slimepit_z0_north" } + }, + { + "type": "oter_id_migration", + "//": "migrated in 0.I", + "oter_ids": { + "s_gun": "s_gun_a", + "s_gun_north": "s_gun_a_north", + "s_gun_east": "s_gun_a_east", + "s_gun_south": "s_gun_a_south", + "s_gun_west": "s_gun_a_west", + "s_gun_looted": "s_gun_a", + "s_gun_looted_north": "s_gun_a_north", + "s_gun_looted_east": "s_gun_a_east", + "s_gun_looted_south": "s_gun_a_south", + "s_gun_looted_west": "s_gun_a_west", + "s_gun_roof": "s_gun_a_roof", + "s_gun_roof_north": "s_gun_a_roof_north", + "s_gun_roof_east": "s_gun_a_roof_east", + "s_gun_roof_south": "s_gun_a_roof_south", + "s_gun_roof_west": "s_gun_a_roof_west", + "s_gun_upper_roof": "s_gun_a_roof", + "s_gun_upper_roof_north": "s_gun_a_roof_north", + "s_gun_upper_roof_east": "s_gun_a_roof_east", + "s_gun_upper_roof_south": "s_gun_a_roof_south", + "s_gun_upper_roof_west": "s_gun_a_roof_west", + "s_gun_1": "s_gun_a", + "s_gun_1_north": "s_gun_a_north", + "s_gun_1_east": "s_gun_a_east", + "s_gun_1_south": "s_gun_a_south", + "s_gun_1_west": "s_gun_a_west", + "s_gun_roof_1": "s_gun_a_roof", + "s_gun_roof_1_north": "s_gun_a_roof_north", + "s_gun_roof_1_east": "s_gun_a_roof_east", + "s_gun_roof_1_south": "s_gun_a_roof_south", + "s_gun_roof_1_west": "s_gun_a_roof_west", + "s_gun_upper_roof_1": "s_gun_a_roof", + "s_gun_upper_roof_1_north": "s_gun_a_roof_north", + "s_gun_upper_roof_1_east": "s_gun_a_roof_east", + "s_gun_upper_roof_1_south": "s_gun_a_roof_south", + "s_gun_upper_roof_1_west": "s_gun_a_roof_west", + "s_gun_2": "s_gun_a", + "s_gun_2_north": "s_gun_a_north", + "s_gun_2_east": "s_gun_a_east", + "s_gun_2_south": "s_gun_a_south", + "s_gun_2_west": "s_gun_a_west", + "s_gun_3": "s_gun_a", + "s_gun_3_north": "s_gun_a_north", + "s_gun_3_east": "s_gun_a_east", + "s_gun_3_south": "s_gun_a_south", + "s_gun_3_west": "s_gun_a_west", + "s_gun_3_looted": "s_gun_a", + "s_gun_3_looted_north": "s_gun_a_north", + "s_gun_3_looted_east": "s_gun_a_east", + "s_gun_3_looted_south": "s_gun_a_south", + "s_gun_3_looted_west": "s_gun_a_west", + "s_gun_roof_3": "s_gun_a_roof", + "s_gun_roof_3_north": "s_gun_a_roof_north", + "s_gun_roof_3_east": "s_gun_a_roof_east", + "s_gun_roof_3_south": "s_gun_a_roof_south", + "s_gun_roof_3_west": "s_gun_a_roof_west", + "s_gun_4": "s_gun_a", + "s_gun_4_north": "s_gun_a_north", + "s_gun_4_east": "s_gun_a_east", + "s_gun_4_south": "s_gun_a_south", + "s_gun_4_west": "s_gun_a_west", + "s_gun_4_looted": "s_gun_a", + "s_gun_4_looted_north": "s_gun_a_north", + "s_gun_4_looted_east": "s_gun_a_east", + "s_gun_4_looted_south": "s_gun_a_south", + "s_gun_4_looted_west": "s_gun_a_west", + "s_gun_roof_4": "s_gun_a_roof", + "s_gun_roof_4_north": "s_gun_a_roof_north", + "s_gun_roof_4_east": "s_gun_a_roof_east", + "s_gun_roof_4_south": "s_gun_a_roof_south", + "s_gun_roof_4_west": "s_gun_a_roof_west", + "s_gunstore": "s_gun_a", + "s_gunstore_north": "s_gun_a_north", + "s_gunstore_east": "s_gun_a_east", + "s_gunstore_south": "s_gun_a_south", + "s_gunstore_west": "s_gun_a_west", + "s_gun_2ndfloor_4": "s_gun_a", + "s_gun_2ndfloor_4_north": "s_gun_a_north", + "s_gun_2ndfloor_4_east": "s_gun_a_east", + "s_gun_2ndfloor_4_south": "s_gun_a_south", + "s_gun_2ndfloor_4_west": "s_gun_a_west", + "s_gunstore_2ndfloor": "s_gun_a", + "s_gunstore_2ndfloor_north": "s_gun_a_north", + "s_gunstore_2ndfloor_east": "s_gun_a_east", + "s_gunstore_2ndfloor_south": "s_gun_a_south", + "s_gunstore_2ndfloor_west": "s_gun_a_west", + "s_gunstore_roof": "s_gun_a_roof", + "s_gunstore_roof_north": "s_gun_a_roof_north", + "s_gunstore_roof_east": "s_gun_a_roof_east", + "s_gunstore_roof_south": "s_gun_a_roof_south", + "s_gunstore_roof_west": "s_gun_a_roof_west", + "s_gunstore_looted": "s_gun_a", + "s_gunstore_looted_north": "s_gun_a_north", + "s_gunstore_looted_east": "s_gun_a_east", + "s_gunstore_looted_south": "s_gun_a_south", + "s_gunstore_looted_west": "s_gun_a_west" + } + }, + { + "type": "overmap_special_migration", + "id": "s_gun", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_looted", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_1", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_2", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_3", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_3_looted", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_4", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gun_4_looted", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gunstore", + "new_id": "s_gun_a" + }, + { + "type": "overmap_special_migration", + "id": "s_gunstore_looted", + "new_id": "s_gun_a" } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index e0464cba75c23..ef0e9577bc21c 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -1512,77 +1512,19 @@ }, { "type": "city_building", - "id": "s_gun", + "id": "s_gun_a", "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_looted", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_looted_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_1", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_1_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_1_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_2", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_2_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_1_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_upper_roof_1_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_3", - "locations": [ "land" ], - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_3_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_3_north" } ] + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_gun_a_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_gun_a_roof_north" } ] }, { "type": "city_building", - "id": "s_gun_3_looted", + "id": "s_gun_b", "locations": [ "land" ], "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_3_looted_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_roof_3_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_4", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_4_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_2ndfloor_4_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_roof_4_north" } - ] - }, - { - "type": "city_building", - "id": "s_gun_4_looted", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gun_4_looted_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gun_2ndfloor_4_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gun_roof_4_north" } + { "point": [ 0, 0, 0 ], "overmap": "s_gun_b_store_north" }, + { "point": [ 1, 0, 0 ], "overmap": "s_gun_b_range_north" }, + { "point": [ 0, 0, 1 ], "overmap": "s_gun_b_roof_north" }, + { "point": [ 1, 0, 1 ], "overmap": "s_gun_b_range_roof_north" } ] }, { @@ -1604,26 +1546,6 @@ { "point": [ 0, 0, 2 ], "overmap": "s_electronicstore_roof_north" } ] }, - { - "type": "city_building", - "id": "s_gunstore", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gunstore_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gunstore_2ndfloor_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gunstore_roof_north" } - ] - }, - { - "type": "city_building", - "id": "s_gunstore_looted", - "locations": [ "land" ], - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gunstore_looted_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gunstore_2ndfloor_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gunstore_roof_north" } - ] - }, { "type": "city_building", "id": "mortuary", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index 3596e4f421170..1131e476b6b31 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -364,44 +364,18 @@ }, { "type": "overmap_terrain", - "id": [ - "s_gun", - "s_gun_looted", - "s_gun_1", - "s_gun_2", - "s_gun_3", - "s_gun_3_looted", - "s_gun_4", - "s_gun_4_looted", - "s_gunstore", - "s_gunstore_looted" - ], + "id": [ "s_gun_a", "s_gun_b_range", "s_gun_b_store" ], "copy-from": "generic_city_building", - "looks_like": "s_gun", + "looks_like": "s_gun_a", "name": "gun store", "color": "red", "extend": { "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] } }, { "type": "overmap_terrain", - "id": [ - "s_gun_roof", - "s_gun_upper_roof", - "s_gun_roof_1", - "s_gun_upper_roof_1", - "s_gun_roof_3", - "s_gun_roof_4", - "s_gunstore_roof" - ], + "id": [ "s_gun_a_roof", "s_gun_b_roof", "s_gun_b_range_roof" ], "name": "gun store roof", - "looks_like": "s_gun_roof", - "copy-from": "generic_city_building", - "color": "red" - }, - { - "type": "overmap_terrain", - "id": [ "s_gun_2ndfloor_4", "s_gunstore_2ndfloor" ], - "name": "gun store 2nd floor", + "looks_like": "s_gun_roof_a", "copy-from": "generic_city_building", "color": "red" }, diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index 1d9099b75fd5d..f5dac0ec764a7 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -1056,16 +1056,8 @@ "gym_fitness": 200, "gym_fitness_1": 200, "s_liquor": 500, - "s_gun": 150, - "s_gun_looted": 150, - "s_gun_1": 150, - "s_gun_2": 150, - "s_gun_3": 150, - "s_gun_3_looted": 150, - "s_gun_4": 150, - "s_gun_4_looted": 150, - "s_gunstore": 150, - "s_gunstore_looted": 150, + "s_gun_a": 1200, + "s_gun_b": 300, "s_clothes": 450, "s_clothes_1": 200, "s_clothes_2": 200, diff --git a/data/json/start_locations.json b/data/json/start_locations.json index db13a343ce14a..c84db8d143be0 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -210,7 +210,7 @@ "type": "start_location", "id": "sloc_gun_store", "name": "Gun Store", - "terrain": [ "s_gun", "s_gun_1", "s_gun_2", "s_gun_3", "s_gun_4" ] + "terrain": [ "s_gun_a", "s_gun_b_store" ] }, { "type": "start_location", diff --git a/data/mods/Defense_Mode/scenarios.json b/data/mods/Defense_Mode/scenarios.json index e2b6c8d58d95d..3e8d4547239d4 100644 --- a/data/mods/Defense_Mode/scenarios.json +++ b/data/mods/Defense_Mode/scenarios.json @@ -66,12 +66,6 @@ "name": "Mansion", "terrain": [ "dm_mansion_e2" ] }, - { - "type": "start_location", - "id": "sloc_gun_store", - "name": "Gun Store", - "terrain": [ "s_gunstore_looted" ] - }, { "type": "start_location", "id": "survivor_camp", diff --git a/data/mods/Defense_Mode/specials.json b/data/mods/Defense_Mode/specials.json index 41296d7a2bde3..26f900dc69e48 100644 --- a/data/mods/Defense_Mode/specials.json +++ b/data/mods/Defense_Mode/specials.json @@ -148,19 +148,6 @@ "occurrences": [ 100, 100 ], "flags": [ "DEFENSE_MODE", "GLOBALLY_UNIQUE" ] }, - { - "type": "overmap_special", - "id": "s_gunstore_looted", - "overmaps": [ - { "point": [ 0, 0, 0 ], "overmap": "s_gunstore_looted_north" }, - { "point": [ 0, 0, 1 ], "overmap": "s_gunstore_2ndfloor_north" }, - { "point": [ 0, 0, 2 ], "overmap": "s_gunstore_roof_north" } - ], - "locations": [ "field" ], - "city_distance": [ 40, -1 ], - "occurrences": [ 100, 100 ], - "flags": [ "DEFENSE_MODE", "GLOBALLY_UNIQUE" ] - }, { "type": "overmap_special", "id": "survivor_forest_camp", diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index de1af0d5a6c9f..8913b21244723 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -64,7 +64,8 @@ "modular_deagle_50", "draco", "draco_mini", - "draco_micro" + "draco_micro", + "modular_ar_pistol" ], "type": "MIGRATION", "replace": "pistol_magnum_automag" @@ -150,25 +151,16 @@ "m18", "p226_9mm", "sp2022", - "ruger_charger" + "ruger_charger", + "hk_mp5_semi_pistol", + "TDI_10", + "draco_9mm" ], "type": "MIGRATION", "replace": "pistol_medium" }, { - "id": [ - "hk_mp5_semi_pistol", - "ksub2000", - "calico", - "hk_mp5_10_semi", - "TDI_10", - "mp40semi", - "hpt3895", - "draco_9mm", - "uberti_1873", - "rossi_r92_357_16", - "rossi_r92_357_20" - ], + "id": [ "ksub2000", "calico", "hk_mp5_10_semi", "mp40semi", "hpt3895", "uberti_1873", "rossi_r92_357_16", "rossi_r92_357_20" ], "type": "MIGRATION", "replace": "pistol_pcc" }, @@ -360,7 +352,6 @@ "ar15_450medium", "ar15_450short", "ar15_762", - "modular_ar_pistol", "rifle_223", "ruger_mini", "sig_assault_rifle", diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json index 413dbbddd0263..84032afb974b8 100644 --- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json +++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json @@ -858,233 +858,154 @@ }, { "type": "palette", - "id": "gun_store_palette", - "//": " P, U, S, h, F, e, |, o, k, z, c, and > are all still available for more terrain or furniture", - "palettes": [ "parametrized_walls_palette" ], + "id": "gunstore_palette", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_wall_w", 1 ], [ "t_wall_gray", 1 ], [ "t_wall_black", 1 ] ] } + } + }, "toilets": { "&": { } }, "terrain": { - "-": "t_wall_w", - "q": "t_thconc_floor", - "&": "t_thconc_floor", - ":": "t_window_bars_alarm", - "+": [ [ "t_door_metal_pickable", 90 ], [ "t_door_metal_o", 5 ], [ "t_door_metal_c", 15 ] ], - "D": [ [ "t_door_o", 40 ], [ "t_door_c", 40 ], [ "t_door_locked_interior", 20 ] ], - ",": [ [ "t_region_groundcover_urban", 100 ], [ "t_region_shrub", 10 ] ], - "@": "t_region_shrub_decorative", - "u": "t_region_shrub", - "B": "t_region_groundcover_barren", + "C": "t_sidewalk", + "D": "t_door_c", + "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" }, + "j": "t_carpet_concrete_red", + "W": "t_strconc_wall", + "x": "t_thconc_floor_no_roof", + "Z": "t_bars", + "#": "t_brick_wall", + ":": "t_window_bars_domestic", + "+": [ [ "t_door_metal_o", 60 ], [ "t_door_metal_c", 40 ] ], + ",": "t_region_groundcover_urban", "'": "t_sidewalk", - "/": "t_sidewalk", - "C": "t_thconc_floor", - "`": "t_thconc_floor", ".": "t_thconc_floor", - "a": "t_thconc_floor", - "?": "t_thconc_floor", - "l": "t_thconc_floor", - "E": "t_thconc_floor", - "d": "t_thconc_floor", - "^": "t_thconc_floor", - "Q": "t_thconc_floor", - "x": "t_thconc_floor", - "X": "t_thconc_floor", - "A": "t_thconc_floor", - "r": "t_thconc_floor", - "R": "t_thconc_floor", - "m": "t_thconc_floor", - "M": "t_thconc_floor", - "T": "t_thconc_floor", - "N": "t_thconc_floor", - "n": "t_thconc_floor", - "K": "t_thconc_floor", - "G": "t_thconc_floor", - "g": "t_thconc_floor", - "f": "t_thconc_floor", - "L": "t_thconc_floor", - "y": "t_thconc_floor", - "Y": "t_thconc_floor", - "v": "t_thconc_floor", - "=": "t_thconc_floor", - "_": "t_pavement", - "*": "t_pavement_y", - "<": "t_stairs_up", ";": "t_gutter_downspout", - "W": "t_strconc_wall", - "Z": "t_bars" + "(": "t_chaingate_c", + "%": "t_chainfence" }, "furniture": { - "$": "f_atm_off", - "C": "f_counter", - "3": "f_counter", - "R": "f_counter", - "a": "f_stool", - "?": "f_console_broken", - "d": [ [ "f_displaycase", 65 ], [ "f_displaycase_o", 35 ] ], - "p": "f_displaycase_b", - "n": "f_table", + "A": "f_chair", + "B": "f_utility_shelf", + "C": "f_sandbag_half", + "c": "f_counter_gate_c", + "d": "f_displaycase_o", "E": "f_desk", - "^": "f_indoor_plant", - "l": "f_locker", - "N": "f_locker", + "e": "f_gunsafe_o", + "F": "f_utility_shelf", + "f": "f_fridge", + "G": "f_rack", + "g": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "H": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "h": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "i": "f_rack", + "J": "f_rack", + "K": "f_rack", + "k": [ [ "f_displaycase_b", 70 ], [ "f_displaycase_o", 30 ] ], + "L": [ [ "f_gunsafe_o", 40 ], [ "f_gunsafe_c", 50 ], [ "f_gunsafe_mj", 10 ] ], + "l": "f_rack_coat", "M": "f_locker", "m": "f_rack", - "Y": "f_rack", - "y": "f_rack", - "F": "f_locker", + "N": "f_locker", + "n": "f_table", + "O": "f_rack", + "o": "f_rack", + "p": "f_sofa", "Q": "f_rack", - "K": "f_rack", - "L": [ [ "f_rack_l", 65 ], [ "f_rack", 35 ] ], - "G": "f_rack", - "v": "f_rack", "q": "f_sink", + "R": "f_counter", "r": "f_trashcan", - "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], "S": "f_crate_o", - "A": "f_chair", + "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], "T": "f_target", + "t": "f_rack", + "v": "f_rack", "w": "f_dumpster", - "X": [ [ "f_gunsafe_ml", 90 ], [ "f_gunsafe_o", 10 ] ], - "e": "f_gunsafe_o", - "O": [ [ "f_gunsafe_ml", 90 ], [ "f_gunsafe_o", 10 ] ], - "x": "f_sandbag_wall", - "g": "f_sofa", - "f": "f_fridge", - "/": "f_flagpole" + "x": "f_sandbag_half", + "Y": "f_rack", + "y": "f_rack", + "3": "f_counter", + "4": "f_foot_locker_aluminum", + "$": [ [ "f_atm_off", 5 ], [ "f_null", 95 ] ], + "?": "f_console_broken", + "^": "f_indoor_plant", + "!": "f_cardboard_box", + "/": "f_locker", + "|": "f_locker", + "`": "f_rack" }, - "item": { "/": { "item": "american_flag" } }, + "item": { "F": { "item": "gun_lock", "repeat": [ 5, 20 ] } }, "items": { - "X": { "item": "SUS_gunstore_safe", "chance": 20 }, - "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 ] }, - "m": { "item": "SUS_gunstore_looted_storage", "chance": 20, "repeat": [ 1, 2 ] }, - "M": { "item": "SUS_gunstore_looted_storage", "chance": 20, "repeat": [ 1, 2 ] }, - "d": { "item": "SUS_gunstore_displaycase", "chance": 25 }, - "p": { "item": "SUS_gunstore_displaycase", "chance": 25 }, - "K": { - "item": { - "//": "gun books kept on racks in the FoH", - "subtype": "collection", - "entries": [ { "group": "book_gunref", "prob": 5 }, { "group": "book_gunmags", "prob": 20 } ] - }, - "chance": 75 - }, - "|": { + "B": { "item": "guns_common_boxed", "chance": 15 }, + "E": { "item": "office_mess", "repeat": 3, "chance": 20 }, + "g": { "item": "guns_rifle_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "H": { "item": "guns_pistol_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "h": { "item": "guns_shotgun_common_display", "repeat": [ 0, 1 ], "chance": 30 }, + "i": { "item": { - "//": "civilian magazines kept on racks behind the counter in the FoH", - "subtype": "collection", - "entries": [ { "group": "mags_common", "prob": 20 }, { "group": "mags_common", "prob": 30 } ] + "entries": [ + { "group": "ammo_pistol_common", "prob": 100 }, + { "group": "ammo_pistol_rare", "prob": 20 }, + { "group": "ammo_rifle_common", "prob": 100 }, + { "group": "ammo_rifle_rare", "prob": 20 }, + { "group": "ammo_shotgun_common", "prob": 10 } + ] }, - "chance": 65 + "repeat": [ 0, 3 ], + "chance": 40 }, - "Y": { "item": "SUS_gunstore_gear", "chance": 20 }, - "v": { + "J": { "item": "mags_common_restricted_packaged", "repeat": [ 3, 6 ], "chance": 50 }, + "K": { "item": { - "//": "gun mods kept on racks in the FoH", "subtype": "collection", - "entries": [ { "group": "gunmod_common", "prob": 20 }, { "group": "gunmod_rare", "prob": 30 } ] + "entries": [ { "group": "book_gunref", "prob": 50 }, { "group": "book_gunmags", "prob": 80 } ] }, - "chance": 20 + "repeat": 4, + "chance": 40 }, - "l": { + "l": { "item": "unisex_coat_rack", "repeat": 4, "chance": 75 }, + "N": { "item": "ear_protection", "repeat": [ 2, 8 ] }, + "n": { "item": { - "//": "workers items that were placed in lockers before the CATA, kept in the BoH", - "subtype": "collection", - "entries": [ { "group": "unisex_coat_rack" } ] + "subtype": "distribution", + "//": "moderate chance of snacks and mags on tables", + "entries": [ + { "group": "vending_food_items", "prob": 40 }, + { "group": "vending_drink_items", "prob": 40 }, + { "group": "book_gunmags", "prob": 10 } + ] }, - "chance": 25 + "chance": 30 }, - "N": { + "O": { "item": "SUS_gunstore_optics_packaged", "repeat": [ 3, 5 ], "chance": 60 }, + "o": { "item": "SUS_gunstore_hearing", "repeat": [ 10, 16 ] }, + "Q": { "item": "ammo_casings_gunsmith_bulk", "repeat": 15, "chance": 35 }, + "r": { "item": "trash", "repeat": 5, "chance": 45 }, + "s": { "item": "SUS_gunstore_crate", "chance": 80, "repeat": [ 1, 3 ] }, + "S": { "item": "SUS_gunstore_crate", "chance": 50, "repeat": [ 1, 3 ] }, + "t": { "item": "SUS_gunstore_carry_gear", "repeat": [ 5, 7 ], "chance": 60 }, + "v": { "item": { - "//": "ear protection kept in the proximity of store gun ranges", + "//": "gun mods kept on racks in the FoH", "subtype": "collection", - "entries": [ { "group": "ear_protection", "prob": 30 } ] + "entries": [ { "group": "gunmod_common", "prob": 70 }, { "group": "gunmod_rare", "prob": 30 } ] }, - "chance": 25 + "repeat": [ 3, 6 ], + "chance": 60 }, + "w": { "item": "trash", "repeat": 30, "chance": 45 }, + "Y": { "item": "SUS_gunstore_gear", "chance": 60, "repeat": [ 1, 4 ] }, "y": { "item": { "//": "gunsmithing tools kept on racks", "subtype": "collection", "entries": [ { "group": "ammo_parts", "prob": 80 }, { "group": "tools_gunsmith", "prob": 5 } ] }, - "chance": 20 - }, - "L": { - "item": { - "//": "locked racks for all common gun type of civilian firearms", - "subtype": "collection", - "entries": [ { "group": "guns_common_display" } ] - }, - "chance": 20 - }, - "f": { - "item": { "//": "rec room fridge", "subtype": "collection", "entries": [ { "group": "fridgesnacks" } ] }, - "repeat": 10, - "chance": 35 - }, - "R": { - "item": { - "//": "counters used for shooting at the gun range, chance of spawning any loaded common firearm as well as spent brass", - "subtype": "collection", - "entries": [ { "group": "guns_common_display", "prob": 25 }, { "group": "casings", "prob": 50 } ] - }, - "chance": 20 - }, - "r": { - "item": { "//": "contents of trashcans in store", "subtype": "collection", "entries": [ { "group": "trash" } ] }, "repeat": 5, - "chance": 45 - }, - "w": { - "item": { "//": "contents of dumpsters", "subtype": "collection", "entries": [ { "group": "trash" } ] }, - "repeat": 30, - "chance": 45 - }, - "Q": { - "item": { - "subtype": "collection", - "//": "bulk casing on racks in the FoH", - "entries": [ { "group": "ammo_casings_gunsmith_bulk" } ] - }, - "chance": 25 - }, - "=": { - "item": { - "subtype": "collection", - "//": "spent casings scattered around shooting ranges", - "entries": [ { "group": "casings" } ] - }, "chance": 50 }, - "C": { - "item": { - "subtype": "distribution", - "//": "low chance of snacks and gun mags on counters", - "entries": [ - { "group": "vending_food_items", "prob": 33 }, - { "group": "vending_drink_items", "prob": 33 }, - { "group": "book_gunmags", "prob": 33 } - ] - }, - "chance": 15 - }, - "n": { - "item": { - "subtype": "distribution", - "//": "moderate chance of snacks and mags on tables", - "entries": [ - { "group": "vending_food_items", "prob": 33 }, - { "group": "vending_drink_items", "prob": 33 }, - { "group": "book_gunmags", "prob": 33 } - ] - }, - "chance": 30 - }, - "E": { - "item": { "subtype": "collection", "//": "items on store desks", "entries": [ { "group": "office_mess" } ] }, - "chance": 20 - } + "=": { "item": "casings", "repeat": 100, "chance": 10 }, + "`": { "item": "ammo_casings_gunsmith_bulk", "repeat": [ 6, 8 ] } } }, { diff --git a/data/mods/TEST_DATA/regions.json b/data/mods/TEST_DATA/regions.json index ec90163ee85d2..31a82a3ff2b99 100644 --- a/data/mods/TEST_DATA/regions.json +++ b/data/mods/TEST_DATA/regions.json @@ -133,7 +133,7 @@ "shops": { "s_gas": 5, "s_liquor": 5, - "s_gun": 5, + "s_gun_a": 5, "s_restaurant_deserted_test": 5, "abstorefront": 15, "station_radio": 5, diff --git a/data/mods/TropiCataclysm/tropical_regional_map_settings.json b/data/mods/TropiCataclysm/tropical_regional_map_settings.json index 277c5fb10a4a7..6c74db231178f 100644 --- a/data/mods/TropiCataclysm/tropical_regional_map_settings.json +++ b/data/mods/TropiCataclysm/tropical_regional_map_settings.json @@ -970,16 +970,8 @@ "gym_fitness": 200, "gym_fitness_1": 200, "s_liquor": 500, - "s_gun": 200, - "s_gun_looted": 200, - "s_gun_1": 200, - "s_gun_2": 200, - "s_gun_3": 200, - "s_gun_3_looted": 200, - "s_gun_4": 200, - "s_gun_4_looted": 200, - "s_gunstore": 200, - "s_gunstore_looted": 200, + "s_gun_a": 1600, + "s_gun_b": 400, "s_clothes": 450, "s_clothes_1": 200, "s_clothes_2": 200, diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json index 37b964f120023..34b37dda02d22 100644 --- a/data/mods/alt_map_key/overmap_terrain.json +++ b/data/mods/alt_map_key/overmap_terrain.json @@ -577,19 +577,8 @@ }, { "type": "overmap_terrain", - "id": [ - "s_gun", - "s_gun_looted", - "s_gun_1", - "s_gun_2", - "s_gun_3", - "s_gun_3_looted", - "s_gun_4", - "s_gun_4_looted", - "s_gunstore", - "s_gunstore_looted" - ], - "copy-from": "s_gun", + "id": [ "s_gun_a", "s_gun_b_store" ], + "copy-from": "s_gun_a", "name": "gun store", "sym": "g", "color": "red" diff --git a/data/mods/classic_zombies/region_overlay.json b/data/mods/classic_zombies/region_overlay.json index 43ae897dd246f..4ca362dcfd1cc 100644 --- a/data/mods/classic_zombies/region_overlay.json +++ b/data/mods/classic_zombies/region_overlay.json @@ -14,22 +14,7 @@ }, "city": { "//": "Increased hunting store chance, decreased gun store/mil surplus chances.", - "shops": { - "s_hunting": 300, - "s_gun": 50, - "s_gun_looted": 50, - "s_gun_1": 50, - "s_gun_2": 50, - "s_gun_3": 50, - "s_gun_3_looted": 50, - "s_gun_4": 50, - "s_gun_4_looted": 50, - "s_gunstore": 50, - "s_gunstore_looted": 50, - "mil_surplus": 20, - "mil_surplus_1": 20, - "mil_surplus_2": 20 - } + "shops": { "s_hunting": 300, "s_gun_a": 350, "s_gun_b": 150, "mil_surplus": 20, "mil_surplus_1": 20, "mil_surplus_2": 20 } }, "weather": { "base_temperature": 5.5, diff --git a/data/mods/desert_region/desert_regional_map_settings.json b/data/mods/desert_region/desert_regional_map_settings.json index 4a1d935f1a3dd..170463eb98138 100644 --- a/data/mods/desert_region/desert_regional_map_settings.json +++ b/data/mods/desert_region/desert_regional_map_settings.json @@ -602,16 +602,8 @@ "gym_fitness": 200, "gym_fitness_1": 200, "s_liquor": 500, - "s_gun": 200, - "s_gun_looted": 200, - "s_gun_1": 200, - "s_gun_2": 200, - "s_gun_3": 200, - "s_gun_3_looted": 200, - "s_gun_4": 200, - "s_gun_4_looted": 200, - "s_gunstore": 200, - "s_gunstore_looted": 200, + "s_gun_a": 1600, + "s_gun_b": 400, "s_clothes": 450, "s_clothes_1": 200, "s_clothes_2": 200,