From b586223022eab4a92abd683510e61361a42ca054 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:13:55 +0200 Subject: [PATCH 01/12] add off vending machines, add nests for vending machines --- .../furniture-tools.json | 54 ++++++++++++++++++ .../nested/vending_machines_nested.json | 57 +++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 data/json/mapgen/nested/vending_machines_nested.json diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 11bae340de37d..e19418e97b0dc 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1638,6 +1638,37 @@ ] } }, + { + "type": "furniture", + "id": "f_vending_reinforced_off", + "name": "reinforced vending machine (off)", + "looks_like": "f_vending_reinforced", + "description": "A bit tougher to crack open than a regular vending machine. Out of order, for lack of power. That just makes it all the sweeter of a target, doesn't it?", + "symbol": "{", + "color": "light_red", + "move_cost_mod": -1, + "coverage": 90, + "required_str": 30, + "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "FLAMMABLE_HARD", "MINEABLE" ], + "bash": { + "str_min": 150, + "str_max": 520, + "sound": "glass breaking!", + "sound_fail": "whack!", + "furn_set": "f_vending_o", + "items": [ + { "item": "glass_shard", "count": [ 8, 25 ] }, + { "item": "sheet_metal", "count": [ 0, 2 ] }, + { "item": "steel_chunk", "count": [ 1, 5 ] }, + { "item": "money_one", "count": [ 0, 100 ] }, + { "item": "money_two", "count": [ 0, 20 ] }, + { "item": "money_five", "count": [ 0, 100 ] }, + { "item": "money_ten", "count": [ 0, 100 ] }, + { "item": "money_twenty", "count": [ 0, 100 ] }, + { "item": "money_fifty", "count": [ 0, 50 ] } + ] + } + }, { "type": "furniture", "id": "f_vending_c", @@ -1662,6 +1693,29 @@ "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] } }, + { + "type": "furniture", + "id": "f_vending_c_off", + "name": "vending machine (off)", + "looks_like": "f_vending_c", + "symbol": "{", + "description": "An upright metal cabinet with a see-through door. Out of order, for lack of power.", + "color": "light_cyan", + "move_cost_mod": -1, + "coverage": 90, + "required_str": 12, + "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "MINEABLE" ], + "bash": { + "str_min": 20, + "str_max": 40, + "sound": "glass breaking!", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 12, + "furn_set": "f_vending_o", + "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] + } + }, { "type": "furniture", "id": "f_vending_o", diff --git a/data/json/mapgen/nested/vending_machines_nested.json b/data/json/mapgen/nested/vending_machines_nested.json new file mode 100644 index 0000000000000..e1fc230bebae6 --- /dev/null +++ b/data/json/mapgen/nested/vending_machines_nested.json @@ -0,0 +1,57 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_glass_shards", + "object": { + "mapgensize": [ 1, 1 ], + "flags": [ "ALLOW_TERRAIN_UNDER_ITEMS" ], + "item": { " ": [ { "item": "glass_shard", "repeat": [ 1, 25 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine", + "object": { "mapgensize": [ 1, 1 ], "flags": [ "ALLOW_TERRAIN_UNDER_ITEMS" ], "furniture": { " ": "f_vending_c" } } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_off", + "object": { "mapgensize": [ 1, 1 ], "flags": [ "ALLOW_TERRAIN_UNDER_ITEMS" ], "furniture": { " ": "f_vending_c_off" } } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_broken", + "object": { + "mapgensize": [ 1, 1 ], + "furniture": { " ": "f_vending_o" }, + "set": [ { "point": "item_remove", "x": 0, "y": 0 } ], + "item": { " ": [ { "item": "glass_shard", "repeat": [ 1, 25 ] } ] } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_looted", + "//": "should be `one in (days since cataclysm + 4)` to be unlooted, but maps do not support math weight (yet?)", + "object": { + "mapgensize": [ 1, 1 ], + "nested": { " ": { "chunks": [ [ "nest_vending_machine_broken", 9 ], [ "nest_vending_machine_off", 1 ] ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_reinforced", + "object": { "mapgensize": [ 1, 1 ], "flags": [ "ALLOW_TERRAIN_UNDER_ITEMS" ], "furniture": { " ": "f_vending_reinforced" } } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_reinforced_off", + "object": { "mapgensize": [ 1, 1 ], "flags": [ "ALLOW_TERRAIN_UNDER_ITEMS" ], "furniture": { " ": "f_vending_reinforced_off" } } + } +] From 3c85d8372cac923bb3434276334dc67013847b9c Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Mon, 15 Jul 2024 22:42:26 +0200 Subject: [PATCH 02/12] replace some vendingmachines with nests --- data/json/mapgen/bowling_alley.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/bowling_alley.json b/data/json/mapgen/bowling_alley.json index 7a0d51baa6e88..13406f62484b7 100644 --- a/data/json/mapgen/bowling_alley.json +++ b/data/json/mapgen/bowling_alley.json @@ -71,8 +71,9 @@ "&": "f_trashcan" }, "toilets": { "T": { } }, - "vendingmachines": { "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "F": { "item": "vending_food", "chance": 100, "repeat": [ 1, 3 ] }, "=": { "item": "bowling_balls", "chance": 100, "repeat": [ 1, 3 ] }, "t": { "item": "bowling_table", "chance": 33, "repeat": [ 1, 2 ] }, "#": { "item": "bowling_alcohol", "chance": 25 }, From b144e67fb2a96aef6f560a9c3a6b1ed7a9ed87c3 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 16 Jul 2024 13:02:33 +0200 Subject: [PATCH 03/12] more json replacements --- data/json/mapgen/bus_station.json | 4 +++- data/json/mapgen/cs_car_dealership.json | 4 +++- data/json/mapgen/cs_car_showroom.json | 4 +++- data/json/mapgen/dispensary.json | 4 +++- data/json/mapgen/dive_shop.json | 4 +++- data/json/mapgen/drive-in_theater.json | 8 ++++++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json index 5c510456b6c9d..cf16bdfca7c0c 100644 --- a/data/json/mapgen/bus_station.json +++ b/data/json/mapgen/bus_station.json @@ -72,6 +72,8 @@ "G": "f_bulletin" }, "items": { + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 25 }, "Y": { "item": "jackets", "chance": 55, "repeat": [ 1, 6 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, @@ -84,7 +86,7 @@ { "vehicle": "buses", "x": 35, "y": [ 6, 7 ], "chance": 35, "rotation": 360 }, { "vehicle": "buses", "x": 35, "y": [ 16, 17 ], "chance": 35, "rotation": 360 } ], - "vendingmachines": { "8": { "item_group": "vending_drink", "lootable": true }, "9": { "item_group": "vending_food", "lootable": true } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } }, "place_loot": [ { "group": "cash_register_random", "x": 6, "y": 14 } ] } diff --git a/data/json/mapgen/cs_car_dealership.json b/data/json/mapgen/cs_car_dealership.json index 79281a272d590..09e27ee3b3e0e 100644 --- a/data/json/mapgen/cs_car_dealership.json +++ b/data/json/mapgen/cs_car_dealership.json @@ -61,7 +61,7 @@ "T": "f_toilet", "s": "f_sofa" }, - "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_vehicles": [ { "vehicle": "oa_vg_cd_vehicles", "x": 4, "y": 5, "rotation": 270, "chance": 70, "fuel": 0 }, { "vehicle": "oa_vg_cd_vehicles", "x": 11, "y": 5, "rotation": 270, "chance": 70, "fuel": 0 }, @@ -69,6 +69,8 @@ { "vehicle": "oa_vg_cd_vehicles", "x": 18, "y": 15, "rotation": 270, "chance": 70, "fuel": 0 } ], "items": { + "v": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "s": { "item": "oa_discarded_news", "chance": 33 }, "c": { "item": "oa_custom_trash", "chance": 70 }, "D": { "item": "oa_custom_trash", "chance": 60 }, diff --git a/data/json/mapgen/cs_car_showroom.json b/data/json/mapgen/cs_car_showroom.json index cb49f46f17869..515912e3bbe58 100644 --- a/data/json/mapgen/cs_car_showroom.json +++ b/data/json/mapgen/cs_car_showroom.json @@ -67,9 +67,11 @@ "S": "f_sofa", "f": "f_filing_cabinet" }, - "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_vehicles": [ { "vehicle": "oa_vg_cs_vehicles", "x": 16, "y": 8, "rotation": 270, "chance": 100, "status": 0, "fuel": 0 } ], "items": { + "v": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "c": { "item": "oa_custom_trash", "chance": 70 }, "á": { "item": "oa_custom_trash", "chance": 70 }, "C": { "item": "oa_custom_trash", "chance": 70 }, diff --git a/data/json/mapgen/dispensary.json b/data/json/mapgen/dispensary.json index d05c05576cff0..c0d5f8decd500 100644 --- a/data/json/mapgen/dispensary.json +++ b/data/json/mapgen/dispensary.json @@ -38,6 +38,8 @@ "&": "f_trashcan" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "M": { "item": "smoke_shop", "chance": 50, "repeat": [ 1, 2 ] }, "#": { "item": "misc_smoking", "chance": 20 }, "I": { "item": "SUS_office_desk", "chance": 33 }, @@ -53,7 +55,7 @@ "2": [ { "item": "withered", "chance": 75, "repeat": [ 1, 4 ] }, { "item": "seed_weed", "chance": 75, "repeat": [ 1, 4 ] } ] }, "toilets": { "t": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } } + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } } }, { "type": "mapgen", diff --git a/data/json/mapgen/dive_shop.json b/data/json/mapgen/dive_shop.json index d4934168edeea..7cc732d4d5d6c 100644 --- a/data/json/mapgen/dive_shop.json +++ b/data/json/mapgen/dive_shop.json @@ -57,10 +57,12 @@ "B": "f_workbench", "3": "f_air_compressor" }, - "vendingmachines": { "W": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "vehicles": { "v": { "vehicle": "parking_garage_short", "rotation": 90, "chance": 33 } }, "toilets": { "t": { } }, "items": { + "W": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "R": { "item": "SUS_scuba_gear", "chance": 10 }, "D": { "item": "SUS_scuba_gear", "chance": 40 }, "]": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ] } diff --git a/data/json/mapgen/drive-in_theater.json b/data/json/mapgen/drive-in_theater.json index a053a169f6c35..f0cfc799dcc20 100644 --- a/data/json/mapgen/drive-in_theater.json +++ b/data/json/mapgen/drive-in_theater.json @@ -375,8 +375,12 @@ "x": "f_cardboard_box", "X": "f_cardboard_box" }, - "item": { "N": { "item": "movie_poster", "chance": 100 } }, - "vendingmachines": { "$": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "item": { + "N": { "item": "movie_poster", "chance": 100 }, + "$": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 } + }, + "nested": { "$": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } } } ] From 8c95699a7c286638ed8474196994044adcca2fa7 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:09:12 +0200 Subject: [PATCH 04/12] more json churn --- .../city_blocks/urban_14_dense_house_mart_food.json | 12 +++++++++--- data/json/mapgen/golfcourse.json | 4 +++- data/json/mapgen/helipad.json | 6 ++++-- data/json/mapgen/hospital.json | 9 +++++++-- data/json/mapgen/irradiator_1.json | 4 +++- data/json/mapgen/junkyard.json | 3 ++- data/json/mapgen/megastore.json | 3 ++- data/json/mapgen/motel.json | 11 +++++++---- data/json/mapgen/movie_theater.json | 4 +++- data/json/mapgen/music_venue.json | 4 +++- data/json/mapgen/musicstore.json | 3 ++- data/json/mapgen/nursing_home.json | 12 ++++++++---- data/json/mapgen/office_cubical.json | 6 ++++-- data/json/mapgen/park.json | 7 +++++-- data/json/mapgen/pharmacy.json | 6 ++++-- data/json/mapgen/regional_airport.json | 6 ++++-- data/json/mapgen/restaurant.json | 3 ++- data/json/mapgen/reststop.json | 4 +++- data/json/mapgen/s_gun.json | 3 +-- data/json/mapgen/school_1.json | 6 ++++-- data/json/mapgen/smoke_lounge.json | 6 ++++-- data/json/mapgen/speedway.json | 6 ++++-- data/json/mapgen/storage_units_large.json | 3 ++- data/json/mapgen/storage_units_medium.json | 3 ++- data/json/mapgen/stripclub.json | 6 ++++-- data/json/mapgen/sub_station.json | 6 ++++-- data/json/mapgen/thrift.json | 4 +++- data/json/mapgen/town_hall.json | 6 ++++-- 28 files changed, 107 insertions(+), 49 deletions(-) diff --git a/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json b/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json index ebdbe09bc0117..3dd5636ff01e4 100644 --- a/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json +++ b/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json @@ -59,13 +59,17 @@ ")": "f_exercise", "}": [ "f_ergometer", "f_ergometer_mechanical" ] }, - "vendingmachines": { "[": { "item_group": "vending_drink", "lootable": true }, "(": { "item_group": "vending_food", "lootable": true } }, + "nested": { "[": { "chunks": [ "nest_vending_machine_looted" ] }, "(": { "chunks": [ "nest_vending_machine_looted" ] } }, "set": [ { "point": "trap", "id": "tr_rollmat", "x": [ 9, 11 ], "y": 11 }, { "point": "trap", "id": "tr_rollmat", "x": [ 9, 11 ], "y": 12 } ], "place_item": [ { "item": "television", "x": 6, "y": 3 } ], - "items": { "!": [ { "item": "laundry", "chance": 20, "repeat": [ 1, 3 ] }, { "item": "cleaning", "chance": 10 } ] }, + "items": { + "!": [ { "item": "laundry", "chance": 20, "repeat": [ 1, 3 ] }, { "item": "cleaning", "chance": 10 } ], + "[": { "item": "vending_drink", "chance": 100 }, + "(": { "item": "vending_food", "chance": 100 } + }, "place_vehicles": [ { "vehicle": "laundry_cart", "x": [ 2, 6 ], "y": [ 10, 15 ], "chance": 50, "repeat": 2 } ] } }, @@ -128,8 +132,10 @@ "m": "f_glass_fridge", "0": "f_table" }, - "vendingmachines": { "[": { "item_group": "vending_drink", "lootable": true }, "(": { "item_group": "vending_food", "lootable": true } }, + "nested": { "[": { "chunks": [ "nest_vending_machine_looted" ] }, "(": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "[": { "item": "vending_drink", "chance": 100 }, + "(": { "item": "vending_food", "chance": 100 }, "1": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 2 ] } ], "2": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 1, 2 ] } ], "5": [ { "item": "cannedfood", "chance": 30, "repeat": [ 1, 2 ] } ], diff --git a/data/json/mapgen/golfcourse.json b/data/json/mapgen/golfcourse.json index bd69d2faccab2..b810789cb1dda 100644 --- a/data/json/mapgen/golfcourse.json +++ b/data/json/mapgen/golfcourse.json @@ -84,7 +84,7 @@ "│4444444444444444444ww4444444&44444444444444444444444444444444444444444444444444444444444444444│", "││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││" ], - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 72, 95 ], "y": [ 24, 47 ], "repeat": [ 0, 4 ] } ], "terrain": { "4": [ [ "t_region_shrub_decorative", 12 ], "t_region_tree_shade", [ "t_region_groundcover_forest", 3 ] ], @@ -130,6 +130,8 @@ "U": [ "f_dumpster", "f_recycle_bin" ] }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "&": { "item": "trash", "chance": 25, "repeat": 2 }, "v": { "item": "golf_green", "chance": 10 }, "t": { "chance": 75, "item": "office_mess" } diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 4b75064f76d61..af623d61b8f0a 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -113,9 +113,11 @@ "[": { "item": "SUS_fridge", "chance": 50 }, "O": { "item": "SUS_oven", "chance": 75, "repeat": [ 0, 2 ] }, "H": { "item": "SUS_spice_collection", "chance": 75 }, - "&": { "item": "SUS_toilet", "chance": 50 } + "&": { "item": "SUS_toilet", "chance": 50 }, + "1": { "item": "vending_drink", "chance": 100 }, + "2": { "item": "vending_food", "chance": 100 } }, - "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monster": [ { "group": "GROUP_MIL_HELIPAD", "x": [ 3, 21 ], "y": [ 4, 23 ], "chance": 50, "repeat": [ 8, 15 ] }, { "group": "GROUP_MIL_HELIPAD", "x": [ 24, 40 ], "y": [ 10, 23 ], "chance": 40, "repeat": [ 5, 10 ] }, diff --git a/data/json/mapgen/hospital.json b/data/json/mapgen/hospital.json index 44e43b4080a50..c0fe84c2075de 100644 --- a/data/json/mapgen/hospital.json +++ b/data/json/mapgen/hospital.json @@ -153,7 +153,6 @@ "palettes": [ "hospital" ], "terrain": { "5": "t_floor", "H": "t_floor", "X": [ "t_door_metal_locked", "t_door_metal_elocked" ], "=": "t_pavement" }, "furniture": { "H": "f_locker" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, "computers": { "5": { "name": "Medical Supply Access", @@ -168,8 +167,14 @@ } }, "vehicles": { "=": { "vehicle": "pickup_corpses", "chance": 10, "rotation": 270, "status": 1 } }, - "nested": { "=": { "chunks": [ [ "null", 70 ], [ "pile_bodybag_corpses", 30 ] ] } }, + "nested": { + "=": { "chunks": [ [ "null", 70 ], [ "pile_bodybag_corpses", 30 ] ] }, + "D": { "chunks": [ "nest_vending_machine_looted" ] }, + "F": { "chunks": [ "nest_vending_machine_looted" ] } + }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "b": { "item": "magazines", "chance": 50 }, "B": { "item": "hospital_bed", "chance": 80 }, "f": { "item": "SUS_fridge_breakroom", "chance": 90 }, diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 3345889963055..4338ae426f49f 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -285,8 +285,10 @@ } }, "toilets": { "?": { } }, - "vendingmachines": { "V": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, "items": { + "V": { "item_group": "vending_drink" }, + "F": { "item_group": "vending_food" }, "S": { "item": "clothing_outdoor_set", "chance": 50 }, "c": { "item": "repair_storage", "chance": 80 }, "j": { "item": "cleaning", "chance": 80, "repeat": [ 1, 3 ] }, diff --git a/data/json/mapgen/junkyard.json b/data/json/mapgen/junkyard.json index 56f3844144cf7..107ec4113b6cf 100644 --- a/data/json/mapgen/junkyard.json +++ b/data/json/mapgen/junkyard.json @@ -34,7 +34,8 @@ ], "palettes": [ "junkyard_palette" ], "place_toilets": [ { "x": 12, "y": 13 } ], - "vendingmachines": { "K": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "K": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "K": { "item_group": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "place_loot": [ { "item": "television", "x": 17, "y": 9, "chance": 100 } ], "place_items": [ { "chance": 25, "item": "cubical_office", "x": [ 18, 19 ], "y": 12 }, diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index 3d08387e620db..e1892672e6621 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -64,9 +64,10 @@ "U": "f_cupboard", ":": "f_shredder" }, - "vendingmachines": { "$": { "lootable": true } }, + "nested": { "$": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "&": { } }, "items": { + "$": { "item": "default_vending_machine", "chance": 100 }, "Á": { "item": "cash_register_random", "chance": 100 }, "l": { "item": "jackets", "chance": 5 }, "L": { "item": "home_hw", "chance": 50 }, diff --git a/data/json/mapgen/motel.json b/data/json/mapgen/motel.json index e93c520f74ad6..454eeafefc874 100644 --- a/data/json/mapgen/motel.json +++ b/data/json/mapgen/motel.json @@ -68,12 +68,13 @@ "d": "f_deckchair", "t": "f_table" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, "vehicles": { "Á": { "vehicle": "parking_garage", "chance": 33, "rotation": 270 }, "É": { "vehicle": "parking_garage", "chance": 33, "rotation": 90 } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "Y": { "item": "unisex_coat_rack", "chance": 33 }, "n": { "item": "dining", "chance": 6 }, "C": [ { "item": "cash_register_random", "chance": 100 }, { "item": "stand_flyer", "chance": 50 } ], @@ -81,7 +82,6 @@ "a": { "item": "trash", "repeat": [ 0, 2 ], "chance": 45 }, "{": { "item": "trash", "chance": 100, "repeat": [ 0, 5 ] }, "s": { "item": "public_sink", "chance": 40, "repeat": [ 0, 2 ] }, - "F": { "item": "SUS_fridge_breakroom", "chance": 100 }, "c": { "item": "office_supplies", "chance": 20, "repeat": [ 1, 4 ] } }, "toilets": { "T": { } }, @@ -91,7 +91,9 @@ }, "nested": { "E": { "chunks": [ "9x9_motel_room_twin_E", "9x9_motel_room_single_E", "9x9_motel_room_single_1_E" ] }, - "N": { "chunks": [ "9x9_motel_room_twin_N", "9x9_motel_room_single_N", "9x9_motel_room_single_1_N" ] } + "N": { "chunks": [ "9x9_motel_room_twin_N", "9x9_motel_room_single_N", "9x9_motel_room_single_1_N" ] }, + "D": { "chunks": [ "nest_vending_machine_looted" ] }, + "F": { "chunks": [ "nest_vending_machine_looted" ] } } }, { @@ -741,7 +743,8 @@ "$": { "furniture": "f_shower", "items": { "item": "shower", "chance": 33 } }, "S": { "furniture": "f_sink", "items": { "item": "public_sink", "chance": 33 } } }, - "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } }, + "items": { "V": { "item": "vending_drink", "chance": 100 }, "v": { "item": "vending_food", "chance": 100 } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "v": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "L": { } } }, { diff --git a/data/json/mapgen/movie_theater.json b/data/json/mapgen/movie_theater.json index 802ce6fa16fad..9a960b6b4e588 100644 --- a/data/json/mapgen/movie_theater.json +++ b/data/json/mapgen/movie_theater.json @@ -87,8 +87,10 @@ "palettes": [ "movie_theater_palette.json" ], "terrain": { "#": "t_thconc_floor", "H": "t_thconc_floor", "y": "t_thconc_floor" }, "toilets": { "&": { } }, - "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "v": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "&": { "item": "alcohol", "chance": 10 }, "T": { "item": "snacks", "chance": 5 }, "X": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] }, diff --git a/data/json/mapgen/music_venue.json b/data/json/mapgen/music_venue.json index 2063e7424c639..6ea7dee774275 100644 --- a/data/json/mapgen/music_venue.json +++ b/data/json/mapgen/music_venue.json @@ -225,6 +225,8 @@ "7": "f_speaker_cabinet" }, "items": { + "v": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "r": { "item": "glass_set", "chance": 90, "repeat": [ 1, 6 ] }, "L": { "item": "SUS_janitors_closet", "chance": 100 }, "á": { "item": "bar_table", "chance": 12 }, @@ -240,7 +242,7 @@ "#": [ { "item": "jackets", "chance": 16 }, { "item": "hats_unisex", "chance": 12 } ], "Y": [ { "item": "jackets", "chance": 35, "repeat": [ 1, 4 ] }, { "item": "hats_unisex", "chance": 25, "repeat": [ 1, 2 ] } ] }, - "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_loot": [ { "group": "cash_register_random", "x": [ 4, 5 ], "y": 18 }, { "item": "amplifier_head", "x": 6, "y": 9 }, diff --git a/data/json/mapgen/musicstore.json b/data/json/mapgen/musicstore.json index 2aad26ac61784..ec56eb98522c6 100644 --- a/data/json/mapgen/musicstore.json +++ b/data/json/mapgen/musicstore.json @@ -65,7 +65,8 @@ "r": "f_rack", "d": "f_dumpster" }, - "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "1": { "item": "vending_drink", "chance": 100 } }, "toilets": { "T": { } }, "place_loot": [ { "group": "mussto_stringinst", "x": [ 5, 10 ], "y": 10, "chance": 70, "repeat": [ 3, 7 ] }, diff --git a/data/json/mapgen/nursing_home.json b/data/json/mapgen/nursing_home.json index 8d02dc74b0a4c..ee697d16d34e0 100644 --- a/data/json/mapgen/nursing_home.json +++ b/data/json/mapgen/nursing_home.json @@ -191,10 +191,12 @@ { "item": "games", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "office_mess", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "magazines", "chance": 20, "repeat": [ 0, 1 ] } - ] + ], + "?": { "item": "vending_drink", "chance": 100 }, + ",": { "item": "vending_food", "chance": 100 } }, "monster": { "3": { "monster": "mon_civilian_icu", "chance": 10 }, "8": { "monster": "mon_civilian_icu", "chance": 10 } }, - "vendingmachines": { "?": { "item_group": "vending_drink", "lootable": true }, ",": { "item_group": "vending_food", "lootable": true } }, + "nested": { "?": { "chunks": [ "nest_vending_machine_looted" ] }, ",": { "chunks": [ "nest_vending_machine_looted" ] } }, "palettes": [ "nursing_home_palette" ], "place_monster": [ { "group": "GROUP_NURSING_HOME", "x": [ 1, 20 ], "y": [ 6, 23 ], "repeat": [ 5, 8 ] }, @@ -412,9 +414,11 @@ { "item": "office_mess", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "magazines", "chance": 20, "repeat": [ 0, 1 ] } ], - ".": [ { "item": "trash", "chance": 2 }, { "item": "office_mess", "chance": 3 } ] + ".": [ { "item": "trash", "chance": 2 }, { "item": "office_mess", "chance": 3 } ], + "?": { "item": "vending_drink", "chance": 100 }, + ",": { "item": "vending_food", "chance": 100 } }, - "vendingmachines": { "?": { "item_group": "vending_drink", "lootable": true }, ",": { "item_group": "vending_food", "lootable": true } }, + "nested": { "?": { "chunks": [ "nest_vending_machine_looted" ] }, ",": { "chunks": [ "nest_vending_machine_looted" ] } }, "palettes": [ "nursing_home_sh_palette" ], "monster": { "3": { "monster": "mon_civilian_icu", "chance": 10 }, "8": { "monster": "mon_civilian_icu", "chance": 10 } }, "place_monster": [ diff --git a/data/json/mapgen/office_cubical.json b/data/json/mapgen/office_cubical.json index 6f15f99056dfa..a5522e1572b23 100644 --- a/data/json/mapgen/office_cubical.json +++ b/data/json/mapgen/office_cubical.json @@ -59,9 +59,10 @@ "o": "f_bookcase", "t": "f_table" }, - "vendingmachines": { "V": { "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } }, "items": { + "V": { "item": "default_vending_machine", "chance": 100 }, "e": { "item": "SUS_fridge_breakroom", "chance": 55, "repeat": [ 2, 3 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 20 }, @@ -190,9 +191,10 @@ "o": "f_bookcase", "t": "f_table" }, - "vendingmachines": { "V": { "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } }, "items": { + "V": { "item": "default_vending_machine", "chance": 100 }, "e": { "item": "SUS_fridge_breakroom", "chance": 55, "repeat": [ 2, 3 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 20 }, diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json index 092bb79dc8332..e23dadd970f0c 100644 --- a/data/json/mapgen/park.json +++ b/data/json/mapgen/park.json @@ -538,8 +538,11 @@ " , " ], "palettes": [ "park_scenic_palette" ], - "items": { "N": { "item": "bulletin_public", "chance": 50, "repeat": [ 1, 3 ] } }, - "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true } }, + "items": { + "N": { "item": "bulletin_public", "chance": 50, "repeat": [ 1, 3 ] }, + "v": { "item": "vending_drink", "chance": 100 } + }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, diff --git a/data/json/mapgen/pharmacy.json b/data/json/mapgen/pharmacy.json index 4fec13c3853af..aec8c363ae2a4 100644 --- a/data/json/mapgen/pharmacy.json +++ b/data/json/mapgen/pharmacy.json @@ -199,9 +199,11 @@ "x": "f_glass_cabinet" }, "toilets": { "T": { } }, - "vendingmachines": { "l": { "item_group": "vending_drink", "lootable": true }, "m": { "item_group": "vending_food", "lootable": true } }, + "nested": { "l": { "chunks": [ "nest_vending_machine_looted" ] }, "m": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { - "#": [ { "item": "snacks", "chance": 10 } ], + "l": { "item": "vending_drink", "chance": 100 }, + "m": { "item": "vending_food", "chance": 100 }, + "#": { "item": "snacks", "chance": 10 }, "f": { "item": "fridgesnacks", "chance": 60, "repeat": [ 1, 12 ] }, "1": { "item": "magazines", "chance": 60, "repeat": [ 4, 16 ] }, "2": { "item": "snacks", "chance": 60, "repeat": [ 1, 12 ] }, diff --git a/data/json/mapgen/regional_airport.json b/data/json/mapgen/regional_airport.json index a088312cc585f..16c99ddc2d41b 100644 --- a/data/json/mapgen/regional_airport.json +++ b/data/json/mapgen/regional_airport.json @@ -355,9 +355,11 @@ "O": [ { "item": "supplies_electronics", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "mechanics", "chance": 20, "repeat": [ 1, 2 ] } - ] + ], + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 } }, - "vendingmachines": { "8": { "item_group": "vending_drink", "lootable": true }, "9": { "item_group": "vending_food", "lootable": true } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, "vehicles": { "Á": { "vehicle": "parkinglotbasic", "chance": 33, "rotation": 270 }, "É": { "vehicle": "parkinglotbasic", "chance": 33, "rotation": 90 } diff --git a/data/json/mapgen/restaurant.json b/data/json/mapgen/restaurant.json index 512a4a4e80574..33b4919c020af 100644 --- a/data/json/mapgen/restaurant.json +++ b/data/json/mapgen/restaurant.json @@ -463,6 +463,7 @@ }, "item": { "L": { "item": "medium_disposable_cell", "chance": 100, "repeat": [ 1, 2 ] } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "SUS_fridge_breakroom", "chance": 100 }, "x": { "item": "trash", "chance": 100, "repeat": [ 2, 4 ] }, "B": { "item": "magazines", "chance": 50, "repeat": [ 3, 5 ] }, @@ -481,7 +482,7 @@ "i": { "item": "softdrugs", "chance": 70, "repeat": [ 2, 3 ] }, "c": [ { "item": "kitchen", "chance": 100, "repeat": [ 1, 5 ] }, { "item": "knifeblock", "chance": 75, "repeat": [ 1, 2 ] } ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_loot": [ { "item": "television", "x": [ 3, 4 ], "y": 20, "repeat": 1, "chance": 100 } ], "place_nested": [ { "chunks": [ [ "foodperson_break_room", 25 ], [ "null", 75 ] ], "x": 15, "y": 10 } ] } diff --git a/data/json/mapgen/reststop.json b/data/json/mapgen/reststop.json index ea273887d7585..38753c38b986d 100644 --- a/data/json/mapgen/reststop.json +++ b/data/json/mapgen/reststop.json @@ -97,8 +97,10 @@ "R": "f_bike_rack" }, "toilets": { "B": { } }, - "vendingmachines": { "%": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "%": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "%": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "B": { "item": "SUS_toilet", "chance": 30 }, "Y": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] }, "E": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] } diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json index eaddf8bd597ff..1bdb6a63a0a9c 100644 --- a/data/json/mapgen/s_gun.json +++ b/data/json/mapgen/s_gun.json @@ -373,14 +373,13 @@ ], "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 ] ] }, + "V": { "chunks": [ [ "destroyed_furniture", 75 ], [ "null", 80 ], [ "nest_vending_machine_broken", 75 ] ] }, "A": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, "E": { "chunks": [ [ "destroyed_furniture", 45 ], [ "null", 90 ] ] }, "a": { "chunks": [ [ "destroyed_furniture", 20 ], [ "null", 80 ] ] }, diff --git a/data/json/mapgen/school_1.json b/data/json/mapgen/school_1.json index 52bf0a9e1d41b..bcc0f5c3ad82f 100644 --- a/data/json/mapgen/school_1.json +++ b/data/json/mapgen/school_1.json @@ -554,10 +554,12 @@ { "item": "snacks", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "cannedfood_commercial", "chance": 70, "repeat": [ 1, 3 ] }, { "item": "dining", "chance": 5, "repeat": [ 1, 3 ] } - ] + ], + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 } }, "item": { "§": { "item": "american_flag" } }, - "vendingmachines": { "8": { "item_group": "vending_drink", "lootable": true }, "9": { "item_group": "vending_food", "lootable": true } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, "computers": { "6": { "name": "School Bell Software 1.1", diff --git a/data/json/mapgen/smoke_lounge.json b/data/json/mapgen/smoke_lounge.json index fa5450cfb0a7f..5716db5c9d607 100644 --- a/data/json/mapgen/smoke_lounge.json +++ b/data/json/mapgen/smoke_lounge.json @@ -87,7 +87,8 @@ "g": "f_stool", "Y": "f_trashcan" }, - "vendingmachines": { "M": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "M": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "M": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "sealed_item": { "1": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" } }, "toilets": { "&": { } } }, @@ -233,7 +234,8 @@ "g": "f_stool", "Y": "f_trashcan" }, - "vendingmachines": { "M": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "M": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "M": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "sealed_item": { "1": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" } }, "toilets": { "&": { } } }, diff --git a/data/json/mapgen/speedway.json b/data/json/mapgen/speedway.json index 344380b065a16..7f20bce628944 100644 --- a/data/json/mapgen/speedway.json +++ b/data/json/mapgen/speedway.json @@ -76,10 +76,12 @@ "i": { "item": "SUS_office_filing_cabinet", "chance": 25 }, "a": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, "A": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, - "D": { "item": "trash", "chance": 80, "repeat": [ 4, 8 ] } + "D": { "item": "trash", "chance": 80, "repeat": [ 4, 8 ] }, + "V": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 } }, "toilets": { "T": { } }, - "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "vehicles": { "v": { "vehicle": "cars_only", "chance": 10, "rotation": 90 }, "^": { "vehicle": "cars_only", "chance": 10, "rotation": 270 }, diff --git a/data/json/mapgen/storage_units_large.json b/data/json/mapgen/storage_units_large.json index 827ad97d201aa..fd0e785325290 100644 --- a/data/json/mapgen/storage_units_large.json +++ b/data/json/mapgen/storage_units_large.json @@ -217,7 +217,8 @@ "I": "f_sofa", "M": [ "f_crate_c", "f_cardboard_box" ] }, - "vendingmachines": { "U": { "item_group": "vending_drink", "lootable": true }, "Á": { "item_group": "vending_food", "lootable": true } }, + "nested": { "U": { "chunks": [ "nest_vending_machine_looted" ] }, "Á": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "U": { "item": "vending_drink", "chance": 100 }, "Á": { "item": "vending_food", "chance": 100 } }, "place_loot": [ { "item": "stepladder", "x": 14, "y": 12, "chance": 50 }, { "item": "stepladder", "x": 5, "y": 4, "chance": 50 } ], "place_items": [ { "item": "homebooks", "x": [ 0, 5 ], "y": [ 9, 10 ], "chance": 50, "repeat": [ 1, 11 ] }, diff --git a/data/json/mapgen/storage_units_medium.json b/data/json/mapgen/storage_units_medium.json index bf269d964a365..2bcdd4c63dbfd 100644 --- a/data/json/mapgen/storage_units_medium.json +++ b/data/json/mapgen/storage_units_medium.json @@ -219,7 +219,8 @@ "M": [ "f_crate_c", "f_cardboard_box" ] }, "place_loot": [ { "item": "television", "x": 3, "y": 6, "chance": 75 }, { "item": "stepladder", "x": 20, "y": 19, "chance": 100 } ], - "vendingmachines": { "W": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "W": { "item": "vending_drink", "chance": 100 }, "V": { "item": "vending_food", "chance": 100 } }, "place_items": [ { "item": "softdrugs", "x": [ 1, 2 ], "y": [ 1, 3 ], "chance": 50, "repeat": [ 1, 11 ] }, { "item": "camping", "x": 1, "y": [ 1, 3 ], "chance": 50, "repeat": [ 1, 11 ] }, diff --git a/data/json/mapgen/stripclub.json b/data/json/mapgen/stripclub.json index 39188633074d9..f3169d7a3bcd3 100644 --- a/data/json/mapgen/stripclub.json +++ b/data/json/mapgen/stripclub.json @@ -412,7 +412,9 @@ "C": [ { "item": "magazines", "chance": 25 }, { "item": "bar_alcohol", "chance": 25 } ], "g": { "item": "beer_selection", "chance": 65, "repeat": [ 1, 3 ] }, "a": { "item": "chair_hat", "chance": 5 }, - "e": { "item": "stripclub_dirty", "chance": 5 } + "e": { "item": "stripclub_dirty", "chance": 5 }, + "V": { "item": "vending_food", "chance": 100 }, + "v": { "item": "vending_drink", "chance": 100 } }, "place_fields": [ { "field": "fd_blood", "x": [ 8, 19 ], "y": [ 3, 20 ], "repeat": [ 1, 8 ] }, @@ -426,7 +428,7 @@ ] }, "place_loot": [ { "group": "cash_register_random", "x": [ 13, 16 ], "y": 18 } ], - "vendingmachines": { "V": { "item_group": "vending_food", "lootable": true }, "v": { "item_group": "vending_drink", "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "v": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monsters": [ { "monster": "GROUP_RESORT_DANCERS", "x": [ 1, 23 ], "y": [ 0, 22 ], "density": 0.5 } ], "toilets": { "e": { } } } diff --git a/data/json/mapgen/sub_station.json b/data/json/mapgen/sub_station.json index cfc7ea3d7e6bd..74c18548fb300 100644 --- a/data/json/mapgen/sub_station.json +++ b/data/json/mapgen/sub_station.json @@ -33,7 +33,8 @@ "SSSSSSSSSSSSSSSSSSSSSSSS" ], "palettes": [ "subway" ], - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } } + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } } } }, { @@ -105,7 +106,8 @@ "########################" ], "palettes": [ "subway_underground" ], - "vendingmachines": { "J": { "item_group": "vending_drink", "lootable": true }, "C": { "item_group": "vending_food", "lootable": true } }, + "nested": { "J": { "chunks": [ "nest_vending_machine_looted" ] }, "C": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "J": { "item": "vending_drink", "chance": 100 }, "C": { "item": "vending_food", "chance": 100 } }, "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 4, 9 ], "repeat": [ 5, 9 ] } ], "place_item": [ { "item": "subwaymap", "x": 1, "y": [ 6, 7 ], "chance": 75 } ] } diff --git a/data/json/mapgen/thrift.json b/data/json/mapgen/thrift.json index b7166c7a44026..c8b0e0382e119 100644 --- a/data/json/mapgen/thrift.json +++ b/data/json/mapgen/thrift.json @@ -76,9 +76,11 @@ "L": "f_locker", "U": [ "f_dumpster", "f_recycle_bin" ] }, - "vendingmachines": { "W": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } }, + "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "B": { } }, "items": { + "W": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "J": { "item": "office", "chance": 30, "repeat": [ 3, 4 ] }, "A": { "item": "thrift_misc", "chance": 60, "repeat": [ 1, 6 ] }, "a": { "item": "thrift_books", "chance": 60, "repeat": [ 1, 6 ] }, diff --git a/data/json/mapgen/town_hall.json b/data/json/mapgen/town_hall.json index ba797e6c957a9..5abf323f31b8c 100644 --- a/data/json/mapgen/town_hall.json +++ b/data/json/mapgen/town_hall.json @@ -73,14 +73,16 @@ "O": { "item": "SUS_oven", "chance": 100 }, "u": [ { "item": "SUS_coffee_cupboard", "chance": 50 }, { "item": "dining", "chance": 30 } ], "R": { "item": "office_supplies", "chance": 50, "repeat": [ 1, 2 ] }, - "I": { "item": "SUS_office_filing_cabinet", "chance": 80 } + "I": { "item": "SUS_office_filing_cabinet", "chance": 80 }, + "4": { "item": "vending_drink", "chance": 100 }, + "5": { "item": "vending_food", "chance": 100 } }, "item": { "]": { "item": "american_flag" }, "[": { "item": "american_flag" }, "I": [ { "item": "subwaymap", "chance": 2 }, { "item": "sewermap", "chance": 2 } ] }, - "vendingmachines": { "4": { "item_group": "vending_drink", "lootable": true }, "5": { "item_group": "vending_food", "lootable": true } }, + "nested": { "4": { "chunks": [ "nest_vending_machine_looted" ] }, "5": { "chunks": [ "nest_vending_machine_looted" ] } }, "monster": { " ": { "group": "GROUP_CIVILIAN", "chance": 1 } } }, { From 86c155952feeda2283db0f0e3a08096a86f997a4 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Tue, 16 Jul 2024 20:34:39 +0200 Subject: [PATCH 05/12] more json churn --- data/json/mapgen/gas_stations/gas_station_bunker.json | 4 +++- data/json/mapgen/gas_stations/s_gas.json | 3 ++- data/json/mapgen/irradiator_1.json | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/json/mapgen/gas_stations/gas_station_bunker.json b/data/json/mapgen/gas_stations/gas_station_bunker.json index c935a3cbc91fe..a57e442940d92 100644 --- a/data/json/mapgen/gas_stations/gas_station_bunker.json +++ b/data/json/mapgen/gas_stations/gas_station_bunker.json @@ -402,9 +402,11 @@ "P": "f_autodoc", "M": "f_autodoc_couch" }, - "vendingmachines": { "Ú": { "item_group": "vending_drink", "lootable": true }, "Ó": { "item_group": "vending_food", "lootable": true } }, + "nested": { "Ú": { "chunks": [ "nest_vending_machine_looted" ] }, "Ó": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "n": { } }, "items": { + "Ú": { "item": "vending_drink", "chance": 100 }, + "Ó": { "item": "vending_food", "chance": 100 }, ".": { "item": "office_mess", "chance": 2 }, "1": [ { "item": "SUS_silverware", "chance": 100 }, { "item": "SUS_utensils", "chance": 100 } ], "2": [ { "item": "SUS_cookware", "chance": 100 }, { "item": "SUS_appliances_cupboard", "chance": 70 } ], diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json index 20b28d39f5038..efce9e324b6ab 100644 --- a/data/json/mapgen/gas_stations/s_gas.json +++ b/data/json/mapgen/gas_stations/s_gas.json @@ -44,7 +44,8 @@ "gaspumps": { "G": { "fuel": "gasoline" }, "D": { "fuel": "diesel" } }, "furniture": { "9": "f_aut_gas_console" }, "signs": { "P": { "signage": "Danger! Do not smoke! Risk of explosion!" } }, - "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "1": { "item_group": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, "place_liquids": [ { "liquid": "gasoline", "x": 2, "y": 3, "repeat": [ 200, 1075 ] }, { "liquid": "diesel", "x": 4, "y": 3, "repeat": [ 200, 1075 ] } diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json index 4338ae426f49f..878fa7066d8cb 100644 --- a/data/json/mapgen/irradiator_1.json +++ b/data/json/mapgen/irradiator_1.json @@ -287,8 +287,8 @@ "toilets": { "?": { } }, "nested": { "V": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, "items": { - "V": { "item_group": "vending_drink" }, - "F": { "item_group": "vending_food" }, + "V": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "S": { "item": "clothing_outdoor_set", "chance": 50 }, "c": { "item": "repair_storage", "chance": 80 }, "j": { "item": "cleaning", "chance": 80, "repeat": [ 1, 3 ] }, From 33a164fee95de4348b00f5db1cd11b0c055f46ce Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Tue, 16 Jul 2024 20:51:11 +0200 Subject: [PATCH 06/12] more json churn --- data/json/mapgen/nested/retail_nested.json | 20 ++++++++++++++----- .../mapgen/riverside/whaleys_boat_rental.json | 4 +++- data/json/mapgen/store/s_games.json | 3 ++- .../mapgen_palettes/bike_shop_palette.json | 4 +++- .../convention_center_palette.json | 5 ++++- data/json/mapgen_palettes/deserter_city.json | 4 +++- data/json/mapgen_palettes/lumberyard.json | 4 +++- data/json/mapgen_palettes/office.json | 5 ++++- .../mapgen_palettes/police_dept_palette.json | 4 +++- .../json/mapgen_palettes/stadium_palette.json | 4 +++- data/mods/Defense_Mode/mapgen/hospital.json | 9 +++++++-- .../mapgen_palettes/other_palettes.json | 4 +++- 12 files changed, 53 insertions(+), 17 deletions(-) diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json index 739e2ebce4fe1..e56143185b7bb 100644 --- a/data/json/mapgen/nested/retail_nested.json +++ b/data/json/mapgen/nested/retail_nested.json @@ -1162,8 +1162,10 @@ "y": [ "f_indoor_plant", "f_indoor_plant_y" ], "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } @@ -1193,8 +1195,10 @@ "F": "f_vending_c", "y": [ "f_indoor_plant", "f_indoor_plant_y" ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item_group": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } } @@ -1223,8 +1227,10 @@ "y": [ "f_indoor_plant", "f_indoor_plant_y" ], "?": "f_console_broken" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item_group": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } @@ -1292,8 +1298,10 @@ "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ], "?": "f_console_broken" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item_group": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } @@ -1325,8 +1333,10 @@ "y": [ "f_indoor_plant", "f_indoor_plant_y" ], "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item_group": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } diff --git a/data/json/mapgen/riverside/whaleys_boat_rental.json b/data/json/mapgen/riverside/whaleys_boat_rental.json index c6fe34d51d221..db223385c4f85 100644 --- a/data/json/mapgen/riverside/whaleys_boat_rental.json +++ b/data/json/mapgen/riverside/whaleys_boat_rental.json @@ -47,6 +47,8 @@ ] }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "&": { "item": "trash", "chance": 60, "repeat": [ 1, 3 ] }, "r": [ { "chance": 55, "item": "swimmer_head", "repeat": [ 1, 3 ] }, @@ -67,7 +69,7 @@ { "chance": 45, "item": "swimmer_gloves", "repeat": [ 1, 4 ] } ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "t": { } } }, { diff --git a/data/json/mapgen/store/s_games.json b/data/json/mapgen/store/s_games.json index 0732f09d61e24..2b0f38bfc9716 100644 --- a/data/json/mapgen/store/s_games.json +++ b/data/json/mapgen/store/s_games.json @@ -31,7 +31,8 @@ ".nn,,,,,######oooo#####.", "........................" ], - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "D": { "item_group": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "terrain": { "|": "t_wall_w", "#": "t_brick_wall", diff --git a/data/json/mapgen_palettes/bike_shop_palette.json b/data/json/mapgen_palettes/bike_shop_palette.json index e165a9bcf0622..74eba59c55aa0 100644 --- a/data/json/mapgen_palettes/bike_shop_palette.json +++ b/data/json/mapgen_palettes/bike_shop_palette.json @@ -33,8 +33,10 @@ "^": "f_indoor_plant" }, "toilets": { "T": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "%": { "item": "cash_register_random", "chance": 100 }, "&": { "item": "trash", "chance": 70 }, "@": { "item": "trash", "chance": 90 }, diff --git a/data/json/mapgen_palettes/convention_center_palette.json b/data/json/mapgen_palettes/convention_center_palette.json index 71ef1dfa49be6..3eab059280dab 100644 --- a/data/json/mapgen_palettes/convention_center_palette.json +++ b/data/json/mapgen_palettes/convention_center_palette.json @@ -76,6 +76,8 @@ "a": "f_trashcan" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "e": { "item": "SUS_fridge_breakroom", "chance": 80 }, "é": { "item": "fast_fridge", "chance": 80, "repeat": [ 4, 10 ] }, "r": { "item": "fast_kitchen", "chance": 80, "repeat": [ 2, 5 ] }, @@ -88,9 +90,10 @@ "A": { "item": "trash", "chance": 75, "repeat": [ 1, 5 ] } }, "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, "toilets": { "t": { } }, "nested": { + "D": { "chunks": [ "nest_vending_machine_looted" ] }, + "F": { "chunks": [ "nest_vending_machine_looted" ] }, "(": { "chunks": [ [ "null", 2 ], diff --git a/data/json/mapgen_palettes/deserter_city.json b/data/json/mapgen_palettes/deserter_city.json index bbb7df0f7e927..082837d862968 100644 --- a/data/json/mapgen_palettes/deserter_city.json +++ b/data/json/mapgen_palettes/deserter_city.json @@ -59,6 +59,8 @@ "y": "f_locker" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 40 }, ";": { "item": "office_supplies", "chance": 65, "repeat": [ 1, 10 ] }, "y": { "item": "SUS_janitors_closet", "chance": 90 }, @@ -75,7 +77,7 @@ "M": { "item": "milspec_arsenal_223_pouch_gun&mags&cans", "chance": 100 }, "O": [ { "item": "SUS_pantry", "chance": 33 }, { "item": "cannedfood", "chance": 80, "repeat": [ 1, 2 ] } ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } } } ] diff --git a/data/json/mapgen_palettes/lumberyard.json b/data/json/mapgen_palettes/lumberyard.json index 34a1479b41765..a6abdd6b3e144 100644 --- a/data/json/mapgen_palettes/lumberyard.json +++ b/data/json/mapgen_palettes/lumberyard.json @@ -54,6 +54,8 @@ }, "toilets": { "t": { } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "x": { "item": "lumberyard", "chance": 90, "repeat": [ 3, 5 ] }, "&": { "item": "trash", "chance": 75, "repeat": [ 2, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 33 }, @@ -66,6 +68,6 @@ "m": [ { "item": "softdrugs", "chance": 40 }, { "item": "harddrugs", "chance": 40 } ] }, "item": { "O": { "item": "2x4", "repeat": [ 2, 20 ] }, ",": { "item": "splinter", "chance": 10, "repeat": [ 1, 5 ] } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } } + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } } } ] diff --git a/data/json/mapgen_palettes/office.json b/data/json/mapgen_palettes/office.json index 0235f1c41943d..cfaca7dfca23a 100644 --- a/data/json/mapgen_palettes/office.json +++ b/data/json/mapgen_palettes/office.json @@ -71,6 +71,8 @@ "A": "f_bookcase" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 40 }, "e": { "item": "SUS_fridge_breakroom", "chance": 70 }, "o": { "item": "SUS_oven", "chance": 90 }, @@ -83,7 +85,6 @@ "A": { "item": "homebooks", "chance": 40, "repeat": [ 1, 4 ] }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, "monster": { "_": { "group": "GROUP_CIVILIAN", "chance": 1 }, ".": { "group": "GROUP_CIVILIAN", "chance": 1 } }, "toilets": { "T": { } }, "vehicles": { @@ -91,6 +92,8 @@ "É": { "vehicle": "parking_garage", "chance": 50, "rotation": 90 } }, "nested": { + "D": { "chunks": [ "nest_vending_machine_looted" ] }, + "F": { "chunks": [ "nest_vending_machine_looted" ] }, "7": { "chunks": [ [ "5x5_corridor_office0_sw", 1 ], [ "5x5_corridor_office1_sw", 1 ], [ "5x5_corridor_sofas_sw", 2 ] ] }, "8": { "chunks": [ [ "5x5_corridor_office0_se", 1 ], [ "5x5_corridor_office1_se", 1 ], [ "5x5_corridor_sofas_se", 2 ] ] }, "[": { "chunks": [ [ "3x3_desk_l_1", 1 ], [ "3x3_desk_l_2", 1 ], [ "3x3_desk_l_3", 1 ] ] }, diff --git a/data/json/mapgen_palettes/police_dept_palette.json b/data/json/mapgen_palettes/police_dept_palette.json index 2235a490f521b..e121a58526e69 100644 --- a/data/json/mapgen_palettes/police_dept_palette.json +++ b/data/json/mapgen_palettes/police_dept_palette.json @@ -87,6 +87,8 @@ "£": "f_MS" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "y": { "item": "cop_locker", "chance": 20 }, "P": { "item": "book_school", "chance": 60, "repeat": [ 1, 5 ] }, "@": [ { "item": "novels", "chance": 30 }, { "item": "contraband", "chance": 5 }, { "item": "bed", "chance": 50 } ], @@ -108,7 +110,7 @@ "t": { "item": "toilet_paper", "chance": 66, "repeat": [ 1, 3 ] }, "j": [ { "item": "toothbrush_plain", "chance": 100 }, { "item": "soap", "chance": 75, "charges": [ 1, 10 ] } ] }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "computers": { "x": { "name": "PolCom OS v1.47 - Supply Room Access", diff --git a/data/json/mapgen_palettes/stadium_palette.json b/data/json/mapgen_palettes/stadium_palette.json index b27f1ba552dc6..198799aaa6077 100644 --- a/data/json/mapgen_palettes/stadium_palette.json +++ b/data/json/mapgen_palettes/stadium_palette.json @@ -81,7 +81,7 @@ "*": { "param": "bush", "fallback": "t_shrub" }, "^": "t_elevator" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "furniture": { "z": "f_water_heater_family", "b": "f_metal_bench", @@ -124,6 +124,8 @@ "/": "f_flagpole" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "b": [ { "item": "beer", "chance": 1, "repeat": [ 1, 2 ] }, { "item": "snacks", "chance": 1, "repeat": [ 1, 2 ] }, diff --git a/data/mods/Defense_Mode/mapgen/hospital.json b/data/mods/Defense_Mode/mapgen/hospital.json index d6c295864b9db..7ab928fea4f7e 100644 --- a/data/mods/Defense_Mode/mapgen/hospital.json +++ b/data/mods/Defense_Mode/mapgen/hospital.json @@ -86,7 +86,6 @@ "palettes": [ "hospital" ], "terrain": { "5": "t_floor", "H": "t_floor", "X": [ "t_door_metal_locked", "t_door_metal_elocked" ], "=": "t_pavement" }, "furniture": { "H": "f_locker" }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, "computers": { "5": { "name": "Medical Supply Access", @@ -101,8 +100,14 @@ } }, "vehicles": { "=": { "vehicle": "pickup_corpses", "chance": 10, "rotation": 270, "status": 1 } }, - "nested": { "=": { "chunks": [ [ "null", 70 ] ] } }, + "nested": { + "D": { "chunks": [ "nest_vending_machine_looted" ] }, + "F": { "chunks": [ "nest_vending_machine_looted" ] }, + "=": { "chunks": [ [ "null", 70 ] ] } + }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "b": { "item": "magazines", "chance": 50 }, "B": { "item": "hospital_bed", "chance": 80 }, "f": { "item": "SUS_fridge_breakroom", "chance": 90 }, diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json index 5e0e68466db4a..232b071dfaad2 100644 --- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json +++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json @@ -1292,6 +1292,8 @@ }, "toilets": { "t": { } }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "x": { "item": "lumberyard", "chance": 90, "repeat": [ 3, 5 ] }, "&": { "item": "trash", "chance": 75, "repeat": [ 2, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 33 }, @@ -1304,7 +1306,7 @@ "m": [ { "item": "softdrugs", "chance": 20 }, { "item": "harddrugs", "chance": 20 } ] }, "item": { "O": { "item": "2x4", "repeat": [ 2, 20 ] }, ",": { "item": "splinter", "chance": 10, "repeat": [ 1, 5 ] } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } } + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } } }, { "type": "palette", From 4e4dad0b0938ccafd66a7ec46b311138570daccf Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Tue, 16 Jul 2024 23:00:11 +0200 Subject: [PATCH 07/12] more json churn --- .../furniture-tools.json | 4 ++-- data/json/mapgen/drive-in_theater.json | 7 ++----- data/json/mapgen/gas_stations/s_gas.json | 2 +- data/json/mapgen/junkyard.json | 2 +- data/json/mapgen/lab/lab_floorplan_cross.json | 3 ++- .../json/mapgen/lab/lab_floorplans_1side.json | 3 ++- data/json/mapgen/lab/lab_rooms.json | 3 ++- data/json/mapgen/nested/retail_nested.json | 8 ++++---- .../nested/vending_machines_nested.json | 20 ++++++++++++++++++- data/json/mapgen/store/s_games.json | 2 +- 10 files changed, 36 insertions(+), 18 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index e19418e97b0dc..15099e8e27372 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1680,7 +1680,7 @@ "move_cost_mod": -1, "coverage": 90, "required_str": 12, - "flags": [ "SEALED", "PLACE_ITEM", "ALARMED", "CONTAINER", "BLOCKSDOOR", "MINEABLE" ], + "flags": [ "SEALED", "PLACE_ITEM", "ALARMED", "CONTAINER", "BLOCKSDOOR", "MINEABLE", "TRANSPARENT" ], "examine_action": "vending", "bash": { "str_min": 20, @@ -1704,7 +1704,7 @@ "move_cost_mod": -1, "coverage": 90, "required_str": 12, - "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "MINEABLE" ], + "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "MINEABLE", "TRANSPARENT" ], "bash": { "str_min": 20, "str_max": 40, diff --git a/data/json/mapgen/drive-in_theater.json b/data/json/mapgen/drive-in_theater.json index f0cfc799dcc20..1a4693e7e7884 100644 --- a/data/json/mapgen/drive-in_theater.json +++ b/data/json/mapgen/drive-in_theater.json @@ -375,11 +375,8 @@ "x": "f_cardboard_box", "X": "f_cardboard_box" }, - "item": { - "N": { "item": "movie_poster", "chance": 100 }, - "$": { "item": "vending_drink", "chance": 100 }, - "V": { "item": "vending_food", "chance": 100 } - }, + "item": { "N": { "item": "movie_poster", "chance": 100 } }, + "items": { "$": { "item": "vending_drink", "chance": 100 }, "V": { "item": "vending_food", "chance": 100 } }, "nested": { "$": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "T": { } } } diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json index efce9e324b6ab..7e065e89a0712 100644 --- a/data/json/mapgen/gas_stations/s_gas.json +++ b/data/json/mapgen/gas_stations/s_gas.json @@ -45,7 +45,7 @@ "furniture": { "9": "f_aut_gas_console" }, "signs": { "P": { "signage": "Danger! Do not smoke! Risk of explosion!" } }, "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "1": { "item_group": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, + "items": { "1": { "item": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, "place_liquids": [ { "liquid": "gasoline", "x": 2, "y": 3, "repeat": [ 200, 1075 ] }, { "liquid": "diesel", "x": 4, "y": 3, "repeat": [ 200, 1075 ] } diff --git a/data/json/mapgen/junkyard.json b/data/json/mapgen/junkyard.json index 107ec4113b6cf..e04bf12b20d85 100644 --- a/data/json/mapgen/junkyard.json +++ b/data/json/mapgen/junkyard.json @@ -35,7 +35,7 @@ "palettes": [ "junkyard_palette" ], "place_toilets": [ { "x": 12, "y": 13 } ], "nested": { "K": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "K": { "item_group": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, + "items": { "K": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "place_loot": [ { "item": "television", "x": 17, "y": 9, "chance": 100 } ], "place_items": [ { "chance": 25, "item": "cubical_office", "x": [ 18, 19 ], "y": 12 }, diff --git a/data/json/mapgen/lab/lab_floorplan_cross.json b/data/json/mapgen/lab/lab_floorplan_cross.json index 138aea17af3f5..c24640ce75e6a 100644 --- a/data/json/mapgen/lab/lab_floorplan_cross.json +++ b/data/json/mapgen/lab/lab_floorplan_cross.json @@ -232,7 +232,8 @@ "-----------MM----------|" ], "palettes": [ "lab_palette" ], - "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_off" ] }, "2": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { "1": { "item": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, "mapping": { "t": { "items": [ { "item": "fridge", "chance": 30 } ] }, "l": { diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json index 6f9c87d4a237f..99024f9761eb1 100644 --- a/data/json/mapgen/lab/lab_floorplans_1side.json +++ b/data/json/mapgen/lab/lab_floorplans_1side.json @@ -78,7 +78,8 @@ "|----------------------|" ], "palettes": [ "lab_palette" ], - "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_off" ] }, "2": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { "1": { "item": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, "furniture": { "a": [ "f_stool", diff --git a/data/json/mapgen/lab/lab_rooms.json b/data/json/mapgen/lab/lab_rooms.json index f9c524048658e..ba1a8f02d9885 100644 --- a/data/json/mapgen/lab/lab_rooms.json +++ b/data/json/mapgen/lab/lab_rooms.json @@ -1023,7 +1023,8 @@ ], "palettes": [ "lab_palette" ], "furniture": { "C": "f_cupboard", "O": "f_oven" }, - "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_off" ] }, "2": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { "1": { "item": "vending_drink", "chance": 100 }, "2": { "item": "vending_food", "chance": 100 } }, "mapping": { "t": { "items": [ { "item": "vending_food_items", "chance": 10 } ] }, "f": { "items": [ { "item": "fridge", "chance": 80 } ] }, diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json index e56143185b7bb..22282d94b323d 100644 --- a/data/json/mapgen/nested/retail_nested.json +++ b/data/json/mapgen/nested/retail_nested.json @@ -1197,7 +1197,7 @@ }, "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { - "D": { "item_group": "vending_drink", "chance": 100 }, + "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 }, "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] } @@ -1229,7 +1229,7 @@ }, "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { - "D": { "item_group": "vending_drink", "chance": 100 }, + "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] @@ -1300,7 +1300,7 @@ }, "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { - "D": { "item_group": "vending_drink", "chance": 100 }, + "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] @@ -1335,7 +1335,7 @@ }, "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { - "D": { "item_group": "vending_drink", "chance": 100 }, + "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 }, "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ], "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ] diff --git a/data/json/mapgen/nested/vending_machines_nested.json b/data/json/mapgen/nested/vending_machines_nested.json index e1fc230bebae6..16d630324d0f5 100644 --- a/data/json/mapgen/nested/vending_machines_nested.json +++ b/data/json/mapgen/nested/vending_machines_nested.json @@ -32,6 +32,16 @@ "item": { " ": [ { "item": "glass_shard", "repeat": [ 1, 25 ] } ] } } }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_broken_but_not_looted", + "object": { + "mapgensize": [ 1, 1 ], + "furniture": { " ": "f_vending_o" }, + "item": { " ": [ { "item": "glass_shard", "repeat": [ 1, 25 ] } ] } + } + }, { "type": "mapgen", "method": "json", @@ -39,7 +49,15 @@ "//": "should be `one in (days since cataclysm + 4)` to be unlooted, but maps do not support math weight (yet?)", "object": { "mapgensize": [ 1, 1 ], - "nested": { " ": { "chunks": [ [ "nest_vending_machine_broken", 9 ], [ "nest_vending_machine_off", 1 ] ] } } + "nested": { + " ": { + "chunks": [ + [ "nest_vending_machine_broken", 85 ], + [ "nest_vending_machine_off", 10 ], + [ "nest_vending_machine_broken_but_not_looted", 5 ] + ] + } + } } }, { diff --git a/data/json/mapgen/store/s_games.json b/data/json/mapgen/store/s_games.json index 2b0f38bfc9716..8dd8b195b72b7 100644 --- a/data/json/mapgen/store/s_games.json +++ b/data/json/mapgen/store/s_games.json @@ -32,7 +32,7 @@ "........................" ], "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "D": { "item_group": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, + "items": { "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, "terrain": { "|": "t_wall_w", "#": "t_brick_wall", From 1cd5a937590c5658874013665ffc8015a33e4279 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Tue, 16 Jul 2024 23:20:18 +0200 Subject: [PATCH 08/12] more json churn --- data/json/mapgen/gas_stations/s_gas.json | 9 +++++++-- data/json/mapgen_palettes/hospital.json | 8 ++++++-- data/json/mapgen_palettes/lab_surface_palette.json | 6 ++++-- .../mapgen_palettes/miniature_railway_palette.json | 4 +++- data/json/mapgen_palettes/nuclear_plant_palette.json | 4 +++- data/json/mapgen_palettes/office_skyscraper.json | 12 +++++++++--- data/json/mapgen_palettes/oil_platform_palette.json | 4 +++- data/json/mapgen_palettes/prison.json | 7 +++++-- data/json/mapgen_palettes/steel_mill_palette.json | 4 +++- .../underwater_structures_palette.json | 8 ++++++-- .../mapgen/skyscraper_lab/skyscraper_lab.json | 12 +++++++++--- .../mapgen_palettes/skyscraper_lab_palette.json | 4 +++- .../mapgen_palettes/field_office_palette.json | 4 +++- .../Guide_for_beginning_mapgen.md | 2 -- 14 files changed, 64 insertions(+), 24 deletions(-) diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json index 7e065e89a0712..c41601a903f4c 100644 --- a/data/json/mapgen/gas_stations/s_gas.json +++ b/data/json/mapgen/gas_stations/s_gas.json @@ -122,9 +122,14 @@ }, "toilets": { "T": { } }, "gaspumps": { "!": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { + "l": { "item": "SUS_janitors_closet", "chance": 70 }, + "&": { "item": "trash_cart", "chance": 50 }, + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 } + }, "place_signs": [ { "signage": "Wide selection of storage batteries! Discounts!", "x": 13, "y": 10 } ], - "items": { "l": { "item": "SUS_janitors_closet", "chance": 70 }, "&": { "item": "trash_cart", "chance": 50 } }, "place_loot": [ { "group": "cash_register_random", "x": [ 9, 13 ], "y": 18, "chance": 100 }, { "group": "fridgesnacks", "x": 21, "y": [ 13, 17 ], "chance": 80, "repeat": [ 1, 12 ] }, diff --git a/data/json/mapgen_palettes/hospital.json b/data/json/mapgen_palettes/hospital.json index 58e69ef17cc02..c53746233edd2 100644 --- a/data/json/mapgen_palettes/hospital.json +++ b/data/json/mapgen_palettes/hospital.json @@ -110,7 +110,7 @@ ".": "t_open_air", "-": "t_open_air_rooved" }, - "vendingmachines": { "R": { "item_group": "vending_drink" }, "S": { "item_group": "vending_food" } }, + "nested": { "R": { "chunks": [ "nest_vending_machine_off" ] }, "S": { "chunks": [ "nest_vending_machine_off" ] } }, "furniture": { "A": "f_stool", "B": "f_locker", @@ -172,7 +172,11 @@ "z": "f_trashcan" }, "toilets": { "T": { } }, - "items": { "4": [ { "item": "saline_bottle_random", "chance": 100 } ] }, + "items": { + "R": { "item": "vending_drink", "chance": 100 }, + "S": { "item": "vending_food", "chance": 100 }, + "4": [ { "item": "saline_bottle_random", "chance": 100 } ] + }, "vehicles": { "ɱ": { "vehicle": "laundry_cart", "chance": 100, "rotation": 90 }, "ƃ": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 }, diff --git a/data/json/mapgen_palettes/lab_surface_palette.json b/data/json/mapgen_palettes/lab_surface_palette.json index bc61914259197..c03e7cb485350 100644 --- a/data/json/mapgen_palettes/lab_surface_palette.json +++ b/data/json/mapgen_palettes/lab_surface_palette.json @@ -55,7 +55,8 @@ "x": "f_console_broken" }, "toilets": { "T": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } } }, { "type": "palette", @@ -115,7 +116,8 @@ "x": "f_console_broken" }, "toilets": { "T": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, + "items": { "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } } }, { "type": "palette", diff --git a/data/json/mapgen_palettes/miniature_railway_palette.json b/data/json/mapgen_palettes/miniature_railway_palette.json index b6c8daeedcee7..3f021f8d6bbe5 100644 --- a/data/json/mapgen_palettes/miniature_railway_palette.json +++ b/data/json/mapgen_palettes/miniature_railway_palette.json @@ -46,6 +46,8 @@ "c": "f_counter_gate_c" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "a": { "item": "trash", "chance": 40, "repeat": [ 1, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 55 }, "s": { "item": "metal_workshop", "chance": 80, "repeat": [ 1, 6 ] }, @@ -55,6 +57,6 @@ "7": { "item": "office_paper", "chance": 70, "repeat": [ 1, 3 ] } }, "toilets": { "t": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "V": { "item_group": "vending_food" } } + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "V": { "chunks": [ "nest_vending_machine_off" ] } } } ] diff --git a/data/json/mapgen_palettes/nuclear_plant_palette.json b/data/json/mapgen_palettes/nuclear_plant_palette.json index 5594db967a0d9..a9a2ff862c2b9 100644 --- a/data/json/mapgen_palettes/nuclear_plant_palette.json +++ b/data/json/mapgen_palettes/nuclear_plant_palette.json @@ -83,6 +83,8 @@ "k": [ [ "f_nuclear_fuel_cell", 60 ], [ "f_null", 40 ] ] }, "items": { + "d": { "item": "vending_drink", "chance": 100 }, + "v": { "item": "vending_food", "chance": 100 }, "7": { "item": "cleaning", "chance": 10, "repeat": [ 1, 2 ] }, "2": { "item": "cleaning", "chance": 5 }, "3": [ @@ -204,6 +206,6 @@ "9": { "group": "GROUP_MIL_WEAK", "chance": 98 } }, "toilets": { "t": { } }, - "vendingmachines": { "d": { "item_group": "vending_drink" }, "v": { "item_group": "vending_food" } } + "nested": { "d": { "chunks": [ "nest_vending_machine_off" ] }, "v": { "chunks": [ "nest_vending_machine_off" ] } } } ] diff --git a/data/json/mapgen_palettes/office_skyscraper.json b/data/json/mapgen_palettes/office_skyscraper.json index b2d81e162a937..09ecb494c33e4 100644 --- a/data/json/mapgen_palettes/office_skyscraper.json +++ b/data/json/mapgen_palettes/office_skyscraper.json @@ -38,8 +38,12 @@ "±": "t_ramp_down_low" }, "furniture": { "b": "f_bench", "^": [ "f_indoor_plant", "f_indoor_plant_y" ], "x": "f_console_broken" }, - "items": { "a": { "item": "trash", "chance": 70, "repeat": [ 2, 5 ] } }, - "vendingmachines": { "8": { "item_group": "vending_drink" }, "9": { "item_group": "vending_food" } }, + "items": { + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 }, + "a": { "item": "trash", "chance": 70, "repeat": [ 2, 5 ] } + }, + "nested": { "8": { "chunks": [ "nest_vending_machine_off" ] }, "9": { "chunks": [ "nest_vending_machine_off" ] } }, "toilets": { "T": { } } }, { @@ -485,6 +489,8 @@ "Y": "f_rack_coat" }, "items": { + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 }, "d": [ { "item": "SUS_office_desk", "chance": 50 }, { "item": "homebooks", "chance": 2 } ], "e": [ { "item": "SUS_fridge_breakroom", "chance": 70 } ], "o": { "item": "oven", "chance": 70 }, @@ -496,7 +502,7 @@ "F": { "item": "SUS_office_filing_cabinet", "chance": 70 }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "8": { "item_group": "vending_drink" }, "9": { "item_group": "vending_food" } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_off" ] }, "9": { "chunks": [ "nest_vending_machine_off" ] } }, "toilets": { "T": { } } } ] diff --git a/data/json/mapgen_palettes/oil_platform_palette.json b/data/json/mapgen_palettes/oil_platform_palette.json index cc6aa36265700..4261e6ba1f578 100644 --- a/data/json/mapgen_palettes/oil_platform_palette.json +++ b/data/json/mapgen_palettes/oil_platform_palette.json @@ -144,6 +144,8 @@ }, "toilets": { "g": { } }, "items": { + "D": { "item": "vending_drink_items", "chance": 100 }, + "F": { "item": "vending_food_items", "chance": 100 }, "I": [ { "item": "saline_bottle_random", "chance": 100 } ], "B": [ { "item": "book_survival", "chance": 5 }, @@ -270,7 +272,7 @@ "→": { "vehicle": "helicopters", "chance": 20, "rotation": [ 0, 90, 180, 270 ] }, "n": { "vehicle": "inflatable_boat", "chance": 80 } }, - "vendingmachines": { "D": { "item_group": "vending_drink_items" }, "F": { "item_group": "vending_food_items" } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } }, "monster": { "i": { "monster": "mon_zombie_swimmer_base", "chance": 30 }, "↨": { "monster": "mon_gas_zombie", "chance": 5 }, diff --git a/data/json/mapgen_palettes/prison.json b/data/json/mapgen_palettes/prison.json index 96062f827efbe..adef315128c37 100644 --- a/data/json/mapgen_palettes/prison.json +++ b/data/json/mapgen_palettes/prison.json @@ -307,6 +307,8 @@ "toilets": { "й": { } }, "item": { "н": { "item": "cassock", "chance": 95 } }, "items": { + "v": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "Ø": { "item": "trash_cart", "chance": 50, "repeat": [ 2, 3 ] }, "c": { "item": "animalshelter_utility", "chance": 45, "repeat": [ 2, 3 ] }, "$": [ { "item": "cop_torso", "chance": 33 }, { "item": "cop_pants", "chance": 33 }, { "item": "cop_shoes", "chance": 33 } ], @@ -348,12 +350,13 @@ "'": [ { "monster": "mon_dog_zombie_cop", "chance": 1 }, { "monster": "mon_zombie_cop", "chance": 1 } ] }, "nested": { + "v": { "chunks": [ "nest_vending_machine_off" ] }, + "V": { "chunks": [ "nest_vending_machine_off" ] }, "^": { "chunks": [ [ "corpse_blood_3x3", 5 ], [ "null", 95 ] ] }, ".": { "chunks": [ [ "corpse_blood_3x3", 5 ], [ "null", 95 ] ] }, ",": { "chunks": [ [ "corpse_blood_3x3", 5 ], [ "null", 95 ] ] }, "'": { "chunks": [ [ "corpse_blood_3x3", 5 ], [ "null", 95 ] ] }, "Б": { "chunks": [ [ "corpse_blood_3x3", 5 ], [ "null", 95 ] ] } - }, - "vendingmachines": { "v": { "item_group": "vending_drink" }, "V": { "item_group": "vending_food" } } + } } ] diff --git a/data/json/mapgen_palettes/steel_mill_palette.json b/data/json/mapgen_palettes/steel_mill_palette.json index 644666871f275..113ebc9d9f1c0 100644 --- a/data/json/mapgen_palettes/steel_mill_palette.json +++ b/data/json/mapgen_palettes/steel_mill_palette.json @@ -72,6 +72,8 @@ "7": "f_filing_cabinet" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "T": { "item": "snacks", "chance": 30 }, "d": { "item": "office", "chance": 30 }, "y": { "item": "office", "chance": 30 }, @@ -88,6 +90,6 @@ "7": { "item": "office_paper", "chance": 30 } }, "toilets": { "t": { } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "V": { "item_group": "vending_food" } } + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "V": { "chunks": [ "nest_vending_machine_off" ] } } } ] diff --git a/data/json/mapgen_palettes/underwater_structures_palette.json b/data/json/mapgen_palettes/underwater_structures_palette.json index 6f27ad176347e..c19568ef7cf9f 100644 --- a/data/json/mapgen_palettes/underwater_structures_palette.json +++ b/data/json/mapgen_palettes/underwater_structures_palette.json @@ -48,7 +48,11 @@ }, "toilets": { "t": { } }, "gaspumps": { "!": { } }, - "items": { "I": [ { "item": "saline_bottle_random", "chance": 100 } ] }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } + "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, + "I": [ { "item": "saline_bottle_random", "chance": 100 } ] + }, + "nested": { "D": { "chunks": [ "nest_vending_machine_off" ] }, "F": { "chunks": [ "nest_vending_machine_off" ] } } } ] diff --git a/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json b/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json index 77cd840dfe066..6c8f76d9e3671 100644 --- a/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json +++ b/data/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json @@ -84,12 +84,14 @@ { "chunks": [ "phavian_skyscraper_lab_break_area_4x4" ], "x": 32, "y": 27 } ], "items": { + "Đ": { "item": "vending_drink", "chance": 100 }, + "Ƒ": { "item": "vending_food", "chance": 100 }, "e": { "item": "fridgesnacks", "chance": 80, "repeat": [ 1, 12 ] }, "l": { "item": "feral_security_death_drops_9mm", "chance": 80, "repeat": [ 1, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 33 }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "Đ": { "item_group": "vending_drink" }, "Ƒ": { "item_group": "vending_food" } }, + "nested": { "Đ": { "chunks": [ "nest_vending_machine_off" ] }, "Ƒ": { "chunks": [ "nest_vending_machine_off" ] } }, "place_monster": [ { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 22, 23 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 24, 25 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, @@ -213,12 +215,14 @@ { "chunks": [ "phavian_skyscraper_lab_break_area_4x4" ], "x": 32, "y": 27 } ], "items": { + "Đ": { "item": "vending_drink", "chance": 100 }, + "Ƒ": { "item": "vending_food", "chance": 100 }, "e": { "item": "fridgesnacks", "chance": 80, "repeat": [ 1, 12 ] }, "l": { "item": "feral_security_death_drops_9mm", "chance": 80, "repeat": [ 1, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 33 }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "Đ": { "item_group": "vending_drink" }, "Ƒ": { "item_group": "vending_food" } }, + "nested": { "Đ": { "chunks": [ "nest_vending_machine_off" ] }, "Ƒ": { "chunks": [ "nest_vending_machine_off" ] } }, "place_monster": [ { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 22, 23 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 24, 25 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, @@ -342,12 +346,14 @@ { "chunks": [ "phavian_skyscraper_lab_break_area_4x4" ], "x": 32, "y": 27 } ], "items": { + "Đ": { "item": "vending_drink", "chance": 100 }, + "Ƒ": { "item": "vending_food", "chance": 100 }, "e": { "item": "fridgesnacks", "chance": 80, "repeat": [ 1, 12 ] }, "l": { "item": "feral_security_death_drops_9mm", "chance": 80, "repeat": [ 1, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 33 }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "Đ": { "item_group": "vending_drink" }, "Ƒ": { "item_group": "vending_food" } }, + "nested": { "Đ": { "chunks": [ "nest_vending_machine_off" ] }, "Ƒ": { "chunks": [ "nest_vending_machine_off" ] } }, "place_monster": [ { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 22, 23 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, { "group": "GROUP_LAB_BASIC_SECURITY", "x": [ 24, 25 ], "y": [ 5, 12 ], "chance": 60, "repeat": [ 2, 5 ] }, diff --git a/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json b/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json index 849f38d1c12bf..c49c52d3a31dc 100644 --- a/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json +++ b/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json @@ -72,6 +72,8 @@ "Ƒ": "f_vending_c" }, "items": { + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 }, "d": [ { "item": "SUS_office_desk", "chance": 50 }, { "item": "homebooks", "chance": 2 } ], "e": [ { "item": "SUS_fridge_breakroom", "chance": 70 } ], "o": { "item": "oven", "chance": 70 }, @@ -83,7 +85,7 @@ "F": { "item": "SUS_office_filing_cabinet", "chance": 70 }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "8": { "item_group": "vending_drink" }, "9": { "item_group": "vending_food" } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_off" ] }, "9": { "chunks": [ "nest_vending_machine_off" ] } }, "toilets": { "T": { } } }, { diff --git a/data/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json b/data/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json index eec723062723b..95b8ce03b063c 100644 --- a/data/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json +++ b/data/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json @@ -81,6 +81,8 @@ "7": "f_small_satelitte_dish" }, "items": { + "8": { "item": "vending_drink", "chance": 100 }, + "9": { "item": "vending_food", "chance": 100 }, "d": [ { "item": "xed_office", "chance": 40, "repeat": [ 1, 2 ] }, { "item": "xed_cubical_office", "chance": 40, "repeat": [ 1, 2 ] }, @@ -101,7 +103,7 @@ "F": { "item": "file_room", "chance": 70, "repeat": [ 1, 10 ] }, ".": { "item": "office_mess", "chance": 1 } }, - "vendingmachines": { "8": { "item_group": "vending_drink" }, "9": { "item_group": "vending_food" } }, + "nested": { "8": { "chunks": [ "nest_vending_machine_off" ] }, "9": { "chunks": [ "nest_vending_machine_off" ] } }, "toilets": { "T": { } } } ] diff --git a/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md b/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md index 20ece08c1b1d5..8b63426614119 100644 --- a/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md +++ b/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md @@ -211,8 +211,6 @@ Sample: 5. `"toilets"` and other specially defined furniture: you'll run into some specially defined common furniture which allows for some easier placement. In our sample map the entry: `"toilets": { ";": { } },` defines the symbol entry and will also auto-place water in your toilets. There are a few other specialty furniture entries. -The other most common one is: `"vendingmachines": { "D": { "item_group": "vending_drink" }, "V": { "item_group": "vending_food" } }` this assigns two symbols for vending machines and makes one for food & one for drinks. *note: you can put any item_group into the machines, like those bullet ones*. - 6. Item spawns: There are many ways to place items. This tutorial will only cover explicit symbol placement which is the easiest. There is documentation all about loot spawns you can read for further information. See: [doc/ITEM_SPAWN.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/ITEM_SPAWN.md). our sample uses "items": for its tag. others include: "place_item", "place_items", "place_loot". Some of these allow for individual item placement and others groups, or both. This will be covered in another tutorial. From 7ee8f3628a419bb25cec33a522d4966a2ce10e1e Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Tue, 16 Jul 2024 23:35:03 +0200 Subject: [PATCH 09/12] more json churn --- data/json/mapgen/mall/mall_basement.json | 6 ++++-- data/json/mapgen/nested/strip_mall_nested.json | 12 +++++++++--- .../mapgen_palettes/aircraft_carrier_palette.json | 7 +++++-- data/json/mapgen_palettes/hotel_tower_palette.json | 4 +++- data/json/mapgen_palettes/karting_l.json | 4 +++- data/json/mapgen_palettes/textile_mill_museum.json | 4 +++- data/mods/No_Hope/Mapgen/helipad.json | 4 +++- .../mods/No_Hope/mapgen_palettes/other_palettes.json | 4 +++- 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/data/json/mapgen/mall/mall_basement.json b/data/json/mapgen/mall/mall_basement.json index eef230b2109bb..858ee121d7227 100644 --- a/data/json/mapgen/mall/mall_basement.json +++ b/data/json/mapgen/mall/mall_basement.json @@ -55,7 +55,8 @@ "F": "t_linoleum_gray" }, "furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" }, - "vendingmachines": { "(": { "item_group": "vending_drink", "lootable": true }, ")": { "item_group": "vending_food", "lootable": true } }, + "nested": { "(": { "chunks": [ "nest_vending_machine_looted" ] }, ")": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "(": { "item": "vending_drink", "chance": 100 }, ")": { "item": "vending_food", "chance": 100 } }, "place_monster": [ { "group": "GROUP_MALL", "x": [ 72, 95 ], "y": [ 8, 23 ], "repeat": [ 8, 12 ] } ] } }, @@ -166,7 +167,8 @@ ")": "t_linoleum_gray" }, "furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" }, - "vendingmachines": { "(": { "item_group": "vending_drink", "lootable": true }, ")": { "item_group": "vending_food", "lootable": true } }, + "nested": { "(": { "chunks": [ "nest_vending_machine_looted" ] }, ")": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "(": { "item": "vending_drink", "chance": 100 }, ")": { "item": "vending_food", "chance": 100 } }, "place_monster": [ { "group": "GROUP_MALL", "x": [ 24, 47 ], "y": [ 10, 23 ], "repeat": [ 4, 8 ] } ] } } diff --git a/data/json/mapgen/nested/strip_mall_nested.json b/data/json/mapgen/nested/strip_mall_nested.json index cde697b5365b6..3719246391000 100644 --- a/data/json/mapgen/nested/strip_mall_nested.json +++ b/data/json/mapgen/nested/strip_mall_nested.json @@ -205,8 +205,10 @@ "M": "f_arcade_machine" }, "toilets": { "&": { } }, - "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "v": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "V": { "item": "vending_drink", "chance": 100 }, + "v": { "item": "vending_food", "chance": 100 }, "$": { "item": "cash_register_random", "chance": 100 }, "k": { "item": "SUS_toilet", "chance": 100 }, "y": { "item": "trash", "chance": 100, "repeat": [ 2, 4 ] }, @@ -639,8 +641,10 @@ "7": "f_tourist_table", "z": "f_trashcan" }, - "vendingmachines": { "2": { "item_group": "vending_drink", "lootable": true }, "3": { "item_group": "vending_food", "lootable": true } }, + "nested": { "2": { "chunks": [ "nest_vending_machine_looted" ] }, "3": { "chunks": [ "nest_vending_machine_looted" ] } }, "items": { + "2": { "item": "vending_drink", "chance": 100 }, + "3": { "item": "vending_food", "chance": 100 }, "1": { "item": "games", "chance": 65, "repeat": [ 3, 4 ] }, "t": { "item": "bookstore_misc", "chance": 25 }, "n": { "item": "magazines", "chance": 50, "repeat": 2 }, @@ -3333,12 +3337,14 @@ }, "toilets": { "&": { } }, "items": { + "1": { "item": "vending_drink", "chance": 100 }, + "2": { "item": "vending_food", "chance": 100 }, "O": { "item": "gym", "chance": 30 }, "c": { "item": "gym", "chance": 10 }, "t": { "item": "trash", "chance": 100, "repeat": [ 2, 3 ] }, "d": { "item": "SUS_office_desk", "chance": 75 } }, - "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_signs": [ { "signage": "Champion 's Fitness Center", "x": 10, "y": 21 } ], "place_loot": [ { "item": "money_strap_one", "x": 1, "y": 20, "chance": 75, "repeat": [ 1, 4 ] }, diff --git a/data/json/mapgen_palettes/aircraft_carrier_palette.json b/data/json/mapgen_palettes/aircraft_carrier_palette.json index f42f99dbe43e8..0c68b7e9d2a27 100644 --- a/data/json/mapgen_palettes/aircraft_carrier_palette.json +++ b/data/json/mapgen_palettes/aircraft_carrier_palette.json @@ -120,6 +120,8 @@ "Ä": "f_cellphone_booster" }, "items": { + "J": { "item": "vending_drink", "chance": 100 }, + "K": { "item": "vending_food", "chance": 100 }, "M": [ { "item": "fireman_cabinet", "chance": 100, "repeat": [ 2, 4 ] }, { "item": "used_1st_aid", "chance": 55, "repeat": [ 1, 2 ] }, @@ -304,6 +306,8 @@ "toilets": { "&": { } }, "traps": { "=": "tr_rollmat" }, "nested": { + "J": { "chunks": [ "nest_vending_machine_looted" ] }, + "K": { "chunks": [ "nest_vending_machine_looted" ] }, "δ": { "chunks": [ [ "null", 2 ], [ "crates_supplies_mechanics", 3 ] ] }, "ε": { "chunks": [ [ "null", 2 ], [ "crates_armament_milspec", 3 ] ] }, "ζ": { "chunks": [ [ "null", 2 ], [ "crates_random_supply", 3 ] ] } @@ -311,7 +315,6 @@ "vehicles": { "n": { "vehicle": "hospital_bed", "chance": 100, "status": 1 }, "Θ": { "vehicle": "hospital_bed", "chance": 100, "rotation": 270, "status": 1 } - }, - "vendingmachines": { "J": { "item_group": "vending_drink", "lootable": true }, "K": { "item_group": "vending_food", "lootable": true } } + } } ] diff --git a/data/json/mapgen_palettes/hotel_tower_palette.json b/data/json/mapgen_palettes/hotel_tower_palette.json index f874f8801b919..3b0bb59f31f2c 100644 --- a/data/json/mapgen_palettes/hotel_tower_palette.json +++ b/data/json/mapgen_palettes/hotel_tower_palette.json @@ -66,9 +66,11 @@ "4": "t_gutter_downspout", "P": "t_sewage_pump" }, - "vendingmachines": { "U": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "U": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "&": { } }, "items": { + "U": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "B": { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] }, "L": { "item": "hotel_luggage", "chance": 66 }, "c": { "item": "magazines", "chance": 15 }, diff --git a/data/json/mapgen_palettes/karting_l.json b/data/json/mapgen_palettes/karting_l.json index 56c70d2e5266c..aa207d2ff1699 100644 --- a/data/json/mapgen_palettes/karting_l.json +++ b/data/json/mapgen_palettes/karting_l.json @@ -62,6 +62,8 @@ "l": "f_locker" }, "items": { + "j": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "l": { "item": "clothing_work_set", "chance": 25 }, "Y": { "item": "clothing_biker", "chance": 20 }, "r": { "item": "pool_table", "chance": 40 }, @@ -70,6 +72,6 @@ "x": { "item": "SUS_welding_gear", "chance": 30, "repeat": [ 1, 2 ] } }, "toilets": { "t": { } }, - "vendingmachines": { "j": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } } + "nested": { "j": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } } } ] diff --git a/data/json/mapgen_palettes/textile_mill_museum.json b/data/json/mapgen_palettes/textile_mill_museum.json index 6505bb72bb3eb..b98f249063e43 100644 --- a/data/json/mapgen_palettes/textile_mill_museum.json +++ b/data/json/mapgen_palettes/textile_mill_museum.json @@ -45,6 +45,8 @@ "l": "f_locker" }, "items": { + "D": { "item": "vending_drink", "chance": 100 }, + "V": { "item": "vending_food", "chance": 100 }, "l": { "item": "clothing_work_set", "chance": 25 }, "d": { "item": "office", "chance": 30 }, "W": { "item": "SUS_tailoring_tool_drawer", "chance": 25 }, @@ -53,6 +55,6 @@ "c": { "item": "SUS_tailoring_materials", "chance": 25 }, "7": { "item": "office_paper", "chance": 30 } }, - "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "V": { "item_group": "vending_food", "lootable": true } } + "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } } } ] diff --git a/data/mods/No_Hope/Mapgen/helipad.json b/data/mods/No_Hope/Mapgen/helipad.json index a5498157d2540..7a2dd8dcbe436 100644 --- a/data/mods/No_Hope/Mapgen/helipad.json +++ b/data/mods/No_Hope/Mapgen/helipad.json @@ -61,6 +61,8 @@ "toilets": { "&": { } }, "gaspumps": { "$": { "fuel": "jp8", "amount": [ 20, 100 ] } }, "items": { + "1": { "item": "vending_drink", "chance": 100 }, + "2": { "item": "vending_food", "chance": 100 }, "B": { "item": { "subtype": "distribution", @@ -116,7 +118,7 @@ "H": { "item": "SUS_spice_collection", "chance": 75 }, "&": { "item": "SUS_toilet", "chance": 50 } }, - "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monster": [ { "group": "GROUP_MIL_HELIPAD", "x": [ 3, 21 ], "y": [ 4, 23 ], "chance": 50, "repeat": [ 8, 15 ] }, { "group": "GROUP_MIL_HELIPAD", "x": [ 24, 40 ], "y": [ 10, 23 ], "chance": 40, "repeat": [ 5, 10 ] }, diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json index 232b071dfaad2..ab143149bd91a 100644 --- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json +++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json @@ -259,9 +259,11 @@ "4": "t_gutter_downspout", "P": "t_sewage_pump" }, - "vendingmachines": { "U": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "nested": { "U": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, "toilets": { "&": { } }, "items": { + "U": { "item": "vending_drink", "chance": 100 }, + "F": { "item": "vending_food", "chance": 100 }, "B": { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] }, "L": { "item": "hotel_luggage", "chance": 66 }, "c": { "item": "magazines", "chance": 15 }, From de14cdf8f330f865adf16392a48ff9901d8d36d9 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:12:30 +0200 Subject: [PATCH 10/12] Apply suggestions from code review Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --- data/json/furniture_and_terrain/furniture-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index 15099e8e27372..d335f9c59a140 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1649,7 +1649,7 @@ "move_cost_mod": -1, "coverage": 90, "required_str": 30, - "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "FLAMMABLE_HARD", "MINEABLE" ], + "flags": [ "SEALED", "PLACE_ITEM", "CONTAINER", "BLOCKSDOOR", "MINEABLE" ], "bash": { "str_min": 150, "str_max": 520, From e1bc24110fc14dba38b8a89f310a396ea10bdb21 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:57:07 +0200 Subject: [PATCH 11/12] more json churn --- .../furniture-tools.json | 2 +- data/json/itemgroups/vending_machines.json | 9 +++++- data/json/mapgen/Pottery_Sewing_Shops.json | 6 ++-- .../apartment_complex_other.json | 8 ++--- data/json/mapgen/garage_gas.json | 6 ++-- data/json/mapgen/mall/mall_ground.json | 18 +++++------ data/json/mapgen/marina.json | 6 ++-- data/json/mapgen/megastore.json | 3 +- .../nested/vending_machines_nested.json | 30 +++++++++++++++++++ data/json/mapgen/office_cubical.json | 6 ++-- data/json/mapgen/private_resort.json | 6 ++-- data/json/mapgen/s_hardware.json | 5 +++- data/json/mapgen_palettes/field_football.json | 2 +- data/json/mapgen_palettes/microlab.json | 4 +-- data/json/mapgen_palettes/park_palette.json | 2 +- .../maps/mapgen/augmentation_clinic.json | 5 ++-- .../maps/mapgen/exosuit_garage_2.json | 3 +- .../habitat_blocks/habitat_block_1.json | 3 +- .../habitat_blocks/habitat_block_2.json | 4 +-- .../habitat_blocks/habitat_block_3.json | 3 +- .../mapgen/habitats/habitat_greenhouse.json | 3 +- .../port_augustmoon/port_augustmoon_main.json | 26 +++++++++++----- data/mods/Aftershock/maps/mapgen/s_gas.json | 3 +- .../maps/mapgen/urban_worm_farm.json | 3 +- .../mods/DinoMod/mapgen/palettes_DinoLab.json | 2 +- .../MindOverMatter/mapgen/phavian_office.json | 4 +-- data/mods/No_Hope/Mapgen/necropolis.json | 17 ++++++++--- .../mapgen/railroad/railroad_station.json | 10 +++---- 28 files changed, 131 insertions(+), 68 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index d335f9c59a140..c0bc585b9d084 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1617,7 +1617,7 @@ "move_cost_mod": -1, "coverage": 90, "required_str": 30, - "flags": [ "SEALED", "PLACE_ITEM", "ALARMED", "CONTAINER", "BLOCKSDOOR", "FLAMMABLE_HARD", "MINEABLE" ], + "flags": [ "SEALED", "PLACE_ITEM", "ALARMED", "CONTAINER", "BLOCKSDOOR", "MINEABLE" ], "examine_action": "vending", "bash": { "str_min": 150, diff --git a/data/json/itemgroups/vending_machines.json b/data/json/itemgroups/vending_machines.json index 886704f029b82..83d504c4f4e52 100644 --- a/data/json/itemgroups/vending_machines.json +++ b/data/json/itemgroups/vending_machines.json @@ -3,7 +3,14 @@ "type": "item_group", "id": "default_vending_machine", "subtype": "collection", - "entries": [ { "group": "vending_drink", "prob": 50 }, { "group": "vending_drink", "prob": 50 } ] + "entries": [ + { "group": "vending_food_items", "count": [ 2, 10 ] }, + { "group": "vending_food_items", "prob": 66, "count": [ 2, 12 ] }, + { "group": "vending_food_items", "prob": 20, "count": [ 2, 12 ] }, + { "group": "vending_drink_items", "count": [ 2, 10 ] }, + { "group": "vending_drink_items", "prob": 66, "count": [ 2, 12 ] }, + { "group": "vending_drink_items", "prob": 20, "count": [ 2, 12 ] } + ] }, { "type": "item_group", diff --git a/data/json/mapgen/Pottery_Sewing_Shops.json b/data/json/mapgen/Pottery_Sewing_Shops.json index 2e8b0d4e89d19..567ff6c4ab2a1 100644 --- a/data/json/mapgen/Pottery_Sewing_Shops.json +++ b/data/json/mapgen/Pottery_Sewing_Shops.json @@ -110,9 +110,9 @@ { "item": "cash_register_random", "x": 18, "y": [ 8, 10 ], "chance": 100 } ], "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 4 ] } ], - "place_vendingmachines": [ - { "item_group": "vending_food", "x": 4, "y": 6, "lootable": true }, - { "item_group": "vending_drink", "x": 18, "y": 6, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 4, "y": 6 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 18, "y": 6 } ] } }, diff --git a/data/json/mapgen/apartment_complex/apartment_complex_other.json b/data/json/mapgen/apartment_complex/apartment_complex_other.json index 2f71894096f2e..4d8c6cb2d9f76 100644 --- a/data/json/mapgen/apartment_complex/apartment_complex_other.json +++ b/data/json/mapgen/apartment_complex/apartment_complex_other.json @@ -104,10 +104,10 @@ " ": "t_linoleum_white" }, "furniture": { "G": "f_home_furnace", "Y": "f_dumpster", "C": "f_bulletin" }, - "place_vendingmachines": [ - { "item_group": "vending_drink", "lootable": true, "x": [ 14, 17 ], "y": 16 }, - { "item_group": "vending_drink", "lootable": true, "x": 24, "y": 16 }, - { "item_group": "vending_food", "lootable": true, "x": 24, "y": 18 } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": [ 14, 17 ], "y": 16 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 24, "y": 16 }, + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 24, "y": 18 } ] } }, diff --git a/data/json/mapgen/garage_gas.json b/data/json/mapgen/garage_gas.json index 7b83b8dedc0d9..6613f70bc9c55 100644 --- a/data/json/mapgen/garage_gas.json +++ b/data/json/mapgen/garage_gas.json @@ -71,9 +71,9 @@ }, "gaspumps": { "&": { } }, "toilets": { "t": { } }, - "place_vendingmachines": [ - { "item_group": "vending_food", "x": 31, "y": 6, "lootable": true }, - { "item_group": "vending_drink", "x": 32, "y": 6, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 31, "y": 6 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 32, "y": 6 } ], "place_loot": [ { "group": "magazines", "x": 26, "y": 10, "chance": 80, "repeat": [ 4, 12 ] }, diff --git a/data/json/mapgen/mall/mall_ground.json b/data/json/mapgen/mall/mall_ground.json index be4831889f835..4dc3930d5851d 100644 --- a/data/json/mapgen/mall/mall_ground.json +++ b/data/json/mapgen/mall/mall_ground.json @@ -140,9 +140,9 @@ "F": "t_linoleum_gray" }, "furniture": { "%": [ "f_indoor_plant", "f_indoor_plant_y" ], "*": "f_trashcan", "Á": "f_console_broken", "¤": "f_bulletin" }, - "place_vendingmachines": [ - { "item_group": "vending_food", "x": 99, "y": 6, "lootable": true }, - { "item_group": "vending_drink", "x": 100, "y": 6, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 99, "y": 6 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 100, "y": 6 } ], "items": { "d": [ @@ -556,9 +556,9 @@ "A": "t_linoleum_white", "!": "t_linoleum_white" }, - "place_vendingmachines": [ - { "item_group": "vending_drink", "x": 74, "y": 17, "lootable": true }, - { "item_group": "vending_food", "x": 74, "y": 18, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 74, "y": 17 }, + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 74, "y": 18 } ], "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" }, @@ -1438,9 +1438,9 @@ { "group": "cash_register_random", "x": 38, "y": 0 }, { "group": "cash_register_random", "x": 39, "y": [ 17, 19 ] } ], - "place_vendingmachines": [ - { "item_group": "vending_drink", "x": 4, "y": 12, "lootable": true }, - { "item_group": "vending_food", "x": 4, "y": 13, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 4, "y": 12 }, + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 4, "y": 13 } ], "items": { "d": [ diff --git a/data/json/mapgen/marina.json b/data/json/mapgen/marina.json index 74f93ab4b6692..49736f12402ae 100644 --- a/data/json/mapgen/marina.json +++ b/data/json/mapgen/marina.json @@ -163,9 +163,9 @@ "T": "f_table" }, "toilets": { "&": { } }, - "place_vendingmachines": [ - { "item_group": "vending_food", "x": 13, "y": 59, "lootable": true }, - { "item_group": "vending_drink", "x": 13, "y": 60, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 13, "y": 59 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 13, "y": 60 } ], "items": { "f": { "item": "SUS_fridge", "chance": 80 }, diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index e1892672e6621..4c3f1669bad3a 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -64,10 +64,9 @@ "U": "f_cupboard", ":": "f_shredder" }, - "nested": { "$": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { "$": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "&": { } }, "items": { - "$": { "item": "default_vending_machine", "chance": 100 }, "Á": { "item": "cash_register_random", "chance": 100 }, "l": { "item": "jackets", "chance": 5 }, "L": { "item": "home_hw", "chance": 50 }, diff --git a/data/json/mapgen/nested/vending_machines_nested.json b/data/json/mapgen/nested/vending_machines_nested.json index 16d630324d0f5..9b6bf33e6d912 100644 --- a/data/json/mapgen/nested/vending_machines_nested.json +++ b/data/json/mapgen/nested/vending_machines_nested.json @@ -60,6 +60,36 @@ } } }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_looted_food", + "object": { + "mapgensize": [ 1, 1 ], + "items": { "": { "item": "vending_food", "chance": 100 } }, + "nested": { " ": { "chunks": [ [ "nest_vending_machine_looted" ] ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_looted_drink", + "object": { + "mapgensize": [ 1, 1 ], + "items": { "": { "item": "vending_drink", "chance": 100 } }, + "nested": { " ": { "chunks": [ [ "nest_vending_machine_looted" ] ] } } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "nest_vending_machine_looted_mix", + "object": { + "mapgensize": [ 1, 1 ], + "items": { "": { "item": "default_vending_machine", "chance": 100 } }, + "nested": { " ": { "chunks": [ [ "nest_vending_machine_looted" ] ] } } + } + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/office_cubical.json b/data/json/mapgen/office_cubical.json index a5522e1572b23..8cc2a0e6ab5c9 100644 --- a/data/json/mapgen/office_cubical.json +++ b/data/json/mapgen/office_cubical.json @@ -59,10 +59,9 @@ "o": "f_bookcase", "t": "f_table" }, - "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "T": { } }, "items": { - "V": { "item": "default_vending_machine", "chance": 100 }, "e": { "item": "SUS_fridge_breakroom", "chance": 55, "repeat": [ 2, 3 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 20 }, @@ -191,10 +190,9 @@ "o": "f_bookcase", "t": "f_table" }, - "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "T": { } }, "items": { - "V": { "item": "default_vending_machine", "chance": 100 }, "e": { "item": "SUS_fridge_breakroom", "chance": 55, "repeat": [ 2, 3 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 20 }, diff --git a/data/json/mapgen/private_resort.json b/data/json/mapgen/private_resort.json index 47225075bd88c..bda9d06c42395 100644 --- a/data/json/mapgen/private_resort.json +++ b/data/json/mapgen/private_resort.json @@ -194,9 +194,9 @@ " xx__________xx " ], "palettes": [ "p_resort_palette_main_floor" ], - "place_vendingmachines": [ - { "item_group": "vending_food", "x": 60, "y": 1, "lootable": true }, - { "item_group": "vending_drink", "x": 60, "y": 2, "lootable": true } + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 60, "y": 1 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 60, "y": 2 } ], "items": { "L": [ diff --git a/data/json/mapgen/s_hardware.json b/data/json/mapgen/s_hardware.json index dc71288b9dc2a..d8731b6597edc 100644 --- a/data/json/mapgen/s_hardware.json +++ b/data/json/mapgen/s_hardware.json @@ -329,7 +329,10 @@ "u": "f_trashcan", "v": "f_counter" }, - "place_vendingmachines": [ { "x": 8, "y": 2, "lootable": true }, { "x": 8, "y": 3, "lootable": true } ], + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_mix" ], "x": 8, "y": 2 }, + { "chunks": [ "nest_vending_machine_looted_mix" ], "x": 8, "y": 3 } + ], "toilets": { "t": { } }, "place_items": [ { "item": "hardware_bulk", "x": 2, "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 6 ] }, diff --git a/data/json/mapgen_palettes/field_football.json b/data/json/mapgen_palettes/field_football.json index 160138e25479a..1461d2f1f68eb 100644 --- a/data/json/mapgen_palettes/field_football.json +++ b/data/json/mapgen_palettes/field_football.json @@ -22,7 +22,7 @@ "|": "t_wall_w" }, "items": { "h": { "item": "football_items", "chance": 5 } }, - "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_drink" ] } }, "toilets": { ";": { } } } ] diff --git a/data/json/mapgen_palettes/microlab.json b/data/json/mapgen_palettes/microlab.json index 10e0c12e701b7..521ffb4ed7c71 100644 --- a/data/json/mapgen_palettes/microlab.json +++ b/data/json/mapgen_palettes/microlab.json @@ -114,7 +114,7 @@ "i": { "item": "cleaning", "chance": 20 }, "N": { "item": "fireman_cabinet", "chance": 100 } }, - "vendingmachines": { "V": { } } + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } } }, { "type": "palette", @@ -205,6 +205,6 @@ "c": { "monster": "mon_zombie_living_wall", "chance": 3 }, "@": { "monster": "mon_zombie_living_wall", "chance": 80 } }, - "vendingmachines": { "V": { } } + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } } } ] diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json index 8ef431b6fa4a2..18063657cf9e5 100644 --- a/data/json/mapgen_palettes/park_palette.json +++ b/data/json/mapgen_palettes/park_palette.json @@ -83,7 +83,7 @@ }, "furniture": { "b": "f_bench", "&": "f_trashcan" }, "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } }, - "vendingmachines": { "V": { "item_group": "vending_drink" } } + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_drink" ] } } }, { "type": "palette", diff --git a/data/mods/Aftershock/maps/mapgen/augmentation_clinic.json b/data/mods/Aftershock/maps/mapgen/augmentation_clinic.json index 22e8da9c969ec..52110e9a13358 100644 --- a/data/mods/Aftershock/maps/mapgen/augmentation_clinic.json +++ b/data/mods/Aftershock/maps/mapgen/augmentation_clinic.json @@ -57,10 +57,11 @@ { "item": "drugs_rare", "chance": 60 }, { "item": "surgery", "chance": 60 } ], - "?": { "item": "autodoc_supplies", "chance": 100 } + "?": { "item": "autodoc_supplies", "chance": 100 }, + "V": { "itemitem_group": "afs_vending_medicine", "chance": 100 } }, "monster": { "ö": { "monster": "mon_skitterbot" } }, - "vendingmachines": { "V": { "item_group": "afs_vending_medicine", "reinforced": true } } + "nested": { "F": { "chunks": [ "nest_vending_machine_reinforced" ] } } } }, { diff --git a/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json b/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json index 7c4528b6acdbc..e5fd741d0ed67 100644 --- a/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json +++ b/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json @@ -35,7 +35,8 @@ "terrain": { "2": "t_afs_security_gate_closed", "1": "t_afs_door_metal_elocked" }, "furniture": { "4": "f_machinery_light", "5": "f_machinery_electronic" }, "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ], - "vendingmachines": { "3": { "item_group": "afs_vending_false_meals", "reinforced": true } }, + "nested": { "3": { "chunks": [ "nest_vending_machine_reinforced" ] } }, + "items": { "3": { "item": "afs_vending_false_meals", "chance": 100 } }, "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 }, { diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json index f8b4b831250cf..b0c1f4607d123 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json @@ -39,7 +39,8 @@ ], "terrain": { "3": "t_atm" }, "furniture": { "1": "f_washer", "2": "f_dryer" }, - "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_reinforced" ] } }, + "items": { "V": { "item": "afs_vending_false_meals", "chance": 100 } }, "place_nested": [ { "chunks": [ { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a1" } ], "x": 0, "y": 0 }, { diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json index c7777252fd067..a7f454179e05a 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json @@ -316,8 +316,8 @@ "6": "t_carpet_metal_red" }, "furniture": { "á": "f_bookcase", "2": "f_bathtub", "6": "f_table" }, - "items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] } }, - "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true } }, + "items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] }, "V": { "item": "afs_vending_false_meals", "chance": 100 } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_reinforced" ] } }, "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 4, 13 ], "y": [ 2, 23 ], "pack_size": [ 1, 3 ], "chance": 30 }, { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 34, 43 ], "y": [ 2, 23 ], "pack_size": [ 1, 3 ], "chance": 30 }, diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json index 4e75b1ec21b05..0e7c571cf39e8 100644 --- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json +++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json @@ -49,13 +49,14 @@ "ê": "f_rack" }, "items": { + "2": { "item": "afs_vending_false_meals", "chance": 100 }, "á": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 2 ] }, "â": { "item": "softdrugs", "chance": 80, "repeat": [ 1, 4 ] }, "ä": { "item": "tools_common_small", "chance": 70, "repeat": [ 1, 3 ] }, "é": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 3 ] }, "ê": { "item": "afs_old_beverage_storage", "chance": 60, "repeat": [ 1, 5 ] } }, - "vendingmachines": { "2": { "item_group": "afs_vending_false_meals", "reinforced": true } }, + "nested": { "2": { "chunks": [ "nest_vending_machine_reinforced" ] } }, "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 5 ], "chance": 45 } ], "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ] } diff --git a/data/mods/Aftershock/maps/mapgen/habitats/habitat_greenhouse.json b/data/mods/Aftershock/maps/mapgen/habitats/habitat_greenhouse.json index daf16b8059d91..d740da513c3a2 100644 --- a/data/mods/Aftershock/maps/mapgen/habitats/habitat_greenhouse.json +++ b/data/mods/Aftershock/maps/mapgen/habitats/habitat_greenhouse.json @@ -73,11 +73,12 @@ }, "furniture": { "ú": "f_bench", "1": "f_locker", "í": "f_rack", "8": "f_ancient_processor", "t": "f_rack" }, "items": { + "V": { "item": "afs_vending_medicine", "chance": 100 }, "1": [ { "item": "afs_civilian_hazard_outfit", "chance": 60 }, { "item": "afs_colonist_outfit", "chance": 20 } ], "í": { "item": "afs_tools_agricultural_hazardous", "chance": 90 }, "t": { "item": "farming_tools", "chance": 60, "repeat": [ 2, 3 ] } }, - "vendingmachines": { "V": { "item_group": "afs_vending_medicine", "reinforced": true } } + "nested": { "V": { "chunks": [ "nest_vending_machine_reinforced" ] } } } }, { diff --git a/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json b/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json index 6019ada5ad36d..3dd986e3fd72d 100644 --- a/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json +++ b/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json @@ -304,10 +304,15 @@ ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "1": "t_metal_floor", "2": "t_metal_floor", "3": "t_metal_floor" }, - "vendingmachines": { - "1": { "item_group": "afs_vending_false_meals", "reinforced": true }, - "2": { "item_group": "afs_vending_ballistic_ammo", "reinforced": true }, - "3": { "item_group": "afs_vending_medicine", "reinforced": true } + "nested": { + "1": { "chunks": [ "nest_vending_machine_reinforced" ] }, + "2": { "chunks": [ "nest_vending_machine_reinforced" ] }, + "3": { "chunks": [ "nest_vending_machine_reinforced" ] } + }, + "items": { + "1": { "item": "afs_vending_false_meals", "chance": 100 }, + "2": { "item": "afs_vending_ballistic_ammo", "chance": 100 }, + "3": { "item": "afs_vending_medicine", "chance": 100 } } } }, @@ -345,10 +350,15 @@ ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "1": "t_metal_floor", "2": "t_metal_floor", "3": "t_metal_floor" }, - "vendingmachines": { - "1": { "item_group": "afs_vending_false_meals", "reinforced": true }, - "2": { "item_group": "afs_vending_ballistic_ammo", "reinforced": true }, - "3": { "item_group": "afs_vending_energy_ammo", "reinforced": true } + "nested": { + "1": { "chunks": [ "nest_vending_machine_reinforced" ] }, + "2": { "chunks": [ "nest_vending_machine_reinforced" ] }, + "3": { "chunks": [ "nest_vending_machine_reinforced" ] } + }, + "items": { + "1": { "item": "afs_vending_false_meals", "chance": 100 }, + "2": { "item": "afs_vending_ballistic_ammo", "chance": 100 }, + "3": { "item": "afs_vending_energy_ammo", "chance": 100 } } } }, diff --git a/data/mods/Aftershock/maps/mapgen/s_gas.json b/data/mods/Aftershock/maps/mapgen/s_gas.json index 95df1349bddc3..48fa081ca35c2 100644 --- a/data/mods/Aftershock/maps/mapgen/s_gas.json +++ b/data/mods/Aftershock/maps/mapgen/s_gas.json @@ -42,6 +42,7 @@ "toilets": { "&": { } }, "gaspumps": { "G": { } }, "items": { + "ñ": { "item": "afs_vending_false_meals", "chance": 100 }, "d": { "item": "office", "chance": 33, "repeat": [ 1, 2 ] }, "k": { "item": "snacks", "chance": 33, "repeat": [ 1, 2 ] } }, @@ -55,7 +56,7 @@ { "group": "softdrugs", "x": [ 15, 18 ], "y": [ 19, 20 ], "chance": 80, "repeat": [ 0, 2 ] } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 } ], - "vendingmachines": { "ñ": { "item_group": "afs_vending_false_meals", "reinforced": true } } + "nested": { "ñ": { "chunks": [ "nest_vending_machine_reinforced" ] } } } } ] diff --git a/data/mods/Aftershock/maps/mapgen/urban_worm_farm.json b/data/mods/Aftershock/maps/mapgen/urban_worm_farm.json index cfed9f95329a8..ef48f0bfbb95b 100644 --- a/data/mods/Aftershock/maps/mapgen/urban_worm_farm.json +++ b/data/mods/Aftershock/maps/mapgen/urban_worm_farm.json @@ -42,6 +42,7 @@ "B": "f_monomolecularsaw" }, "items": { + "V": { "item": "afs_vending_medicine", "chance": 100 }, "G": { "item": "afs_mealgrub_precursor", "chance": 80, "repeat": [ 1, 3 ] }, "d": { "item": "office", "chance": 60 }, "W": { "item": "oa_ig_sb_water" }, @@ -53,7 +54,7 @@ ] }, "monster": { "ö": { "monster": "mon_skitterbot" } }, - "vendingmachines": { "V": { "item_group": "afs_vending_medicine", "reinforced": true } } + "nested": { "V": { "chunks": [ "nest_vending_machine_reinforced" ] } } } }, { diff --git a/data/mods/DinoMod/mapgen/palettes_DinoLab.json b/data/mods/DinoMod/mapgen/palettes_DinoLab.json index 4cd40c8cd7c39..0350f98f6b850 100644 --- a/data/mods/DinoMod/mapgen/palettes_DinoLab.json +++ b/data/mods/DinoMod/mapgen/palettes_DinoLab.json @@ -76,6 +76,6 @@ "O": [ { "item": "tools_robotics", "chance": 40, "repeat": [ 1, 3 ] }, { "item": "schematics", "chance": 2 } ], "i": { "item": "cleaning", "chance": 20 } }, - "vendingmachines": { "V": { } } + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } } } ] diff --git a/data/mods/MindOverMatter/mapgen/phavian_office.json b/data/mods/MindOverMatter/mapgen/phavian_office.json index 2d5f184fca2e0..4565bacf0cb20 100644 --- a/data/mods/MindOverMatter/mapgen/phavian_office.json +++ b/data/mods/MindOverMatter/mapgen/phavian_office.json @@ -60,7 +60,7 @@ "o": "f_bookcase", "t": "f_table" }, - "vendingmachines": { "V": { "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "T": { } }, "items": { "e": { "item": "SUS_fridge_breakroom", "chance": 55, "repeat": [ 2, 3 ] }, @@ -179,7 +179,7 @@ "+": "t_door_c", "s": "t_soil" }, - "vendingmachines": { "V": { "lootable": true } }, + "nested": { "V": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "T": { } }, "furniture": { "9": "f_metal_bench", "S": "f_sink", "J": "f_counter" }, "place_nested": [ diff --git a/data/mods/No_Hope/Mapgen/necropolis.json b/data/mods/No_Hope/Mapgen/necropolis.json index 6c1173a030d43..783024c304d77 100644 --- a/data/mods/No_Hope/Mapgen/necropolis.json +++ b/data/mods/No_Hope/Mapgen/necropolis.json @@ -230,7 +230,10 @@ { "item": "55gal_drum", "x": 35, "y": 3, "chance": 75 }, { "item": "55gal_drum", "x": 26, "y": 12, "chance": 75 } ], - "place_vendingmachines": [ { "item_group": "vending_food", "x": 14, "y": 38 }, { "item_group": "vending_drink", "x": 14, "y": 39 } ], + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 14, "y": 38 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 14, "y": 39 } + ], "place_items": [ { "item": "office", "x": [ 29, 29 ], "y": [ 30, 32 ], "chance": 70 }, { "item": "office", "x": [ 34, 34 ], "y": [ 30, 32 ], "chance": 70 }, @@ -679,7 +682,7 @@ { "vehicle": "ambulance", "x": 65, "y": 15, "chance": 90, "rotation": 0 }, { "vehicle": "fire_truck", "x": 32, "y": 28, "chance": 90, "rotation": 270 } ], - "place_vendingmachines": [ { "item_group": "vending_drink", "x": 64, "y": 47 } ] + "place_nested": [ { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 64, "y": 47 } ] } }, { @@ -1001,7 +1004,10 @@ { "vehicle": "semi_truck", "x": 12, "y": 38, "chance": 100, "rotation": 0 }, { "vehicle": "policecar", "x": 22, "y": 35, "chance": 90, "rotation": 90 } ], - "place_vendingmachines": [ { "item_group": "vending_food", "x": 64, "y": 0 }, { "item_group": "vending_drink", "x": 68, "y": 17 } ] + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 64, "y": 0 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 68, "y": 17 } + ] } }, { @@ -1330,7 +1336,10 @@ "palettes": [ "necropolis_a" ], "terrain": { "z": "t_floor" }, "toilets": { "t": { } }, - "place_vendingmachines": [ { "item_group": "vending_food", "x": 3, "y": 5 }, { "item_group": "vending_drink", "x": 4, "y": 5 } ], + "place_nested": [ + { "chunks": [ "nest_vending_machine_looted_food" ], "x": 3, "y": 5 }, + { "chunks": [ "nest_vending_machine_looted_drink" ], "x": 4, "y": 5 } + ], "place_items": [ { "item": "mechanics", "x": [ 11, 23 ], "y": [ 18, 18 ], "chance": 80 }, { "item": "manuals", "x": [ 9, 11 ], "y": [ 20, 20 ], "chance": 80 }, diff --git a/data/mods/railroads/mapgen/railroad/railroad_station.json b/data/mods/railroads/mapgen/railroad/railroad_station.json index b3edee4c0e17d..e0783ca32356d 100644 --- a/data/mods/railroads/mapgen/railroad/railroad_station.json +++ b/data/mods/railroads/mapgen/railroad/railroad_station.json @@ -119,11 +119,11 @@ { "monster": "GROUP_ZOMBIE", "x": [ 25, 46 ], "y": [ 73, 94 ], "repeat": [ 0, 1 ], "density": 0.15 }, { "monster": "GROUP_ZOMBIE", "x": [ 49, 70 ], "y": [ 73, 94 ], "repeat": [ 0, 1 ], "density": 0.15 } ], - "vendingmachines": { - "6": { "item_group": "vending_drink", "lootable": true }, - "7": { "item_group": "vending_food", "lootable": true }, - "8": { "item_group": "vending_drink", "lootable": true }, - "9": { "item_group": "vending_food", "lootable": true } + "nested": { + "6": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "7": { "chunks": [ "nest_vending_machine_looted_food" ] }, + "8": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "9": { "chunks": [ "nest_vending_machine_looted_food" ] } }, "place_vehicles": [ { "vehicle": "train_electrical_loco1300", "x": 5, "y": 90, "chance": 10, "rotation": 90, "status": -1 }, From ace5ec4675f7645e81e6028281188694506ce5cf Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:11:36 +0200 Subject: [PATCH 12/12] less json churn --- data/json/mapgen/bowling_alley.json | 3 +-- data/json/mapgen/bus_station.json | 7 ++++--- data/json/mapgen/cs_car_dealership.json | 7 ++++--- data/json/mapgen/cs_car_showroom.json | 7 ++++--- data/json/mapgen/dispensary.json | 7 ++++--- data/json/mapgen/dive_shop.json | 7 ++++--- data/json/mapgen/drive-in_theater.json | 6 ++++-- data/json/mapgen/golfcourse.json | 7 ++++--- data/json/mapgen/helipad.json | 9 +++++---- data/json/mapgen/hospital.json | 6 ++---- data/json/mapgen/junkyard.json | 6 ++++-- data/json/mapgen/motel.json | 12 ++++++------ data/json/mapgen/movie_theater.json | 7 ++++--- data/json/mapgen/music_venue.json | 7 ++++--- data/json/mapgen/musicstore.json | 3 +-- data/json/mapgen/nursing_home.json | 18 ++++++++++-------- data/json/mapgen/park.json | 7 ++----- data/json/mapgen/pharmacy.json | 7 ++++--- data/json/mapgen/regional_airport.json | 9 +++++---- data/json/mapgen/restaurant.json | 3 +-- data/json/mapgen/reststop.json | 7 ++++--- data/json/mapgen/school_1.json | 9 +++++---- data/json/mapgen/smoke_lounge.json | 12 ++++++++---- data/json/mapgen/speedway.json | 9 +++++---- data/json/mapgen/storage_units_large.json | 6 ++++-- data/json/mapgen/storage_units_medium.json | 6 ++++-- data/json/mapgen/stripclub.json | 9 +++++---- data/json/mapgen/sub_station.json | 12 ++++++++---- data/json/mapgen/thrift.json | 7 ++++--- 29 files changed, 124 insertions(+), 98 deletions(-) diff --git a/data/json/mapgen/bowling_alley.json b/data/json/mapgen/bowling_alley.json index 13406f62484b7..5182445154114 100644 --- a/data/json/mapgen/bowling_alley.json +++ b/data/json/mapgen/bowling_alley.json @@ -71,9 +71,8 @@ "&": "f_trashcan" }, "toilets": { "T": { } }, - "nested": { "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { "F": { "chunks": [ "nest_vending_machine_looted_food" ] } }, "items": { - "F": { "item": "vending_food", "chance": 100, "repeat": [ 1, 3 ] }, "=": { "item": "bowling_balls", "chance": 100, "repeat": [ 1, 3 ] }, "t": { "item": "bowling_table", "chance": 33, "repeat": [ 1, 2 ] }, "#": { "item": "bowling_alcohol", "chance": 25 }, diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json index cf16bdfca7c0c..259e9c34e7b85 100644 --- a/data/json/mapgen/bus_station.json +++ b/data/json/mapgen/bus_station.json @@ -72,8 +72,6 @@ "G": "f_bulletin" }, "items": { - "8": { "item": "vending_drink", "chance": 100 }, - "9": { "item": "vending_food", "chance": 100 }, "d": { "item": "SUS_office_desk", "chance": 25 }, "Y": { "item": "jackets", "chance": 55, "repeat": [ 1, 6 ] }, "l": { "item": "SUS_janitors_closet", "chance": 100 }, @@ -86,7 +84,10 @@ { "vehicle": "buses", "x": 35, "y": [ 6, 7 ], "chance": 35, "rotation": 360 }, { "vehicle": "buses", "x": 35, "y": [ 16, 17 ], "chance": 35, "rotation": 360 } ], - "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "8": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "9": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "toilets": { "T": { } }, "place_loot": [ { "group": "cash_register_random", "x": 6, "y": 14 } ] } diff --git a/data/json/mapgen/cs_car_dealership.json b/data/json/mapgen/cs_car_dealership.json index 09e27ee3b3e0e..c6216c9870402 100644 --- a/data/json/mapgen/cs_car_dealership.json +++ b/data/json/mapgen/cs_car_dealership.json @@ -61,7 +61,10 @@ "T": "f_toilet", "s": "f_sofa" }, - "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "v": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_vehicles": [ { "vehicle": "oa_vg_cd_vehicles", "x": 4, "y": 5, "rotation": 270, "chance": 70, "fuel": 0 }, { "vehicle": "oa_vg_cd_vehicles", "x": 11, "y": 5, "rotation": 270, "chance": 70, "fuel": 0 }, @@ -69,8 +72,6 @@ { "vehicle": "oa_vg_cd_vehicles", "x": 18, "y": 15, "rotation": 270, "chance": 70, "fuel": 0 } ], "items": { - "v": { "item": "vending_drink", "chance": 100 }, - "V": { "item": "vending_food", "chance": 100 }, "s": { "item": "oa_discarded_news", "chance": 33 }, "c": { "item": "oa_custom_trash", "chance": 70 }, "D": { "item": "oa_custom_trash", "chance": 60 }, diff --git a/data/json/mapgen/cs_car_showroom.json b/data/json/mapgen/cs_car_showroom.json index 515912e3bbe58..ae2f1a7778749 100644 --- a/data/json/mapgen/cs_car_showroom.json +++ b/data/json/mapgen/cs_car_showroom.json @@ -67,11 +67,12 @@ "S": "f_sofa", "f": "f_filing_cabinet" }, - "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "v": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_vehicles": [ { "vehicle": "oa_vg_cs_vehicles", "x": 16, "y": 8, "rotation": 270, "chance": 100, "status": 0, "fuel": 0 } ], "items": { - "v": { "item": "vending_drink", "chance": 100 }, - "V": { "item": "vending_food", "chance": 100 }, "c": { "item": "oa_custom_trash", "chance": 70 }, "á": { "item": "oa_custom_trash", "chance": 70 }, "C": { "item": "oa_custom_trash", "chance": 70 }, diff --git a/data/json/mapgen/dispensary.json b/data/json/mapgen/dispensary.json index c0d5f8decd500..d84ed7cf25704 100644 --- a/data/json/mapgen/dispensary.json +++ b/data/json/mapgen/dispensary.json @@ -38,8 +38,6 @@ "&": "f_trashcan" }, "items": { - "D": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "M": { "item": "smoke_shop", "chance": 50, "repeat": [ 1, 2 ] }, "#": { "item": "misc_smoking", "chance": 20 }, "I": { "item": "SUS_office_desk", "chance": 33 }, @@ -55,7 +53,10 @@ "2": [ { "item": "withered", "chance": 75, "repeat": [ 1, 4 ] }, { "item": "seed_weed", "chance": 75, "repeat": [ 1, 4 ] } ] }, "toilets": { "t": { } }, - "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } } + "nested": { + "D": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + } }, { "type": "mapgen", diff --git a/data/json/mapgen/dive_shop.json b/data/json/mapgen/dive_shop.json index 7cc732d4d5d6c..832baa91c0149 100644 --- a/data/json/mapgen/dive_shop.json +++ b/data/json/mapgen/dive_shop.json @@ -57,12 +57,13 @@ "B": "f_workbench", "3": "f_air_compressor" }, - "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "W": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "vehicles": { "v": { "vehicle": "parking_garage_short", "rotation": 90, "chance": 33 } }, "toilets": { "t": { } }, "items": { - "W": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "R": { "item": "SUS_scuba_gear", "chance": 10 }, "D": { "item": "SUS_scuba_gear", "chance": 40 }, "]": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ] } diff --git a/data/json/mapgen/drive-in_theater.json b/data/json/mapgen/drive-in_theater.json index 1a4693e7e7884..ed5183b15a05e 100644 --- a/data/json/mapgen/drive-in_theater.json +++ b/data/json/mapgen/drive-in_theater.json @@ -376,8 +376,10 @@ "X": "f_cardboard_box" }, "item": { "N": { "item": "movie_poster", "chance": 100 } }, - "items": { "$": { "item": "vending_drink", "chance": 100 }, "V": { "item": "vending_food", "chance": 100 } }, - "nested": { "$": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "$": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "toilets": { "T": { } } } ] diff --git a/data/json/mapgen/golfcourse.json b/data/json/mapgen/golfcourse.json index b810789cb1dda..039bda393585c 100644 --- a/data/json/mapgen/golfcourse.json +++ b/data/json/mapgen/golfcourse.json @@ -84,7 +84,10 @@ "│4444444444444444444ww4444444&44444444444444444444444444444444444444444444444444444444444444444│", "││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││" ], - "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "D": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 72, 95 ], "y": [ 24, 47 ], "repeat": [ 0, 4 ] } ], "terrain": { "4": [ [ "t_region_shrub_decorative", 12 ], "t_region_tree_shade", [ "t_region_groundcover_forest", 3 ] ], @@ -130,8 +133,6 @@ "U": [ "f_dumpster", "f_recycle_bin" ] }, "items": { - "D": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "&": { "item": "trash", "chance": 25, "repeat": 2 }, "v": { "item": "golf_green", "chance": 10 }, "t": { "chance": 75, "item": "office_mess" } diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index af623d61b8f0a..23daf28f79790 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -113,11 +113,12 @@ "[": { "item": "SUS_fridge", "chance": 50 }, "O": { "item": "SUS_oven", "chance": 75, "repeat": [ 0, 2 ] }, "H": { "item": "SUS_spice_collection", "chance": 75 }, - "&": { "item": "SUS_toilet", "chance": 50 }, - "1": { "item": "vending_drink", "chance": 100 }, - "2": { "item": "vending_food", "chance": 100 } + "&": { "item": "SUS_toilet", "chance": 50 } + }, + "nested": { + "1": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "2": { "chunks": [ "nest_vending_machine_looted_food" ] } }, - "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] }, "2": { "chunks": [ "nest_vending_machine_looted" ] } }, "place_monster": [ { "group": "GROUP_MIL_HELIPAD", "x": [ 3, 21 ], "y": [ 4, 23 ], "chance": 50, "repeat": [ 8, 15 ] }, { "group": "GROUP_MIL_HELIPAD", "x": [ 24, 40 ], "y": [ 10, 23 ], "chance": 40, "repeat": [ 5, 10 ] }, diff --git a/data/json/mapgen/hospital.json b/data/json/mapgen/hospital.json index c0fe84c2075de..d097ab992622e 100644 --- a/data/json/mapgen/hospital.json +++ b/data/json/mapgen/hospital.json @@ -169,12 +169,10 @@ "vehicles": { "=": { "vehicle": "pickup_corpses", "chance": 10, "rotation": 270, "status": 1 } }, "nested": { "=": { "chunks": [ [ "null", 70 ], [ "pile_bodybag_corpses", 30 ] ] }, - "D": { "chunks": [ "nest_vending_machine_looted" ] }, - "F": { "chunks": [ "nest_vending_machine_looted" ] } + "D": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } }, "items": { - "D": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "b": { "item": "magazines", "chance": 50 }, "B": { "item": "hospital_bed", "chance": 80 }, "f": { "item": "SUS_fridge_breakroom", "chance": 90 }, diff --git a/data/json/mapgen/junkyard.json b/data/json/mapgen/junkyard.json index e04bf12b20d85..079d4dbbebb2f 100644 --- a/data/json/mapgen/junkyard.json +++ b/data/json/mapgen/junkyard.json @@ -34,8 +34,10 @@ ], "palettes": [ "junkyard_palette" ], "place_toilets": [ { "x": 12, "y": 13 } ], - "nested": { "K": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "K": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, + "nested": { + "K": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_loot": [ { "item": "television", "x": 17, "y": 9, "chance": 100 } ], "place_items": [ { "chance": 25, "item": "cubical_office", "x": [ 18, 19 ], "y": 12 }, diff --git a/data/json/mapgen/motel.json b/data/json/mapgen/motel.json index 454eeafefc874..168c893bdc005 100644 --- a/data/json/mapgen/motel.json +++ b/data/json/mapgen/motel.json @@ -73,8 +73,6 @@ "É": { "vehicle": "parking_garage", "chance": 33, "rotation": 90 } }, "items": { - "D": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "Y": { "item": "unisex_coat_rack", "chance": 33 }, "n": { "item": "dining", "chance": 6 }, "C": [ { "item": "cash_register_random", "chance": 100 }, { "item": "stand_flyer", "chance": 50 } ], @@ -92,8 +90,8 @@ "nested": { "E": { "chunks": [ "9x9_motel_room_twin_E", "9x9_motel_room_single_E", "9x9_motel_room_single_1_E" ] }, "N": { "chunks": [ "9x9_motel_room_twin_N", "9x9_motel_room_single_N", "9x9_motel_room_single_1_N" ] }, - "D": { "chunks": [ "nest_vending_machine_looted" ] }, - "F": { "chunks": [ "nest_vending_machine_looted" ] } + "D": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } } }, { @@ -743,8 +741,10 @@ "$": { "furniture": "f_shower", "items": { "item": "shower", "chance": 33 } }, "S": { "furniture": "f_sink", "items": { "item": "public_sink", "chance": 33 } } }, - "items": { "V": { "item": "vending_drink", "chance": 100 }, "v": { "item": "vending_food", "chance": 100 } }, - "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "v": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "V": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "v": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "toilets": { "L": { } } }, { diff --git a/data/json/mapgen/movie_theater.json b/data/json/mapgen/movie_theater.json index 9a960b6b4e588..e7ae73ddb832c 100644 --- a/data/json/mapgen/movie_theater.json +++ b/data/json/mapgen/movie_theater.json @@ -87,10 +87,11 @@ "palettes": [ "movie_theater_palette.json" ], "terrain": { "#": "t_thconc_floor", "H": "t_thconc_floor", "y": "t_thconc_floor" }, "toilets": { "&": { } }, - "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "v": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "items": { - "v": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "&": { "item": "alcohol", "chance": 10 }, "T": { "item": "snacks", "chance": 5 }, "X": { "item": "snacks", "chance": 30, "repeat": [ 6, 12 ] }, diff --git a/data/json/mapgen/music_venue.json b/data/json/mapgen/music_venue.json index 6ea7dee774275..227b66dd7ef94 100644 --- a/data/json/mapgen/music_venue.json +++ b/data/json/mapgen/music_venue.json @@ -225,8 +225,6 @@ "7": "f_speaker_cabinet" }, "items": { - "v": { "item": "vending_drink", "chance": 100 }, - "V": { "item": "vending_food", "chance": 100 }, "r": { "item": "glass_set", "chance": 90, "repeat": [ 1, 6 ] }, "L": { "item": "SUS_janitors_closet", "chance": 100 }, "á": { "item": "bar_table", "chance": 12 }, @@ -242,7 +240,10 @@ "#": [ { "item": "jackets", "chance": 16 }, { "item": "hats_unisex", "chance": 12 } ], "Y": [ { "item": "jackets", "chance": 35, "repeat": [ 1, 4 ] }, { "item": "hats_unisex", "chance": 25, "repeat": [ 1, 2 ] } ] }, - "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "v": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_loot": [ { "group": "cash_register_random", "x": [ 4, 5 ], "y": 18 }, { "item": "amplifier_head", "x": 6, "y": 9 }, diff --git a/data/json/mapgen/musicstore.json b/data/json/mapgen/musicstore.json index ec56eb98522c6..06e2699ac1f71 100644 --- a/data/json/mapgen/musicstore.json +++ b/data/json/mapgen/musicstore.json @@ -65,8 +65,7 @@ "r": "f_rack", "d": "f_dumpster" }, - "nested": { "1": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "1": { "item": "vending_drink", "chance": 100 } }, + "nested": { "1": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "toilets": { "T": { } }, "place_loot": [ { "group": "mussto_stringinst", "x": [ 5, 10 ], "y": 10, "chance": 70, "repeat": [ 3, 7 ] }, diff --git a/data/json/mapgen/nursing_home.json b/data/json/mapgen/nursing_home.json index ee697d16d34e0..979389cd292a0 100644 --- a/data/json/mapgen/nursing_home.json +++ b/data/json/mapgen/nursing_home.json @@ -191,12 +191,13 @@ { "item": "games", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "office_mess", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "magazines", "chance": 20, "repeat": [ 0, 1 ] } - ], - "?": { "item": "vending_drink", "chance": 100 }, - ",": { "item": "vending_food", "chance": 100 } + ] }, "monster": { "3": { "monster": "mon_civilian_icu", "chance": 10 }, "8": { "monster": "mon_civilian_icu", "chance": 10 } }, - "nested": { "?": { "chunks": [ "nest_vending_machine_looted" ] }, ",": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "?": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + ",": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "palettes": [ "nursing_home_palette" ], "place_monster": [ { "group": "GROUP_NURSING_HOME", "x": [ 1, 20 ], "y": [ 6, 23 ], "repeat": [ 5, 8 ] }, @@ -414,11 +415,12 @@ { "item": "office_mess", "chance": 20, "repeat": [ 0, 1 ] }, { "item": "magazines", "chance": 20, "repeat": [ 0, 1 ] } ], - ".": [ { "item": "trash", "chance": 2 }, { "item": "office_mess", "chance": 3 } ], - "?": { "item": "vending_drink", "chance": 100 }, - ",": { "item": "vending_food", "chance": 100 } + ".": [ { "item": "trash", "chance": 2 }, { "item": "office_mess", "chance": 3 } ] + }, + "nested": { + "?": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + ",": { "chunks": [ "nest_vending_machine_looted_food" ] } }, - "nested": { "?": { "chunks": [ "nest_vending_machine_looted" ] }, ",": { "chunks": [ "nest_vending_machine_looted" ] } }, "palettes": [ "nursing_home_sh_palette" ], "monster": { "3": { "monster": "mon_civilian_icu", "chance": 10 }, "8": { "monster": "mon_civilian_icu", "chance": 10 } }, "place_monster": [ diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json index e23dadd970f0c..1bb95150b00d4 100644 --- a/data/json/mapgen/park.json +++ b/data/json/mapgen/park.json @@ -538,11 +538,8 @@ " , " ], "palettes": [ "park_scenic_palette" ], - "items": { - "N": { "item": "bulletin_public", "chance": 50, "repeat": [ 1, 3 ] }, - "v": { "item": "vending_drink", "chance": 100 } - }, - "nested": { "v": { "chunks": [ "nest_vending_machine_looted" ] } }, + "items": { "N": { "item": "bulletin_public", "chance": 50, "repeat": [ 1, 3 ] } }, + "nested": { "v": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "place_monster": [ { "group": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 10 ], "chance": 50 } ] } }, diff --git a/data/json/mapgen/pharmacy.json b/data/json/mapgen/pharmacy.json index aec8c363ae2a4..eb4b5336e9901 100644 --- a/data/json/mapgen/pharmacy.json +++ b/data/json/mapgen/pharmacy.json @@ -199,10 +199,11 @@ "x": "f_glass_cabinet" }, "toilets": { "T": { } }, - "nested": { "l": { "chunks": [ "nest_vending_machine_looted" ] }, "m": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "l": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "m": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "items": { - "l": { "item": "vending_drink", "chance": 100 }, - "m": { "item": "vending_food", "chance": 100 }, "#": { "item": "snacks", "chance": 10 }, "f": { "item": "fridgesnacks", "chance": 60, "repeat": [ 1, 12 ] }, "1": { "item": "magazines", "chance": 60, "repeat": [ 4, 16 ] }, diff --git a/data/json/mapgen/regional_airport.json b/data/json/mapgen/regional_airport.json index 16c99ddc2d41b..0a0f61c59d408 100644 --- a/data/json/mapgen/regional_airport.json +++ b/data/json/mapgen/regional_airport.json @@ -355,11 +355,12 @@ "O": [ { "item": "supplies_electronics", "chance": 20, "repeat": [ 1, 2 ] }, { "item": "mechanics", "chance": 20, "repeat": [ 1, 2 ] } - ], - "8": { "item": "vending_drink", "chance": 100 }, - "9": { "item": "vending_food", "chance": 100 } + ] + }, + "nested": { + "8": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "9": { "chunks": [ "nest_vending_machine_looted_food" ] } }, - "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, "vehicles": { "Á": { "vehicle": "parkinglotbasic", "chance": 33, "rotation": 270 }, "É": { "vehicle": "parkinglotbasic", "chance": 33, "rotation": 90 } diff --git a/data/json/mapgen/restaurant.json b/data/json/mapgen/restaurant.json index 33b4919c020af..a22cf97c47539 100644 --- a/data/json/mapgen/restaurant.json +++ b/data/json/mapgen/restaurant.json @@ -463,7 +463,6 @@ }, "item": { "L": { "item": "medium_disposable_cell", "chance": 100, "repeat": [ 1, 2 ] } }, "items": { - "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "SUS_fridge_breakroom", "chance": 100 }, "x": { "item": "trash", "chance": 100, "repeat": [ 2, 4 ] }, "B": { "item": "magazines", "chance": 50, "repeat": [ 3, 5 ] }, @@ -482,7 +481,7 @@ "i": { "item": "softdrugs", "chance": 70, "repeat": [ 2, 3 ] }, "c": [ { "item": "kitchen", "chance": 100, "repeat": [ 1, 5 ] }, { "item": "knifeblock", "chance": 75, "repeat": [ 1, 2 ] } ] }, - "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { "D": { "chunks": [ "nest_vending_machine_looted_mix" ] } }, "place_loot": [ { "item": "television", "x": [ 3, 4 ], "y": 20, "repeat": 1, "chance": 100 } ], "place_nested": [ { "chunks": [ [ "foodperson_break_room", 25 ], [ "null", 75 ] ], "x": 15, "y": 10 } ] } diff --git a/data/json/mapgen/reststop.json b/data/json/mapgen/reststop.json index 38753c38b986d..ca9f77d8150d1 100644 --- a/data/json/mapgen/reststop.json +++ b/data/json/mapgen/reststop.json @@ -97,10 +97,11 @@ "R": "f_bike_rack" }, "toilets": { "B": { } }, - "nested": { "%": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "%": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "items": { - "%": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 }, "B": { "item": "SUS_toilet", "chance": 30 }, "Y": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] }, "E": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] } diff --git a/data/json/mapgen/school_1.json b/data/json/mapgen/school_1.json index bcc0f5c3ad82f..bbf49b358293b 100644 --- a/data/json/mapgen/school_1.json +++ b/data/json/mapgen/school_1.json @@ -554,12 +554,13 @@ { "item": "snacks", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "cannedfood_commercial", "chance": 70, "repeat": [ 1, 3 ] }, { "item": "dining", "chance": 5, "repeat": [ 1, 3 ] } - ], - "8": { "item": "vending_drink", "chance": 100 }, - "9": { "item": "vending_food", "chance": 100 } + ] }, "item": { "§": { "item": "american_flag" } }, - "nested": { "8": { "chunks": [ "nest_vending_machine_looted" ] }, "9": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "8": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "9": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "computers": { "6": { "name": "School Bell Software 1.1", diff --git a/data/json/mapgen/smoke_lounge.json b/data/json/mapgen/smoke_lounge.json index 5716db5c9d607..2c9291e61a905 100644 --- a/data/json/mapgen/smoke_lounge.json +++ b/data/json/mapgen/smoke_lounge.json @@ -87,8 +87,10 @@ "g": "f_stool", "Y": "f_trashcan" }, - "nested": { "M": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "M": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, + "nested": { + "M": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_nest_vending_machine_looted_foodlooted" ] } + }, "sealed_item": { "1": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" } }, "toilets": { "&": { } } }, @@ -234,8 +236,10 @@ "g": "f_stool", "Y": "f_trashcan" }, - "nested": { "M": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "M": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } }, + "nested": { + "M": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_nest_vending_machine_looted_foodlooted" ] } + }, "sealed_item": { "1": { "item": { "item": "seed_tobacco" }, "furniture": "f_planter_harvest" } }, "toilets": { "&": { } } }, diff --git a/data/json/mapgen/speedway.json b/data/json/mapgen/speedway.json index 7f20bce628944..c2491ce9d5e9e 100644 --- a/data/json/mapgen/speedway.json +++ b/data/json/mapgen/speedway.json @@ -76,12 +76,13 @@ "i": { "item": "SUS_office_filing_cabinet", "chance": 25 }, "a": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, "A": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] }, - "D": { "item": "trash", "chance": 80, "repeat": [ 4, 8 ] }, - "V": { "item": "vending_drink", "chance": 100 }, - "F": { "item": "vending_food", "chance": 100 } + "D": { "item": "trash", "chance": 80, "repeat": [ 4, 8 ] } }, "toilets": { "T": { } }, - "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "V": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "vehicles": { "v": { "vehicle": "cars_only", "chance": 10, "rotation": 90 }, "^": { "vehicle": "cars_only", "chance": 10, "rotation": 270 }, diff --git a/data/json/mapgen/storage_units_large.json b/data/json/mapgen/storage_units_large.json index fd0e785325290..9e09ddc490ab3 100644 --- a/data/json/mapgen/storage_units_large.json +++ b/data/json/mapgen/storage_units_large.json @@ -217,8 +217,10 @@ "I": "f_sofa", "M": [ "f_crate_c", "f_cardboard_box" ] }, - "nested": { "U": { "chunks": [ "nest_vending_machine_looted" ] }, "Á": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "U": { "item": "vending_drink", "chance": 100 }, "Á": { "item": "vending_food", "chance": 100 } }, + "nested": { + "U": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "Á": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_loot": [ { "item": "stepladder", "x": 14, "y": 12, "chance": 50 }, { "item": "stepladder", "x": 5, "y": 4, "chance": 50 } ], "place_items": [ { "item": "homebooks", "x": [ 0, 5 ], "y": [ 9, 10 ], "chance": 50, "repeat": [ 1, 11 ] }, diff --git a/data/json/mapgen/storage_units_medium.json b/data/json/mapgen/storage_units_medium.json index 2bcdd4c63dbfd..8b55408c0ab2f 100644 --- a/data/json/mapgen/storage_units_medium.json +++ b/data/json/mapgen/storage_units_medium.json @@ -219,8 +219,10 @@ "M": [ "f_crate_c", "f_cardboard_box" ] }, "place_loot": [ { "item": "television", "x": 3, "y": 6, "chance": 75 }, { "item": "stepladder", "x": 20, "y": 19, "chance": 100 } ], - "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "W": { "item": "vending_drink", "chance": 100 }, "V": { "item": "vending_food", "chance": 100 } }, + "nested": { + "W": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_items": [ { "item": "softdrugs", "x": [ 1, 2 ], "y": [ 1, 3 ], "chance": 50, "repeat": [ 1, 11 ] }, { "item": "camping", "x": 1, "y": [ 1, 3 ], "chance": 50, "repeat": [ 1, 11 ] }, diff --git a/data/json/mapgen/stripclub.json b/data/json/mapgen/stripclub.json index f3169d7a3bcd3..62e3247978a5b 100644 --- a/data/json/mapgen/stripclub.json +++ b/data/json/mapgen/stripclub.json @@ -412,9 +412,7 @@ "C": [ { "item": "magazines", "chance": 25 }, { "item": "bar_alcohol", "chance": 25 } ], "g": { "item": "beer_selection", "chance": 65, "repeat": [ 1, 3 ] }, "a": { "item": "chair_hat", "chance": 5 }, - "e": { "item": "stripclub_dirty", "chance": 5 }, - "V": { "item": "vending_food", "chance": 100 }, - "v": { "item": "vending_drink", "chance": 100 } + "e": { "item": "stripclub_dirty", "chance": 5 } }, "place_fields": [ { "field": "fd_blood", "x": [ 8, 19 ], "y": [ 3, 20 ], "repeat": [ 1, 8 ] }, @@ -428,7 +426,10 @@ ] }, "place_loot": [ { "group": "cash_register_random", "x": [ 13, 16 ], "y": 18 } ], - "nested": { "V": { "chunks": [ "nest_vending_machine_looted" ] }, "v": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "V": { "chunks": [ "nest_vending_machine_looted_food" ] }, + "v": { "chunks": [ "nest_vending_machine_looted_drink" ] } + }, "place_monsters": [ { "monster": "GROUP_RESORT_DANCERS", "x": [ 1, 23 ], "y": [ 0, 22 ], "density": 0.5 } ], "toilets": { "e": { } } } diff --git a/data/json/mapgen/sub_station.json b/data/json/mapgen/sub_station.json index 74c18548fb300..657ce98e8864e 100644 --- a/data/json/mapgen/sub_station.json +++ b/data/json/mapgen/sub_station.json @@ -33,8 +33,10 @@ "SSSSSSSSSSSSSSSSSSSSSSSS" ], "palettes": [ "subway" ], - "nested": { "D": { "chunks": [ "nest_vending_machine_looted" ] }, "F": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "D": { "item": "vending_drink", "chance": 100 }, "F": { "item": "vending_food", "chance": 100 } } + "nested": { + "D": { "chunks": [ "nest_vending_machine_looted_food" ] }, + "F": { "chunks": [ "nest_vending_machine_looted_drink" ] } + } } }, { @@ -106,8 +108,10 @@ "########################" ], "palettes": [ "subway_underground" ], - "nested": { "J": { "chunks": [ "nest_vending_machine_looted" ] }, "C": { "chunks": [ "nest_vending_machine_looted" ] } }, - "items": { "J": { "item": "vending_drink", "chance": 100 }, "C": { "item": "vending_food", "chance": 100 } }, + "nested": { + "J": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "C": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 6, 20 ], "y": [ 4, 9 ], "repeat": [ 5, 9 ] } ], "place_item": [ { "item": "subwaymap", "x": 1, "y": [ 6, 7 ], "chance": 75 } ] } diff --git a/data/json/mapgen/thrift.json b/data/json/mapgen/thrift.json index c8b0e0382e119..c659664b33553 100644 --- a/data/json/mapgen/thrift.json +++ b/data/json/mapgen/thrift.json @@ -76,11 +76,12 @@ "L": "f_locker", "U": [ "f_dumpster", "f_recycle_bin" ] }, - "nested": { "W": { "chunks": [ "nest_vending_machine_looted" ] }, "V": { "chunks": [ "nest_vending_machine_looted" ] } }, + "nested": { + "W": { "chunks": [ "nest_vending_machine_looted_drink" ] }, + "V": { "chunks": [ "nest_vending_machine_looted_food" ] } + }, "toilets": { "B": { } }, "items": { - "W": { "item": "vending_drink", "chance": 100 }, - "V": { "item": "vending_food", "chance": 100 }, "J": { "item": "office", "chance": 30, "repeat": [ 3, 4 ] }, "A": { "item": "thrift_misc", "chance": 60, "repeat": [ 1, 6 ] }, "a": { "item": "thrift_books", "chance": 60, "repeat": [ 1, 6 ] },