Remove vendingmachines mapgen syntax, replace existing VM with nests, replace active VM with turned off (in vanilla)

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,
@@ -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", "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",
@@ -1649,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,
@@ -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", "TRANSPARENT" ],
+    "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",

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",

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 }
       ]
     }
   },

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 }
       ]
     }
   },

data/json/mapgen/bowling_alley.json

@@ -71,7 +71,7 @@
         "&": "f_trashcan"
       },
       "toilets": { "T": {  } },
-      "vendingmachines": { "F": { "item_group": "vending_food", "lootable": true } },
+      "nested": { "F": { "chunks": [ "nest_vending_machine_looted_food" ] } },
       "items": {
         "=": { "item": "bowling_balls", "chance": 100, "repeat": [ 1, 3 ] },
         "t": { "item": "bowling_table", "chance": 33, "repeat": [ 1, 2 ] },

data/json/mapgen/bus_station.json

@@ -84,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 }
       ],
-      "vendingmachines": { "8": { "item_group": "vending_drink", "lootable": true }, "9": { "item_group": "vending_food", "lootable": true } },
+      "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 } ]
     }

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 ] } ],

data/json/mapgen/cs_car_dealership.json

@@ -61,7 +61,10 @@
         "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_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 },

data/json/mapgen/cs_car_showroom.json

@@ -67,7 +67,10 @@
         "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_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": {
         "c": { "item": "oa_custom_trash", "chance": 70 },

data/json/mapgen/dispensary.json

@@ -53,7 +53,10 @@
       "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_drink" ] },
+      "F": { "chunks": [ "nest_vending_machine_looted_food" ] }
+    }
   },
   {
     "type": "mapgen",

data/json/mapgen/dive_shop.json

@@ -57,7 +57,10 @@
       "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_drink" ] },
+      "F": { "chunks": [ "nest_vending_machine_looted_food" ] }
+    },
     "vehicles": { "v": { "vehicle": "parking_garage_short", "rotation": 90, "chance": 33 } },
     "toilets": { "t": {  } },
     "items": {

data/json/mapgen/drive-in_theater.json

@@ -376,7 +376,10 @@
       "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 } },
+    "nested": {
+      "$": { "chunks": [ "nest_vending_machine_looted_drink" ] },
+      "V": { "chunks": [ "nest_vending_machine_looted_food" ] }
+    },
     "toilets": { "T": {  } }
   }
 ]

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 ] },

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 } ],

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": "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 ] }
@@ -121,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 ] },

data/json/mapgen/golfcourse.json

@@ -84,7 +84,10 @@
         "│4444444444444444444ww4444444&44444444444444444444444444444444444444444444444444444444444444444│",
         "││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││"
       ],
-      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
+      "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 ] ],

data/json/mapgen/helipad.json

@@ -115,7 +115,10 @@
         "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_drink" ] },
+        "2": { "chunks": [ "nest_vending_machine_looted_food" ] }
+      },
       "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 ] },

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,7 +167,11 @@
         }
       },
       "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_drink" ] },
+        "F": { "chunks": [ "nest_vending_machine_looted_food" ] }
+      },
       "items": {
         "b": { "item": "magazines", "chance": 50 },
         "B": { "item": "hospital_bed", "chance": 80 },

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": "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 ] },

data/json/mapgen/junkyard.json

@@ -34,7 +34,10 @@
       ],
       "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_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 },

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": {

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",

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 } ] },