From 9f784b109a343591790d03474be6fac49b3ecd48 Mon Sep 17 00:00:00 2001 From: Holli Date: Tue, 21 Jan 2025 20:11:54 -0700 Subject: [PATCH] Further remove old gunstores + fix testing things --- data/json/mapgen/s_gun.json | 2 - data/json/mapgen_palettes/gunstore.json | 447 ------------------ data/json/regional_map_settings.json | 4 +- .../mapgen_palettes/other_palettes.json | 293 +++++------- 4 files changed, 109 insertions(+), 637 deletions(-) diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index 7e161cf0ea60a..5902ce15eb33a 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -3,7 +3,6 @@ "type": "mapgen", "method": "json", "om_terrain": [ "s_gun_a" ], - "weight": 99999, "object": { "fill_ter": "t_thconc_floor", "rows": [ @@ -120,7 +119,6 @@ "type": "mapgen", "method": "json", "om_terrain": [ [ "s_gun_b_store", "s_gun_b_range" ] ], - "weight": 300, "object": { "fill_ter": "t_thconc_floor", "rows": [ diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json index 0b054abe7c09c..aabc74ecba677 100644 --- a/data/json/mapgen_palettes/gunstore.json +++ b/data/json/mapgen_palettes/gunstore.json @@ -1,247 +1,4 @@ [ - { - "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" ], - "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", - "'": "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" - }, - "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", - "E": "f_desk", - "^": "f_indoor_plant", - "l": "f_locker", - "N": "f_locker", - "M": "f_locker", - "m": "f_rack", - "Y": "f_rack", - "y": "f_rack", - "F": "f_locker", - "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_trashcan", - "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], - "S": "f_crate_o", - "A": "f_chair", - "T": "f_target", - "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" - }, - "item": { "/": { "item": "american_flag" } }, - "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 }, - "K": { - "item": { - "//": "gun books kept on racks in the FoH", - "subtype": "collection", - "entries": [ { "group": "book_gunref", "prob": 5 }, { "group": "book_gunmags", "prob": 80 } ] - }, - "repeat": 3, - "chance": 75 - }, - "F": { - "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 } ] - }, - "repeat": 15, - "chance": 65 - }, - "Y": { "item": "SUS_gunstore_gear", "chance": 90, "repeat": [ 1, 4 ] }, - "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": { - "item": { - "//": "workers items that were placed in lockers before the CATA, kept in the BoH", - "subtype": "collection", - "entries": [ { "group": "unisex_coat_rack" } ] - }, - "repeat": 2, - "chance": 75 - }, - "N": { - "item": { - "//": "ear protection kept in the proximity of store gun ranges", - "subtype": "collection", - "entries": [ { "group": "ear_protection", "prob": 30 } ] - }, - "repeat": 8, - "chance": 75 - }, - "y": { - "item": { - "//": "gunsmithing tools kept on racks", - "subtype": "collection", - "entries": [ { "group": "ammo_parts", "prob": 80 }, { "group": "tools_gunsmith", "prob": 5 } ] - }, - "repeat": 5, - "chance": 50 - }, - "L": { - "item": { - "//": "locked racks for all common gun type of civilian firearms", - "subtype": "collection", - "entries": [ { "group": "guns_common_display" } ] - }, - "repeat": [ 1, 3 ], - "chance": 80 - }, - "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 } ] - }, - "repeat": 3, - "chance": 80 - }, - "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" } ] - }, - "repeat": 15, - "chance": 35 - }, - "=": { - "item": { - "subtype": "collection", - "//": "spent casings scattered around shooting ranges", - "entries": [ { "group": "casings" } ] - }, - "repeat": 1, - "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 } - ] - }, - "repeat": 2, - "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 } - ] - }, - "repeat": 2, - "chance": 30 - }, - "E": { - "item": { "subtype": "collection", "//": "items on store desks", "entries": [ { "group": "office_mess" } ] }, - "repeat": 3, - "chance": 20 - } - } - }, { "type": "palette", "id": "gunstore_palette_unlooted", @@ -689,209 +446,5 @@ "chance": 15 } } - }, - { - "type": "palette", - "id": "gun_store_palette_looted", - "//": " P, U, S, h, F, e, |, o, k, z, c, and > are all still available for more terrain or furniture", - "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_brick_wall", - ":": [ [ "t_window_empty", 30 ], [ "t_window_bars", 70 ] ], - "+": [ [ "t_mdoor_frame", 10 ], [ "t_door_metal_o", 70 ], [ "t_door_metal_c", 20 ] ], - "D": [ [ "t_door_o", 80 ], [ "t_door_b", 10 ], [ "t_door_c", 10 ] ], - ",": "t_region_groundcover_urban", - "'": "t_sidewalk", - "C": "t_sidewalk", - ".": "t_thconc_floor", - "x": "t_thconc_floor_no_roof", - "j": "t_carpet_concrete_red", - ";": "t_gutter_downspout", - "W": "t_strconc_wall", - "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" } - }, - "furniture": { - "$": [ [ "f_atm_off", 5 ], [ "f_null", 95 ] ], - "C": "f_sandbag_half", - "x": "f_sandbag_half", - "R": "f_counter", - "3": "f_counter", - "?": "f_console_broken", - "d": [ [ "f_displaycase", 65 ], [ "f_displaycase_o", 35 ] ], - "p": [ [ "f_displaycase_b", 60 ], [ "f_displaycase_o", 40 ] ], - "n": "f_table", - "E": "f_desk", - "^": "f_indoor_plant", - "!": "f_cardboard_box", - "l": "f_locker", - "N": "f_locker", - "M": "f_locker", - "/": "f_locker", - "m": "f_rack", - "Y": "f_rack", - "y": "f_rack", - "|": "f_locker", - "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_trashcan", - "s": [ [ "f_crate_c", 55 ], [ "f_crate_o", 45 ] ], - "S": "f_crate_o", - "c": "f_counter_gate_c", - "4": "f_foot_locker_aluminum", - "A": "f_chair", - "T": "f_target", - "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 ] ], - "g": "f_sofa", - "f": "f_fridge", - "J": "f_gunsafe_c" - }, - "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 }, - "K": { - "item": { - "//": "gun books kept on racks in the FoH", - "subtype": "collection", - "entries": [ { "group": "book_gunref", "prob": 5 }, { "group": "book_gunmags", "prob": 80 } ] - }, - "repeat": 3, - "chance": 75 - }, - "|": { - "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 } ] - }, - "repeat": 15, - "chance": 65 - }, - "Y": { "item": "SUS_gunstore_gear", "chance": 90, "repeat": [ 1, 4 ] }, - "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": { - "item": { - "//": "workers items that were placed in lockers before the CATA, kept in the BoH", - "subtype": "collection", - "entries": [ { "group": "unisex_coat_rack" } ] - }, - "repeat": 2, - "chance": 75 - }, - "N": { - "item": { - "//": "ear protection kept in the proximity of store gun ranges", - "subtype": "collection", - "entries": [ { "group": "ear_protection", "prob": 30 } ] - }, - "repeat": 8, - "chance": 75 - }, - "y": { - "item": { - "//": "gunsmithing tools kept on racks", - "subtype": "collection", - "entries": [ { "group": "ammo_parts", "prob": 80 }, { "group": "tools_gunsmith", "prob": 5 } ] - }, - "repeat": 5, - "chance": 50 - }, - "L": { - "item": { - "//": "locked racks for all common gun type of civilian firearms", - "subtype": "collection", - "entries": [ { "group": "guns_common_display" } ] - }, - "repeat": [ 1, 3 ], - "chance": 80 - }, - "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 } ] - }, - "repeat": 3, - "chance": 80 - }, - "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" } ] - }, - "repeat": 15, - "chance": 35 - }, - "=": { - "item": { - "subtype": "collection", - "//": "spent casings scattered around shooting ranges", - "entries": [ { "group": "casings" } ] - }, - "repeat": 1, - "chance": 50 - }, - "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 } - ] - }, - "repeat": 2, - "chance": 30 - }, - "E": { - "item": { "subtype": "collection", "//": "items on store desks", "entries": [ { "group": "office_mess" } ] }, - "repeat": 3, - "chance": 20 - } - } } ] diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json index f139c4f69397c..38775c53ff975 100644 --- a/data/json/regional_map_settings.json +++ b/data/json/regional_map_settings.json @@ -1044,8 +1044,8 @@ "gym_fitness": 200, "gym_fitness_1": 200, "s_liquor": 500, - "s_gun_a": 9999999, - "s_gun_b": 99999999, + "s_gun_a": 1200, + "s_gun_b": 300, "s_clothes": 450, "s_clothes_1": 200, "s_clothes_2": 200, diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json index 88bf27c0f634a..41e7fbdefb34b 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 ] } } }, {