diff --git a/data/json/mapgen/basement/basement_guns.json b/data/json/mapgen/basement/basement_guns.json index 4845619575cc5..9cb5f6168d3eb 100644 --- a/data/json/mapgen/basement/basement_guns.json +++ b/data/json/mapgen/basement/basement_guns.json @@ -48,36 +48,35 @@ }, "furniture": { "#": "f_counter", "]": "f_bookcase", "h": "f_chair", "s": "f_gunsafe_ml", "{": "f_rack" }, "place_loot": [ - { "group": "guns_smg_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 }, - { "group": "guns_rifle_rare", "x": 7, "y": 2, "chance": 30, "magazine": 100 }, - { "group": "mags_pistol_rare", "x": 8, "y": 2, "chance": 75 }, - { "group": "guns_pistol_common", "x": 9, "y": 2, "chance": 90, "magazine": 100 }, - { "group": "mags_pistol_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, - { "group": "guns_rifle_common", "x": 11, "y": 2, "chance": 80, "magazine": 100 }, - { "group": "guns_shotgun_common", "x": 12, "y": 2, "chance": 80, "magazine": 100 }, - { "group": "mags_rifle_common", "x": 13, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, - { "group": "guns_smg_common", "x": 14, "y": 2, "chance": 70, "magazine": 100 }, - { "group": "guns_pistol_rare", "x": 15, "y": 2, "chance": 40, "magazine": 100 }, - { "group": "mags_smg_common", "x": 16, "y": 2, "chance": 70, "repeat": [ 1, 2 ] }, - { "group": "guns_shotgun_rare_static", "x": 17, "y": 2, "chance": 30, "magazine": 100 }, - { "group": "ammo_shotgun_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "ammo_rifle_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "ammo_shotgun_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_pistol_reloaded", "x": 9, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "ammo_rifle_reloaded", "x": 10, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_rifle_common", "x": 11, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "ammo_smg_common", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_pistol_common", "x": 13, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, - { "group": "ammo_rifle_common", "x": 14, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_pistol_common", "x": 15, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_pistol_reloaded", "x": 16, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, - { "group": "ammo_shotgun_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "guns_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "guns_rare", "x": 7, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "mags_rare", "x": 8, "y": 2, "chance": 20 }, + { "group": "guns_common", "x": 9, "y": 2, "chance": 100, "magazine": 100 }, + { "group": "mags_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, + { "group": "guns_common", "x": 11, "y": 2, "chance": 100, "magazine": 100 }, + { "group": "guns_common", "x": 12, "y": 2, "chance": 100, "magazine": 100 }, + { "group": "mags_common", "x": 13, "y": 2, "chance": 100, "repeat": [ 1, 3 ] }, + { "group": "guns_common", "x": 14, "y": 2, "chance": 100, "magazine": 100 }, + { "group": "guns_rare", "x": 15, "y": 2, "chance": 20, "magazine": 100 }, + { "group": "mags_common", "x": 16, "y": 2, "chance": 70, "repeat": [ 1, 2 ] }, + { "group": "guns_rare_static", "x": 17, "y": 2, "chance": 30, "magazine": 100 }, + { "group": "ammo_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "ammo_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_reloaded", "x": 9, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "ammo_reloaded", "x": 10, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 11, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 12, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 13, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 14, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 15, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_reloaded", "x": 16, "y": 5, "chance": 40, "repeat": [ 1, 2 ] }, + { "group": "ammo_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] }, { "group": "book_gunref", "x": 14, "y": [ 10, 11 ], "chance": 60 }, { "group": "gunmod_common", "x": 4, "y": 11, "chance": 100 }, - { "group": "guns_obscure", "x": 6, "y": 11, "chance": 100, "ammo": 100, "magazine": 100 }, - { "group": "museum_guns", "x": 6, "y": 11, "chance": 70, "ammo": 70, "magazine": 90 }, + { "group": "guns_obscure", "x": 6, "y": 11, "chance": 10, "ammo": 100, "magazine": 100 }, { "group": "tools_common", "x": 20, "y": 12, "chance": 100 }, - { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 30 }, + { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 10 }, { "group": "gunmod_rare", "x": 19, "y": 13, "chance": 100 } ], "place_monsters": [ diff --git a/data/json/mapgen/basement/basement_survival.json b/data/json/mapgen/basement/basement_survival.json index eaa680d09d745..b428c14d753b8 100644 --- a/data/json/mapgen/basement/basement_survival.json +++ b/data/json/mapgen/basement/basement_survival.json @@ -120,7 +120,7 @@ { "group": "gear_survival", "x": 13, "y": 14, "chance": 75 }, { "group": "gear_survival", "x": 13, "y": 15, "chance": 75 }, { - "group": "guns_survival", + "group": "guns_common", "x": 19, "y": [ 3, 4 ], "chance": 100, @@ -129,8 +129,8 @@ "magazine": 100 }, { "group": "ammo_reloaded", "x": 19, "y": 5, "chance": 100, "repeat": [ 1, 3 ], "magazine": 100 }, - { "group": "guns_pistol_common", "x": 15, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 }, - { "group": "guns_pistol_common", "x": 21, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 }, + { "group": "guns_common", "x": 15, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 }, + { "group": "guns_common", "x": 21, "y": 10, "chance": 30, "ammo": 75, "magazine": 100 }, { "group": "clothing_outdoor_set", "x": 15, "y": 10, "chance": 30 }, { "group": "clothing_outdoor_set", "x": 21, "y": 10, "chance": 30 }, { "item": "blanket", "x": 16, "y": 10, "chance": 30 }, diff --git a/data/json/mapgen/farm_supply.json b/data/json/mapgen/farm_supply.json index d5bac78e13b22..4ba0557e1cc3a 100644 --- a/data/json/mapgen/farm_supply.json +++ b/data/json/mapgen/farm_supply.json @@ -519,7 +519,7 @@ "à": { "item": { "subtype": "collection", - "entries": [ { "group": "guns_rifle_common_display", "prob": 40 }, { "group": "guns_shotgun_common_display", "prob": 60 } ] + "entries": [ { "group": "guns_rifle_common_display", "prob": 60 }, { "group": "guns_shotgun_common_display", "prob": 40 } ] }, "chance": 7, "repeat": [ 0, 2 ] diff --git a/data/json/mapgen/gas_stations/gas_station_bunker.json b/data/json/mapgen/gas_stations/gas_station_bunker.json index 6ce4dfc1d1996..1477818a93524 100644 --- a/data/json/mapgen/gas_stations/gas_station_bunker.json +++ b/data/json/mapgen/gas_stations/gas_station_bunker.json @@ -261,9 +261,9 @@ "i": { "item": "SUS_office_desk", "chance": 70 }, "p": { "item": "clothing_male", "chance": 70, "repeat": 3 }, "P": [ - { "item": "guns_pistol_milspec", "chance": 60, "repeat": 3 }, - { "item": "ammo_pistol_milspec", "chance": 60, "repeat": 3 }, - { "item": "prison_armor", "chance": 60, "repeat": 3 } + { "item": "guns_pistol_milspec", "chance": 60 }, + { "item": "ammo_pistol_milspec", "chance": 60 }, + { "item": "prison_armor", "chance": 60 } ], "n": { "item": "SUS_bathroom_sink", "chance": 90 } }, @@ -431,10 +431,10 @@ "D": { "item": "textbooks", "chance": 80, "repeat": [ 1, 12 ] }, "Y": [ { "item": "mut_lab", "chance": 33, "repeat": [ 1, 2 ] }, { "item": "chem_lab", "chance": 75, "repeat": [ 1, 3 ] } ], "B": [ - { "item": "guns_rifle_milspec", "chance": 40, "repeat": [ 1, 4 ] }, - { "item": "guns_smg_milspec", "chance": 40, "repeat": [ 1, 4 ] }, - { "item": "ammo_rifle_milspec", "chance": 40, "repeat": [ 1, 4 ] }, - { "item": "ammo_smg_milspec", "chance": 40, "repeat": [ 1, 4 ] } + { "item": "guns_rifle_milspec", "chance": 40 }, + { "item": "guns_smg_milspec", "chance": 40 }, + { "item": "ammo_rifle_milspec", "chance": 40 }, + { "item": "ammo_smg_milspec", "chance": 40 } ] }, "place_loot": [ diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json index 309cd1a48b545..71d749f94588b 100644 --- a/data/json/mapgen/gas_stations/s_gas.json +++ b/data/json/mapgen/gas_stations/s_gas.json @@ -287,9 +287,9 @@ { "item": "road", "x": [ 20, 20 ], "y": [ 13, 14 ], "chance": 80, "repeat": [ 1, 4 ] }, { "item": "camping", "x": [ 9, 9 ], "y": [ 15, 15 ], "chance": 90, "repeat": [ 1, 10 ] }, { "item": "magazines", "x": [ 9, 9 ], "y": [ 13, 15 ], "chance": 90, "repeat": [ 1, 25 ] }, - { "item": "softdrugs", "x": [ 8, 8 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 8 ] } + { "item": "softdrugs", "x": [ 8, 8 ], "y": [ 13, 15 ], "chance": 80, "repeat": [ 1, 8 ] }, + { "item": "nested_shotgun_s", "x": 3, "y": 20, "chance": 10 } ], - "place_item": [ { "item": "shotgun_s", "x": 3, "y": 20 }, { "item": "shot_00", "x": 7, "y": 19, "chance": 50 } ], "place_monster": [ { "group": "GROUP_ZOMBIE_GAS", "x": [ 5, 10 ], "y": [ 6, 10 ], "repeat": [ 1, 2 ], "chance": 25 } ] } }, diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json index 61890e81d5b79..2ff84c762ffbb 100644 --- a/data/json/mapgen/house/house_garage_prepper.json +++ b/data/json/mapgen/house/house_garage_prepper.json @@ -85,7 +85,7 @@ ] }, "place_loot": [ - { "group": "guns_survival", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 80, "ammo": 100, "magazine": 100 }, + { "group": "guns_survival", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 50, "ammo": 100, "magazine": 100 }, { "group": "tools_common", "x": [ 14, 16 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 3 ] }, { "group": "supplies_fuel", "x": [ 14, 14 ], "y": [ 3, 6 ], "chance": 90, "repeat": [ 1, 2 ] }, { "group": "mischw", "x": [ 14, 16 ], "y": [ 11, 11 ], "chance": 65, "repeat": [ 1, 3 ] }, @@ -98,8 +98,8 @@ "group": "guns_survival", "x": [ 15, 16 ], "y": [ 8, 9 ], - "chance": 70, - "repeat": [ 1, 3 ], + "chance": 60, + "repeat": [ 1, 2 ], "ammo": 75, "magazine": 95 } diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 8ca69229e44ed..1727c7e4ae3fd 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -675,9 +675,9 @@ "V": [ { "item": "tools_common", "chance": 50, "repeat": [ 0, 1 ] } ], "U": [ { "item": "SUS_office_filing_cabinet", "chance": 50, "repeat": [ 1, 10 ] }, - { "item": "guns_obscure", "chance": 50, "repeat": [ 1, 2 ] }, - { "item": "ammo_obscure", "chance": 50, "repeat": [ 2, 4 ] }, - { "item": "mags_obscure", "chance": 50, "repeat": [ 2, 3 ] } + { "item": "guns_common", "chance": 50, "repeat": [ 1, 2 ] }, + { "item": "ammo_common", "chance": 50, "repeat": [ 2, 4 ] }, + { "item": "mags_common", "chance": 50, "repeat": [ 2, 3 ] } ], "^": [ { "item": "mil_base_iv", "chance": 70 } ] }, diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json index 227f4f2b1fe81..97036477e3b3c 100644 --- a/data/json/mapgen/nested/basement_nested.json +++ b/data/json/mapgen/nested/basement_nested.json @@ -1466,24 +1466,24 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 20, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1498,10 +1498,10 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "gunmod_common", "chance": 50, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 40, "repeat": [ 1, 2 ] } ] } @@ -1542,24 +1542,24 @@ "furniture": { "%": "f_rack_wood", "$": "f_rack_wood", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1574,9 +1574,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 40, "repeat": [ 1, 2 ] } ] @@ -1618,24 +1618,24 @@ "furniture": { "%": "f_locker", "$": "f_locker", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1650,9 +1650,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 60, "repeat": [ 1, 2 ] } ] @@ -1693,24 +1693,24 @@ "furniture": { "%": "f_locker", "$": "f_locker", "=": "f_table", ",": "f_table", "~": "f_workbench", "!": "f_bookcase" }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -1725,9 +1725,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 60, "repeat": [ 1, 2 ] } ] @@ -3785,24 +3785,24 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 20, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3817,9 +3817,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 80, "repeat": [ 1, 2 ] } ] @@ -3876,24 +3876,24 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 20, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3908,9 +3908,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 80, "repeat": [ 1, 2 ] } ] @@ -3967,24 +3967,24 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 20, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -3999,9 +3999,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 80, "repeat": [ 1, 2 ] } ] @@ -4058,24 +4058,24 @@ }, "items": { "%": [ - { "item": "guns_rifle_common", "chance": 60, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_rifle_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_common", "chance": 70, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_pistol_rare", "chance": 30, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_rifle_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_rifle_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_common", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_shotgun_rare_static", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_obscure", "chance": 1, "ammo": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], "$": [ - { "item": "guns_smg_rare", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_smg_common", "chance": 50, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_common", "chance": 30, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_shotgun_rare_static", "chance": 20, "magazine": 100, "repeat": [ 1, 2 ] }, - { "item": "guns_obscure", "chance": 20, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] } + { "item": "guns_pistol_common", "chance": 100, "ammo": 100, "magazine": 100, "repeat": [ 2, 4 ] }, + { "item": "guns_pistol_rare", "chance": 10, "ammo": 100, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_common", "chance": 10, "magazine": 100, "repeat": [ 1, 2 ] }, + { "item": "guns_smg_rare", "chance": 1, "magazine": 100, "repeat": [ 1, 2 ] } ], ",": [ - { "item": "mags_pistol_rare", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_pistol_common", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "mags_smg_common", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mags_smg_common", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "mags_rifle_common", "chance": 40, "repeat": [ 1, 2 ] }, - { "item": "mags_pistol_rare", "chance": 20, "repeat": [ 1, 2 ] } + { "item": "mags_pistol_rare", "chance": 10, "repeat": [ 1, 2 ] } ], "=": [ { "item": "ammo_rifle_reloaded", "chance": 40, "repeat": [ 1, 2 ] }, @@ -4090,9 +4090,9 @@ { "item": "ammo_pistol_reloaded", "chance": 60, "repeat": [ 1, 2 ] } ], "~": [ - { "item": "museum_guns", "chance": 10 }, + { "item": "museum_guns", "chance": 1 }, { "item": "tools_common", "chance": 60 }, - { "item": "gunmod_rare", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "gunmod_rare", "chance": 5, "repeat": [ 1, 2 ] }, { "item": "gunmod_common", "chance": 20, "repeat": [ 1, 2 ] } ], "!": [ { "item": "book_gunref", "chance": 80, "repeat": [ 1, 2 ] } ] diff --git a/data/json/mapgen/nested/strip_mall_nested.json b/data/json/mapgen/nested/strip_mall_nested.json index 7a6c9cb8f88fd..c39468927ba38 100644 --- a/data/json/mapgen/nested/strip_mall_nested.json +++ b/data/json/mapgen/nested/strip_mall_nested.json @@ -3142,11 +3142,11 @@ "4": { "item": "guns_rifle_common", "chance": 50, "repeat": 2 }, "5": { "item": "jackets", "chance": 50, "repeat": [ 2, 4 ] }, "6": { "item": "clothing_hunting", "chance": 50, "repeat": [ 2, 4 ] }, - "C": { "item": "guns_shotgun_common", "chance": 50, "repeat": [ 3, 4 ] }, + "C": { "item": "guns_shotgun_common", "chance": 50, "repeat": 1 }, "B": { "item": "SUS_dishes", "chance": 100 }, "b": { "item": "SUS_silverware", "chance": 100 }, "0": { "item": "ammo_rifle_common", "chance": 100, "repeat": [ 3, 5 ] }, - "o": { "item": "ammo_shotgun_common", "chance": 100, "repeat": [ 3, 5 ] }, + "o": { "item": "ammo_shotgun_common", "chance": 100, "repeat": [ 1, 2 ] }, "d": { "item": "SUS_office_desk", "chance": 60 }, "$": { "item": "cash_register_random", "chance": 100 }, "L": { "item": "SUS_janitors_closet", "chance": 100 }, diff --git a/data/json/mapgen/police_department.json b/data/json/mapgen/police_department.json index 5c6dfebb37d97..83f39a1bc68fe 100644 --- a/data/json/mapgen/police_department.json +++ b/data/json/mapgen/police_department.json @@ -123,9 +123,9 @@ "|||||||||||||_.._|4::::::::::::::::|X:|_..i|||||", "|!|!|yyyyyyy|_.._|4::4444::4|222222|::|_..i|SSS|", "|___|_______|_.._|4::4││4::4||||||||Y:|_.._|___|", - "|___+_qqqqq_+_.._|4::4││4::4|{}[[[[|Y:|_.._+__a|", - "|!|!|_______|_..h|4::4444::4|{:::::|::|_.._|___|", - "|||||yyyyyyy|_..h|4::::::::4|]:ppp:|x:|_..i|+|+|", + "|___+_qqqqq_+_.._|4::4││4::4|}[[[[[|Y:|_.._+__a|", + "|!|!|_______|_..h|4::4444::4|}:::::|::|_.._|___|", + "|||||yyyyyyy|_..h|4::::::::4|{:ppp:|x:|_..i|+|+|", "|||||yyyyyyy|_..h|4::::::::4|]:::::≈::|_..i|_|_|", "|!|!|_______|_..h|4444444444|333335|::|_..i|T|T|", "|___+_qqqqq_+_.._||||||||||||||||||||L|_.._|||||", @@ -158,11 +158,10 @@ "2": { "item": "SUS_office_filing_cabinet", "chance": 100, "repeat": [ 1, 3 ] }, "3": { "item": "cop_items", "chance": 90, "repeat": [ 3, 6 ] }, "4": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 4 ] }, - "5": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 4 ] }, - "{": { "item": "police_armory_any_sniperrifle", "chance": 100 }, + "{": { "item": "police_armory_any_sniperrifle", "chance": 50 }, "}": { "item": "police_armory_any_assaultrifle", "chance": 100 }, "[": { "item": "police_armory_any_pistol", "chance": 100 }, - "]": { "item": "police_armory_any_shotgun", "chance": 100, "repeat": [ 1, 2 ] } + "]": { "item": "police_armory_any_shotgun", "chance": 50 } }, "furniture": { "2": "f_rack", diff --git a/data/json/mapgen/police_station.json b/data/json/mapgen/police_station.json index 4dda60e22a6d0..454c5404adb5d 100644 --- a/data/json/mapgen/police_station.json +++ b/data/json/mapgen/police_station.json @@ -71,10 +71,10 @@ "c": { "item": "kitchen", "chance": 40, "repeat": [ 2, 4 ] }, "1": { "item": "cop_items", "chance": 80, "repeat": [ 5, 8 ] }, "l": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 4 ] }, - "{": { "item": "police_armory_any_sniperrifle", "chance": 90 }, + "{": { "item": "police_armory_any_sniperrifle", "chance": 50 }, "}": { "item": "police_armory_any_assaultrifle", "chance": 90 }, - "[": { "item": "police_armory_any_pistol", "chance": 95 }, - "]": { "item": "police_armory_any_shotgun", "chance": 85 }, + "[": { "item": "police_armory_any_pistol", "chance": 100, "repeat": 2 }, + "]": { "item": "police_armory_any_shotgun", "chance": 5 }, "L": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 4 ] } }, "item": { "/": { "item": "american_flag" } }, @@ -342,7 +342,7 @@ "[": { "item": "police_armory_any_pistol", "chance": 90 }, "9": { "item": "police_armory_any_assaultrifle", "chance": 100 }, "{": { "item": "police_armory_any_sniperrifle", "chance": 80 }, - "]": { "item": "police_armory_any_shotgun", "chance": 100 }, + "]": { "item": "police_armory_any_shotgun", "chance": 10 }, "7": [ { "item": "jewelry_front", "chance": 50, "repeat": [ 2, 3 ] }, { "item": "stash_drugs", "chance": 50, "repeat": [ 2, 3 ] }, @@ -503,10 +503,10 @@ "t": { "item": "trash_cart", "chance": 50, "repeat": [ 2, 3 ] }, "1": { "item": "cop_items", "chance": 90, "repeat": [ 2, 4 ] }, "l": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 3 ] }, - "{": { "item": "police_armory_any_sniperrifle", "chance": 80 }, + "{": { "item": "police_armory_any_sniperrifle", "chance": 50 }, "}": { "item": "police_armory_any_assaultrifle", "chance": 80 }, - "[": { "item": "police_armory_any_pistol", "chance": 90 }, - "]": { "item": "police_armory_any_shotgun", "chance": 80 }, + "[": { "item": "police_armory_any_pistol", "chance": 90, "repeat": 2 }, + "]": { "item": "police_armory_any_shotgun", "chance": 5 }, "L": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 3 ] }, "D": { "item": "office", "chance": 60, "repeat": [ 2, 3 ] }, "T": { "item": "dining", "chance": 60, "repeat": [ 2, 3 ] }, diff --git a/data/json/mapgen/radio_tower.json b/data/json/mapgen/radio_tower.json index 20416cf0699fb..b6ab796372d44 100644 --- a/data/json/mapgen/radio_tower.json +++ b/data/json/mapgen/radio_tower.json @@ -286,7 +286,7 @@ [ "null", 40 ], [ "radio_tower_2x2_map", 40 ], [ "radio_tower_2x2_holdout", 10 ], - [ "radio_tower_2x2_sniper", 10 ], + [ "radio_tower_2x2_sniper", 2 ], [ "radio_tower_wasp", 5 ] ], "x": 10, diff --git a/data/json/mapgen/store/s_hunting.json b/data/json/mapgen/store/s_hunting.json index 340bc43ce79e6..4be4b3c9102c6 100644 --- a/data/json/mapgen/store/s_hunting.json +++ b/data/json/mapgen/store/s_hunting.json @@ -36,7 +36,7 @@ "place_loot": [ { "group": "guns_rifle_hunting_display", "x": 2, "y": 13, "chance": 70, "repeat": [ 2, 3 ] }, { "group": "guns_pistol_hunting_display", "x": 2, "y": 13, "chance": 70, "repeat": [ 2, 3 ] }, - { "group": "guns_shotgun_common_display", "x": 2, "y": 14, "chance": 70, "repeat": [ 3, 4 ] }, + { "group": "guns_shotgun_common_display", "x": 2, "y": 14, "chance": 70, "repeat": [ 1, 2 ] }, { "group": "SUS_hunting_archery", "x": 2, "y": 15, "chance": 80, "repeat": [ 4, 5 ] }, { "group": "archery_ammo", "x": 2, "y": 16, "chance": 80, "repeat": [ 4, 6 ] }, { "group": "archery_loaded_quivers", "x": 2, "y": 16, "chance": 40, "repeat": [ 2, 4 ] }, diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json index 70689c4564346..247ee6f1d4d47 100644 --- a/data/json/mapgen_palettes/gunstore.json +++ b/data/json/mapgen_palettes/gunstore.json @@ -119,13 +119,13 @@ "items": { "X": { "item": "SUS_gunstore_safe", "chance": 50, "repeat": [ 10, 20 ] }, "O": { "item": "SUS_gunstore_safe_obscure", "chance": 75, "repeat": [ 3, 6 ] }, - "s": { "item": "SUS_gunstore_crate", "chance": 75, "repeat": [ 1, 3 ] }, - "S": { "item": "SUS_gunstore_crate", "chance": 5, "repeat": [ 1, 3 ] }, + "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": 25 }, + "p": { "item": "SUS_gunstore_displaycase", "chance": 55 }, "K": { "item": { "//": "gun books kept on racks in the FoH", diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index 45fa5477d0c9b..8549e60cc59df 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -252,7 +252,7 @@ { "item": "home_display_case", "chance": 30 }, { "item": "harddrugs", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "maps", "chance": 2 }, - { "item": "guns_pistol_common", "chance": 50, "ammo": 90, "magazine": 100 }, + { "item": "guns_pistol_common", "chance": 25, "ammo": 90, "magazine": 100 }, { "item": "gemstones", "chance": 30, "repeat": [ 1, 2 ] } ], "w": [ diff --git a/data/json/vehicles/emergency.json b/data/json/vehicles/emergency.json index 04afad6afcb9a..8ec07a41d0320 100644 --- a/data/json/vehicles/emergency.json +++ b/data/json/vehicles/emergency.json @@ -461,7 +461,7 @@ { "x": -2, "y": 0, "chance": 5, "item_groups": [ "cop_gear" ] }, { "x": -2, "y": 1, "chance": 3, "magazine": 100, "ammo": 50, "item_groups": [ "cop_weapons" ] }, { "x": -2, "y": 1, "chance": 100, "item_groups": [ "spare_tire_kit_small_jack" ] }, - { "x": -2, "y": 1, "chance": 10, "item_groups": [ "longguns_cop_loaded" ] } + { "x": -2, "y": 1, "chance": 1, "item_groups": [ "longguns_cop_loaded" ] } ] }, {