From 355ecd0aa64dd9e30a012ba02fef8d865206c8a0 Mon Sep 17 00:00:00 2001
From: LovamkicsiGazsi <farkasb0420@gmail.com>
Date: Sun, 29 Jan 2023 00:53:14 +0100
Subject: [PATCH 1/5] cleanup private resort

---
 data/json/mapgen/private_resort.json          | 1918 ++++-------------
 data/json/mapgen_palettes/private_resort.json |  329 +--
 .../overmap/overmap_special/specials.json     |    4 +-
 .../overmap_terrain_private_resort.json       |    3 +-
 data/json/vehicle_groups.json                 |    3 +-
 5 files changed, 585 insertions(+), 1672 deletions(-)

diff --git a/data/json/mapgen/private_resort.json b/data/json/mapgen/private_resort.json
index 3a59ddd21a590..37ba7ba95bcab 100644
--- a/data/json/mapgen/private_resort.json
+++ b/data/json/mapgen/private_resort.json
@@ -2,1178 +2,451 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1nw" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_metal_floor",
-      "rows": [
-        "....______..______......",
-        ".FFW======WW======WFFFFF",
-        ".F.%:____:__:____:%.....",
-        ".F..:____:__:____:......",
-        ".F..:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F..:____:__:____:......",
-        ".F..W=====WW=====WWW|||W",
-        ".F..Wmmmmm%mmmmmm%Wfmmmf",
-        ".F..WmmmmmmmmmmmmmWfmmmf",
-        ".F..WmmZmmmZmmmmmmWfmmmf",
-        ".F..WmZmmmmmmmmmmmWfmmmf",
-        ".F..WmZmmmZmmmmmmmWfmmmf",
-        ".F..WmmmmZmmmmmmmmWW|||W",
-        ".F..WmmmmZZmmmmmmm|mmmmm",
-        ".F..WmmmmZZm>>mmmm|mmmm<",
-        ".F..W|W|WWWWWWWWWWWmZmmL",
-        ".F..W W,,Bb,,Bb,ggWZZmmL",
-        ".F..W W,,,,,,,?,,,|mmmmL",
-        ".F..W W,,?,,,,,,,,|mmmmL",
-        ".F..W W,,Bb,,Bb?,,WmmmmL"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_signs": [
-        { "signage": "Private property.  No trespassing!", "x": 4, "y": 0 },
-        { "signage": "Private property.  No trespassing!", "x": 18, "y": 0 }
-      ],
-      "place_items": [
-        { "chance": 40, "item": "alcohol", "x": 7, "y": 13, "repeat": [ 2, 8 ] },
-        { "chance": 100, "item": "snacks", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 15, "item": "snacks", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 100, "item": "groce_condiment", "x": 11, "y": 13 },
-        { "chance": 15, "item": "groce_condiment", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "crate_wine", "x": 6, "y": 14, "repeat": [ 1, 3 ] },
-        { "chance": 15, "item": "crate_wine", "x": 6, "y": 14, "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "softdrinks_canned", "x": 6, "y": 15, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "crate_kitchen", "x": 10, "y": 15, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "behindcounter", "x": 10, "y": 17, "repeat": [ 5, 7 ] },
-        { "chance": 50, "item": "foodintincan", "x": 9, "y": 18, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "cannedfood", "x": 20, "y": 19, "repeat": [ 10, 5 ] },
-        { "chance": 50, "item": "cleaning", "x": 19, "y": 20, "repeat": [ 10, 5 ] },
-        { "chance": 90, "item": "SUS_fridge", "x": 19, "y": 11 },
-        { "chance": 50, "item": "SUS_fridge", "x": 19, "y": 12 },
-        { "chance": 50, "item": "SUS_fridge", "x": 19, "y": 13 },
-        { "chance": 20, "item": "SUS_fridge", "x": 19, "y": 14 },
-        { "chance": 50, "item": "SUS_fridge", "x": 19, "y": 15 },
-        { "chance": 90, "item": "SUS_fridge", "x": 23, "y": 11 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 12 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 13 },
-        { "chance": 20, "item": "SUS_fridge", "x": 23, "y": 14 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 15 },
-        { "chance": 20, "item": "butcher_tools", "x": 9, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 9, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 13, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 13, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "butcher_raw_meat", "x": 16, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "butcher_raw_meat", "x": 17, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 19 },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 20 },
-        { "chance": 40, "item": "stash_drugs", "x": 24, "y": 20 },
-        { "chance": 40, "item": "dresser", "x": 24, "y": 21, "repeat": [ 1, 3 ] },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 22 },
-        { "chance": 40, "item": "dresser", "x": 24, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 60, "item": "stash_drugs", "x": 24, "y": 23 }
-      ],
-      "place_vehicles": [
-        { "vehicle": "pickup", "x": 13, "y": 13, "chance": 75, "rotation": 270, "status": -1 },
-        { "vehicle": "policesuv", "x": 11, "y": 7, "chance": 25, "rotation": 90, "status": -1 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_ZOMBIE_COP", "x": [ 4, 20 ], "y": [ 3, 9 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 5, 23 ], "y": [ 11, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ww" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_metal_floor",
-      "rows": [
-        ".F..W WWWWWWWWWWWWWW|||W",
-        ".F..W WBdSdS{{{{{{RRmmm]",
-        ".F..W WBmmmmmmmmmmmmmmm]",
-        ".F..W WBmBBBOBSBOBBBlmm]",
-        ".F..W WBmBBBOBSBOBBBlmm]",
-        ".F..W WBmmmmmmmmmmmmmmm]",
-        ".F..W WBBBBBBBBBBBBBmmm]",
-        ".F..W+WWWWWWWWWWWWWW#W+W",
-        ".F..wr#]]]##########rrrr",
-        ".F..wr;rrrrrrrrrrrr#rrrr",
-        ".F..Wr#rrrrrrrrrrrr#rrrr",
-        ".F..wr##############rrrr",
-        ".F..wrrssssssssssssrrrrr",
-        ".F..wrrrrrrrrrrrrrrrrrrr",
-        ".F..Wrrrrrccrrrrrrcccrrr",
-        ".F..wccrrcTTcrrrrcTTTcrr",
-        ".F..wTTcrcTTcrrrrcTTTcrr",
-        ".F..wccrrrccrrrrrrcccrrr",
-        ".F..Wrrrrrrrrrrrrrrrrrrr",
-        ".F..wccrrrccrrrrrrcccrrr",
-        ".F..wTTcrcTTcrrrrcTTTcrr",
-        ".F..wccrrcTTcrrrrcTTTcrr",
-        ".F..Wrrrrrccr<<rrrcccrrr",
-        ".F..W+WWWWWWWWWWWWWWWWW+"
-      ],
-      "palettes": [ "p_resort_palette_restaraunt" ],
-      "items": {
-        "{": {
-          "item": {
-            "subtype": "distribution",
-            "entries": [
-              { "group": "SUS_silverware", "prob": 50 },
-              { "group": "SUS_utensils", "prob": 50 },
-              { "group": "SUS_knife_drawer", "prob": 25 },
-              { "group": "SUS_junk_drawer", "prob": 10 },
-              { "group": "SUS_dishes", "prob": 50 },
-              { "group": "SUS_appliances_cupboard", "prob": 10 },
-              { "group": "SUS_coffee_cupboard", "prob": 20 },
-              { "group": "SUS_spice_collection", "prob": 10 }
-            ]
-          },
-          "chance": 75
-        },
-        "S": { "item": "SUS_kitchen_sink", "chance": 75 },
-        "d": { "item": "SUS_dishwasher", "chance": 75 },
-        "B": { "item": "SUS_cookware", "chance": 33, "repeat": [ 1, 2 ] },
-        "O": { "item": "SUS_oven", "chance": 75 }
-      },
-      "place_items": [
-        { "chance": 40, "item": "bar_fridge", "x": [ 7, 9 ], "y": [ 8, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 30, "item": "bar_table", "x": [ 7, 18 ], "y": [ 11, 11 ], "repeat": [ 15, 20 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 10, 18 ], "y": [ 8, 8 ], "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 5, 6 ], "y": [ 16, 16 ], "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 10, 11 ], "y": [ 15, 16 ], "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 18, 20 ], "y": [ 15, 16 ], "repeat": [ 3, 9 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 5, 6 ], "y": [ 20, 20 ], "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 10, 11 ], "y": [ 19, 20 ], "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 18, 20 ], "y": [ 19, 20 ], "repeat": [ 3, 9 ] },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 1 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 2 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 3 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 4 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 5 },
-        { "chance": 50, "item": "SUS_fridge", "x": 23, "y": 6 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 5, 23 ], "y": [ 0, 23 ], "density": 0.75 },
-        { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 7, 23 ], "y": [ 0, 6 ], "density": 0.2 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1sw" ],
-    "weight": 1000,
+    "om_terrain": [ [ "p_resort_1nw", "p_resort_1nn", "p_resort_1ne" ], [ "null", "p_resort_1mm", "p_resort_1ee" ] ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".F..W  WTSTW^^W^^WTSTW  ",
-        ".F..W  W   W $W$ W   W  ",
-        ".F..W  +   +  W  +   +  ",
-        ".F..W  WWWWWWWWWWWWWWW  ",
-        ".F..W  +   +  W  +   +  ",
-        ".F..W  W   W $W$ W   W  ",
-        ".F..W  WTSTW^^W^^WTSTW  ",
-        ".F..WWWWWWWWWWWWWWWWWWWW",
-        ".F......................",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 5, 23 ], "y": [ 0, 7 ], "repeat": [ 0, 1 ], "density": 0.2 } ],
-      "toilets": { "$": {  } },
-      "place_items": [
-        { "chance": 50, "item": "restaur_bath", "x": [ 12, 13 ], "y": [ 0, 2 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 15, 16 ], "y": [ 0, 2 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 12, 13 ], "y": [ 4, 6 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 15, 16 ], "y": [ 4, 6 ], "repeat": [ 3, 6 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 12, 13 ], "y": [ 0, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 15, 16 ], "y": [ 0, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 12, 13 ], "y": [ 4, 6 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 15, 16 ], "y": [ 4, 6 ], "repeat": [ 1, 2 ] }
-      ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 10, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 15, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 19, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pw" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.....................x",
-        ".F.....................x",
-        ".FFFFFFFFFFFFFFFFFFFFFFF",
-        "........................"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 2, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 11, "chance": 20, "rotation": 0, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 16, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 4, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 13, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 18, "chance": 20, "rotation": 180, "status": 1 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1nn" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor_waxed",
-      "rows": [
-        "........................",
-        "FFFFFFFFFFFFFFFFFFFFFFFF",
-        "........................",
-        "........................",
-        "WWWWWWWWWWWWWWWWWWWWWWWW",
-        "WHHHH'HaaaaHHaaaaH'HHHH+",
-        "Wc9HHHHa##aHHa##aHHHHHHW",
-        "WHHHHHHa##aHHa##aHHHHHHW",
-        "WHHHHHHHHHHHHHHHHHHHHHHW",
-        "WHHIHHHHHHHHHHIHHHHHHH'W",
-        "W###sHHHHHHHHHHHHHHHH##W",
-        "W]H#sHHHHHHHHHHssssss##8",
-        "W#H#sHHHHHHHHHs########W",
-        "W#H#sHHHHHHHHHs#i##i###W",
-        "W#H#sHHHHHHHHHs########W",
-        "WHH#sHHHHHHHHHHssssss##8",
-        "W;##sHHHHHHHHHHHHHHHH##W",
-        "|HHHHHHHHHHHHHHHHHHHHH'W",
-        "WHHHHHHHHHHHHHHHHHHHHHHW",
-        "WHHHHHa###aHHa###aHHHHHW",
-        "WHHHHHa#i#aHHa#i#aHHHHHW",
-        "WHHHHHa###aHHa###aHHHHH+",
-        "WHHHH'aaaaaHHaaaaa'HHHH+",
-        "WWW++WWWWWWWWWWWWWW++WWW"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_items": [
-        { "chance": 40, "item": "bar_fridge", "x": 1, "y": 11, "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "bar_table", "x": [ 3, 3 ], "y": [ 10, 16 ], "repeat": [ 6, 12 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 1, 1 ], "y": [ 12, 14 ], "repeat": [ 5, 10 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 8, 9 ], "y": [ 6, 7 ], "repeat": [ 1, 4 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 14, 15 ], "y": [ 6, 7 ], "repeat": [ 1, 4 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 7, 9 ], "y": [ 19, 21 ], "repeat": [ 1, 8 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 14, 16 ], "y": [ 19, 21 ], "repeat": [ 1, 8 ] }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_DANCERS", "x": [ 0, 23 ], "y": [ 5, 23 ], "repeat": [ 1, 2 ], "density": 0.4 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1mm" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_concrete",
-      "rows": [
-        "W..PP..............PP..W",
-        "W..PP..............PP..W",
-        "W..PPP7^7^7777^7^7PPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..7PPUUUU#PP#UUUUPP7..W",
-        "W..^PPUUUU#PP#UUUUPP^..W",
-        "W..7PPUUUU#PP#UUUUPP7..W",
-        "W..PPPUUUU####UUUUPPP..W",
-        "W..7PPUUUUUUUUUUUUPP7..W",
-        "W..^PPUUUUUUUUUUUUPP^..W",
-        "W..7PPUUUUUUUUUUUUPP7..W",
-        "W..PPPPPP~PPPP~PPPPPP..W",
-        "W..PPP^PPPPPPPPPP^PPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..PP......PP......PP..W",
-        "W..PP......PP......PP..W",
-        "WWW++WWWWWW++WWWWWW++WWW",
-        "+     <<<      <<<     +",
-        "+                      +",
-        "WW+WW  WWWWWWWWWW  WW+WW"
+        "    ______________                                                      ",
+        " FF|==============|FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
+        " F %y____________y%                                                   F ",
+        " F  y____________y                                                    F ",
+        " F  y____________y      ||||||||||||||||||||||||||||||||||||||||||||  F ",
+        " F  y____________yxxxxx |....'.aaaa..aaaa.'....+...................|  F ",
+        " F  y____________yxxxxx |c9....a##a..a##a......||+|||8|||8|||8|||8||  F ",
+        " F  y____________yxxxxx |......a##a..a##a......|L.j|..K|..K|..K|..K|  F ",
+        " F  y____________y  xxx |......................|L.j|.i^|.i^|.i^|.i^|  F ",
+        " F  y____________y  xxx |......................|L..|aaa|aaa|aaa|aaa|  F ",
+        " F  |============|||---||###s........HHHHHHHHHH|||.|||||||||||||||||  F ",
+        " F  |::::::::::::%|:::::|S.#s........Hrrrrrrrrr|.|...0TK0TK0TK..+.K|  F ",
+        " F  |:::::::::::::|:::gg|f.#s........Hr........8.8....c..c..c...|.1|  F ",
+        " F  |:::::::::::::|:::gg|#.#s........Hr.i..i...|.|..............||||  F ",
+        " F  |:::::::::::::|:::gg|#.#s........Hr........8.8..KV.j.VV.j...|.$|  F ",
+        " F  |Z:::::::::::Z|:::::|..#s........Hrrrrrrrrr|.|..KV.j.VV.j...+.S|  F ",
+        " F  |::Z:::::::::Z||---||;##s........HHHHHHHHHH||||||||||||||||+||||  F ",
+        " F  |:::::Z:::::::-:::::-......................8..|$.+.S|S.+.$|.eee|  F ",
+        " F  |:ZZ::::ZZ::::-::::<|......................8..||||.S|S.||||..c.|  F ",
+        " F  |-||---|||||::|L:::L|.....a###a..a###a.....|..|$.+..|..+.$|....|  F ",
+        " F  |:|]:::]]]]|::|:::::|.....a#i#a..a#i#a.....|..|||||+|+|||||...f|  F ",
+        " F  |:|]:::::::|>>|44:33|<<...a###a..a###a.....8...........-......f|  F ",
+        " F  |:|]:::]]]]|>>|44533|<<..'aaaaa..aaaaa'....8...........-......f|  F ",
+        " F  |:||---||||||||||||||||++||||||||||||||++|||..|..||||||||||||-||  F ",
+        "││││││││││││││││││││││││:xxxx*////////////*xx* |.....;.###ffSSff...|  F ",
+        "││││││││││││││││││││││││|**xx**************xx* |.....#.............|  F ",
+        "││││││││││││││││││││││││|/*7xx7N7N7xx7N7N7xxx* |.....##############|  F ",
+        "││││││││││││││││││││││││|/*Nxxxxxxxxxxxxxxxxx* |......ssssssssssss.|  F ",
+        "││││││││││││││││││││││││|/*7xxxxxxxxxxxxxxxxx* |...................|  F ",
+        "││││││││││││││││││││││││|**xxxUUUU#;;#UUUUxx7* |...................|  F ",
+        "││││││││││││││││││││││││:xxxxxUUUU#..#UUUUxxN* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││|**xxxUUUU#s.#UUUUxx7* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││| *xxxUUUU####UUUUxxx* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││| *7xxUUUUUUUUUUUUxx7* |...................|  F ",
+        "││││││││││││││││││││││││| *NxxUUUUUUUUUUUUxxN* |..@s.s@.TTc..cTT...|  F ",
+        "││││││││││││││││││││││││| *7xxUUUUUUUUUUUUxx7* |..@s.s@.sTc..cTs...|  F ",
+        "││││││││││││││││││││││││| *xxxxxx~xxxx~xxxxxx* |..@s.s@.TTc..cTT...|  F ",
+        "││││││││││││││││││││││││| *xxxNxxxxxxxxxxNxxx* |...................|  F ",
+        "││││││││││││││││││││││││| *xxDDDxxxxxxxxDDDxx* |.......((.....((...|  F ",
+        "││││││││││││││││││││││││| *xxDDDxx7xx7xxDDDxx* |....'......'.......|  F ",
+        "││││││││││││││││││││││││| *xxDDDxxxxxxxxDDDxx* |....rrrrrrrrr||qqq||  F ",
+        "││││││││││││││││││││││││| *xxxxxxxxxxxxxxxxxx* |....r,,,,,,,,|Teee.|  F ",
+        "││││││││││││││││││││││││| *xx******xx******xx* |....r,C,C,9C,|T.c.Y|  F ",
+        "││││││││││││││││││││││││| *xx*////*xx*////*xx* |....,,,,,,,,,|.....|  F ",
+        "││││││││││││││││││││││││|||++||||||++||||||++|||..||||||||||||||-|||  F ",
+        "││││││││││││││││││││││││+......<<......<<.........-................|  F ",
+        "││││││││││││││││││││││││+.........................-................|  F ",
+        "││││││││││││││││││││││││|......................|||||||..cc...|||+|||  F "
       ],
       "palettes": [ "p_resort_palette_main_floor" ],
+      "terrain": { "│": "t_hole", "L": "t_thconc_floor" },
+      "place_fields": [ { "field": "fd_bile", "x": [ 25, 46 ], "y": [ 5, 22 ], "repeat": [ 40, 60 ] } ],
       "items": {
-        "#": { "item": "bar_alcohol", "chance": 50, "repeat": [ 1, 2 ] },
-        "^": [
+        "N": [
           { "item": "bar_table", "chance": 50, "repeat": [ 1, 3 ] },
           { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 3 ] },
           { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] }
-        ]
-      },
-      "place_monsters": [
-        { "monster": "GROUP_POOL_NOKIDS", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ss" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "Wh hW  Weeeeee !W  Wh hW",
-        "Wh hW  W&c  c& !W  Wh hW",
-        "Wh hW  W&c     !W  Wh hW",
-        "WW+WW  Weee!!!  W  WW+WW",
-        "Wj LW  WWWWWWWW+W  WL jW",
-        "Wj LW           #  WL jW",
-        "Wj LW  ###&####&#  WL jW",
-        "Wj LW              WL jW",
-        "W   +  /        /  +   W",
-        "WWWWWwwWW++WW++WWwwWWWWW",
-        "...xxxxxxxxxxxxxxxxxx...",
-        "..IxxxxxxxxxxxxxxxxxxI..",
-        "xxxxxxxxxxxxxxxxxxxxxxxx",
-        "x______________________x",
-        "x______________________x",
-        "x______________________x",
-        "x______________________x",
-        "xx____________________xx",
-        ".xx__________________xx.",
-        "..xx________________xx..",
-        "...xx______________xx...",
-        "....xx____________xx....",
-        ".....xx__________xx.....",
-        ".....xx__________xx....."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "items": {
-        "e": { "item": "SUS_office_desk", "chance": 50 },
-        "!": { "item": "SUS_office_filing_cabinet", "chance": 75 },
-        "L": { "item": "dresser", "chance": 50, "repeat": [ 1, 3 ] },
-        "h": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] }
-      },
-      "place_vehicles": [
-        { "vehicle": "police_pileup", "x": 4, "y": 15, "chance": 75, "rotation": 270, "status": -1 },
-        { "vehicle": "police_pileup", "x": 19, "y": 20, "chance": 25, "rotation": 0, "status": 1 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_ZOMBIE_COP", "x": [ 0, 23 ], "y": [ 10, 23 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 9 ], "repeat": [ 0, 1 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pm" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        "xxxxxxx__________xxxxxxx",
-        "xxxxxxx__________xxxxxxx",
-        "________________________",
-        "____:_:__________:_:____",
-        "________________________",
-        "____:_:__________:_:____",
-        "________________________",
-        "xxxxxxx__________xxxxxxx",
-        "xxxxxxx__________xxxxxxx",
-        ".....xx__________xxxxxxx",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        "....xxx__________xxx....",
-        "...xxx%__________%xxx...",
-        "FFFFGFW==========WFGFFFF",
-        "...xxxx__________xxxx..."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_signs": [
-        { "signage": "Private property.  No trespassing!", "x": 8, "y": 24 },
-        { "signage": "Private property.  No trespassing!", "x": 17, "y": 24 }
-      ],
-      "place_vehicles": [ { "vehicle": "limousine", "x": 11, "y": 18, "chance": 75, "rotation": 90, "status": -1 } ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.75 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ne" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "........................",
-        "FFFFFFFFFFFFFFFFFFFFFFF.",
-        "......................F.",
-        "......................F.",
-        "WWWWWWWWWWWWWWWWWWWW..F.",
-        "                   W..F.",
-        "W+WWW8WWW8WWW8WWW8WW..F.",
-        "L jW  KW  KW  KW  KW..F.",
-        "L jW i^W i^W i^W i^W..F.",
-        "L  WaaaWaaaWaaaWaaaW..F.",
-        "WW WWWWWWWWWWWWWWWWW..F.",
-        " W   0TK0TK0TK +   W..F.",
-        " 8    c  c  c  WKj1W..F.",
-        " W             WWWWW..F.",
-        " 8  KV j VV j  WTS$W..F.",
-        " W  KV j VV j  +   W..F.",
-        "WWWWWWWWWWWWWWWWWWWW4.F.",
-        "WWW$+ +$W$+ +$W2553W4.F.",
-        "WWWWW WWWWW WWW    W4.F.",
-        "WWWS   SWS   SWBcL W..F.",
-        "WWWWW+WWWWW+WWWWWW|W..F.",
-        "                   W..F.",
-        "                   W..F.",
-        "++WWWWWWWWWWWWWWWW|W..F."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
+        ],
+        "f": { "item": "bar_fridge", "chance": 66, "repeat": [ 2, 8 ] },
+        "#": { "item": "bar_alcohol", "chance": 33, "repeat": [ 1, 3 ] },
         "^": [
           { "item": "bar_table", "chance": 50, "repeat": [ 1, 3 ] },
           { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 3 ] },
           { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] }
         ],
-        "$": { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] },
         "V": { "item": "private_resort_dancing_clothes", "chance": 50, "repeat": [ 3, 6 ] },
         "K": { "item": "private_resort_dancing_clothes", "chance": 50, "repeat": [ 1, 3 ] }
       },
       "place_items": [
-        { "chance": 50, "item": "dresser", "x": [ 0, 0 ], "y": [ 7, 9 ], "repeat": [ 6, 12 ] },
-        { "chance": 25, "item": "home_hw", "x": 15, "y": 19, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "home_hw", "x": 17, "y": 19, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 16, "y": 14, "repeat": [ 1, 4 ] }
+        { "chance": 75, "item": "keg_beer", "x": 62, "y": 22 },
+        { "chance": 40, "item": "stash_drugs", "x": [ 29, 46 ], "y": [ 5, 22 ], "repeat": [ 1, 6 ] },
+        { "chance": 50, "item": "bar_table", "x": 27, "y": [ 10, 16 ], "repeat": [ 6, 12 ] },
+        { "chance": 66, "item": "tools_common", "x": 19, "y": 19, "repeat": [ 1, 4 ] },
+        { "chance": 100, "item": "SUS_janitors_closet", "x": 23, "y": 19 },
+        { "chance": 50, "item": "bar_table", "x": [ 54, 65 ], "y": 26, "repeat": [ 10, 20 ] },
+        { "chance": 75, "item": "guns_pistol_common", "x": 66, "y": 42 },
+        { "chance": 100, "item": "private_resort_instruments", "x": 54, "y": 42 },
+        { "chance": 100, "item": "private_resort_instruments", "x": 56, "y": 42 }
+      ],
+      "place_monster": [
+        { "group": "GROUP_ZOMBIE_COP", "x": [ 4, 20 ], "y": [ 3, 9 ], "repeat": [ 2, 4 ] },
+        { "group": "GROUP_RESORT_DANCERS", "x": [ 24, 47 ], "y": [ 5, 23 ], "repeat": [ 3, 5 ] },
+        { "group": "GROUP_RESORT_DANCERS", "x": [ 48, 71 ], "y": [ 10, 16 ], "repeat": [ 3, 5 ] }
       ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 9 ], "repeat": [ 0, 1 ], "density": 0.3 },
-        { "monster": "GROUP_RESORT_DANCERS", "x": [ 0, 23 ], "y": [ 10, 16 ], "density": 0.6 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 17, 23 ], "repeat": [ 0, 1 ], "density": 0.3 }
+      "place_signs": [
+        { "signage": "Private property.  No trespassing!", "x": 4, "y": 0 },
+        { "signage": "Private property.  No trespassing!", "x": 18, "y": 0 }
       ],
-      "place_liquids": [
-        { "liquid": "water", "x": 16, "y": 17, "repeat": [ 10, 60 ] },
-        { "liquid": "water", "x": 17, "y": 17, "repeat": [ 5, 80 ] }
+      "place_vehicles": [
+        { "vehicle": "pickup", "x": 13, "y": 13, "chance": 33, "rotation": 270 },
+        { "vehicle": "policesuv", "x": 11, "y": 7, "chance": 100, "rotation": 90 }
       ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1ee" ],
-    "weight": 1000,
+    "om_terrain": [ "p_resort_1ww" ],
     "object": {
-      "fill_ter": "t_floor",
+      "fill_ter": "t_thconc_floor",
       "rows": [
-        "     ; ########]]] W..F.",
-        "     #             W..F.",
-        "     ##############W..F.",
-        "      ssssssssssss W..F.",
-        "                   W..F.",
-        "                   W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "                   W..F.",
-        "  @s s@ TTc  cTT   W..F.",
-        "  @s s@ cTc  cTc   W..F.",
-        "  @s s@ TTc  cTT   W..F.",
-        "                   W..F.",
-        "       ((     ((   W..F.",
-        "    '      '       W..F.",
-        "    JJJJJJJJWQQWqqqW..F.",
-        "    JEEEEEEEWT&W###W..F.",
-        "    JEcEcE9cWcTwLcyW..F.",
-        "    JEEEEEEE|  +   W..F.",
-        "++WWWWWWWWWWWWWWWW|W..F.",
-        "                   w..F.",
-        "                   w..F.",
-        "||WWWWWWWWWWWWWWWW|W..F."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_items": [
-        { "chance": 50, "item": "bar_table", "x": [ 6, 17 ], "y": [ 2, 2 ], "repeat": [ 10, 20 ] },
-        { "chance": 40, "item": "bar_fridge", "x": [ 15, 17 ], "y": [ 0, 0 ], "repeat": [ 2, 8 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 7, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 10 ] },
-        { "chance": 25, "item": "pool_table", "x": [ 9, 10 ], "y": [ 6, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 25, "item": "pool_table", "x": [ 13, 14 ], "y": [ 6, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 75, "item": "guns_pistol_common", "x": 18, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 6, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 8, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 13, "y": 17 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 14, "y": 18 },
-        { "chance": 25, "item": "private_resort_gambling_table", "x": [ 8, 9 ], "y": [ 10, 12 ], "repeat": [ 5, 12 ] },
-        { "chance": 25, "item": "private_resort_gambling_table", "x": 16, "y": 18, "repeat": [ 2, 4 ] },
-        {
-          "chance": 25,
-          "item": "private_resort_gambling_table",
-          "x": [ 14, 15 ],
-          "y": [ 10, 12 ],
-          "repeat": [ 5, 12 ]
-        }
+        " F  |:|1::::666666:|j:8:",
+        " F  |:|1:::::::::::||||:",
+        " F  |:|1::::::::::O|j:8:",
+        " F  |:|2::CCdCCl::O|||||",
+        " F  |:|2::C555Cl::O|j:8:",
+        " F  |:|3:::::::::::||||:",
+        " F  |:|3::COOOC::::|j:8:",
+        " F  |-||-|||||||CC||||||",
+        " F  |,,,,,,;,,,,,,ffSSff",
+        " F  |,,,,,,#,,,,,,,,,,,,",
+        " F  o,,HH,,##,,,,,,,,,,,",
+        " F  o,HTTH,,############",
+        " F  o,HTTH,,ssssssssssss",
+        " F  |,HTTH,,,,,,,,,,,,,,",
+        " F  o,HTTH,,,HH,,,,HH,,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  |,HTTH,,,HH,,,,HH,,,",
+        " F  o,HTTH,,,,,,,,,,,,,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  o,,HH,,,HTTH,,HTTH,,",
+        " F  |,,,,,,,,,,,,,,,,,,,",
+        " F  |,,,,,,,,,,,,,,,,,,,",
+        " F  ||+|||||||||||||||+|"
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.5 } ]
+      "palettes": [ "p_resort_palette_restaraunt" ],
+      "place_items": [ { "chance": 30, "item": "bar_table", "x": [ 12, 23 ], "y": 11, "repeat": [ 15, 20 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1se" ],
-    "weight": 1000,
+    "om_terrain": [ [ "p_resort_1sw", "p_resort_1ss", "p_resort_1se" ], [ "p_resort_pw", "p_resort_pm", "p_resort_pe" ] ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "  |     +  +  cTW  W..F.",
-        "  WcTcLLW>>W &&&WLLW..F.",
-        "  WWWWWWWWWWWWWWWWWW..F.",
-        "  +     +     +   #w..F.",
-        "  W    )W!   !W  c#w..F.",
-        "  W cc uWTc cTW TTTw..F.",
-        "< WOTTc]WT& &TW  vyw..F.",
-        "WWWWwwwWWWwwwWWWwwwW..F.",
-        "......................F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F."
+        " F  |l..#SSSS#|#SSSS#..l|aa......######......AA|l....|.cTTc.l|L...L|  F ",
+        " F  |.........|.........|a.....###eeee###...||||eee!.+..cc...|L.j.L|  F ",
+        " F  |.........|.........|a.^...;.......!#...#.&|&c...|.......|L.j.L|  F ",
+        " F  |.........|.........|a.^...#.s.....!#...#s.|eee!.||||||||||.j.||  F ",
+        " F  |+|+|+|+|+|+|+|+|+|+|a.....###..s.###...|.K|&c...|!!!|hhh|..j.L|  F ",
+        " F  |.|.|.|.|.|.|.|.|.|.|aa......####&#.....|.K|eee!.-..>|...-..j.L|  F ",
+        " F  |$|$|$|$|$|$|$|$|$|$|...H...............+.K|&c...|!!!|hhh|....L|  F ",
+        " F  |||||||||||||||||||||...................|.K||ooo||||||||||||||||  F ",
+        " F                      |....TT..........TT.|.K|                      F ",
+        " F   ****   ****   **** |||||oo||++||++||oo|||||                ****  F ",
+        " F  **//** **//** **//**    xxxxxxxxxxxxxxxx        I I        **//** F ",
+        " F  */  /* */) /* */  /*   xxxxx________xxxxx           *****  */  /* F ",
+        " F  */ )/* */  /* */) /*  xIxx____________xxIx  *****  **///** */) /* F ",
+        " F  **//** **//** **//**  xxx______________xxx **///** */   /* **//** F ",
+        " F   ****   ****   ****   xx________________xx */   /* */ ) /*  ****  F ",
+        " F                        xx________________xx */ ) /* */   /*        F ",
+        " F  ********************  x__________________x */   /* */   /*        F ",
+        " F **//////////////////** x__________________x */   /* */   /*  ****  F ",
+        " F */                  /* x__________________x */   /* */   /* **//** F ",
+        " F */ )    )    )    ) /* x__________________x */ ) /* */ ) /* */) /* F ",
+        " F */                  /* x__________________x */   /* */   /* */  /* F ",
+        " F **//////////////////** x__________________x **///** **///** **//** F ",
+        " F  ********************  x__________________x  *****   *****   ****  F ",
+        " F                        x__________________x                        F ",
+        " F xxxxxxxxxxxxxxxxxxxxx  xx________________xx  xxxxxxxxxxxxxxxxxxxxx F ",
+        " F x____y____y____y____x   x________________x   x____y____y____y____x F ",
+        " F x____y____y____y____x   xx______________xx   x____y____y____y____x F ",
+        " F x_É__y_É__y_É__y_É__x ** xx____________xx ** x_É__y_É__y_É__y_É__x F ",
+        " F x____y____y____y____x *¤* xx__________xx *¤* x____y____y____y____x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x___________________x      x__________x      x___________________x F ",
+        " F x___________________xxxxxxxx__________xxxxxxxx___________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x___________________xxxxxxxx__________xxxxxxxx___________________x F ",
+        " F x___________________x      x__________x      x___________________x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x____y____y____y____x *//* x__________x *//* x____y____y____y____x F ",
+        " F x__Á_y__Á_y__Á_y__Á_x *//* x__________x *//* x__Á_y__Á_y__Á_y__Á_x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x____y____y____y____x      x__________x      x____y____y____y____x F ",
+        " F xxxxxxxxxxxxxxxxxxxxx     xx__________xx     xxxxxxxxxxxxxxxxxxxxx F ",
+        " F                           x%__________%x                           F ",
+        " FFFFFFFFFFFFFFFFFFFFFFFFFFFFG|==========|GFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
+        "                             xx__________xx                             "
       ],
       "palettes": [ "p_resort_palette_main_floor" ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 10, "chance": 20, "rotation": 0, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 15, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 19, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": 1 }
+      "place_vendingmachines": [
+        { "item_group": "vending_food", "x": 60, "y": 1, "lootable": true },
+        { "item_group": "vending_drink", "x": 60, "y": 2, "lootable": true }
       ],
       "items": {
-        "T": { "item": "SUS_office_desk", "chance": 50 },
-        "!": { "item": "SUS_office_filing_cabinet", "chance": 75 },
-        "O": { "item": "SUS_oven", "chance": 75 }
+        "L": [
+          {
+            "item": {
+              "subtype": "distribution",
+              "entries": [
+                { "group": "security_armor", "prob": 50 },
+                { "group": "security_gear", "prob": 66 },
+                { "group": "security_pants", "prob": 100 },
+                { "group": "security_shoes", "prob": 100 },
+                { "group": "security_torso", "prob": 100 }
+              ]
+            },
+            "chance": 33
+          },
+          { "item": "private_resort_sec_weapon", "chance": 75, "repeat": [ 1, 2 ] }
+        ]
       },
-      "place_items": [
-        { "chance": 50, "item": "coffee_table", "x": 4, "y": 1, "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "dresser", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 4, 8 ] },
-        { "chance": 50, "item": "private_resort_gambling_table", "x": [ 17, 18 ], "y": [ 1, 1 ], "repeat": [ 4, 8 ] },
-        { "chance": 50, "item": "private_resort_instruments", "x": [ 17, 18 ], "y": [ 1, 1 ], "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "fridgesnacks", "x": 7, "y": 6, "repeat": [ 4, 8 ] },
-        { "chance": 50, "item": "vending_drink_items", "x": 7, "y": 4, "repeat": [ 5, 10 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 18, 18 ], "y": [ 3, 4 ], "repeat": [ 5, 10 ] },
-        { "chance": 75, "item": "ammo_pistol_rare", "x": 18, "y": 6, "repeat": [ 1, 2 ] },
-        { "chance": 80, "item": "guns_pistol_obscure", "x": 18, "y": 6 },
-        { "chance": 40, "item": "jewelry_front", "x": 18, "y": 6, "repeat": [ 2, 4 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 18, "y": 6, "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "dresser", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 2, 4 ] },
-        { "chance": 50, "item": "guns_shotgun_common", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "private_resort_sec_weapon", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 1, 3 ] }
+      "place_fields": [ { "field": "fd_bile", "x": [ 5, 23 ], "y": [ 0, 6 ], "repeat": [ 10, 20 ] } ],
+      "place_monster": [
+        { "group": "GROUP_ZOMBIE_COP", "x": [ 24, 47 ], "y": [ 10, 23 ], "repeat": [ 4, 8 ] },
+        { "group": "GROUP_RESORT_MIXED_STAFF", "x": [ 48, 66 ], "y": [ 0, 7 ], "density": 0.25 }
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 0, 18 ], "y": [ 0, 7 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pe" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "......................F.",
-        "......................F.",
-        "FFFFFFFFFFFFFFFFFFFFFFF.",
-        "........................"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
       "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 2, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 11, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 16, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 4, "chance": 20, "rotation": 180, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 13, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 18, "chance": 20, "rotation": 180, "status": 1 }
+        { "vehicle": "police_pileup", "x": 28, "y": 15, "chance": 100, "rotation": 270 },
+        { "vehicle": "police_pileup", "x": 43, "y": 20, "chance": 100, "rotation": 0 },
+        { "vehicle": "limousine", "x": 35, "y": 42, "chance": 75, "rotation": 90 }
+      ],
+      "place_signs": [
+        { "signage": "Private property.  No trespassing!", "x": 30, "y": 47 },
+        { "signage": "Private property.  No trespassing!", "x": 41, "y": 47 }
       ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_2nw" ],
-    "weight": 1000,
+    "om_terrain": [
+      [ "p_resort_2nw", "p_resort_2nn", "p_resort_2ne" ],
+      [ "p_resort_2ww", "p_resort_2mm", "p_resort_2ee" ],
+      [ "p_resort_2sw", "p_resort_2ss", "p_resort_2se" ]
+    ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "****WWWWWWWWWWWWWWWWWWWW",
-        "****?c--cTc-cTc-cTc-s#]#",
-        "****?Tc-------------s#c#",
-        "****?c--cTc-----cTc--;-#",
-        "****WWWWWWWWW+WWWWWWWW|W",
-        "****WBBhWL-$WRRRRRRRRRRR",
-        "**rrwS-0W^-KWRRRRRRRRRRR",
-        "**r-WW+WWW+WWRRWWWWWWW|W",
-        "**r-+--ddd-#WRRW--ZZWL-<",
-        "**r-W------#WRR|----+---",
-        "**rrw-bb----+RRWZ-Z-WL->",
-        "****w^bbcTTcWRRWWWWWWWWW",
-        "****WWWWWWWWWRRWd---v-V-",
-        "****Wf------+RRXTd--#---",
-        "****w#----bbWRRW[-K----b",
-        "****w#--c-bbWRRWW+WWW+WW"
+        "                                                                        ",
+        "                                                                        ",
+        "                                                       rrrrr            ",
+        "                                                       r...r            ",
+        "                        ||||||||||||||||||||||||ooo||ooo|+||oo||oo||    ",
+        "                        |││││││││││││││││││││││|TTc..bbd..|]....cTT|    ",
+        "                        |││││││││││││││││││││││|cc.......d|bbb..cTTo    ",
+        "                        |││││││││││││││││││││││|.....l..bb|bbbd..cc|    ",
+        "    rrrrrrrrrrrrrrrrrrrr|││││││││││││││││││││││|||+||||||||||||....|rr  ",
+        "    r___________________|││││││││││││││││││││││|a...H|STBB|B0$|+||||.r  ",
+        "    r___________________|││││││││││││││││││││││|a^...+..BB|B..|....+.r  ",
+        "    r___________________|││││││││││││││││││││││|a...K|...0|S..|H...|.r  ",
+        "    |||||||||+o|???????||rrr││││││││││││││││rrr|||X||||||||||+|..^.orr  ",
+        "    |dbd|BBS|,,,,,,,,,,,-,,r││││││││││││││││r,,-,,,,,,,,,,,+....aaao    ",
+        "  rr|.b.|..$|,,,,,,,,,,,-,,r││││││││││││││││r,,-,,,,,,,,,,,|KK..###o    ",
+        "  r.o...||+||,,..H..||-||,,r││││││││││││││││r,,|#.H......,,|||||||||    ",
+        "  r.+...l..#|,,....a|::<|,,r││││││││││││││││r,,|#......H.,,|S$B|###|    ",
+        "  r.oH.....#|,,..^^a|L::|,,r││││││││││││││││r,,|#...^....,,|..B|aaa|    ",
+        "  rr|a.^....+,,.aaaa|::>|,,r││││││││││││││││r,,|#.aaaaa..,,|0..|.^.|    ",
+        "    |aaaa..K|,,||||||||||,,r││││││││││││││││r,,||||||||||,,||+||...o    ",
+        "    |||||||||,,|K...aaaa|,,rrrrrrrrrrrrrrrrrr,,|WWW55zzz|,,X.......o    ",
+        "    |f.aaaaK|,,X.....TT.|>>,,,,,,,,,,,,,,,,,,,,|........-,,|K...bb.o    ",
+        "    o#..TT..+,,|l.......|>>,,,,,,,,,,,,,,,,,,,,|WWW55zzz|,,|l..dbbd|rr  ",
+        "    o#.H....|,,||+||.^^.|||ooo||ooo||ooo||ooo||||||||||||,,|||||||||.r  ",
+        "    |......l|,,|S..|.bb.o                      |dbbbd|BB|,,|B.$|d..+.r  ",
+        "    ||+||...|,,|h.$|dbbd|rr                    o.bbb.+.0|,,|B.0|bb.|.r  ",
+        "    |0.$|..^|,,||||||||||.r                    o..^..|.S|,,|B.S|bb.|rr  ",
+        "    o...|.bb|,,|l.aaaaa.+.r                  rroH...l|.$|,,||+||d..o    ",
+        "    |BBS|dbb|,,+...TTT..|.r                  r.|.....||||,,|K......o    ",
+        "    |||||||||,,|K......#|rr       ____       r.+.aaK....X,,+....H.#o    ",
+        "    |d..H...+,,|[...H..#o         ____       r.||||||||||,,|aaa.l.#|rr  ",
+        "    obb....K|,,||+||....o         ____       rr|.dbd.|BB|,,|||||||||.r  ",
+        "    obb....#|,,|0.S|....o         ____         o..b..+.0|,,|B.$|d..+.r  ",
+        "    |d..l..#|,,|..B|.bb.|                      o..^..|.S|,,|B..|bb.|.r  ",
+        "    ||+||..f|,,|.$B|dbbd|rr                  rro....l|.$|,,|S..|bb.|rr  ",
+        "    |..$|...|,,||||||||||.r                  r.|.....||||,,||+||d..o    ",
+        "    o.BB|.^.|,,|K..HH...+.r                  r.+.H[K....X,,|l......o    ",
+        "  rr|SBB|aaa|,,+.......#o.r                  r.||||||||||,,X....^^.o    ",
+        "  r.|||||||||,,|...^...#orr                  rr|.dbd.|BB|,,|K..aaaa|rr  ",
+        "  r.+..aaa.K|,,|l.aaa..#|                      o..b..+.0|,,|||||||||.r  ",
+        "  r.|f..T...X,,||+|||..||                      oH.^..|.S|,,|BB$|d..+.r  ",
+        "  rro#......|,,|0.S|....|                      o....l|.$|,,|BB.|bb.|.r  ",
+        "    o#.....H|,,|..B|.bb.o                      oa....||||,,|S..|bb.|rr  ",
+        "    ||+||...|,,|.$B|dbbd|                      |aaaK....+,,||+||d..o    ",
+        "    |..S|.^.|,,|||||||||||????????????????????|||||||||||,,|l......o    ",
+        "    o.BB|.b.|,,,,,,,,,,,,,,,,,,>>,,,,,,>>,,,,,,,,,,,,,,,,,,X....^.ao    ",
+        "    |$BB|dbd|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|K..aaaa|    ",
+        "    |||||||||+|||||||X|||rrrrrrrrrrrrrrrrrrrr,,||||++||++|||||||||||    ",
+        "    ol.aaaa.K.|BB.|l...K|│││││││││││││││││││r,,|............#ffff..|    ",
+        "  rro.........|$..+.....|│││││││││││││││││││r,,o..c......c..;......o    ",
+        "  r.|.###.l..H|S.0|....a|│││││││││││││││││││r,,o.ctc....ctc.##.....o    ",
+        "  r.+.....||+||||||H..Ta|│││││││││││││││││││r,,+..c..cc..c...###SS#|    ",
+        "  r.|..^..|0..|d.......a|│││││││││││││││││││r,,o....cttc......ssss.o    ",
+        "  rro.bbb.|..B|bb^......|│││││││││││││││││││r,,oc....cc............o    ",
+        "    odbbbd|S$B|d....###f|│││││││││││││││││││r,,|tc.........ctc....l|    ",
+        "    ||ooo|||||||||||ooo|||????????????????????|||oo++oo|||oo|oo|oo||    ",
+        "                        r_______________________________r               ",
+        "                        r_______________________________r               ",
+        "                        rr_____________________________rr               ",
+        "                         rrr________________rrrrrrrrrrrr                ",
+        "                           r________________r                           ",
+        "                           rr______________rr                           ",
+        "                            rrrrrrrrrrrrrrrr                            ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        "
       ],
       "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 2, 4 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 2, 4 ] }
-        ],
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "Z": { "item": "crate_wine", "chance": 50, "repeat": [ 1, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] }
-      },
       "place_items": [
-        { "chance": 50, "item": "bar_table", "x": [ 21, 21 ], "y": [ 9, 10 ], "repeat": [ 3, 6 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 23, 23 ], "y": [ 9, 11 ], "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 5, 5 ], "y": [ 22, 23 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 9, 10 ], "y": [ 19, 19 ], "repeat": [ 3, 6 ] },
-        { "chance": 25, "item": "home_hw", "x": 21, "y": 16, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "home_hw", "x": 21, "y": 18, "repeat": [ 1, 3 ] },
-        { "chance": 75, "item": "keg_beer", "x": 16, "y": 16 },
-        { "chance": 75, "item": "keg_beer", "x": 17, "y": 16 },
-        { "chance": 75, "item": "keg_beer", "x": 17, "y": 18 },
-        { "chance": 75, "item": "keg_beer", "x": 19, "y": 18 },
+        { "chance": 75, "item": "keg_beer", "x": 66, "y": 48 },
+        { "chance": 75, "item": "keg_beer", "x": 65, "y": 48 },
         { "chance": 50, "item": "remains_human_generic", "x": 20, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 10, 15 ] },
-        { "chance": 10, "item": "shelter", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 10, 15 ] },
-        { "chance": 33, "item": "butcher_tools", "x": 20, "y": 21, "repeat": [ 1, 3 ] },
         { "chance": 33, "item": "corpses", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 2, 4 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 9, 23 ], "repeat": [ 0, 1 ], "density": 0.5 } ]
+      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 48, 66 ], "y": [ 48, 54 ], "repeat": [ 1, 3 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_2ww" ],
-    "weight": 1000,
+    "om_terrain": [
+      [ "p_resort_rnw", "p_resort_rnn", "p_resort_rne" ],
+      [ "p_resort_rww", "p_resort_rmm", "p_resort_ree" ],
+      [ "p_resort_rsw", "p_resort_rss", "p_resort_rse" ]
+    ],
     "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "****Wd-TTc-^WRRWS-dW---w",
-        "****WW+WWW+WWRRWh-$WbbdW",
-        "****W0-dWK-LWRRWWWWWWWWW",
-        "****w---W---WRRW[-cTTc-+",
-        "****WBBhW-$^WRR+------#W",
-        "****WWWWWWWWWRRWK--c--#w",
-        "****Wd------+RRWd-bbb-^w",
-        "****wbb--T-#WRRWW+WWW+WW",
-        "****wbb-cT-#WRRWK-KWS-KW",
-        "****Wd-----#WRRW--^WBBBw",
-        "****WW+WWW+WWRRW-$^WBBBW",
-        "****W---WL-KWRRWWWWWWWWW",
-        "****w-BBW---WRR+---i---+",
-        "**rrWSBBW-$^WRRWK-----#w",
-        "**r-WWWWWWWWWRRW[-bbb-dw",
-        "**r-+-------XRRW[-bbb-dW",
-        "**r-W-----bbWRRWW+WWW+WW",
-        "**rrw#-V--bbWRRWK-KWS-dW",
-        "****w#-----dWRRW^--WB--w",
-        "****WW+WWW+WWRRW-$^WB^KW",
-        "****W--SWL-KWRRWWWWWWWWW",
-        "****w-BBW---WRRRRRRRRRRR",
-        "****WdBBW-$^W>>RRRRRRRRR",
-        "****WWWWWWWWWWWW+WWWWWWX"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ]
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 0, 23 ], "density": 0.75 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2sw" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "****wcTT---------W^-----",
-        "**rrw-TT-[WWWWWWWWW[--cT",
-        "**r-W-cc--WdShWBS0Wd--cT",
-        "**r-+-----+---W---+---[[",
-        "**r-WWWWW-WWWWWWWWW-WWWW",
-        "**rrw-----+^-$W$--+-----",
-        "****wbbdbbWK--W^-LWbbdbb",
-        "****WWwwwWWWwWWWwWWWwwwW",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ]
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 0, 6 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2nn" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "************************",
-        "************************",
-        "*rrrrr*************rrrrr",
-        "*r---r*************r---r",
-        "WwW+WwWWwwwWWWwwwWWwW+Ww",
-        "W^---dW#--cTTTc--#Wd---d",
-        "Wbbb-dW#--cTTTc--#WK-bbb",
-        "Wbbb--+----ccc----+--bbb",
-        "WWWWWWW-----------WWWWWW",
-        "WBBBW#-^a--###c---cTW^$L",
-        "WBBBW#-^a-c#i#-----TW--L",
-        "Wd--+---------------+--K",
-        "WWWWWWWWWWW+++WWWWWWWWWW",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "WW++WWWWWWWWWWWWWWWWW++W",
-        "WK--W^-KW^BBWBBdWT-$W--K",
-        "W[--W$--W-BBWBB-W--^W--[",
-        "W[--WWW+W+WWWWW+W+WWW--[",
-        "W----------dW#----------",
-        "W-------bbbbW#--bbb---Tc",
-        "Wai-----bbbbW#--bbb---Tc",
-        "Waa--------dW#-^bbbd----",
-        "WWwwwwWwwwwWWWwwwwWwwwwW"
-      ],
-      "place_item": [ { "item": "television", "repeat": 1, "x": 5, "y": 9 } ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "private_resort_gambling_table", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_items": [ { "chance": 50, "item": "stash_drugs", "x": [ 11, 13 ], "y": [ 9, 10 ], "repeat": [ 1, 5 ] } ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 23 ], "density": 0.8 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2mm" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "_**********************_",
-        "rr*********************_",
-        "-r*********************_",
-        "-r********************rr",
-        "-r********************r-",
-        "rr********************r-",
-        "_*********************r-",
-        "_*********************rr",
-        "_**********************_",
-        "_**********************_",
-        "rr********************rr",
-        "-r********************r-",
-        "-r********************r-",
-        "-r********************r-",
-        "rr********************rr",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "????????????????????????",
-        "RRRRRR>>>RRRRR>>>RRRRRRR",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "WXWWWWWWWWWWWWWWWWWWWWWW"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ss" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "W____________________W<W",
-        "W____________________+_W",
-        "W____________________WWW",
-        "W______________________w",
-        "W______________________w",
-        "W______________________W",
-        "W______________________w",
-        "W______________________W",
-        "r______________________r",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 1, 20 ], "y": [ 0, 8 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ne" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "************************",
-        "************************",
-        "*******rrrrr************",
-        "*******r---r************",
-        "WwwwWwwwW+WWwwWWwwWW****",
-        "WTTc-bbd--W-----cTTW****",
-        "Wcc------dWbbbd-cTTw****",
-        "W---dd[-bbWbbbd--ccW****",
-        "WW+WWWWWWWWWWWW----Wrr**",
-        "Wc-ddWSTBBWBd$W+WWWW-r**",
-        "WT------BBWB--W----+-r**",
-        "Wc-K[W^-$KWS--W--ddW-r**",
-        "WWXWWWWWWWWWW+W--aawrr**",
-        "RRRRRRRRRRR+-------w****",
-        "RRRRRRRRRRRWKK[[###w****",
-        "WWWW|WWWWRRWWWWWWWWW****",
-        "WTTT-TTTWRRW^$-WBBdW****",
-        "W-------WRRW---WBB-w****",
-        "Wooozzz5WRRWc-TWS--W****",
-        "WWWWWWWWWRRWW+WWW+WW****",
-        "WTBBWTc-+RRX------dw****",
-        "W--SWT--WRRWK---bbbw****",
-        "W$--+---WRRW[---bbbwrr**",
-        "WWWWWWWWWRRWWWWWWWWW-r**"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_items": [
-        { "chance": 33, "item": "laundry", "x": [ 1, 3 ], "y": [ 18, 18 ], "repeat": [ 3, 9 ] },
-        { "chance": 33, "item": "laundry", "x": [ 4, 6 ], "y": [ 18, 18 ], "repeat": [ 3, 9 ] },
-        { "chance": 33, "item": "cleaning", "x": [ 1, 3 ], "y": [ 16, 16 ], "repeat": [ 3, 5 ] },
-        { "chance": 33, "item": "cleaning", "x": [ 4, 6 ], "y": [ 16, 16 ], "repeat": [ 1, 9 ] }
-      ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 5, 23 ], "repeat": [ 1, 2 ], "density": 0.5 } ],
-      "place_liquids": [ { "liquid": "water", "x": 7, "y": 18, "repeat": [ 10, 100 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ee" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "Wdbb^WBBWRRWB-$Wbb-+-r**",
-        "W-bb-+-SWRRWB-SWbb-W-r**",
-        "w----WWWWRRWd-TWd--Wrr**",
-        "w#---+-$WRRWW+WWd--w****",
-        "W#c--WWWWRRWK-K----w****",
-        "+-------XRR+----cTTW****",
-        "WWWWWWWWWRRW###-cTTWrr**",
-        "WbbdbWBBWRRWWWWWWWWW-r**",
-        "wd---+-SWRRWB-$Wbb-+-r**",
-        "w##--WWWWRRWB--Wbb-W-r**",
-        "w----+-$WRRWd-SWd--wrr**",
-        "Waa--WWWWRRWW+WW^-cw****",
-        "+-------XRRW------Tw****",
-        "WWWWWWWWWRRX------Tw****",
-        "Wbb--WBBWRRW[[dd--cWrr**",
-        "wbb--+-SWRRWWWWWWWWW-r**",
-        "wdd--WWWWRRWBB$Wbb-+-r**",
-        "wc---+-$WRRWBB-Wbb-W-r**",
-        "wT---WWWWRRWS--Wd--wrr**",
-        "W-------+RRWW+WWd--w****",
-        "WWWWWWWWWRRW-------w****",
-        "RRRRRRRRRRRX---c--#w****",
-        "RRRRRRRRRRRW-cTTc-#W****",
-        "WWWWWWWWW++WWWWWWWWW****"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 0, 23 ], "density": 1 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2se" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_floor",
+      "fill_ter": "t_flat_roof",
       "rows": [
-        "#c------+--+-------w****",
-        "##SO]]WWW--WWWdbTdbw****",
-        "WWWWWWWh+--+hWWWWWWW****",
-        "dbTdbdWWW--WWWbdbbdw****",
-        "--c--bW$+--+$Wb----w****",
-        "WWWW+WWWW--WWWW+WWWW****",
-        ">-----------------<w****",
-        "WwwWWwwWWwwWWwwWWwwW****",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "O": { "item": "SUS_oven", "chance": 50, "repeat": [ 0, 3 ] },
-        "]": { "item": "SUS_fridge", "chance": 75 },
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "#": { "item": "fridgesnacks", "chance": 50, "repeat": [ 0, 2 ] }
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 0, 18 ], "y": [ 0, 6 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
+        "                                                                        ",
+        "                                                                        ",
+        "                         .....             .....       .....            ",
+        "                         .....             .....       .....            ",
+        "                        52222222222222222222222222222222222222222225    ",
+        "                        |..........................................3    ",
+        "                        |................................A.........3    ",
+        "                        |..........................................3    ",
+        "                        |..........................................3..  ",
+        "                        |..........................................3..  ",
+        "                        |........................................A.3..  ",
+        "                        |..........................................3..  ",
+        "    522222222222222222225..........................................3..  ",
+        "    |..............................................................3    ",
+        "  ..|.N.:..........Я...............................................3    ",
+        "  ..|..............................................................3    ",
+        "  ..|.A................>.........................................:.3    ",
+        "  ..|.................................................Я............3    ",
+        "  ..|............................................................N.3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |.......................A..............A.......................3    ",
+        "    |..............................................................3..  ",
+        "    |..................##########################..................3..  ",
+        "    |..................#                        #................A.3..  ",
+        "    |..................#..                      #..................3..  ",
+        "    |..................#..                      #..................3..  ",
+        "    |......&&..==....A.#..                    ..#..................3    ",
+        "    |..................#..                    ..#..................3    ",
+        "    |..................#..                    ..#.A................3    ",
+        "    |..................#                      ..#..................3..  ",
+        "    |..................#                      ..#..................3..  ",
+        "    |..................#                        #................A.3..  ",
+        "    |..................#                        #..................3..  ",
+        "    |..................#..                    ..#..................3..  ",
+        "    |..................#..                    ..#..................3    ",
+        "    |................A.#..                    ..#.A................3    ",
+        "  ..|..................#..                    ..#..................3    ",
+        "  ..|..................#..                    ..#..................3..  ",
+        "  ..|.A................#                        #..................3..  ",
+        "  ..|..................#                        #................A.3..  ",
+        "  ..|..................#                        #..................3..  ",
+        "    |..................#                        #..................3..  ",
+        "    |..................#                        #..................3    ",
+        "    |..................##########################..................3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |........................oooo.oooo.oooo........................3    ",
+        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|..............................................................3    ",
+        "  ..|............................................N.:...............3    ",
+        "    |.............................................................>3    ",
+        "    5--------------------------------------------------------------5    ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { "#": "t_concrete_railing", ">": "t_stairs_down" }
     }
   },
   {
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0nw" ],
-    "weight": 1000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "*****WWWWWWW************",
-        "*****W3.1.3W************",
-        "*****W3...3W************",
-        "*****WFFGFFW************",
-        "*****W.....WWWWWWW******",
-        "*****W2.2..WLLLLBW******",
-        "*****W2.2..|...cBW******",
-        "*****W1.1..W....BW******",
-        "*****WWWWWWW++WWWW******",
-        "***********W<<W*********",
-        "***WWWWWWWWW++WWWWWWW***",
-        "***WLWg...gW..WSSSSSW***",
-        "***W.|.....+..+.....W***",
-        "***WyWg...gWLLWfffffW***",
-        "***WWWWWWWWWWWWWWWWWW***"
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "     |||||||            ",
+        "     |3:1:3|            ",
+        "     |3:::3|            ",
+        "     |FFGFF|            ",
+        "     |:::::|||||||      ",
+        "     |2:2::|LLLLB|      ",
+        "     |2:2::-:::cB|      ",
+        "     |1:1::|::::B|      ",
+        "     |||||||::||||      ",
+        "           |::|         ",
+        "   |||||||||::|         ",
+        "   |L|g:::g|::|||||     ",
+        "   |:-:::::+::::<<|     ",
+        "   |Y|g:::g|::::<<|     ",
+        "   ||||||||||||||||     "
       ],
       "palettes": [ "p_resort_palette_basement" ],
       "place_loot": [ { "group": "tools_toolbox", "repeat": 1, "x": 8, "y": 11 } ],
-      "items": {
-        "S": { "item": "preserved_food", "chance": 50, "repeat": [ 0, 3 ] },
-        "f": { "item": "butcher_raw_meat", "chance": 50, "repeat": [ 0, 6 ] }
-      },
       "place_items": [
         { "chance": 50, "item": "tools_common", "x": [ 12, 15 ], "y": [ 14, 14 ], "repeat": [ 1, 8 ] },
         { "chance": 33, "item": "power_tools", "x": [ 16, 16 ], "y": [ 14, 16 ], "repeat": [ 1, 2 ] },
@@ -1186,12 +459,7 @@
         { "chance": 75, "item": "keg_beer", "x": 9, "y": 20 },
         { "chance": 75, "item": "keg_beer", "x": 7, "y": 22 },
         { "chance": 75, "item": "keg_beer", "x": 8, "y": 22 },
-        { "chance": 75, "item": "keg_beer", "x": 9, "y": 22 },
-        { "chance": 25, "item": "home_hw", "x": [ 12, 13 ], "y": [ 22, 22 ], "repeat": [ 1, 3 ] }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 13, 16 ], "y": [ 16, 16 ], "repeat": [ 0, 1 ], "density": 0.1 },
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 6, 19 ], "y": [ 20, 22 ], "repeat": [ 0, 1 ], "density": 0.1 }
+        { "chance": 75, "item": "keg_beer", "x": 9, "y": 22 }
       ],
       "place_liquids": [
         { "liquid": "brandy", "x": 6, "y": 20, "repeat": [ 0, 8 ] },
@@ -1205,418 +473,54 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0se" ],
-    "weight": 1000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "********WWWW************",
-        "********W<<WWWWWWWWW****",
-        "*****WWWW++WKKKKKKKW****",
-        "*****W..+..+......&W****",
-        "*****WXWW..+.....cTW****",
-        "*****W.%WllWKKKKKKKW****",
-        "*****W..W..WWWWWWWWWW***",
-        "*****W.T0..WWmmmmmmmW***",
-        "*****WcT0..X.l,,,,,mW***",
-        "*****WL&W..V&my,y,ymW***",
-        "*****WWWWWWWWmy,y,ymW***",
-        "************Wmmm?mmmW***",
-        "***********WWWWW.WWWW***",
-        "***********W.X.W.X.yW***",
-        "***********WVV.l.V.yW***",
-        "***********W.X.W.V.yW***",
-        "***********WWWWWWWWWW***",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "       |||              ",
+        "     |||<|||||||||||    ",
+        "     |:::::|!!!!!!!|    ",
+        "     |:::::-::::::&|    ",
+        "     |-||::|!!!!!!!|    ",
+        "     |:%|==|||||||||    ",
+        "     |:e|::|            ",
+        "     |ce0::||||||||||   ",
+        "     |:e0::V:mmmmmmm|   ",
+        "     |L&|::X:=YYYYYm|   ",
+        "     ||||::V&m:::::m|   ",
+        "        |||||mYYYYYm|   ",
+        "            |mmmmmmm|   ",
+        "            |||||||||   ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
       ],
       "palettes": [ "p_resort_palette_basement" ],
-      "items": { "K": { "item": "SUS_office_filing_cabinet" } },
-      "place_items": [
-        { "chance": 1, "item": "manuals", "x": [ 12, 18 ], "y": [ 2, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 1, "item": "manuals", "x": [ 12, 18 ], "y": [ 5, 5 ], "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "office_mess", "x": 18, "y": 4, "repeat": [ 1, 4 ] },
-        { "chance": 50, "item": "private_resort_sec_weapon", "x": [ 7, 7 ], "y": [ 7, 8 ], "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "office_mess", "x": [ 7, 7 ], "y": [ 7, 8 ], "repeat": [ 1, 4 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 14, 14 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 16, 16 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 18, 18 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 19, "y": 13, "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "mansion_gunsafe", "x": 19, "y": 14, "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "file_room", "x": 19, "y": 15, "repeat": [ 5, 10 ] },
-        { "chance": 25, "item": "mil_armor_torso", "x": 19, "y": 15, "repeat": [ 1, 2 ] },
-        { "chance": 75, "item": "corpses", "x": 12, "y": 13 },
-        { "chance": 75, "item": "default_zombie_clothes", "x": 12, "y": 13, "repeat": [ 3, 6 ] },
-        { "chance": 75, "item": "corpses", "x": 12, "y": 15 },
-        { "chance": 75, "item": "default_zombie_clothes", "x": 12, "y": 15, "repeat": [ 3, 6 ] },
-        { "chance": 75, "item": "private_resort_sec_weapon", "x": 6, "y": 9, "repeat": [ 1, 4 ] },
-        { "chance": 75, "item": "guns_shotgun_common", "x": 6, "y": 9 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_BOUNCER", "x": [ 6, 18 ], "y": [ 10, 13 ], "repeat": [ 0, 1 ], "density": 0.1 },
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 9, 18 ], "y": [ 3, 4 ], "density": 0.2 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rnw" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "****rrrrrrrrrrrrrrrrrrrr",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r______ff___________",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__________________>",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__#________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__________________r"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 9, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rww" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "****r__________________r",
-        "****r__________________r",
-        "****r_____H____H_______r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r______ss__________r",
-        "****r______ss__________r",
-        "****r__________________r",
-        "****r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r_s________________r",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 1, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rsw" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "****r___________________",
-        "**__r___________________",
-        "**__r______I____________",
-        "**__r___________________",
-        "**__r___________________",
-        "**__r____________((_____",
-        "****r___________________",
-        "****rrrrrrrrrrrrrrrrrrrr",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 0, 7 ], "repeat": [ 3, 10 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rnn" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "*_____*************__(__",
-        "*_____*************_____",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "r_______________________",
-        "r__________I____________",
-        "r_______________________",
-        "r_______________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "____________sb__________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "rrrrrrrrrrrrrrrrrrrrrrrr"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 1, 22 ], "y": [ 7, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rmm" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "__**********************",
-        "__**********************",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "**********************__",
-        "**********************__",
-        "************************",
-        "************************",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "________________________",
-        "________________________",
-        "rrrrrrrrrrrrrrrrrrrrrr__"
-      ],
-      "palettes": [ "p_resort_palette_roof" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rss" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "r********************r__",
-        "r********************r>_",
-        "r********************rrr",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rne" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "*******_____************",
-        "*******_____************",
-        "rrrrrrrrrrrrrrrrrrrr****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r__**",
-        "r__________________r__**"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [ [ "roof_2x2_infrastructure", 80 ], [ "roof_2x2_infrastructure_2", 40 ], [ "roof_2x2_utilities", 40 ] ],
-          "x": [ 3, 18 ],
-          "y": [ 7, 22 ]
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 9, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_ree" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [ [ "roof_2x2_infrastructure", 80 ], [ "roof_2x2_infrastructure_2", 40 ], [ "roof_2x2_utilities", 40 ] ],
-          "x": [ 3, 18 ],
-          "y": [ 2, 20 ]
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 0, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rse" ],
-    "weight": 1000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "__________________>r****",
-        "rrrrrrrrrrrrrrrrrrrr****",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [
-            [ "roof_2x2_infrastructure", 80 ],
-            [ "roof_2x2_infrastructure_2", 40 ],
-            [ "roof_2x2_utilities", 40 ],
-            [ "roof_6x6_survivor", 5 ]
-          ],
-          "x": [ 2, 10 ],
-          "y": 1
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 0, 7 ], "repeat": [ 3, 10 ] } ]
+      "items": {
+        "L": [
+          {
+            "item": {
+              "subtype": "distribution",
+              "entries": [
+                { "group": "security_armor", "prob": 50 },
+                { "group": "security_gear", "prob": 66 },
+                { "group": "security_pants", "prob": 100 },
+                { "group": "security_shoes", "prob": 100 },
+                { "group": "security_torso", "prob": 100 }
+              ]
+            },
+            "chance": 75
+          },
+          { "item": "private_resort_sec_weapon", "chance": 75, "repeat": [ 1, 2 ] }
+        ]
+      },
+      "place_monsters": [ { "monster": "GROUP_RESORT_BOUNCER", "x": [ 6, 18 ], "y": [ 10, 13 ], "repeat": [ 1, 2 ] } ]
     }
   }
 ]
diff --git a/data/json/mapgen_palettes/private_resort.json b/data/json/mapgen_palettes/private_resort.json
index effeb1fe942e4..3e26f8f712440 100644
--- a/data/json/mapgen_palettes/private_resort.json
+++ b/data/json/mapgen_palettes/private_resort.json
@@ -1,248 +1,259 @@
 [
   {
     "type": "palette",
-    "id": "p_resort_palette_main_floor",
+    "id": "p_resort_palette_main",
     "furniture": {
-      "&": "f_console_broken",
+      "#": "f_counter",
+      ";": "f_counter_gate_c",
+      "T": "f_table",
+      "H": "f_armchair",
+      "Z": [ "f_crate_c", "f_crate_o", "f_cardboard_box" ],
       "f": "f_glass_fridge",
-      "B": "f_workbench",
       "]": "f_fridge",
       "O": "f_oven",
-      "R": "f_woodstove",
-      "#": "f_counter",
-      "d": "f_dishwasher",
-      "{": "f_cupboard",
       "S": "f_sink",
-      "b": "f_butcher_rack",
-      "?": "f_hanging_meathook",
-      "l": "f_trashcan",
-      "g": "f_dumpster",
-      "T": "f_table",
-      "^": "f_coffee_table",
-      "L": "f_locker",
-      ";": "f_counter_gate_c",
-      "s": "f_stool",
+      "j": "f_bench",
       "c": "f_chair",
+      "s": "f_stool",
       "a": "f_sofa",
       "i": "f_dancing_pole",
+      "!": "f_filing_cabinet",
+      "K": "f_rack_coat",
+      "e": "f_desk",
+      "l": "f_trashcan",
+      "Y": "f_safe_l",
+      "L": "f_locker",
+      "&": "f_console_broken"
+    },
+    "terrain": {
+      "<": "t_stairs_up",
+      ">": "t_stairs_down",
+      "-": "t_door_metal_c",
+      "|": "t_wall_w",
+      "o": "t_window_domestic",
+      ".": "t_floor",
+      ",": "t_carpet_red",
+      ":": "t_thconc_floor",
+      " ": "t_region_groundcover",
+      "+": [ [ "t_door_c", 3 ], [ "t_door_o", 1 ] ],
+      "F": "t_privacy_fence",
+      "G": "t_privacy_fencegate_c",
+      "8": "t_door_curtain_c",
+      "=": "t_door_metal_locked",
+      "r": "t_concrete_railing"
+    },
+    "toilets": { "$": {  } },
+    "items": {
+      "$": { "item": "stash_drugs", "chance": 75 },
+      "Y": { "item": "mansion_safe", "chance": 100, "repeat": [ 3, 8 ] },
+      "l": { "item": "trash", "chance": 66, "repeat": [ 1, 3 ] },
+      "e": { "item": "SUS_office_desk", "chance": 50 },
+      "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
+      "i": { "item": "underwear", "chance": 100 },
+      "]": { "item": "SUS_fridge", "chance": 80 }
+    },
+    "monster": {
+      ".": { "group": "GROUP_RESORT_MIXED", "chance": 4 },
+      ",": { "group": "GROUP_RESORT_MIXED", "chance": 2 },
+      "x": { "group": "GROUP_RESORT_MIXED", "chance": 2 },
+      "_": { "group": "GROUP_RESORT_MIXED", "chance": 2 },
+      "U": { "group": "GROUP_POOL_NOKIDS", "chance": 10 },
+      ":": { "group": "GROUP_RESORT_STAFF", "chance": 5 }
+    }
+  },
+  {
+    "type": "palette",
+    "id": "p_resort_palette_main_floor",
+    "palettes": [ "p_resort_palette_main" ],
+    "furniture": {
+      "d": "f_dishwasher",
+      "{": "f_cupboard",
+      "g": "f_dumpster",
+      "^": "f_coffee_table",
+      "N": "f_tourist_table",
+      "C": "f_chair",
       "D": "f_bathtub",
       "7": "f_deckchair",
       "h": "f_shower",
-      "e": "f_desk",
-      "j": "f_bench",
       "~": "f_dive_block",
-      "!": "f_filing_cabinet",
       "0": "f_bigmirror",
       "V": "f_wardrobe",
       "1": "f_shower",
-      "K": "f_rack_coat",
       "2": "f_water_heater",
       "3": "f_home_furnace",
       "4": "f_air_conditioner",
       "5": "f_standing_tank",
       "t": "f_pool_table",
-      "y": "f_safe_l",
       "6": "f_arcade_machine",
       "9": "f_piano",
       "'": "f_speaker_cabinet",
       "(": "f_roulette_table",
-      "v": "f_armchair",
-      ")": "f_vending_c",
-      "u": "f_vending_o",
-      "Z": "f_crate_c"
+      "*": "f_hedge_short",
+      "¤": "f_topiary_dragon",
+      "/": "f_region_flower"
     },
     "terrain": {
-      " ": "t_floor",
-      ".": "t_region_groundcover_urban",
-      "F": "t_privacy_fence",
-      "W": "t_wall_w",
-      "G": "t_privacy_fencegate_c",
+      "*": "t_region_groundcover",
+      "/": "t_region_groundcover",
+      "¤": "t_region_groundcover",
+      ")": "t_region_tree_evergreen",
       "_": "t_pavement",
-      ":": "t_pavement_y",
-      "=": "t_door_metal_locked",
-      "w": "t_window_domestic",
+      "Á": "t_pavement",
+      "É": "t_pavement",
+      "y": "t_pavement_y",
       "%": "t_gates_control_concrete",
-      "|": "t_door_metal_c",
-      ",": "t_scrap_floor",
-      "<": "t_stairs_up",
-      ">": "t_stairs_down",
-      "r": "t_carpet_red",
-      "+": [ [ "t_door_c", 3 ], [ "t_door_o", 1 ] ],
-      "H": "t_floor_waxed",
       "I": "t_little_column",
-      "P": "t_concrete",
       "U": "t_water_pool",
-      "m": "t_metal_floor",
       "p": "t_door_c_peep",
-      "8": "t_door_curtain_c",
       "n": "t_carpet_green",
-      "E": "t_floor_red",
       "q": "t_window_bars",
       "Q": "t_window_stained_red",
-      "J": "t_guardrail",
-      "/": "t_atm",
+      "A": "t_atm",
       "@": "t_slot_machine",
-      "x": "t_sidewalk"
+      "9": "t_carpet_red",
+      "C": "t_carpet_red",
+      "]": "t_thconc_floor",
+      "3": "t_thconc_floor",
+      "4": "t_thconc_floor",
+      "5": "t_thconc_floor",
+      "x": "t_concrete",
+      "P": "t_concrete",
+      "D": "t_concrete",
+      "7": "t_concrete",
+      "~": "t_concrete",
+      "N": "t_concrete",
+      "r": "t_railing"
+    },
+    "items": {
+      "Z": [
+        {
+          "item": {
+            "subtype": "distribution",
+            "entries": [
+              { "chance": 40, "group": "alcohol", "repeat": [ 2, 8 ] },
+              { "chance": 100, "group": "snacks", "repeat": [ 3, 5 ] },
+              { "chance": 100, "group": "groce_condiment", "repeat": [ 3, 5 ] },
+              { "chance": 50, "group": "crate_wine", "repeat": [ 1, 3 ] },
+              { "chance": 50, "group": "softdrinks_canned", "repeat": [ 3, 5 ] },
+              { "chance": 50, "group": "crate_kitchen", "repeat": [ 3, 5 ] },
+              { "chance": 50, "group": "behindcounter", "repeat": [ 5, 7 ] },
+              { "chance": 50, "group": "foodintincan", "repeat": [ 3, 5 ] },
+              { "chance": 50, "group": "cannedfood", "repeat": [ 10, 5 ] }
+            ]
+          },
+          "chance": 33
+        }
+      ],
+      "t": { "item": "pool_table", "chance": 33, "repeat": [ 1, 2 ] }
+    },
+    "vehicles": {
+      "Á": { "vehicle": "parking_garage", "rotation": 90, "chance": 66 },
+      "É": { "vehicle": "parking_garage", "rotation": 270, "chance": 66 }
     }
   },
   {
     "type": "palette",
     "id": "p_resort_palette_restaraunt",
+    "palettes": [ "p_resort_palette_main" ],
     "furniture": {
-      "f": "f_glass_fridge",
-      "B": "f_workbench",
-      "]": "f_fridge",
-      "O": "f_oven",
-      "R": "f_woodstove",
-      "#": "f_counter",
-      "d": "f_dishwasher",
-      "{": "f_cupboard",
-      "S": "f_sink",
-      "l": "f_trashcan",
-      "T": "f_table",
-      ";": "f_counter_gate_c",
-      "s": "f_stool",
-      "c": "f_chair",
-      "K": "f_rack_coat",
-      "2": "f_water_heater",
-      "3": "f_home_furnace",
-      "4": "f_air_conditioner",
-      "5": "f_standing_tank",
-      "t": "f_pool_table",
-      "y": "f_safe_l",
-      "6": "f_arcade_machine",
-      "9": "f_piano",
-      "'": "f_speaker_cabinet",
-      "(": "f_roulette_table",
-      "v": "f_armchair",
-      ")": "f_vending_c",
-      "u": "f_vending_o",
-      "Z": "f_crate_c"
+      "C": "f_counter",
+      "1": "f_cupboard",
+      "2": "f_cupboard",
+      "3": "f_cupboard",
+      "5": "f_sink",
+      "6": "f_rack_wood",
+      "d": "f_dishwasher"
     },
     "terrain": {
-      " ": "t_floor",
-      ".": "t_region_groundcover_urban",
-      "F": "t_privacy_fence",
-      "W": "t_wall_w",
-      "w": "t_window_domestic",
-      "m": "t_metal_floor",
-      "|": "t_door_metal_c",
-      "<": "t_stairs_up",
-      "r": "t_carpet_red",
+      "f": "t_carpet_red",
       "#": "t_carpet_red",
+      "S": "t_carpet_red",
       "T": "t_carpet_red",
-      "c": "t_carpet_red",
+      "H": "t_carpet_red",
       ";": "t_carpet_red",
-      "s": "t_carpet_red",
-      "+": "t_door_c"
+      "s": "t_carpet_red"
+    },
+    "items": {
+      "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ],
+      "2": { "item": "SUS_cookware", "chance": 100 },
+      "3": [ { "item": "SUS_utensils", "chance": 50 }, { "item": "SUS_knife_drawer", "chance": 50 } ],
+      "5": { "item": "SUS_kitchen_sink", "chance": 100 },
+      "6": [ { "item": "SUS_pantry", "chance": 25 }, { "item": "cannedfood", "chance": 20, "repeat": [ 1, 2 ] } ],
+      "O": { "item": "SUS_oven", "chance": 100 },
+      "f": { "item": "bar_fridge", "chance": 66, "repeat": [ 2, 8 ] },
+      "d": { "item": "SUS_dishwasher", "chance": 70 }
     }
   },
   {
     "type": "palette",
     "id": "p_resort_palette_living_floor",
+    "palettes": [ "p_resort_palette_main" ],
     "furniture": {
-      "#": "f_counter",
-      ";": "f_counter_gate_c",
-      "'": "f_speaker_cabinet",
       "b": "f_bed",
       "0": "f_bigmirror",
       "[": "f_wardrobe",
       "h": "f_shower",
-      "a": "f_sofa",
-      "c": "f_chair",
-      "f": "f_glass_fridge",
-      "]": "f_fridge",
-      "S": "f_sink",
-      "7": "f_deckchair",
       "B": "f_bathtub",
-      "K": "f_rack_coat",
       "^": "f_coffee_table",
-      "L": "f_locker",
-      "T": "f_table",
+      "t": "f_table",
       "d": "f_dresser",
-      "v": "f_butcher_rack",
-      "V": "f_woodstove",
-      "i": "f_dancing_pole",
-      "s": "f_stool",
-      "o": "f_washer",
-      "5": "f_standing_tank",
+      "W": "f_washer",
       "z": "f_dryer",
-      "Z": "f_crate_c"
+      "5": "f_utility_shelf"
     },
     "terrain": {
-      "W": "t_wall_w",
-      "+": [ [ "t_door_c", 3 ], [ "t_door_o", 1 ] ],
-      "<": "t_stairs_up",
-      ">": "t_stairs_down",
-      "*": "t_open_air",
-      "w": "t_window_domestic",
-      "r": "t_guardrail",
-      "R": "t_floor_red",
+      "│": "t_open_air_rooved",
+      " ": "t_open_air",
+      "L": "t_thconc_floor",
       "_": "t_flat_roof",
-      "-": "t_floor",
       "?": "t_wall_glass",
-      "|": "t_door_metal_c",
       "X": "t_door_locked_interior"
+    },
+    "items": {
+      "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] },
+      "t": [
+        { "item": "bar_table", "chance": 40, "repeat": [ 2, 4 ] },
+        { "item": "bar_alcohol", "chance": 25, "repeat": [ 2, 4 ] }
+      ],
+      "5": { "item": "laundromat_bleach", "chance": 100 },
+      "W": { "item": "laundry", "chance": 33, "repeat": [ 1, 6 ] },
+      "z": { "item": "laundry", "chance": 33, "repeat": [ 1, 6 ] },
+      "Z": { "item": "crate_wine", "chance": 50, "repeat": [ 1, 2 ] },
+      "_": { "item": "roof_trash", "chance": 1 },
+      "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
+      "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
+      "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
+      "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
+      "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
+      "L": { "item": "SUS_janitors_closet", "chance": 100 },
+      "#": [
+        { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
+        { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
+      ]
     }
   },
   {
     "type": "palette",
     "id": "p_resort_palette_basement",
+    "palettes": [ "p_resort_palette_main" ],
     "furniture": {
-      "&": "f_console_broken",
       "1": "f_generator_broken",
       "2": "f_machinery_light",
       "3": "f_machinery_heavy",
-      "L": "f_locker",
-      "S": "f_utility_shelf",
-      "f": "f_glass_fridge",
-      "y": "f_safe_l",
+      "N": "f_utility_shelf",
       "g": "f_wood_keg",
-      "c": "f_chair",
-      "B": "f_workbench",
-      "T": "f_table",
-      "K": "f_bookcase"
+      "B": "f_workbench"
     },
     "terrain": {
-      " ": "t_rock_floor",
-      "*": "t_rock",
-      ".": "t_thconc_floor",
-      "W": "t_sconc_wall",
-      "|": "t_door_metal_c",
-      "+": "t_door_c",
+      "|": "t_sconc_wall",
+      " ": "t_soil",
       "G": "t_chaingate_l",
       "F": "t_chainfence",
       "X": "t_door_bar_locked",
       "V": "t_bars",
       "0": "t_ballistic_glass",
-      "l": "t_door_metal_locked",
-      "?": "t_secretdoor_metal_c",
-      ",": "t_metal_floor",
       "m": "t_wall_metal",
-      "%": "t_gates_control_concrete",
-      "<": "t_stairs_up"
-    }
-  },
-  {
-    "type": "palette",
-    "id": "p_resort_palette_roof",
-    "furniture": {
-      "c": "f_air_conditioner",
-      "f": "f_air_filter",
-      "b": "f_cellphone_booster",
-      "(": "f_small_satelitte_dish",
-      "s": "f_solar_unit",
-      "H": "f_chimney",
-      "l": "f_machinery_light",
-      "v": "f_roof_turbine_vent"
-    },
-    "terrain": {
-      "*": "t_open_air",
-      "_": "t_flat_roof",
-      ">": "t_stairs_down",
-      "r": "t_guardrail",
-      "#": "t_sai_box_damaged",
-      "I": "t_lgtn_arrest"
+      "%": "t_gates_control_concrete"
     }
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
index 6a966aed76f86..f53516c3e7919 100644
--- a/data/json/overmap/overmap_special/specials.json
+++ b/data/json/overmap/overmap_special/specials.json
@@ -7375,8 +7375,8 @@
       { "point": [ 2, 2, 2 ], "overmap": "p_resort_rse_north" }
     ],
     "connections": [
-      { "point": [ 1, 4, 0 ], "terrain": "road", "connection": "local_road" },
-      { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road" }
+      { "point": [ 1, 4, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 3, 0 ] },
+      { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] }
     ],
     "locations": [ "wilderness" ],
     "city_distance": [ 8, 40 ],
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json b/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json
index c01fd8932b555..3ef185f836e3e 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json
@@ -10,7 +10,7 @@
     "flags": [ "RISK_HIGH", "SOURCE_DRINK", "SOURCE_LUXURY" ]
   },
   {
-    "id": "p_resort_1nw",
+    "id": [ "p_resort_1nw", "p_resort_pm" ],
     "type": "overmap_terrain",
     "sym": "P",
     "copy-from": "generic_private_resort"
@@ -38,7 +38,6 @@
       "p_resort_2sw",
       "p_resort_2ww",
       "p_resort_pe",
-      "p_resort_pm",
       "p_resort_pw",
       "p_resort_ree",
       "p_resort_rmm",
diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
index 247370a01c867..2ed3c4fd97313 100644
--- a/data/json/vehicle_groups.json
+++ b/data/json/vehicle_groups.json
@@ -755,8 +755,7 @@
       [ "motorcycle_enduro", 50 ],
       [ "superbike", 50 ],
       [ "motorcycle_sidecart", 50 ],
-      [ "car_sports", 30 ],
-      [ "underlift_tow_truck", 10 ]
+      [ "car_sports", 30 ]
     ]
   },
   {

From 78f2f485d618858ded4ee6502905c5cd47eee63c Mon Sep 17 00:00:00 2001
From: LovamkicsiGazsi <farkasb0420@gmail.com>
Date: Sun, 29 Jan 2023 15:44:12 +0100
Subject: [PATCH 2/5] roof fix

---
 data/json/mapgen/private_resort.json | 62 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/data/json/mapgen/private_resort.json b/data/json/mapgen/private_resort.json
index 37ba7ba95bcab..eeac477eb03cf 100644
--- a/data/json/mapgen/private_resort.json
+++ b/data/json/mapgen/private_resort.json
@@ -251,7 +251,7 @@
         "                        |││││││││││││││││││││││|cc.......d|bbb..cTTo    ",
         "                        |││││││││││││││││││││││|.....l..bb|bbbd..cc|    ",
         "    rrrrrrrrrrrrrrrrrrrr|││││││││││││││││││││││|||+||||||||||||....|rr  ",
-        "    r___________________|││││││││││││││││││││││|a...H|STBB|B0$|+||||.r  ",
+        "    r___________________|││││││││││││││││││││││|a...H|S$BB|B0$|+||||.r  ",
         "    r___________________|││││││││││││││││││││││|a^...+..BB|B..|....+.r  ",
         "    r___________________|││││││││││││││││││││││|a...K|...0|S..|H...|.r  ",
         "    |||||||||+o|???????||rrr││││││││││││││││rrr|||X||||||||||+|..^.orr  ",
@@ -338,8 +338,8 @@
       "rows": [
         "                                                                        ",
         "                                                                        ",
-        "                         .....             .....       .....            ",
-        "                         .....             .....       .....            ",
+        "                                                       .....            ",
+        "                                                       .....            ",
         "                        52222222222222222222222222222222222222222225    ",
         "                        |..........................................3    ",
         "                        |................................A.........3    ",
@@ -351,46 +351,46 @@
         "    522222222222222222225..........................................3..  ",
         "    |..............................................................3    ",
         "  ..|.N.:..........Я...............................................3    ",
-        "  ..|..............................................................3    ",
-        "  ..|.A................>.........................................:.3    ",
-        "  ..|.................................................Я............3    ",
+        "  ..|.................###..........................................3    ",
+        "  ..|.A...............#>#........................................:.3    ",
+        "  ..|.................#.#.............................Я............3    ",
         "  ..|............................................................N.3    ",
         "    |..............................................................3    ",
         "    |..............................................................3    ",
         "    |.......................A..............A.......................3    ",
         "    |..............................................................3..  ",
-        "    |..................##########################..................3..  ",
-        "    |..................#                        #................A.3..  ",
-        "    |..................#..                      #..................3..  ",
-        "    |..................#..                      #..................3..  ",
-        "    |......&&..==....A.#..                    ..#..................3    ",
-        "    |..................#..                    ..#..................3    ",
-        "    |..................#..                    ..#.A................3    ",
-        "    |..................#                      ..#..................3..  ",
-        "    |..................#                      ..#..................3..  ",
-        "    |..................#                        #................A.3..  ",
-        "    |..................#                        #..................3..  ",
-        "    |..................#..                    ..#..................3..  ",
-        "    |..................#..                    ..#..................3    ",
-        "    |................A.#..                    ..#.A................3    ",
-        "  ..|..................#..                    ..#..................3    ",
-        "  ..|..................#..                    ..#..................3..  ",
-        "  ..|.A................#                        #..................3..  ",
-        "  ..|..................#                        #................A.3..  ",
-        "  ..|..................#                        #..................3..  ",
-        "    |..................#                        #..................3..  ",
-        "    |..................#                        #..................3    ",
-        "    |..................##########################..................3    ",
+        "    |...................########################...................3..  ",
+        "    |...................#                      #.................A.3..  ",
+        "    |...................#..                    #...................3..  ",
+        "    |...................#..                    #...................3..  ",
+        "    |......&&...==....A.#..                  ..#...................3    ",
+        "    |...................#..                  ..#...................3    ",
+        "    |...................#..                  ..#.A.................3    ",
+        "    |...................#                    ..#...................3..  ",
+        "    |...................#                    ..#...................3..  ",
+        "    |...................#                      #.................A.3..  ",
+        "    |...................#                      #...................3..  ",
+        "    |...................#..                  ..#...................3..  ",
+        "    |...................#..                  ..#...................3    ",
+        "    |.................A.#..                  ..#.A.................3    ",
+        "  ..|...................#..                  ..#...................3    ",
+        "  ..|...................#..                  ..#...................3..  ",
+        "  ..|.A.................#                      #...................3..  ",
+        "  ..|...................#                      #.................A.3..  ",
+        "  ..|...................#                      #...................3..  ",
+        "    |...................#                      #...................3..  ",
+        "    |...................#                      #...................3    ",
+        "    |...................########################...................3    ",
         "    |..............................................................3    ",
         "    |..............................................................3    ",
         "    |..............................................................3    ",
         "    |........................oooo.oooo.oooo........................3    ",
         "  ..|........................oooo.oooo.oooo........................3    ",
         "  ..|........................oooo.oooo.oooo........................3    ",
-        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|.A......................oooo.oooo.oooo........................3    ",
         "  ..|..............................................................3    ",
-        "  ..|............................................N.:...............3    ",
-        "    |.............................................................>3    ",
+        "  ..|..............A.............................N.:...............3    ",
+        "    |..............................................................3    ",
         "    5--------------------------------------------------------------5    ",
         "                                                                        ",
         "                                                                        ",

From aed9a79f9bb5c0101e8b8caf12ac9c0c6b2ad2c2 Mon Sep 17 00:00:00 2001
From: LovamkicsiGazsi <farkasb0420@gmail.com>
Date: Sun, 29 Jan 2023 16:00:12 +0100
Subject: [PATCH 3/5] no hope fix

same as vanilla, except that vending machines are always empty, loot is no longer guaranteed, cars have status 1
---
 data/mods/No_Hope/Mapgen/private_resort.json | 1917 ++++--------------
 1 file changed, 409 insertions(+), 1508 deletions(-)

diff --git a/data/mods/No_Hope/Mapgen/private_resort.json b/data/mods/No_Hope/Mapgen/private_resort.json
index e6dc778e85c85..d8a87f0f13fcf 100644
--- a/data/mods/No_Hope/Mapgen/private_resort.json
+++ b/data/mods/No_Hope/Mapgen/private_resort.json
@@ -2,1178 +2,448 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1nw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_metal_floor",
-      "rows": [
-        "....______..______......",
-        ".FFW======WW======WFFFFF",
-        ".F.%:____:__:____:%.....",
-        ".F..:____:__:____:......",
-        ".F..:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F.g:____:__:____:____..",
-        ".F..:____:__:____:......",
-        ".F..W=====WW=====WWW|||W",
-        ".F..Wmmmmm%mmmmmm%Wfmmmf",
-        ".F..WmmmmmmmmmmmmmWfmmmf",
-        ".F..WmmZmmmZmmmmmmWfmmmf",
-        ".F..WmZmmmmmmmmmmmWfmmmf",
-        ".F..WmZmmmZmmmmmmmWfmmmf",
-        ".F..WmmmmZmmmmmmmmWW|||W",
-        ".F..WmmmmZZmmmmmmm|mmmmm",
-        ".F..WmmmmZZm>>mmmm|mmmm<",
-        ".F..W|W|WWWWWWWWWWWmZmmL",
-        ".F..W W,,Bb,,Bb,ggWZZmmL",
-        ".F..W W,,,,,,,?,,,|mmmmL",
-        ".F..W W,,?,,,,,,,,|mmmmL",
-        ".F..W W,,Bb,,Bb?,,WmmmmL"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_signs": [
-        { "signage": "Private property.  No trespassing!", "x": 4, "y": 0 },
-        { "signage": "Private property.  No trespassing!", "x": 18, "y": 0 }
-      ],
-      "place_items": [
-        { "chance": 40, "item": "alcohol", "x": 7, "y": 13, "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "snacks", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 15, "item": "snacks", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "groce_condiment", "x": 11, "y": 13 },
-        { "chance": 15, "item": "groce_condiment", "x": 7, "y": 13, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "crate_wine", "x": 6, "y": 14, "repeat": [ 1, 3 ] },
-        { "chance": 15, "item": "crate_wine", "x": 6, "y": 14, "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "softdrinks_canned", "x": 6, "y": 15, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "crate_kitchen", "x": 10, "y": 15, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "behindcounter", "x": 10, "y": 17, "repeat": [ 5, 7 ] },
-        { "chance": 50, "item": "foodintincan", "x": 9, "y": 18, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "cannedfood", "x": 20, "y": 19, "repeat": [ 10, 5 ] },
-        { "chance": 50, "item": "cleaning", "x": 19, "y": 20, "repeat": [ 10, 5 ] },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 19, "y": 11 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 19, "y": 12 },
-        { "chance": 50, "item": "SUS_fridge_healthy_vegan", "x": 19, "y": 13 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 19, "y": 14 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 19, "y": 15 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 11 },
-        { "chance": 50, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 12 },
-        { "chance": 50, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 13 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 14 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 15 },
-        { "chance": 20, "item": "butcher_tools", "x": 9, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 9, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 13, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 20, "item": "butcher_tools", "x": 13, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "butcher_raw_meat", "x": 16, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "butcher_raw_meat", "x": 17, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 19 },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 20 },
-        { "chance": 40, "item": "stash_drugs", "x": 24, "y": 20 },
-        { "chance": 40, "item": "dresser", "x": 24, "y": 21, "repeat": [ 1, 3 ] },
-        { "chance": 40, "item": "clothing_outdoor_torso", "x": 24, "y": 22 },
-        { "chance": 40, "item": "dresser", "x": 24, "y": 23, "repeat": [ 1, 3 ] },
-        { "chance": 60, "item": "stash_drugs", "x": 24, "y": 23 }
-      ],
-      "place_vehicles": [
-        { "vehicle": "pickup", "x": 13, "y": 13, "chance": 75, "rotation": 270, "status": -1 },
-        { "vehicle": "policesuv", "x": 11, "y": 7, "chance": 25, "rotation": 90, "status": -1 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_ZOMBIE_COP", "x": [ 4, 20 ], "y": [ 3, 9 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 5, 23 ], "y": [ 11, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ww" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_metal_floor",
-      "rows": [
-        ".F..W WWWWWWWWWWWWWW|||W",
-        ".F..W WBdSdS{{{{{{RRmmm]",
-        ".F..W WBmmmmmmmmmmmmmmm]",
-        ".F..W WBmBBBOBSBOBBBlmm]",
-        ".F..W WBmBBBOBSBOBBBlmm]",
-        ".F..W WBmmmmmmmmmmmmmmm]",
-        ".F..W WBBBBBBBBBBBBBmmm]",
-        ".F..W+WWWWWWWWWWWWWW#W+W",
-        ".F..wr#]]]##########rrrr",
-        ".F..wr;rrrrrrrrrrrr#rrrr",
-        ".F..Wr#rrrrrrrrrrrr#rrrr",
-        ".F..wr##############rrrr",
-        ".F..wrrssssssssssssrrrrr",
-        ".F..wrrrrrrrrrrrrrrrrrrr",
-        ".F..Wrrrrrccrrrrrrcccrrr",
-        ".F..wccrrcTTcrrrrcTTTcrr",
-        ".F..wTTcrcTTcrrrrcTTTcrr",
-        ".F..wccrrrccrrrrrrcccrrr",
-        ".F..Wrrrrrrrrrrrrrrrrrrr",
-        ".F..wccrrrccrrrrrrcccrrr",
-        ".F..wTTcrcTTcrrrrcTTTcrr",
-        ".F..wccrrcTTcrrrrcTTTcrr",
-        ".F..Wrrrrrccr<<rrrcccrrr",
-        ".F..W+WWWWWWWWWWWWWWWWW+"
-      ],
-      "palettes": [ "p_resort_palette_restaraunt" ],
-      "items": {
-        "{": {
-          "item": {
-            "subtype": "distribution",
-            "entries": [
-              { "group": "SUS_silverware", "prob": 50 },
-              { "group": "SUS_utensils", "prob": 50 },
-              { "group": "SUS_knife_drawer", "prob": 25 },
-              { "group": "SUS_junk_drawer", "prob": 10 },
-              { "group": "SUS_dishes", "prob": 50 },
-              { "group": "SUS_appliances_cupboard", "prob": 10 },
-              { "group": "SUS_coffee_cupboard", "prob": 20 },
-              { "group": "SUS_spice_collection", "prob": 10 }
-            ]
-          },
-          "chance": 75
-        },
-        "S": { "item": "SUS_kitchen_sink", "chance": 75 },
-        "d": { "item": "SUS_dishwasher", "chance": 75 },
-        "B": { "item": "SUS_cookware", "chance": 33, "repeat": [ 1, 2 ] },
-        "O": { "item": "SUS_oven", "chance": 75 }
-      },
-      "place_items": [
-        { "chance": 40, "item": "bar_fridge", "x": [ 7, 9 ], "y": [ 8, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 30, "item": "bar_table", "x": [ 7, 18 ], "y": [ 11, 11 ], "repeat": [ 15, 20 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 10, 18 ], "y": [ 8, 8 ], "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 5, 6 ], "y": [ 16, 16 ], "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 10, 11 ], "y": [ 15, 16 ], "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 18, 20 ], "y": [ 15, 16 ], "repeat": [ 3, 9 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 5, 6 ], "y": [ 20, 20 ], "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 10, 11 ], "y": [ 19, 20 ], "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "restaur_table", "x": [ 18, 20 ], "y": [ 19, 20 ], "repeat": [ 3, 9 ] },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 1 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 2 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 3 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 4 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 5 },
-        { "chance": 20, "item": "SUS_fridge_healthy_vegan", "x": 23, "y": 6 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 5, 23 ], "y": [ 0, 23 ], "density": 0.75 },
-        { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 7, 23 ], "y": [ 0, 6 ], "density": 0.2 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1sw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        ".F..W  WTSTW^^W^^WTSTW  ",
-        ".F..W  W   W $W$ W   W  ",
-        ".F..W  +   +  W  +   +  ",
-        ".F..W  WWWWWWWWWWWWWWW  ",
-        ".F..W  +   +  W  +   +  ",
-        ".F..W  W   W $W$ W   W  ",
-        ".F..W  WTSTW^^W^^WTSTW  ",
-        ".F..WWWWWWWWWWWWWWWWWWWW",
-        ".F......................",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 5, 23 ], "y": [ 0, 7 ], "repeat": [ 0, 1 ], "density": 0.2 } ],
-      "toilets": { "$": {  } },
-      "place_items": [
-        { "chance": 50, "item": "restaur_bath", "x": [ 12, 13 ], "y": [ 0, 2 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 15, 16 ], "y": [ 0, 2 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 12, 13 ], "y": [ 4, 6 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "restaur_bath", "x": [ 15, 16 ], "y": [ 4, 6 ], "repeat": [ 3, 6 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 12, 13 ], "y": [ 0, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 15, 16 ], "y": [ 0, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 12, 13 ], "y": [ 4, 6 ], "repeat": [ 1, 2 ] },
-        { "chance": 25, "item": "stash_drugs", "x": [ 15, 16 ], "y": [ 4, 6 ], "repeat": [ 1, 2 ] }
-      ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 10, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 15, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 19, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 20, "chance": 20, "rotation": 180, "status": 1 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F._____________________",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.:::::::______:::::::x",
-        ".F.:::::::______:::::::x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.____________________x",
-        ".F.....................x",
-        ".F.....................x",
-        ".FFFFFFFFFFFFFFFFFFFFFFF",
-        "........................"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 2, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 11, "chance": 20, "rotation": 0, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 9, "y": 16, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 4, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 13, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 17, "y": 18, "chance": 20, "rotation": 180, "status": 1 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1nn" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor_waxed",
-      "rows": [
-        "........................",
-        "FFFFFFFFFFFFFFFFFFFFFFFF",
-        "........................",
-        "........................",
-        "WWWWWWWWWWWWWWWWWWWWWWWW",
-        "WHHHH'HaaaaHHaaaaH'HHHH+",
-        "Wc9HHHHa##aHHa##aHHHHHHW",
-        "WHHHHHHa##aHHa##aHHHHHHW",
-        "WHHHHHHHHHHHHHHHHHHHHHHW",
-        "WHHIHHHHHHHHHHIHHHHHHH'W",
-        "W###sHHHHHHHHHHHHHHHH##W",
-        "W]H#sHHHHHHHHHHssssss##8",
-        "W#H#sHHHHHHHHHs########W",
-        "W#H#sHHHHHHHHHs#i##i###W",
-        "W#H#sHHHHHHHHHs########W",
-        "WHH#sHHHHHHHHHHssssss##8",
-        "W;##sHHHHHHHHHHHHHHHH##W",
-        "|HHHHHHHHHHHHHHHHHHHHH'W",
-        "WHHHHHHHHHHHHHHHHHHHHHHW",
-        "WHHHHHa###aHHa###aHHHHHW",
-        "WHHHHHa#i#aHHa#i#aHHHHHW",
-        "WHHHHHa###aHHa###aHHHHH+",
-        "WHHHH'aaaaaHHaaaaa'HHHH+",
-        "WWW++WWWWWWWWWWWWWW++WWW"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_items": [
-        { "chance": 40, "item": "bar_fridge", "x": 1, "y": 11, "repeat": [ 2, 8 ] },
-        { "chance": 50, "item": "bar_table", "x": [ 3, 3 ], "y": [ 10, 16 ], "repeat": [ 6, 12 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 1, 1 ], "y": [ 12, 14 ], "repeat": [ 5, 10 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 8, 9 ], "y": [ 6, 7 ], "repeat": [ 1, 4 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 14, 15 ], "y": [ 6, 7 ], "repeat": [ 1, 4 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 7, 9 ], "y": [ 19, 21 ], "repeat": [ 1, 8 ] },
-        { "chance": 40, "item": "stash_drugs", "x": [ 14, 16 ], "y": [ 19, 21 ], "repeat": [ 1, 8 ] }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_DANCERS", "x": [ 0, 23 ], "y": [ 5, 23 ], "repeat": [ 1, 2 ], "density": 0.4 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1mm" ],
-    "weight": 100000,
+    "om_terrain": [ [ "p_resort_1nw", "p_resort_1nn", "p_resort_1ne" ], [ "null", "p_resort_1mm", "p_resort_1ee" ] ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "W..PP..............PP..W",
-        "W..PP..............PP..W",
-        "W..PPP7^7^7777^7^7PPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..7PPUUUU#PP#UUUUPP7..W",
-        "W..^PPUUUU#PP#UUUUPP^..W",
-        "W..7PPUUUU#PP#UUUUPP7..W",
-        "W..PPPUUUU####UUUUPPP..W",
-        "W..7PPUUUUUUUUUUUUPP7..W",
-        "W..^PPUUUUUUUUUUUUPP^..W",
-        "W..7PPUUUUUUUUUUUUPP7..W",
-        "W..PPPPPP~PPPP~PPPPPP..W",
-        "W..PPP^PPPPPPPPPP^PPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPDDDPPPPPPPPDDDPP..W",
-        "W..PPPPPPPPPPPPPPPPPP..W",
-        "W..PP......PP......PP..W",
-        "W..PP......PP......PP..W",
-        "WWW++WWWWWW++WWWWWW++WWW",
-        "+     <<<      <<<     +",
-        "+                      +",
-        "WW+WW  WWWWWWWWWW  WW+WW"
+        "    ______________                                                      ",
+        " FF|==============|FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
+        " F %y____________y%                                                   F ",
+        " F  y____________y                                                    F ",
+        " F  y____________y      ||||||||||||||||||||||||||||||||||||||||||||  F ",
+        " F  y____________yxxxxx |....'.aaaa..aaaa.'....+...................|  F ",
+        " F  y____________yxxxxx |c9....a##a..a##a......||+|||8|||8|||8|||8||  F ",
+        " F  y____________yxxxxx |......a##a..a##a......|L.j|..K|..K|..K|..K|  F ",
+        " F  y____________y  xxx |......................|L.j|.i^|.i^|.i^|.i^|  F ",
+        " F  y____________y  xxx |......................|L..|aaa|aaa|aaa|aaa|  F ",
+        " F  |============|||---||###s........HHHHHHHHHH|||.|||||||||||||||||  F ",
+        " F  |::::::::::::%|:::::|S.#s........Hrrrrrrrrr|.|...0TK0TK0TK..+.K|  F ",
+        " F  |:::::::::::::|:::gg|f.#s........Hr........8.8....c..c..c...|.1|  F ",
+        " F  |:::::::::::::|:::gg|#.#s........Hr.i..i...|.|..............||||  F ",
+        " F  |:::::::::::::|:::gg|#.#s........Hr........8.8..KV.j.VV.j...|.$|  F ",
+        " F  |Z:::::::::::Z|:::::|..#s........Hrrrrrrrrr|.|..KV.j.VV.j...+.S|  F ",
+        " F  |::Z:::::::::Z||---||;##s........HHHHHHHHHH||||||||||||||||+||||  F ",
+        " F  |:::::Z:::::::-:::::-......................8..|$.+.S|S.+.$|.eee|  F ",
+        " F  |:ZZ::::ZZ::::-::::<|......................8..||||.S|S.||||..c.|  F ",
+        " F  |-||---|||||::|L:::L|.....a###a..a###a.....|..|$.+..|..+.$|....|  F ",
+        " F  |:|]:::]]]]|::|:::::|.....a#i#a..a#i#a.....|..|||||+|+|||||...f|  F ",
+        " F  |:|]:::::::|>>|44:33|<<...a###a..a###a.....8...........-......f|  F ",
+        " F  |:|]:::]]]]|>>|44533|<<..'aaaaa..aaaaa'....8...........-......f|  F ",
+        " F  |:||---||||||||||||||||++||||||||||||||++|||..|..||||||||||||-||  F ",
+        "││││││││││││││││││││││││:xxxx*////////////*xx* |.....;.###ffSSff...|  F ",
+        "││││││││││││││││││││││││|**xx**************xx* |.....#.............|  F ",
+        "││││││││││││││││││││││││|/*7xx7N7N7xx7N7N7xxx* |.....##############|  F ",
+        "││││││││││││││││││││││││|/*Nxxxxxxxxxxxxxxxxx* |......ssssssssssss.|  F ",
+        "││││││││││││││││││││││││|/*7xxxxxxxxxxxxxxxxx* |...................|  F ",
+        "││││││││││││││││││││││││|**xxxUUUU#;;#UUUUxx7* |...................|  F ",
+        "││││││││││││││││││││││││:xxxxxUUUU#..#UUUUxxN* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││|**xxxUUUU#s.#UUUUxx7* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││| *xxxUUUU####UUUUxxx* |..@s.s@..tt..tt...6|  F ",
+        "││││││││││││││││││││││││| *7xxUUUUUUUUUUUUxx7* |...................|  F ",
+        "││││││││││││││││││││││││| *NxxUUUUUUUUUUUUxxN* |..@s.s@.TTc..cTT...|  F ",
+        "││││││││││││││││││││││││| *7xxUUUUUUUUUUUUxx7* |..@s.s@.sTc..cTs...|  F ",
+        "││││││││││││││││││││││││| *xxxxxx~xxxx~xxxxxx* |..@s.s@.TTc..cTT...|  F ",
+        "││││││││││││││││││││││││| *xxxNxxxxxxxxxxNxxx* |...................|  F ",
+        "││││││││││││││││││││││││| *xxDDDxxxxxxxxDDDxx* |.......((.....((...|  F ",
+        "││││││││││││││││││││││││| *xxDDDxx7xx7xxDDDxx* |....'......'.......|  F ",
+        "││││││││││││││││││││││││| *xxDDDxxxxxxxxDDDxx* |....rrrrrrrrr||qqq||  F ",
+        "││││││││││││││││││││││││| *xxxxxxxxxxxxxxxxxx* |....r,,,,,,,,|Teee.|  F ",
+        "││││││││││││││││││││││││| *xx******xx******xx* |....r,C,C,9C,|T.c.Y|  F ",
+        "││││││││││││││││││││││││| *xx*////*xx*////*xx* |....,,,,,,,,,|.....|  F ",
+        "││││││││││││││││││││││││|||++||||||++||||||++|||..||||||||||||||-|||  F ",
+        "││││││││││││││││││││││││+......<<......<<.........-................|  F ",
+        "││││││││││││││││││││││││+.........................-................|  F ",
+        "││││││││││││││││││││││││|......................|||||||..cc...|||+|||  F "
       ],
       "palettes": [ "p_resort_palette_main_floor" ],
+      "terrain": { "│": "t_hole", "L": "t_thconc_floor" },
+      "place_fields": [ { "field": "fd_bile", "x": [ 25, 46 ], "y": [ 5, 22 ], "repeat": [ 40, 60 ] } ],
       "items": {
-        "#": { "item": "bar_alcohol", "chance": 50, "repeat": [ 1, 2 ] },
-        "^": [
+        "N": [
           { "item": "bar_table", "chance": 50, "repeat": [ 1, 3 ] },
           { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 3 ] },
           { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] }
-        ]
-      },
-      "place_monsters": [
-        { "monster": "GROUP_POOL_NOKIDS", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ss" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "Wh hW  Weeeeee !W  Wh hW",
-        "Wh hW  W&c  c& !W  Wh hW",
-        "Wh hW  W&c     !W  Wh hW",
-        "WW+WW  Weee!!!  W  WW+WW",
-        "Wj LW  WWWWWWWW+W  WL jW",
-        "Wj LW           #  WL jW",
-        "Wj LW  ###&####&#  WL jW",
-        "Wj LW              WL jW",
-        "W   +  /        /  +   W",
-        "WWWWWwwWW++WW++WWwwWWWWW",
-        "...xxxxxxxxxxxxxxxxxx...",
-        "..IxxxxxxxxxxxxxxxxxxI..",
-        "xxxxxxxxxxxxxxxxxxxxxxxx",
-        "x______________________x",
-        "x______________________x",
-        "x______________________x",
-        "x______________________x",
-        "xx____________________xx",
-        ".xx__________________xx.",
-        "..xx________________xx..",
-        "...xx______________xx...",
-        "....xx____________xx....",
-        ".....xx__________xx.....",
-        ".....xx__________xx....."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "items": {
-        "e": { "item": "SUS_office_desk", "chance": 50 },
-        "!": { "item": "SUS_office_filing_cabinet", "chance": 75 },
-        "L": { "item": "dresser", "chance": 50, "repeat": [ 1, 3 ] },
-        "h": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] }
-      },
-      "place_vehicles": [
-        { "vehicle": "police_pileup", "x": 4, "y": 15, "chance": 75, "rotation": 270, "status": -1 },
-        { "vehicle": "police_pileup", "x": 19, "y": 20, "chance": 25, "rotation": 0, "status": 1 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_ZOMBIE_COP", "x": [ 0, 23 ], "y": [ 10, 23 ], "density": 0.5 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 9 ], "repeat": [ 0, 1 ], "density": 0.5 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pm" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        "xxxxxxx__________xxxxxxx",
-        "xxxxxxx__________xxxxxxx",
-        "________________________",
-        "____:_:__________:_:____",
-        "________________________",
-        "____:_:__________:_:____",
-        "________________________",
-        "xxxxxxx__________xxxxxxx",
-        "xxxxxxx__________xxxxxxx",
-        ".....xx__________xxxxxxx",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        ".....xx__________xx.....",
-        "....xxx__________xxx....",
-        "...xxx%__________%xxx...",
-        "FFFFGFW==========WFGFFFF",
-        "...xxxx__________xxxx..."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_signs": [
-        { "signage": "Private property.  No trespassing!", "x": 8, "y": 24 },
-        { "signage": "Private property.  No trespassing!", "x": 17, "y": 24 }
-      ],
-      "place_vehicles": [ { "vehicle": "limousine", "x": 11, "y": 18, "chance": 75, "rotation": 90, "status": -1 } ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.75 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_1ne" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "........................",
-        "FFFFFFFFFFFFFFFFFFFFFFF.",
-        "......................F.",
-        "......................F.",
-        "WWWWWWWWWWWWWWWWWWWW..F.",
-        "                   W..F.",
-        "W+WWW8WWWWWWW8WWW8WW..F.",
-        "L jW  KW  KW  KW  KW..F.",
-        "L jW i^W i^W i^W i^W..F.",
-        "L  WaaaWaaaWaaaWaaaW..F.",
-        "WW WWWWWWWWWWWWWWWWW..F.",
-        " W   0TK0TK0TK +   W..F.",
-        " 8    c  c  c  WKj1W..F.",
-        " W             WWWWW..F.",
-        " 8  KV j VV j  WTS$W..F.",
-        " W  KV j VV j  +   W..F.",
-        "WWWWWWWWWWWWWWWWWWWW4.F.",
-        "WWW$+ +$W$+ +$W2553W4.F.",
-        "WWWWW WWWWW WWW    W4.F.",
-        "WWWS   SWS   SWBcL W..F.",
-        "WWWWW+WWWWW+WWWWWW|W..F.",
-        "                   W..F.",
-        "                   W..F.",
-        "++WWWWWWWWWWWWWWWW|W..F."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
+        ],
+        "f": { "item": "bar_fridge", "chance": 66, "repeat": [ 2, 8 ] },
+        "#": { "item": "bar_alcohol", "chance": 33, "repeat": [ 1, 3 ] },
         "^": [
           { "item": "bar_table", "chance": 50, "repeat": [ 1, 3 ] },
           { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 3 ] },
           { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] }
         ],
-        "$": { "item": "stash_drugs", "chance": 25, "repeat": [ 0, 1 ] },
         "V": { "item": "private_resort_dancing_clothes", "chance": 50, "repeat": [ 3, 6 ] },
         "K": { "item": "private_resort_dancing_clothes", "chance": 50, "repeat": [ 1, 3 ] }
       },
       "place_items": [
-        { "chance": 50, "item": "dresser", "x": [ 0, 0 ], "y": [ 7, 9 ], "repeat": [ 6, 12 ] },
-        { "chance": 25, "item": "home_hw", "x": 15, "y": 19, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "home_hw", "x": 17, "y": 19, "repeat": [ 3, 5 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 16, "y": 14, "repeat": [ 1, 4 ] }
+        { "chance": 75, "item": "keg_beer", "x": 62, "y": 22 },
+        { "chance": 40, "item": "stash_drugs", "x": [ 29, 46 ], "y": [ 5, 22 ], "repeat": [ 1, 6 ] },
+        { "chance": 50, "item": "bar_table", "x": 27, "y": [ 10, 16 ], "repeat": [ 6, 12 ] },
+        { "chance": 66, "item": "tools_common", "x": 19, "y": 19, "repeat": [ 1, 4 ] },
+        { "chance": 80, "item": "SUS_janitors_closet", "x": 23, "y": 19 },
+        { "chance": 50, "item": "bar_table", "x": [ 54, 65 ], "y": 26, "repeat": [ 10, 20 ] },
+        { "chance": 75, "item": "guns_pistol_common", "x": 66, "y": 42 },
+        { "chance": 80, "item": "private_resort_instruments", "x": 54, "y": 42 },
+        { "chance": 80, "item": "private_resort_instruments", "x": 56, "y": 42 }
+      ],
+      "place_monster": [
+        { "group": "GROUP_ZOMBIE_COP", "x": [ 4, 20 ], "y": [ 3, 9 ], "repeat": [ 2, 4 ] },
+        { "group": "GROUP_RESORT_DANCERS", "x": [ 24, 47 ], "y": [ 5, 23 ], "repeat": [ 3, 5 ] },
+        { "group": "GROUP_RESORT_DANCERS", "x": [ 48, 71 ], "y": [ 10, 16 ], "repeat": [ 3, 5 ] }
       ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 9 ], "repeat": [ 0, 1 ], "density": 0.3 },
-        { "monster": "GROUP_RESORT_DANCERS", "x": [ 0, 23 ], "y": [ 10, 16 ], "density": 0.6 },
-        { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 17, 23 ], "repeat": [ 0, 1 ], "density": 0.3 }
+      "place_signs": [
+        { "signage": "Private property.  No trespassing!", "x": 4, "y": 0 },
+        { "signage": "Private property.  No trespassing!", "x": 18, "y": 0 }
       ],
-      "place_liquids": [
-        { "liquid": "water", "x": 16, "y": 17, "repeat": [ 10, 60 ] },
-        { "liquid": "water", "x": 17, "y": 17, "repeat": [ 5, 80 ] }
+      "place_vehicles": [
+        { "vehicle": "pickup", "x": 13, "y": 13, "chance": 33, "rotation": 270, "status": 1 },
+        { "vehicle": "policesuv", "x": 11, "y": 7, "chance": 100, "rotation": 90, "status": 1 }
       ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1ee" ],
-    "weight": 100000,
+    "om_terrain": [ "p_resort_1ww" ],
     "object": {
-      "fill_ter": "t_floor",
+      "fill_ter": "t_thconc_floor",
       "rows": [
-        "     ; ########]]] W..F.",
-        "     #             W..F.",
-        "     ##############W..F.",
-        "      ssssssssssss W..F.",
-        "                   W..F.",
-        "                   W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "  @s s@  tt  tt   6W..F.",
-        "                   W..F.",
-        "  @s s@ TTc  cTT   W..F.",
-        "  @s s@ cTc  cTc   W..F.",
-        "  @s s@ TTc  cTT   W..F.",
-        "                   W..F.",
-        "       ((     ((   W..F.",
-        "    '      '       W..F.",
-        "    JJJJJJJJWQQWqqqW..F.",
-        "    JEEEEEEEWT&W###W..F.",
-        "    JEcEcE9cWcTwLcyW..F.",
-        "    JEEEEEEE|  +   W..F.",
-        "++WWWWWWWWWWWWWWWW|W..F.",
-        "                   w..F.",
-        "                   w..F.",
-        "||WWWWWWWWWWWWWWWW|W..F."
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
-      "place_items": [
-        { "chance": 50, "item": "bar_table", "x": [ 6, 17 ], "y": [ 2, 2 ], "repeat": [ 10, 20 ] },
-        { "chance": 40, "item": "bar_fridge", "x": [ 15, 17 ], "y": [ 0, 0 ], "repeat": [ 2, 8 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 7, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 10 ] },
-        { "chance": 25, "item": "pool_table", "x": [ 9, 10 ], "y": [ 6, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 25, "item": "pool_table", "x": [ 13, 14 ], "y": [ 6, 8 ], "repeat": [ 2, 8 ] },
-        { "chance": 75, "item": "guns_pistol_common", "x": 18, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 6, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 8, "y": 18 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 13, "y": 17 },
-        { "chance": 66, "item": "private_resort_instruments", "x": 14, "y": 18 },
-        { "chance": 25, "item": "private_resort_gambling_table", "x": [ 8, 9 ], "y": [ 10, 12 ], "repeat": [ 5, 12 ] },
-        { "chance": 25, "item": "private_resort_gambling_table", "x": 16, "y": 18, "repeat": [ 2, 4 ] },
-        {
-          "chance": 25,
-          "item": "private_resort_gambling_table",
-          "x": [ 14, 15 ],
-          "y": [ 10, 12 ],
-          "repeat": [ 5, 12 ]
-        }
+        " F  |:|1::::666666:|j:8:",
+        " F  |:|1:::::::::::||||:",
+        " F  |:|1::::::::::O|j:8:",
+        " F  |:|2::CCdCCl::O|||||",
+        " F  |:|2::C555Cl::O|j:8:",
+        " F  |:|3:::::::::::||||:",
+        " F  |:|3::COOOC::::|j:8:",
+        " F  |-||-|||||||CC||||||",
+        " F  |,,,,,,;,,,,,,ffSSff",
+        " F  |,,,,,,#,,,,,,,,,,,,",
+        " F  o,,HH,,##,,,,,,,,,,,",
+        " F  o,HTTH,,############",
+        " F  o,HTTH,,ssssssssssss",
+        " F  |,HTTH,,,,,,,,,,,,,,",
+        " F  o,HTTH,,,HH,,,,HH,,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  |,HTTH,,,HH,,,,HH,,,",
+        " F  o,HTTH,,,,,,,,,,,,,,",
+        " F  o,HTTH,,HTTH,,HTTH,,",
+        " F  o,,HH,,,HTTH,,HTTH,,",
+        " F  |,,,,,,,,,,,,,,,,,,,",
+        " F  |,,,,,,,,,,,,,,,,,,,",
+        " F  ||+|||||||||||||||+|"
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.5 } ]
+      "palettes": [ "p_resort_palette_restaraunt" ],
+      "place_items": [ { "chance": 30, "item": "bar_table", "x": [ 12, 23 ], "y": 11, "repeat": [ 15, 20 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_1se" ],
-    "weight": 100000,
+    "om_terrain": [ [ "p_resort_1sw", "p_resort_1ss", "p_resort_1se" ], [ "p_resort_pw", "p_resort_pm", "p_resort_pe" ] ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "  |     +  +  cTW  W..F.",
-        "  WcTcLLW>>W &&&WLLW..F.",
-        "  WWWWWWWWWWWWWWWWWW..F.",
-        "  +     +     +   #w..F.",
-        "  W    )W!   !W  c#w..F.",
-        "  W cc uWTc cTW TTTw..F.",
-        "< WOTTc]WT& &TW  vyw..F.",
-        "WWWWwwwWWWwwwWWWwwwW..F.",
-        "......................F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F."
+        " F  |l..#SSSS#|#SSSS#..l|aa......######......AA|l....|.cTTc.l|L...L|  F ",
+        " F  |.........|.........|a.....###eeee###...||||eee!.+..cc...|L.j.L|  F ",
+        " F  |.........|.........|a.^...;.......!#...#.&|&c...|.......|L.j.L|  F ",
+        " F  |.........|.........|a.^...#.s.....!#...#s.|eee!.||||||||||.j.||  F ",
+        " F  |+|+|+|+|+|+|+|+|+|+|a.....###..s.###...|.K|&c...|!!!|hhh|..j.L|  F ",
+        " F  |.|.|.|.|.|.|.|.|.|.|aa......####&#.....|.K|eee!.-..>|...-..j.L|  F ",
+        " F  |$|$|$|$|$|$|$|$|$|$|...H...............+.K|&c...|!!!|hhh|....L|  F ",
+        " F  |||||||||||||||||||||...................|.K||ooo||||||||||||||||  F ",
+        " F                      |....TT..........TT.|.K|                      F ",
+        " F   ****   ****   **** |||||oo||++||++||oo|||||                ****  F ",
+        " F  **//** **//** **//**    xxxxxxxxxxxxxxxx        I I        **//** F ",
+        " F  */  /* */) /* */  /*   xxxxx________xxxxx           *****  */  /* F ",
+        " F  */ )/* */  /* */) /*  xIxx____________xxIx  *****  **///** */) /* F ",
+        " F  **//** **//** **//**  xxx______________xxx **///** */   /* **//** F ",
+        " F   ****   ****   ****   xx________________xx */   /* */ ) /*  ****  F ",
+        " F                        xx________________xx */ ) /* */   /*        F ",
+        " F  ********************  x__________________x */   /* */   /*        F ",
+        " F **//////////////////** x__________________x */   /* */   /*  ****  F ",
+        " F */                  /* x__________________x */   /* */   /* **//** F ",
+        " F */ )    )    )    ) /* x__________________x */ ) /* */ ) /* */) /* F ",
+        " F */                  /* x__________________x */   /* */   /* */  /* F ",
+        " F **//////////////////** x__________________x **///** **///** **//** F ",
+        " F  ********************  x__________________x  *****   *****   ****  F ",
+        " F                        x__________________x                        F ",
+        " F xxxxxxxxxxxxxxxxxxxxx  xx________________xx  xxxxxxxxxxxxxxxxxxxxx F ",
+        " F x____y____y____y____x   x________________x   x____y____y____y____x F ",
+        " F x____y____y____y____x   xx______________xx   x____y____y____y____x F ",
+        " F x_É__y_É__y_É__y_É__x ** xx____________xx ** x_É__y_É__y_É__y_É__x F ",
+        " F x____y____y____y____x *¤* xx__________xx *¤* x____y____y____y____x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x___________________x      x__________x      x___________________x F ",
+        " F x___________________xxxxxxxx__________xxxxxxxx___________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x________________________________________________________________x F ",
+        " F x___________________xxxxxxxx__________xxxxxxxx___________________x F ",
+        " F x___________________x      x__________x      x___________________x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x____y____y____y____x *//* x__________x *//* x____y____y____y____x F ",
+        " F x__Á_y__Á_y__Á_y__Á_x *//* x__________x *//* x__Á_y__Á_y__Á_y__Á_x F ",
+        " F x____y____y____y____x  **  x__________x  **  x____y____y____y____x F ",
+        " F x____y____y____y____x      x__________x      x____y____y____y____x F ",
+        " F xxxxxxxxxxxxxxxxxxxxx     xx__________xx     xxxxxxxxxxxxxxxxxxxxx F ",
+        " F                           x%__________%x                           F ",
+        " FFFFFFFFFFFFFFFFFFFFFFFFFFFFG|==========|GFFFFFFFFFFFFFFFFFFFFFFFFFFFF ",
+        "                             xx__________xx                             "
       ],
       "palettes": [ "p_resort_palette_main_floor" ],
-      "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 10, "chance": 20, "rotation": 0, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 15, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 19, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 20, "chance": 20, "rotation": 180, "status": 1 }
-      ],
+      "place_vendingmachines": [ { "item_group": "vending_food", "x": 60, "y": 1 }, { "item_group": "vending_drink", "x": 60, "y": 2 } ],
       "items": {
-        "T": { "item": "SUS_office_desk", "chance": 50 },
-        "!": { "item": "SUS_office_filing_cabinet", "chance": 75 },
-        "O": { "item": "SUS_oven", "chance": 75 }
+        "L": [
+          {
+            "item": {
+              "subtype": "distribution",
+              "entries": [
+                { "group": "security_armor", "prob": 50 },
+                { "group": "security_gear", "prob": 66 },
+                { "group": "security_pants", "prob": 100 },
+                { "group": "security_shoes", "prob": 100 },
+                { "group": "security_torso", "prob": 100 }
+              ]
+            },
+            "chance": 33
+          },
+          { "item": "private_resort_sec_weapon", "chance": 75, "repeat": [ 1, 2 ] }
+        ]
       },
-      "place_items": [
-        { "chance": 50, "item": "coffee_table", "x": 4, "y": 1, "repeat": [ 2, 5 ] },
-        { "chance": 50, "item": "dresser", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 4, 8 ] },
-        { "chance": 50, "item": "private_resort_gambling_table", "x": [ 17, 18 ], "y": [ 1, 1 ], "repeat": [ 4, 8 ] },
-        { "chance": 50, "item": "private_resort_instruments", "x": [ 17, 18 ], "y": [ 1, 1 ], "repeat": [ 1, 2 ] },
-        { "chance": 20, "item": "fridgesnacks", "x": 7, "y": 6, "repeat": [ 4, 8 ] },
-        { "chance": 5, "item": "vending_drink_items", "x": 7, "y": 4, "repeat": [ 5, 10 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 18, 18 ], "y": [ 3, 4 ], "repeat": [ 5, 10 ] },
-        { "chance": 75, "item": "ammo_pistol_rare", "x": 18, "y": 6, "repeat": [ 1, 2 ] },
-        { "chance": 80, "item": "guns_pistol_obscure", "x": 18, "y": 6 },
-        { "chance": 40, "item": "jewelry_front", "x": 18, "y": 6, "repeat": [ 2, 4 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 18, "y": 6, "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "dresser", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 2, 4 ] },
-        { "chance": 50, "item": "guns_shotgun_common", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "private_resort_sec_weapon", "x": [ 6, 7 ], "y": [ 1, 1 ], "repeat": [ 1, 3 ] }
+      "place_fields": [ { "field": "fd_bile", "x": [ 5, 23 ], "y": [ 0, 6 ], "repeat": [ 10, 20 ] } ],
+      "place_monster": [
+        { "group": "GROUP_ZOMBIE_COP", "x": [ 24, 47 ], "y": [ 10, 23 ], "repeat": [ 4, 8 ] },
+        { "group": "GROUP_RESORT_MIXED_STAFF", "x": [ 48, 66 ], "y": [ 0, 7 ], "density": 0.25 }
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 0, 18 ], "y": [ 0, 7 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_pe" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "_____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x:::::::______:::::::.F.",
-        "x:::::::______:::::::.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "x____________________.F.",
-        "......................F.",
-        "......................F.",
-        "FFFFFFFFFFFFFFFFFFFFFFF.",
-        "........................"
-      ],
-      "palettes": [ "p_resort_palette_main_floor" ],
       "place_vehicles": [
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 2, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 11, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 7, "y": 16, "chance": 20, "rotation": 0, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 4, "chance": 20, "rotation": 180, "status": -1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 13, "chance": 20, "rotation": 180, "status": 1 },
-        { "vehicle": "parkinglotbasic", "x": 15, "y": 18, "chance": 20, "rotation": 180, "status": 1 }
+        { "vehicle": "police_pileup", "x": 28, "y": 15, "chance": 100, "rotation": 270, "status": 1 },
+        { "vehicle": "police_pileup", "x": 43, "y": 20, "chance": 100, "rotation": 0, "status": 1 },
+        { "vehicle": "limousine", "x": 35, "y": 42, "chance": 75, "rotation": 90, "status": 1 }
+      ],
+      "place_signs": [
+        { "signage": "Private property.  No trespassing!", "x": 30, "y": 47 },
+        { "signage": "Private property.  No trespassing!", "x": 41, "y": 47 }
       ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_2nw" ],
-    "weight": 100000,
+    "om_terrain": [
+      [ "p_resort_2nw", "p_resort_2nn", "p_resort_2ne" ],
+      [ "p_resort_2ww", "p_resort_2mm", "p_resort_2ee" ],
+      [ "p_resort_2sw", "p_resort_2ss", "p_resort_2se" ]
+    ],
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "****WWWWWWWWWWWWWWWWWWWW",
-        "****?c--cTc-cTc-cTc-s#]#",
-        "****?Tc-------------s#c#",
-        "****?c--cTc-----cTc--;-#",
-        "****WWWWWWWWW+WWWWWWWW|W",
-        "****WBBhWL-$WRRRRRRRRRRR",
-        "**rrwS-0W^-KWRRRRRRRRRRR",
-        "**r-WW+WWW+WWRRWWWWWWW|W",
-        "**r-+--ddd-#WRRW--ZZWL-<",
-        "**r-W------#WRR|----+---",
-        "**rrw-bb----+RRWZ-Z-WL->",
-        "****w^bbcTTcWRRWWWWWWWWW",
-        "****WWWWWWWWWRRWd---v-V-",
-        "****Wf------+RRXTd--#---",
-        "****w#----bbWRRW[-K----b",
-        "****w#--c-bbWRRWW+WWW+WW"
+        "                                                                        ",
+        "                                                                        ",
+        "                                                       rrrrr            ",
+        "                                                       r...r            ",
+        "                        ||||||||||||||||||||||||ooo||ooo|+||oo||oo||    ",
+        "                        |││││││││││││││││││││││|TTc..bbd..|]....cTT|    ",
+        "                        |││││││││││││││││││││││|cc.......d|bbb..cTTo    ",
+        "                        |││││││││││││││││││││││|.....l..bb|bbbd..cc|    ",
+        "    rrrrrrrrrrrrrrrrrrrr|││││││││││││││││││││││|||+||||||||||||....|rr  ",
+        "    r___________________|││││││││││││││││││││││|a...H|S$BB|B0$|+||||.r  ",
+        "    r___________________|││││││││││││││││││││││|a^...+..BB|B..|....+.r  ",
+        "    r___________________|││││││││││││││││││││││|a...K|...0|S..|H...|.r  ",
+        "    |||||||||+o|???????||rrr││││││││││││││││rrr|||X||||||||||+|..^.orr  ",
+        "    |dbd|BBS|,,,,,,,,,,,-,,r││││││││││││││││r,,-,,,,,,,,,,,+....aaao    ",
+        "  rr|.b.|..$|,,,,,,,,,,,-,,r││││││││││││││││r,,-,,,,,,,,,,,|KK..###o    ",
+        "  r.o...||+||,,..H..||-||,,r││││││││││││││││r,,|#.H......,,|||||||||    ",
+        "  r.+...l..#|,,....a|::<|,,r││││││││││││││││r,,|#......H.,,|S$B|###|    ",
+        "  r.oH.....#|,,..^^a|L::|,,r││││││││││││││││r,,|#...^....,,|..B|aaa|    ",
+        "  rr|a.^....+,,.aaaa|::>|,,r││││││││││││││││r,,|#.aaaaa..,,|0..|.^.|    ",
+        "    |aaaa..K|,,||||||||||,,r││││││││││││││││r,,||||||||||,,||+||...o    ",
+        "    |||||||||,,|K...aaaa|,,rrrrrrrrrrrrrrrrrr,,|WWW55zzz|,,X.......o    ",
+        "    |f.aaaaK|,,X.....TT.|>>,,,,,,,,,,,,,,,,,,,,|........-,,|K...bb.o    ",
+        "    o#..TT..+,,|l.......|>>,,,,,,,,,,,,,,,,,,,,|WWW55zzz|,,|l..dbbd|rr  ",
+        "    o#.H....|,,||+||.^^.|||ooo||ooo||ooo||ooo||||||||||||,,|||||||||.r  ",
+        "    |......l|,,|S..|.bb.o                      |dbbbd|BB|,,|B.$|d..+.r  ",
+        "    ||+||...|,,|h.$|dbbd|rr                    o.bbb.+.0|,,|B.0|bb.|.r  ",
+        "    |0.$|..^|,,||||||||||.r                    o..^..|.S|,,|B.S|bb.|rr  ",
+        "    o...|.bb|,,|l.aaaaa.+.r                  rroH...l|.$|,,||+||d..o    ",
+        "    |BBS|dbb|,,+...TTT..|.r                  r.|.....||||,,|K......o    ",
+        "    |||||||||,,|K......#|rr       ____       r.+.aaK....X,,+....H.#o    ",
+        "    |d..H...+,,|[...H..#o         ____       r.||||||||||,,|aaa.l.#|rr  ",
+        "    obb....K|,,||+||....o         ____       rr|.dbd.|BB|,,|||||||||.r  ",
+        "    obb....#|,,|0.S|....o         ____         o..b..+.0|,,|B.$|d..+.r  ",
+        "    |d..l..#|,,|..B|.bb.|                      o..^..|.S|,,|B..|bb.|.r  ",
+        "    ||+||..f|,,|.$B|dbbd|rr                  rro....l|.$|,,|S..|bb.|rr  ",
+        "    |..$|...|,,||||||||||.r                  r.|.....||||,,||+||d..o    ",
+        "    o.BB|.^.|,,|K..HH...+.r                  r.+.H[K....X,,|l......o    ",
+        "  rr|SBB|aaa|,,+.......#o.r                  r.||||||||||,,X....^^.o    ",
+        "  r.|||||||||,,|...^...#orr                  rr|.dbd.|BB|,,|K..aaaa|rr  ",
+        "  r.+..aaa.K|,,|l.aaa..#|                      o..b..+.0|,,|||||||||.r  ",
+        "  r.|f..T...X,,||+|||..||                      oH.^..|.S|,,|BB$|d..+.r  ",
+        "  rro#......|,,|0.S|....|                      o....l|.$|,,|BB.|bb.|.r  ",
+        "    o#.....H|,,|..B|.bb.o                      oa....||||,,|S..|bb.|rr  ",
+        "    ||+||...|,,|.$B|dbbd|                      |aaaK....+,,||+||d..o    ",
+        "    |..S|.^.|,,|||||||||||????????????????????|||||||||||,,|l......o    ",
+        "    o.BB|.b.|,,,,,,,,,,,,,,,,,,>>,,,,,,>>,,,,,,,,,,,,,,,,,,X....^.ao    ",
+        "    |$BB|dbd|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|K..aaaa|    ",
+        "    |||||||||+|||||||X|||rrrrrrrrrrrrrrrrrrrr,,||||++||++|||||||||||    ",
+        "    ol.aaaa.K.|BB.|l...K|│││││││││││││││││││r,,|............#ffff..|    ",
+        "  rro.........|$..+.....|│││││││││││││││││││r,,o..c......c..;......o    ",
+        "  r.|.###.l..H|S.0|....a|│││││││││││││││││││r,,o.ctc....ctc.##.....o    ",
+        "  r.+.....||+||||||H..Ta|│││││││││││││││││││r,,+..c..cc..c...###SS#|    ",
+        "  r.|..^..|0..|d.......a|│││││││││││││││││││r,,o....cttc......ssss.o    ",
+        "  rro.bbb.|..B|bb^......|│││││││││││││││││││r,,oc....cc............o    ",
+        "    odbbbd|S$B|d....###f|│││││││││││││││││││r,,|tc.........ctc....l|    ",
+        "    ||ooo|||||||||||ooo|||????????????????????|||oo++oo|||oo|oo|oo||    ",
+        "                        r_______________________________r               ",
+        "                        r_______________________________r               ",
+        "                        rr_____________________________rr               ",
+        "                         rrr________________rrrrrrrrrrrr                ",
+        "                           r________________r                           ",
+        "                           rr______________rr                           ",
+        "                            rrrrrrrrrrrrrrrr                            ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        "
       ],
       "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 2, 4 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 2, 4 ] }
-        ],
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "Z": { "item": "crate_wine", "chance": 50, "repeat": [ 1, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] }
-      },
       "place_items": [
-        { "chance": 50, "item": "bar_table", "x": [ 21, 21 ], "y": [ 9, 10 ], "repeat": [ 3, 6 ] },
-        { "chance": 40, "item": "bar_alcohol", "x": [ 23, 23 ], "y": [ 9, 11 ], "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 5, 5 ], "y": [ 22, 23 ], "repeat": [ 3, 6 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 9, 10 ], "y": [ 19, 19 ], "repeat": [ 3, 6 ] },
-        { "chance": 25, "item": "home_hw", "x": 21, "y": 16, "repeat": [ 1, 3 ] },
-        { "chance": 25, "item": "home_hw", "x": 21, "y": 18, "repeat": [ 1, 3 ] },
-        { "chance": 75, "item": "keg_beer", "x": 16, "y": 16 },
-        { "chance": 75, "item": "keg_beer", "x": 17, "y": 16 },
-        { "chance": 75, "item": "keg_beer", "x": 17, "y": 18 },
-        { "chance": 75, "item": "keg_beer", "x": 19, "y": 18 },
+        { "chance": 75, "item": "keg_beer", "x": 66, "y": 48 },
+        { "chance": 75, "item": "keg_beer", "x": 65, "y": 48 },
         { "chance": 50, "item": "remains_human_generic", "x": 20, "y": 20, "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "livingroom", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 10, 15 ] },
-        { "chance": 10, "item": "shelter", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 10, 15 ] },
-        { "chance": 33, "item": "butcher_tools", "x": 20, "y": 21, "repeat": [ 1, 3 ] },
         { "chance": 33, "item": "corpses", "x": [ 16, 23 ], "y": [ 20, 22 ], "repeat": [ 2, 4 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 9, 23 ], "repeat": [ 0, 1 ], "density": 0.5 } ]
+      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 48, 66 ], "y": [ 48, 54 ], "repeat": [ 1, 3 ] } ]
     }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "p_resort_2ww" ],
-    "weight": 100000,
+    "om_terrain": [
+      [ "p_resort_rnw", "p_resort_rnn", "p_resort_rne" ],
+      [ "p_resort_rww", "p_resort_rmm", "p_resort_ree" ],
+      [ "p_resort_rsw", "p_resort_rss", "p_resort_rse" ]
+    ],
     "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "****Wd-TTc-^WRRWS-dW---w",
-        "****WW+WWW+WWRRWh-$WbbdW",
-        "****W0-dWK-LWRRWWWWWWWWW",
-        "****w---W---WRRW[-cTTc-+",
-        "****WBBhW-$^WRR+------#W",
-        "****WWWWWWWWWRRWK--c--#w",
-        "****Wd------+RRWd-bbb-^w",
-        "****wbb--T-#WRRWW+WWW+WW",
-        "****wbb-cT-#WRRWK-KWS-KW",
-        "****Wd-----#WRRW--^WBBBw",
-        "****WW+WWW+WWRRW-$^WBBBW",
-        "****W---WL-KWRRWWWWWWWWW",
-        "****w-BBW---WRR+---i---+",
-        "**rrWSBBW-$^WRRWK-----#w",
-        "**r-WWWWWWWWWRRW[-bbb-dw",
-        "**r-+-------XRRW[-bbb-dW",
-        "**r-W-----bbWRRWW+WWW+WW",
-        "**rrw#-V--bbWRRWK-KWS-dW",
-        "****w#-----dWRRW^--WB--w",
-        "****WW+WWW+WWRRW-$^WB^KW",
-        "****W--SWL-KWRRWWWWWWWWW",
-        "****w-BBW---WRRRRRRRRRRR",
-        "****WdBBW-$^W>>RRRRRRRRR",
-        "****WWWWWWWWWWWW+WWWWWWX"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ]
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 0, 23 ], "density": 0.75 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2sw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "****wcTT---------W^-----",
-        "**rrw-TT-[WWWWWWWWW[--cT",
-        "**r-W-cc--WdShWBS0Wd--cT",
-        "**r-+-----+---W---+---[[",
-        "**r-WWWWW-WWWWWWWWW-WWWW",
-        "**rrw-----+^-$W$--+-----",
-        "****wbbdbbWK--W^-LWbbdbb",
-        "****WWwwwWWWwWWWwWWWwwwW",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ]
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 6, 23 ], "y": [ 0, 6 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2nn" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "************************",
-        "************************",
-        "*rrrrr*************rrrrr",
-        "*r---r*************r---r",
-        "WwW+WwWWwwwWWWwwwWWwW+Ww",
-        "W^---dW#--cTTTc--#Wd---d",
-        "Wbbb-dW#--cTTTc--#WK-bbb",
-        "Wbbb--+----ccc----+--bbb",
-        "WWWWWWW-----------WWWWWW",
-        "WBBBW#-^a--###c---cTW^$L",
-        "WBBBW#-^a-c#i#-----TW--L",
-        "Wd--+---------------+--K",
-        "WWWWWWWWWWW+++WWWWWWWWWW",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "WW++WWWWWWWWWWWWWWWWW++W",
-        "WK--W^-KW^BBWBBdWT-$W--K",
-        "W[--W$--W-BBWBB-W--^W--[",
-        "W[--WWW+W+WWWWW+W+WWW--[",
-        "W----------dW#----------",
-        "W-------bbbbW#--bbb---Tc",
-        "Wai-----bbbbW#--bbb---Tc",
-        "Waa--------dW#-^bbbd----",
-        "WWwwwwWwwwwWWWwwwwWwwwwW"
-      ],
-      "place_item": [ { "item": "television", "repeat": 1, "x": 5, "y": 9 } ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "private_resort_gambling_table", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "L": { "item": "gear_survival", "chance": 33, "repeat": [ 0, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_items": [ { "chance": 50, "item": "stash_drugs", "x": [ 11, 13 ], "y": [ 9, 10 ], "repeat": [ 1, 5 ] } ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 23 ], "y": [ 5, 23 ], "density": 0.8 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2mm" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "_**********************_",
-        "rr*********************_",
-        "-r*********************_",
-        "-r********************rr",
-        "-r********************r-",
-        "rr********************r-",
-        "_*********************r-",
-        "_*********************rr",
-        "_**********************_",
-        "_**********************_",
-        "rr********************rr",
-        "-r********************r-",
-        "-r********************r-",
-        "-r********************r-",
-        "rr********************rr",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "_**********************_",
-        "????????????????????????",
-        "RRRRRR>>>RRRRR>>>RRRRRRR",
-        "RRRRRRRRRRRRRRRRRRRRRRRR",
-        "WXWWWWWWWWWWWWWWWWWWWWWW"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ss" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "W____________________W<W",
-        "W____________________+_W",
-        "W____________________WWW",
-        "W______________________w",
-        "W______________________w",
-        "W______________________W",
-        "W______________________w",
-        "W______________________W",
-        "r______________________r",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 1, 20 ], "y": [ 0, 8 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ne" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "************************",
-        "************************",
-        "*******rrrrr************",
-        "*******r---r************",
-        "WwwwWwwwW+WWwwWWwwWW****",
-        "WTTc-bbd--W-----cTTW****",
-        "Wcc------dWbbbd-cTTw****",
-        "W---dd[-bbWbbbd--ccW****",
-        "WW+WWWWWWWWWWWW----Wrr**",
-        "Wc-ddWSTBBWBd$W+WWWW-r**",
-        "WT------BBWB--W----+-r**",
-        "Wc-K[W^-$KWS--W--ddW-r**",
-        "WWXWWWWWWWWWW+W--aawrr**",
-        "RRRRRRRRRRR+-------w****",
-        "RRRRRRRRRRRWKK[[###w****",
-        "WWWW|WWWWRRWWWWWWWWW****",
-        "WTTT-TTTWRRW^$-WBBdW****",
-        "W-------WRRW---WBB-w****",
-        "Wooozzz5WRRWc-TWS--W****",
-        "WWWWWWWWWRRWW+WWW+WW****",
-        "WTBBWTc-+RRX------dw****",
-        "W--SWT--WRRWK---bbbw****",
-        "W$--+---WRRW[---bbbwrr**",
-        "WWWWWWWWWRRWWWWWWWWW-r**"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_items": [
-        { "chance": 33, "item": "laundry", "x": [ 1, 3 ], "y": [ 18, 18 ], "repeat": [ 3, 9 ] },
-        { "chance": 33, "item": "laundry", "x": [ 4, 6 ], "y": [ 18, 18 ], "repeat": [ 3, 9 ] },
-        { "chance": 33, "item": "cleaning", "x": [ 1, 3 ], "y": [ 16, 16 ], "repeat": [ 3, 5 ] },
-        { "chance": 33, "item": "cleaning", "x": [ 4, 6 ], "y": [ 16, 16 ], "repeat": [ 1, 9 ] }
-      ],
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 5, 23 ], "repeat": [ 1, 2 ], "density": 0.5 } ],
-      "place_liquids": [ { "liquid": "water", "x": 7, "y": 18, "repeat": [ 10, 100 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2ee" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
-      "rows": [
-        "Wdbb^WBBWRRWB-$Wbb-+-r**",
-        "W-bb-+-SWRRWB-SWbb-W-r**",
-        "w----WWWWRRWd-TWd--Wrr**",
-        "w#---+-$WRRWW+WWd--w****",
-        "W#c--WWWWRRWK-K----w****",
-        "+-------XRR+----cTTW****",
-        "WWWWWWWWWRRW###-cTTWrr**",
-        "WbbdbWBBWRRWWWWWWWWW-r**",
-        "wd---+-SWRRWB-$Wbb-+-r**",
-        "w##--WWWWRRWB--Wbb-W-r**",
-        "w----+-$WRRWd-SWd--wrr**",
-        "Waa--WWWWRRWW+WW^-cw****",
-        "+-------XRRW------Tw****",
-        "WWWWWWWWWRRX------Tw****",
-        "Wbb--WBBWRRW[[dd--cWrr**",
-        "wbb--+-SWRRWWWWWWWWW-r**",
-        "wdd--WWWWRRWBB$Wbb-+-r**",
-        "wc---+-$WRRWBB-Wbb-W-r**",
-        "wT---WWWWRRWS--Wd--wrr**",
-        "W-------+RRWW+WWd--w****",
-        "WWWWWWWWWRRW-------w****",
-        "RRRRRRRRRRRX---c--#w****",
-        "RRRRRRRRRRRW-cTTc-#W****",
-        "WWWWWWWWW++WWWWWWWWW****"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "B": { "item": "shower", "chance": 50, "repeat": [ 0, 1 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "^": { "item": "private_resort_coffee_table", "chance": 33, "repeat": [ 1, 3 ] },
-        "K": { "item": "unisex_coat_rack", "chance": 33, "repeat": [ 1, 3 ] },
-        "#": [
-          { "item": "bar_table", "chance": 40, "repeat": [ 1, 2 ] },
-          { "item": "bar_alcohol", "chance": 25, "repeat": [ 0, 2 ] }
-        ],
-        "[": { "item": "private_resort_wardrobe", "chance": 25, "repeat": [ 0, 3 ] }
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED", "x": [ 0, 18 ], "y": [ 0, 23 ], "density": 1 } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_2se" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_floor",
+      "fill_ter": "t_flat_roof",
       "rows": [
-        "#c------+--+-------w****",
-        "##SO]]WWW--WWWdbTdbw****",
-        "WWWWWWWh+--+hWWWWWWW****",
-        "dbTdbdWWW--WWWbdbbdw****",
-        "--c--bW$+--+$Wb----w****",
-        "WWWW+WWWW--WWWW+WWWW****",
-        ">-----------------<w****",
-        "WwwWWwwWWwwWWwwWWwwW****",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_living_floor" ],
-      "toilets": { "$": {  } },
-      "items": {
-        "d": { "item": "dresser", "chance": 50, "repeat": [ 3, 6 ] },
-        "b": { "item": "bed", "chance": 50, "repeat": [ 0, 2 ] },
-        "O": { "item": "SUS_oven", "chance": 50, "repeat": [ 0, 3 ] },
-        "]": { "item": "SUS_fridge_healthy_vegan", "chance": 25 },
-        "T": { "item": "livingroom", "chance": 33, "repeat": [ 0, 3 ] },
-        "#": { "item": "fridgesnacks", "chance": 50, "repeat": [ 0, 2 ] }
-      },
-      "place_monsters": [ { "monster": "GROUP_RESORT_MIXED_STAFF", "x": [ 0, 18 ], "y": [ 0, 6 ], "repeat": [ 0, 1 ], "density": 0.25 } ]
+        "                                                                        ",
+        "                                                                        ",
+        "                                                       .....            ",
+        "                                                       .....            ",
+        "                        52222222222222222222222222222222222222222225    ",
+        "                        |..........................................3    ",
+        "                        |................................A.........3    ",
+        "                        |..........................................3    ",
+        "                        |..........................................3..  ",
+        "                        |..........................................3..  ",
+        "                        |........................................A.3..  ",
+        "                        |..........................................3..  ",
+        "    522222222222222222225..........................................3..  ",
+        "    |..............................................................3    ",
+        "  ..|.N.:..........Я...............................................3    ",
+        "  ..|.................###..........................................3    ",
+        "  ..|.A...............#>#........................................:.3    ",
+        "  ..|.................#.#.............................Я............3    ",
+        "  ..|............................................................N.3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |.......................A..............A.......................3    ",
+        "    |..............................................................3..  ",
+        "    |...................########################...................3..  ",
+        "    |...................#                      #.................A.3..  ",
+        "    |...................#..                    #...................3..  ",
+        "    |...................#..                    #...................3..  ",
+        "    |......&&...==....A.#..                  ..#...................3    ",
+        "    |...................#..                  ..#...................3    ",
+        "    |...................#..                  ..#.A.................3    ",
+        "    |...................#                    ..#...................3..  ",
+        "    |...................#                    ..#...................3..  ",
+        "    |...................#                      #.................A.3..  ",
+        "    |...................#                      #...................3..  ",
+        "    |...................#..                  ..#...................3..  ",
+        "    |...................#..                  ..#...................3    ",
+        "    |.................A.#..                  ..#.A.................3    ",
+        "  ..|...................#..                  ..#...................3    ",
+        "  ..|...................#..                  ..#...................3..  ",
+        "  ..|.A.................#                      #...................3..  ",
+        "  ..|...................#                      #.................A.3..  ",
+        "  ..|...................#                      #...................3..  ",
+        "    |...................#                      #...................3..  ",
+        "    |...................#                      #...................3    ",
+        "    |...................########################...................3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |..............................................................3    ",
+        "    |........................oooo.oooo.oooo........................3    ",
+        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|........................oooo.oooo.oooo........................3    ",
+        "  ..|.A......................oooo.oooo.oooo........................3    ",
+        "  ..|..............................................................3    ",
+        "  ..|..............A.............................N.:...............3    ",
+        "    |..............................................................3    ",
+        "    5--------------------------------------------------------------5    ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        ",
+        "                                                                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { "#": "t_concrete_railing", ">": "t_stairs_down" }
     }
   },
   {
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0nw" ],
-    "weight": 100000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "*****WWWWWWW************",
-        "*****W3.1.3W************",
-        "*****W3...3W************",
-        "*****WFFGFFW************",
-        "*****W.....WWWWWWW******",
-        "*****W2.2..WLLLLBW******",
-        "*****W2.2..|...cBW******",
-        "*****W1.1..W....BW******",
-        "*****WWWWWWW++WWWW******",
-        "***********W<<W*********",
-        "***WWWWWWWWW++WWWWWWW***",
-        "***WLWg...gW..WSSSSSW***",
-        "***W.|.....+..+.....W***",
-        "***WyWg...gWLLWfffffW***",
-        "***WWWWWWWWWWWWWWWWWW***"
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "     |||||||            ",
+        "     |3:1:3|            ",
+        "     |3:::3|            ",
+        "     |FFGFF|            ",
+        "     |:::::|||||||      ",
+        "     |2:2::|LLLLB|      ",
+        "     |2:2::-:::cB|      ",
+        "     |1:1::|::::B|      ",
+        "     |||||||::||||      ",
+        "           |::|         ",
+        "   |||||||||::|         ",
+        "   |L|g:::g|::|||||     ",
+        "   |:-:::::+::::<<|     ",
+        "   |Y|g:::g|::::<<|     ",
+        "   ||||||||||||||||     "
       ],
       "palettes": [ "p_resort_palette_basement" ],
       "place_loot": [ { "group": "tools_toolbox", "repeat": 1, "x": 8, "y": 11 } ],
-      "items": {
-        "S": { "item": "preserved_food", "chance": 50, "repeat": [ 0, 3 ] },
-        "f": { "item": "butcher_raw_meat", "chance": 50, "repeat": [ 0, 6 ] }
-      },
       "place_items": [
         { "chance": 50, "item": "tools_common", "x": [ 12, 15 ], "y": [ 14, 14 ], "repeat": [ 1, 8 ] },
         { "chance": 33, "item": "power_tools", "x": [ 16, 16 ], "y": [ 14, 16 ], "repeat": [ 1, 2 ] },
@@ -1186,12 +456,7 @@
         { "chance": 75, "item": "keg_beer", "x": 9, "y": 20 },
         { "chance": 75, "item": "keg_beer", "x": 7, "y": 22 },
         { "chance": 75, "item": "keg_beer", "x": 8, "y": 22 },
-        { "chance": 75, "item": "keg_beer", "x": 9, "y": 22 },
-        { "chance": 25, "item": "home_hw", "x": [ 12, 13 ], "y": [ 22, 22 ], "repeat": [ 1, 3 ] }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 13, 16 ], "y": [ 16, 16 ], "repeat": [ 0, 1 ], "density": 0.1 },
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 6, 19 ], "y": [ 20, 22 ], "repeat": [ 0, 1 ], "density": 0.1 }
+        { "chance": 75, "item": "keg_beer", "x": 9, "y": 22 }
       ],
       "place_liquids": [
         { "liquid": "brandy", "x": 6, "y": 20, "repeat": [ 0, 8 ] },
@@ -1205,418 +470,54 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0se" ],
-    "weight": 100000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "********WWWW************",
-        "********W<<WWWWWWWWW****",
-        "*****WWWW++WKKKKKKKW****",
-        "*****W..+..+......&W****",
-        "*****WXWW..+.....cTW****",
-        "*****W.%WllWKKKKKKKW****",
-        "*****W..W..WWWWWWWWWW***",
-        "*****W.T0..WWmmmmmmmW***",
-        "*****WcT0..X.l,,,,,mW***",
-        "*****WL&W..V&my,y,ymW***",
-        "*****WWWWWWWWmy,y,ymW***",
-        "************Wmmm?mmmW***",
-        "***********WWWWW.WWWW***",
-        "***********W.X.W.X.yW***",
-        "***********WVV.l.V.yW***",
-        "***********W.X.W.V.yW***",
-        "***********WWWWWWWWWW***",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "       |||              ",
+        "     |||<|||||||||||    ",
+        "     |:::::|!!!!!!!|    ",
+        "     |:::::-::::::&|    ",
+        "     |-||::|!!!!!!!|    ",
+        "     |:%|==|||||||||    ",
+        "     |:e|::|            ",
+        "     |ce0::||||||||||   ",
+        "     |:e0::V:mmmmmmm|   ",
+        "     |L&|::X:=YYYYYm|   ",
+        "     ||||::V&m:::::m|   ",
+        "        |||||mYYYYYm|   ",
+        "            |mmmmmmm|   ",
+        "            |||||||||   ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
       ],
       "palettes": [ "p_resort_palette_basement" ],
-      "items": { "K": { "item": "SUS_office_filing_cabinet" } },
-      "place_items": [
-        { "chance": 1, "item": "manuals", "x": [ 12, 18 ], "y": [ 2, 2 ], "repeat": [ 1, 2 ] },
-        { "chance": 1, "item": "manuals", "x": [ 12, 18 ], "y": [ 5, 5 ], "repeat": [ 1, 2 ] },
-        { "chance": 50, "item": "office_mess", "x": 18, "y": 4, "repeat": [ 1, 4 ] },
-        { "chance": 50, "item": "private_resort_sec_weapon", "x": [ 7, 7 ], "y": [ 7, 8 ], "repeat": [ 1, 3 ] },
-        { "chance": 50, "item": "office_mess", "x": [ 7, 7 ], "y": [ 7, 8 ], "repeat": [ 1, 4 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 14, 14 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 16, 16 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "mansion_safe", "x": [ 18, 18 ], "y": [ 9, 10 ], "repeat": [ 3, 8 ] },
-        { "chance": 50, "item": "stash_drugs", "x": 19, "y": 13, "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "mansion_gunsafe", "x": 19, "y": 14, "repeat": [ 5, 10 ] },
-        { "chance": 50, "item": "file_room", "x": 19, "y": 15, "repeat": [ 5, 10 ] },
-        { "chance": 25, "item": "mil_armor_torso", "x": 19, "y": 15, "repeat": [ 1, 2 ] },
-        { "chance": 75, "item": "corpses", "x": 12, "y": 13 },
-        { "chance": 75, "item": "default_zombie_clothes", "x": 12, "y": 13, "repeat": [ 3, 6 ] },
-        { "chance": 75, "item": "corpses", "x": 12, "y": 15 },
-        { "chance": 75, "item": "default_zombie_clothes", "x": 12, "y": 15, "repeat": [ 3, 6 ] },
-        { "chance": 75, "item": "private_resort_sec_weapon", "x": 6, "y": 9, "repeat": [ 1, 4 ] },
-        { "chance": 75, "item": "guns_shotgun_common", "x": 6, "y": 9 }
-      ],
-      "place_monsters": [
-        { "monster": "GROUP_RESORT_BOUNCER", "x": [ 6, 18 ], "y": [ 10, 13 ], "repeat": [ 0, 1 ], "density": 0.1 },
-        { "monster": "GROUP_RESORT_STAFF", "x": [ 9, 18 ], "y": [ 3, 4 ], "density": 0.2 }
-      ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rnw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "****rrrrrrrrrrrrrrrrrrrr",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r______ff___________",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__________________>",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__#________________",
-        "****r___________________",
-        "****r___________________",
-        "****r__________________r"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 9, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rww" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "****r__________________r",
-        "****r__________________r",
-        "****r_____H____H_______r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r______ss__________r",
-        "****r______ss__________r",
-        "****r__________________r",
-        "****r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "**__r__________________r",
-        "****r__________________r",
-        "****r__________________r",
-        "****r_s________________r",
-        "****r___________________",
-        "****r___________________",
-        "****r___________________"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 1, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rsw" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "****r___________________",
-        "**__r___________________",
-        "**__r______I____________",
-        "**__r___________________",
-        "**__r___________________",
-        "**__r____________((_____",
-        "****r___________________",
-        "****rrrrrrrrrrrrrrrrrrrr",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 5, 22 ], "y": [ 0, 7 ], "repeat": [ 3, 10 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rnn" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "*_____*************__(__",
-        "*_____*************_____",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "r_______________________",
-        "r__________I____________",
-        "r_______________________",
-        "r_______________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "____________sb__________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "________________________",
-        "rrrrrrrrrrrrrrrrrrrrrrrr"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 1, 22 ], "y": [ 7, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rmm" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "__**********************",
-        "__**********************",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "**********************__",
-        "**********************__",
-        "************************",
-        "************************",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "__********************__",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "rrrrrrrrrrrrrrrrrrrrrrrr",
-        "________________________",
-        "________________________",
-        "rrrrrrrrrrrrrrrrrrrrrr__"
-      ],
-      "palettes": [ "p_resort_palette_roof" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rss" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "r********************r__",
-        "r********************r>_",
-        "r********************rrr",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "r**********************r",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rne" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "************************",
-        "************************",
-        "*******_____************",
-        "*******_____************",
-        "rrrrrrrrrrrrrrrrrrrr****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r__**",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r__**",
-        "r__________________r__**"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [ [ "roof_2x2_infrastructure", 80 ], [ "roof_2x2_infrastructure_2", 40 ], [ "roof_2x2_utilities", 40 ] ],
-          "x": [ 3, 18 ],
-          "y": [ 7, 22 ]
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 9, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_ree" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r****",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r__**",
-        "r__________________r****",
-        "r__________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [ [ "roof_2x2_infrastructure", 80 ], [ "roof_2x2_infrastructure_2", 40 ], [ "roof_2x2_utilities", 40 ] ],
-          "x": [ 3, 18 ],
-          "y": [ 2, 20 ]
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 0, 22 ], "repeat": [ 5, 15 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "p_resort_rse" ],
-    "weight": 100000,
-    "object": {
-      "fill_ter": "t_flat_roof",
-      "rows": [
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "___________________r****",
-        "__________________>r****",
-        "rrrrrrrrrrrrrrrrrrrr****",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************",
-        "************************"
-      ],
-      "palettes": [ "p_resort_palette_roof" ],
-      "place_nested": [
-        {
-          "chunks": [
-            [ "roof_2x2_infrastructure", 80 ],
-            [ "roof_2x2_infrastructure_2", 40 ],
-            [ "roof_2x2_utilities", 40 ],
-            [ "roof_6x6_survivor", 5 ]
-          ],
-          "x": [ 2, 10 ],
-          "y": [ 2, 6 ]
-        }
-      ],
-      "place_items": [ { "chance": 10, "item": "roof_trash", "x": [ 0, 18 ], "y": [ 0, 7 ], "repeat": [ 3, 10 ] } ]
+      "items": {
+        "L": [
+          {
+            "item": {
+              "subtype": "distribution",
+              "entries": [
+                { "group": "security_armor", "prob": 50 },
+                { "group": "security_gear", "prob": 66 },
+                { "group": "security_pants", "prob": 100 },
+                { "group": "security_shoes", "prob": 100 },
+                { "group": "security_torso", "prob": 100 }
+              ]
+            },
+            "chance": 75
+          },
+          { "item": "private_resort_sec_weapon", "chance": 75, "repeat": [ 1, 2 ] }
+        ]
+      },
+      "place_monsters": [ { "monster": "GROUP_RESORT_BOUNCER", "x": [ 6, 18 ], "y": [ 10, 13 ], "repeat": [ 1, 2 ] } ]
     }
   }
 ]

From 75c9487a85d38ccedb92e81b3e813c5b74062ff5 Mon Sep 17 00:00:00 2001
From: LovamkicsiGazsi <farkasb0420@gmail.com>
Date: Sun, 29 Jan 2023 16:26:08 +0100
Subject: [PATCH 4/5] weight

---
 data/mods/No_Hope/Mapgen/private_resort.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/data/mods/No_Hope/Mapgen/private_resort.json b/data/mods/No_Hope/Mapgen/private_resort.json
index d8a87f0f13fcf..80995b6629a40 100644
--- a/data/mods/No_Hope/Mapgen/private_resort.json
+++ b/data/mods/No_Hope/Mapgen/private_resort.json
@@ -3,6 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ [ "p_resort_1nw", "p_resort_1nn", "p_resort_1ne" ], [ "null", "p_resort_1mm", "p_resort_1ee" ] ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -104,6 +105,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_1ww" ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
@@ -140,6 +142,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ [ "p_resort_1sw", "p_resort_1ss", "p_resort_1se" ], [ "p_resort_pw", "p_resort_pm", "p_resort_pe" ] ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -193,7 +196,10 @@
         "                             xx__________xx                             "
       ],
       "palettes": [ "p_resort_palette_main_floor" ],
-      "place_vendingmachines": [ { "item_group": "vending_food", "x": 60, "y": 1 }, { "item_group": "vending_drink", "x": 60, "y": 2 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_food", "x": 60, "y": 1, "lootable": true },
+        { "item_group": "vending_drink", "x": 60, "y": 2, "lootable": true }
+      ],
       "items": {
         "L": [
           {
@@ -236,6 +242,7 @@
       [ "p_resort_2ww", "p_resort_2mm", "p_resort_2ee" ],
       [ "p_resort_2sw", "p_resort_2ss", "p_resort_2se" ]
     ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_floor",
       "rows": [
@@ -330,6 +337,7 @@
       [ "p_resort_rww", "p_resort_rmm", "p_resort_ree" ],
       [ "p_resort_rsw", "p_resort_rss", "p_resort_rse" ]
     ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_flat_roof",
       "rows": [
@@ -414,6 +422,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0nw" ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
@@ -470,6 +479,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "p_resort_0se" ],
+    "weight": 100000,
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [

From 7b4685e1141bb1985f63a06cd7b7dbc5a566525c Mon Sep 17 00:00:00 2001
From: LovamkicsiGazsi <farkasb0420@gmail.com>
Date: Sun, 29 Jan 2023 21:04:52 +0100
Subject: [PATCH 5/5] terrain fixes

---
 data/json/mapgen/private_resort.json          | 4 ++--
 data/json/mapgen_palettes/private_resort.json | 4 +++-
 data/mods/No_Hope/Mapgen/private_resort.json  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/json/mapgen/private_resort.json b/data/json/mapgen/private_resort.json
index eeac477eb03cf..e9c0cb367d039 100644
--- a/data/json/mapgen/private_resort.json
+++ b/data/json/mapgen/private_resort.json
@@ -12,10 +12,10 @@
         " F  y____________y                                                    F ",
         " F  y____________y      ||||||||||||||||||||||||||||||||||||||||||||  F ",
         " F  y____________yxxxxx |....'.aaaa..aaaa.'....+...................|  F ",
-        " F  y____________yxxxxx |c9....a##a..a##a......||+|||8|||8|||8|||8||  F ",
+        " F  y____________yxxxxx |......a##a..a##a......||+|||8|||8|||8|||8||  F ",
         " F  y____________yxxxxx |......a##a..a##a......|L.j|..K|..K|..K|..K|  F ",
         " F  y____________y  xxx |......................|L.j|.i^|.i^|.i^|.i^|  F ",
-        " F  y____________y  xxx |......................|L..|aaa|aaa|aaa|aaa|  F ",
+        " F  y____________y  xxx |sss...................|L..|aaa|aaa|aaa|aaa|  F ",
         " F  |============|||---||###s........HHHHHHHHHH|||.|||||||||||||||||  F ",
         " F  |::::::::::::%|:::::|S.#s........Hrrrrrrrrr|.|...0TK0TK0TK..+.K|  F ",
         " F  |:::::::::::::|:::gg|f.#s........Hr........8.8....c..c..c...|.1|  F ",
diff --git a/data/json/mapgen_palettes/private_resort.json b/data/json/mapgen_palettes/private_resort.json
index 3e26f8f712440..2b34da228283b 100644
--- a/data/json/mapgen_palettes/private_resort.json
+++ b/data/json/mapgen_palettes/private_resort.json
@@ -101,7 +101,7 @@
       "Á": "t_pavement",
       "É": "t_pavement",
       "y": "t_pavement_y",
-      "%": "t_gates_control_concrete",
+      "%": "t_gates_control_concrete_lab",
       "I": "t_little_column",
       "U": "t_water_pool",
       "p": "t_door_c_peep",
@@ -112,6 +112,8 @@
       "@": "t_slot_machine",
       "9": "t_carpet_red",
       "C": "t_carpet_red",
+      "g": "t_thconc_floor",
+      "Z": "t_thconc_floor",
       "]": "t_thconc_floor",
       "3": "t_thconc_floor",
       "4": "t_thconc_floor",
diff --git a/data/mods/No_Hope/Mapgen/private_resort.json b/data/mods/No_Hope/Mapgen/private_resort.json
index 80995b6629a40..592cf4d8825b6 100644
--- a/data/mods/No_Hope/Mapgen/private_resort.json
+++ b/data/mods/No_Hope/Mapgen/private_resort.json
@@ -13,10 +13,10 @@
         " F  y____________y                                                    F ",
         " F  y____________y      ||||||||||||||||||||||||||||||||||||||||||||  F ",
         " F  y____________yxxxxx |....'.aaaa..aaaa.'....+...................|  F ",
-        " F  y____________yxxxxx |c9....a##a..a##a......||+|||8|||8|||8|||8||  F ",
+        " F  y____________yxxxxx |......a##a..a##a......||+|||8|||8|||8|||8||  F ",
         " F  y____________yxxxxx |......a##a..a##a......|L.j|..K|..K|..K|..K|  F ",
         " F  y____________y  xxx |......................|L.j|.i^|.i^|.i^|.i^|  F ",
-        " F  y____________y  xxx |......................|L..|aaa|aaa|aaa|aaa|  F ",
+        " F  y____________y  xxx |sss...................|L..|aaa|aaa|aaa|aaa|  F ",
         " F  |============|||---||###s........HHHHHHHHHH|||.|||||||||||||||||  F ",
         " F  |::::::::::::%|:::::|S.#s........Hrrrrrrrrr|.|...0TK0TK0TK..+.K|  F ",
         " F  |:::::::::::::|:::gg|f.#s........Hr........8.8....c..c..c...|.1|  F ",