From ae5931590df3eb61838a839395478f052663b3fa Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Fri, 15 Nov 2019 12:08:28 -0800
Subject: [PATCH 01/16] rearrange park.json (incomplete)

---
 data/json/mapgen/park.json | 381 +++++++++++++++----------------------
 1 file changed, 149 insertions(+), 232 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index a9412181a785b..ae25b9ce94222 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -398,29 +398,12 @@
       "furniture": {
         "#": "f_bench",
         "&": "f_trashcan",
-        ".": "f_null",
         "0": "f_boulder_medium",
-        "4": "f_null",
-        "7": "f_null",
-        "C": "f_null",
-        "S": "f_null",
-        "T": "f_null",
-        "W": "f_null",
-        "_": "f_null",
         "b": "f_brazier",
         "c": "f_cattails",
-        "d": "f_null",
-        "e": "f_null",
         "f": "f_dandelion",
-        "g": "f_null",
-        "h": "f_null",
         "i": "f_cattails",
-        "m": "f_null",
-        "p": "f_null",
-        "s": "f_null",
-        "t": "f_table",
-        "u": "f_null",
-        "w": "f_null"
+        "t": "f_table"
       },
       "place_items": [
         { "chance": 8, "item": "dogfight", "x": 2, "y": 12 },
@@ -506,54 +489,12 @@
   },
   {
     "method": "json",
+    "om_terrain": "park",
+    "//": "Picnic Park",
+    "type": "mapgen",
+    "weight": 200,
     "object": {
-      "furniture": {
-        "#": "f_bench",
-        "&": "f_trashcan",
-        ".": "f_null",
-        "0": "f_boulder_medium",
-        "1": "f_null",
-        "7": "f_null",
-        "B": "f_bench",
-        "D": "f_dandelion",
-        "T": "f_table",
-        "_": "f_null",
-        "a": "f_null",
-        "b": "f_brazier",
-        "c": "f_null",
-        "d": "f_dandelion",
-        "f": "f_bluebell",
-        "o": "f_boulder_small",
-        "t": "f_table",
-        "u": "f_null",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 10, "item": "barbecue", "x": 3, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 4, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 21, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 22, "y": 8 },
-        { "chance": 10, "item": "barbecue", "x": 3, "y": 7 },
-        { "chance": 10, "item": "snacks", "x": 2, "y": 6 },
-        { "chance": 10, "item": "magazines", "x": 8, "y": 3 },
-        { "chance": 10, "item": "field", "x": 13, "y": 17 },
-        { "chance": 10, "item": "field", "x": 21, "y": 13 },
-        { "chance": 10, "item": "field", "x": 12, "y": 11 },
-        { "chance": 20, "item": "trash", "x": 17, "y": 10 },
-        { "chance": 20, "item": "trash", "x": 18, "y": 10 },
-        { "chance": 20, "item": "trash", "x": 5, "y": 10 },
-        { "chance": 20, "item": "trash", "x": 6, "y": 10 },
-        { "chance": 8, "item": "dogfight", "x": 16, "y": 16 },
-        { "chance": 5, "item": "clutter_yard", "x": 19, "y": 15 },
-        { "chance": 5, "item": "football_items", "x": 8, "y": 12 },
-        { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
-        { "chance": 10, "item": "dining", "x": 2, "y": 8 },
-        { "chance": 10, "item": "dining", "x": 21, "y": 7 },
-        { "chance": 10, "item": "dining", "x": 20, "y": 6 },
-        { "chance": 10, "item": "dining", "x": 15, "y": 6 },
-        { "chance": 10, "item": "dining", "x": 20, "y": 4 },
-        { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
-      ],
+      "fill_ter": "t_grass",
       "rows": [
         "...._................_..",
         ".0ffffffff0._0ffffffff0_",
@@ -581,10 +522,7 @@
         ".7.u7._7..u.7.u7...u..7."
       ],
       "terrain": {
-        "#": "t_grass",
-        "&": "t_grass",
         ".": "t_grass",
-        "0": "t_grass",
         "1": "t_tree_young",
         "7": "t_tree_maple",
         "B": "t_dirt",
@@ -592,61 +530,55 @@
         "T": "t_dirt",
         "_": "t_dirt",
         "a": "t_tree_apple",
-        "b": "t_grass",
         "c": "t_tree_birch",
-        "d": "t_grass",
-        "f": "t_grass",
-        "o": "t_grass",
-        "t": "t_grass",
         "u": "t_underbrush",
         "|": "t_fence_h"
-      }
-    },
-    "om_terrain": "park",
-    "//": "Picnic Park",
-    "type": "mapgen",
-    "weight": 200
-  },
-  {
-    "method": "json",
-    "object": {
+      },
       "furniture": {
-        "#": "f_null",
-        "&": "f_toilet",
-        "*": "f_datura",
-        "+": "f_null",
-        ".": "f_null",
+        ".": [ [ "f_null", 40 ], "f_dandelion", "f_datura", "f_bluebell" ],
+        "#": "f_bench",
+        "&": "f_trashcan",
         "0": "f_boulder_medium",
-        "7": "f_null",
         "B": "f_bench",
-        "D": "f_datura",
-        "H": "f_ladder",
-        "O": "f_boulder_large",
-        "S": "f_null",
-        "T": "f_trashcan",
-        "_": "f_null",
-        "a": "f_sink",
-        "b": "f_bench",
-        "c": "f_null",
-        "d": "f_boulder_medium",
-        "m": "f_null",
-        "s": "f_null",
-        "t": "f_null",
-        "|": "f_null"
+        "D": "f_dandelion",
+        "T": "f_table",
+        "b": "f_brazier",
+        "d": "f_dandelion",
+        "f": "f_bluebell",
+        "o": "f_boulder_small",
+        "t": "f_table"
+      },
+      "mapping": {
+        "&": { "items": [ { "item": "trash", "chance": 80, "repeat": [ 2, 6 ] } ] },
+        "t": { "items": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 3 } ] }
       },
       "place_items": [
-        { "chance": 7, "item": "stash_drugs", "x": 21, "y": 3 },
-        { "chance": 15, "repeat": [ 1, 3 ], "item": "trash", "x": 21, "y": 6 },
-        { "chance": 15, "repeat": [ 1, 3 ], "item": "trash", "x": 21, "y": 4 },
-        { "chance": 10, "item": "magazines", "x": 21, "y": 14 },
-        { "chance": 10, "item": "child_items", "x": 17, "y": 15 },
-        { "chance": 10, "item": "child_items", "x": 15, "y": 15 },
-        { "chance": 10, "item": "snacks", "x": 14, "y": 6 },
-        { "chance": 10, "item": "toy_box", "x": 16, "y": 14 },
-        { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
-      ],
-      "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 18 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ],
+        { "chance": 10, "item": "barbecue", "x": 3, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 4, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 21, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 22, "y": 8 },
+        { "chance": 10, "item": "barbecue", "x": 3, "y": 7 },
+        { "chance": 10, "item": "snacks", "x": 2, "y": 6 },
+        { "chance": 10, "item": "magazines", "x": 8, "y": 3 },
+        { "chance": 10, "item": "field", "x": 13, "y": 17 },
+        { "chance": 10, "item": "field", "x": 21, "y": 13 },
+        { "chance": 10, "item": "field", "x": 12, "y": 11 },
+        { "chance": 8, "item": "dogfight", "x": 16, "y": 16 },
+        { "chance": 5, "item": "clutter_yard", "x": 19, "y": 15 },
+        { "chance": 5, "item": "football_items", "x": 8, "y": 12 },
+        { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
+        { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Playground",
+    "type": "mapgen",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_thconc_floor",
       "rows": [
         "..0.d.O.O.O.0.0......_..",
         "_......s.s.._.........._",
@@ -675,69 +607,70 @@
       ],
       "terrain": {
         "#": "t_sandbox",
-        "&": "t_thconc_floor",
         "*": "t_grass",
         "+": "t_door_c",
         ".": "t_grass",
         "0": "t_grass",
-        "7": "t_tree_maple",
+        "7": [ "t_tree", "t_tree_maple" ],
         "B": "t_dirt",
         "D": "t_dirt",
         "H": "t_sandbox",
         "O": "t_grass",
         "S": "t_slide",
-        "T": "t_thconc_floor",
         "_": "t_dirt",
-        "a": "t_thconc_floor",
         "b": "t_grass",
         "c": "t_concrete",
         "d": "t_dirt",
         "m": "t_monkey_bars",
         "s": "t_sand",
-        "t": "t_thconc_floor",
         "|": "t_brick_wall"
-      }
-    },
-    "om_terrain": "park",
-    "//": "Playground",
-    "type": "mapgen",
-    "weight": 300
-  },
-  {
-    "method": "json",
-    "object": {
+      },
       "furniture": {
-        "#": "f_bench",
-        "&": "f_trashcan",
+        ".": [ [ "f_null", 40 ], "f_dandelion", "f_datura", "f_bluebell" ],
+        "&": "f_toilet",
         "*": "f_datura",
-        "-": "f_null",
-        ".": "f_null",
         "0": "f_boulder_medium",
-        "4": "f_null",
-        "7": "f_null",
-        "T": "f_null",
-        "_": "f_null",
-        "d": "f_null",
-        "f": "f_dandelion",
-        "s": "f_null",
-        "t": "f_null",
-        "u": "f_null",
-        "|": "f_null"
+        "B": "f_bench",
+        "D": [ "f_datura", "f_dandelion" ],
+        "H": "f_ladder",
+        "O": "f_boulder_large",
+        "T": "f_trashcan",
+        "a": "f_sink",
+        "b": "f_bench",
+        "d": "f_boulder_medium"
+      },
+      "items": {
+        "T": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
       },
       "place_items": [
-        { "chance": 10, "item": "forest", "x": 14, "y": 2 },
-        { "chance": 20, "item": "trash", "x": 13, "y": 21 },
-        { "chance": 20, "repeat": [ 1, 3 ], "item": "trash", "x": 19, "y": 13 }
+        { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 },
+        { "chance": 10, "item": "magazines", "x": 21, "y": 14 },
+        { "chance": 10, "item": "child_items", "x": 17, "y": 15 },
+        { "chance": 10, "item": "child_items", "x": 15, "y": 15 },
+        { "chance": 10, "item": "snacks", "x": 14, "y": 6 },
+        { "chance": 10, "item": "toy_box", "x": 16, "y": 14 },
+        { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
       ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 9, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ],
+      "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 18 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "type": "mapgen",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_grass",
       "rows": [
         "...___.......s..d..s....",
         "...___...*.......*.....s",
-        "..d.___d...s.4.u...4u...",
+        "..d.___d...s.7.u...7u...",
         "....____...d..*.........",
-        "......___.*......u...4.d",
+        "......___.*......u...7.d",
         "......___...u...*...s...",
-        "..T....___....s.d.4...d.",
+        "..7....___....s.d.7...d.",
         "..d.....___.d......*dd..",
         "d......d___.....u...d...",
         ".........___......d...u.",
@@ -757,52 +690,43 @@
         "...........f..d....___.."
       ],
       "terrain": {
-        "#": "t_grass",
-        "&": "t_grass",
-        "*": "t_grass",
         "-": "t_wall_log",
         ".": "t_grass",
-        "0": "t_grass",
-        "4": "t_tree_pine",
-        "7": "t_tree_hickory",
-        "T": "t_tree_apple",
+        "7": [ [ "t_tree", 4 ], "t_tree_hickory",  "t_tree_apple", "t_tree_pine", "t_tree_peach", "t_tree_cherry", "t_tree_pear", "t_tree_young" ],
         "_": "t_sidewalk",
         "d": "t_dirt",
-        "f": "t_grass",
-        "s": "t_shrub_blueberry",
+        "s": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
         "t": "t_thconc_floor",
         "u": "t_underbrush",
         "|": "t_fence_h"
+      },
+      "furniture": {
+        "#": "f_bench",
+        "&": "f_trashcan",
+        "*": [ [ "f_datura", 4 ], "f_tulip", "f_dandelion" ],
+        "0": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 3 ], "f_boulder_large" ],
+        "f": [ [ "f_dandelion", 3 ], "f_datura", "f_bluebell" ]
+      },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "d": { "item": "forest", "chance": 10 },
+        "#": { "item": "trash", "chance": 5 }
+      },
+      "monsters" {
+        "_": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
+        "t": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
+        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
       }
-    },
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "type": "mapgen",
-    "weight": 300
+    }
   },
   {
     "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "type": "mapgen",
+    "weight": 400,
     "object": {
-      "furniture": {
-        "#": "f_null",
-        "&": "f_trashcan",
-        ".": "f_null",
-        "0": "f_boulder_medium",
-        "7": "f_null",
-        "O": "f_boulder_large",
-        "S": "f_statue",
-        "_": "f_null",
-        "b": "f_bench",
-        "w": "f_null",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 10, "item": "trash", "x": 14, "y": 20 },
-        { "chance": 10, "item": "trash", "x": 9, "y": 20 },
-        { "chance": 10, "item": "trash", "x": 18, "y": 17 },
-        { "chance": 10, "item": "trash", "x": 9, "y": 3 },
-        { "chance": 10, "item": "stoner", "x": 4, "y": 19 }
-      ],
+      "fill_ter": "t_grass",
       "rows": [
         "........................",
         "........................",
@@ -813,12 +737,12 @@
         "..#|#b_____.._____b#|#..",
         "..#|#b_____.._____b#|#..",
         "..#|#___7......7___#|#..",
-        ".._S____...00...____S_..",
+        ".._S____...OO...____S_..",
         "..______..OwwO..______..",
-        ".........0wwww0.........",
-        ".........0wwww0.........",
+        ".........OwwwwO.........",
+        ".........OwwwwO.........",
         "..______..OwwO..______..",
-        ".._S____...00...____S_..",
+        ".._S____...OO...____S_..",
         "..#|#___7......7___#|#..",
         "..#|#b_____.._____b#|#..",
         "..#|#b_____.._____b#|#..",
@@ -831,54 +755,37 @@
       ],
       "terrain": {
         "#": "t_shrub",
-        "&": "t_grass",
         ".": "t_sidewalk",
         "0": "t_sidewalk",
         "7": "t_tree_maple",
         "O": "t_sidewalk",
-        "S": "t_grass",
         "_": "t_grass",
-        "b": "t_grass",
         "w": "t_water_pool_shallow",
-        "|": "t_fence_h"
+        "|": "t_fence"
+      },
+      "furniture": {
+        "&": "f_trashcan",
+        "O": [ "f_boulder_small", [ "f_boulder_medium", 3 ], [ "f_boulder_large", 3 ] ],
+        "S": "f_statue",
+        "b": "f_bench"
+      },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "b": { "item": "trash", "chance": 2 },
+        "|": { "item": "stoner", "chance": 1 }
+      },
+      "monsters" {
+        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 }
       }
-    },
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "type": "mapgen",
-    "weight": 400
+    }
   },
   {
     "method": "json",
+    "om_terrain": "park",
+    "//": "Pavilion",
+    "type": "mapgen",
+    "weight": 100,
     "object": {
-      "furniture": {
-        "#": "f_null",
-        "&": "f_trashcan",
-        "-": "f_null",
-        ".": "f_null",
-        "4": "f_null",
-        "B": "f_bench",
-        "R": "f_null",
-        "S": "f_null",
-        "T": "f_trashcan",
-        "_": "f_null",
-        "a": "f_null",
-        "b": "f_bench",
-        "c": "f_null",
-        "f": "f_dandelion",
-        "m": "f_null",
-        "r": "f_null",
-        "s": "f_null",
-        "t": "f_null",
-        "v": "f_vending_c",
-        "{": "f_dumpster",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 60, "item": "trash", "x": 13, "y": 16 },
-        { "chance": 60, "item": "trash", "x": 14, "y": 5 },
-        { "chance": 65, "item": "vending_drink_items", "x": 12, "y": 16 }
-      ],
       "rows": [
         "..........____..........",
         "..........____..........",
@@ -927,11 +834,21 @@
         "v": "t_thconc_floor",
         "{": "t_grass",
         "|": "t_chainfence_v"
-      }
-    },
-    "om_terrain": "park",
-    "//": "Pavilion",
-    "type": "mapgen",
-    "weight": 100
+      },
+      "furniture": {
+        "&": "f_trashcan",
+        "B": "f_bench",
+        "T": "f_trashcan",
+        "b": "f_bench",
+        "f": "f_dandelion",
+        "v": "f_vending_c",
+        "{": "f_dumpster"
+      },
+      "place_items": [
+        { "chance": 60, "item": "trash", "x": 13, "y": 16 },
+        { "chance": 60, "item": "trash", "x": 14, "y": 5 },
+        { "chance": 65, "item": "vending_drink_items", "x": 12, "y": 16 }
+      ]
+    }
   }
 ]

From 4bd5ea822cc15fc9a8403833a8c74e65021233be Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 19 Nov 2019 12:38:10 -0800
Subject: [PATCH 02/16] continue updates

---
 data/json/mapgen/park.json | 448 +++++++++++++++++++++----------------
 1 file changed, 253 insertions(+), 195 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index ae25b9ce94222..4bd99e26d2d1e 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -8,7 +8,10 @@
     "name": "GROUP_PARK_PLAYGROUND",
     "type": "monstergroup",
     "default": "mon_null",
-    "monsters": [ { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] } ]
+    "monsters": [
+      { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] },
+      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 2, "pack_size": 1 }
+    ]
   },
   {
     "name": "GROUP_PARK_SCENIC",
@@ -17,7 +20,6 @@
     "monsters": [
       { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
       { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_swimmer", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
       { "monster": "mon_zombie_rot", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
     ]
   },
@@ -40,6 +42,7 @@
     "weight": 500,
     "object": {
       "rotation": [ 0, 3 ],
+      "fill_ter": "t_dirt",
       "rows": [
         "                        ",
         "                        ",
@@ -50,15 +53,15 @@
         "                ##      ",
         "                        ",
         "    mmm                 ",
-        "    mmm    s        t   ",
-        "   tmmm    s            ",
+        "    mmm    s       bt   ",
+        "   tmmm    s       b    ",
         "           s            ",
         "           s            ",
         "                        ",
         "                        ",
-        "      -            t    ",
-        "     t-                 ",
-        "               t        ",
+        "      b            t    ",
+        "     tb                 ",
+        "         bb&   t        ",
         "         t              ",
         "                        ",
         "                        ",
@@ -67,15 +70,30 @@
         "                        "
       ],
       "terrain": {
-        " ": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        " ": [ [ "t_grass", 15 ], "t_grass_dead", "t_dirt" ],
         "#": "t_sandbox",
-        "-": "t_dirt",
+        "b": "t_dirt",
         "m": "t_monkey_bars",
         "s": "t_slide",
-        "t": "t_tree"
+        "t": [ [ "t_tree", 4 ], "t_tree_birch", "t_tree_maple", "t_tree_willow", "t_tree_young" ]
+      },
+      "furniture": {
+        "b": "f_bench",
+        "&": "f_trashcan",
+        " ": [
+          [ "f_null", 200 ],
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ]
       },
-      "furniture": { "-": "f_bench" },
-      "place_monsters": [ { "monster": "GROUP_PARK_PLAYGROUND", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ],
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "monsters": { " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
       "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
     }
   },
@@ -90,43 +108,35 @@
       "rotation": [ 0, 3 ],
       "rows": [
         "                        ",
-        " ---------------------- ",
+        " |||||||||||||||||||||| ",
         " +  . .   . 7 .   . . + ",
-        " |V . .   .   .   . . | ",
-        " |  . .   .....   . . | ",
+        " |V . .   .   .   . .&| ",
+        " |& . .   .....   . . | ",
         " |  .  .  .   .  .  . | ",
-        " |H .   .  ...  .   .H| ",
-        " |H .    .......    .H| ",
-        " |H .               .H| ",
-        " |H .      ...      .H| ",
-        " |H .     .   .     .H| ",
+        " |b .   .  ...  .   .b| ",
+        " |b .    .......    .b| ",
+        " |b .               .b| ",
+        " |b .      ...      .b| ",
+        " |b .     .   .     .b| ",
         " |  ................. | ",
-        " |H .     .   .     .H| ",
-        " |H .      ...      .H| ",
-        " |H .               .H| ",
-        " |H .    .......    .H| ",
-        " |H .   .  ...  .   .H| ",
+        " |b .     .   .     .b| ",
+        " |b .      ...      .b| ",
+        " |b .               .b| ",
+        " |b .    .......    .b| ",
+        " |b .   .  ...  .   .b| ",
         " |  .  .  .   .  .  . | ",
         " |  . .   .....   . . | ",
-        " |R . .   .   .   . . | ",
+        " |& . .   .   .   . .&| ",
         " +  . .   . 7 .   . . + ",
-        " ---------------------- ",
+        " |||||||||||||||||||||| ",
         "                        ",
         "                        "
       ],
-      "terrain": {
-        "+": "t_chaingate_c",
-        "-": "t_chainfence_h",
-        ".": "t_pavement_y",
-        "7": "t_backboard",
-        "H": "t_pavement",
-        "R": "t_pavement",
-        "|": "t_chainfence_v"
-      },
-      "furniture": { "H": "f_bench", "R": "f_trashcan" },
+      "terrain": { "+": "t_chaingate_c", "|": "t_chainfence", ".": "t_pavement_y", "7": "t_backboard" },
+      "furniture": { "b": "f_bench", "&": "f_trashcan" },
       "vendingmachines": { "V": { "item_group": "vending_drink" } },
-      "place_items": [ { "item": "trash", "x": 2, "y": 19, "chance": 50 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_PLAYGROUND", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 5, "repeat": [ 1, 3 ] } }
     }
   },
   {
@@ -140,43 +150,38 @@
       "rotation": [ 0, 3 ],
       "rows": [
         "                        ",
-        " ---------------------  ",
+        " |||||||||||||||||||||& ",
         " + ........[........ +  ",
         " | ........[........ |V ",
-        " | .   .   [   .   . |H ",
-        " | .   .   [   .   . |H ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
         " | .   ....[....   . |  ",
-        " | .   .   [   .   . |  ",
-        " | .   .   [   .   . |  ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
         " | ........[........ |  ",
         " | ........[........ |  ",
         " |                   |  ",
         " |                   |  ",
         " | ........[........ |  ",
         " | ........[........ |  ",
-        " | .   .   [   .   . |  ",
-        " | .   .   [   .   . |  ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
         " | .   ....[....   . |  ",
-        " | .   .   [   .   . |H ",
-        " | .   .   [   .   . |H ",
-        " | ........[........ |R ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
+        " | ........[........ |& ",
         " + ........[........ +  ",
-        " ---------------------  ",
+        " |||||||||||||||||||||  ",
         "                        "
       ],
-      "terrain": {
-        "+": "t_chaingate_c",
-        "-": "t_chainfence_h",
-        ".": "t_pavement_y",
-        "H": "t_pavement",
-        "R": "t_pavement",
-        "[": "t_fence_rope",
-        "|": "t_chainfence_v"
-      },
-      "furniture": { "H": "f_bench", "R": "f_trashcan" },
+      "terrain": { "+": "t_chaingate_c", "|": "t_chainfence", ".": "t_pavement_y", "[": "t_fence_rope" },
+      "furniture": { "b": "f_bench", "&": "f_trashcan" },
       "vendingmachines": { "V": { "item_group": "vending_drink" } },
-      "place_items": [ { "item": "trash", "x": 22, "y": 20, "chance": 50 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "monsters": {
+        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 3, "repeat": [ 1, 3 ] },
+        "b": { "monster": "GROUP_PARK_DOG", "chance": 3 }
+      }
     }
   },
   {
@@ -189,7 +194,7 @@
       "fill_ter": "t_grass",
       "rotation": [ 0, 3 ],
       "rows": [
-        "RHHH                    ",
+        "&bbb                bbb&",
         "   ,,,,,,,,,[,,,,,,,,,  ",
         "  ,$$$$$$$$$[$$$$$$$$$, ",
         "  ,$$$$$$$$$[$$$$$$$$$, ",
@@ -212,15 +217,18 @@
         "  ,$$$$$$$$$[$$$$$$$$$, ",
         "  ,$$$$$$$$$[$$$$$$$$$, ",
         "   ,,,,,,,,,[,,,,,,,,,  ",
-        "                     HHH"
+        "&bbb                bbb&"
       ],
       "terrain": { "$": "t_sand", ",": "t_dirt", ".": "t_pavement_y", "H": "t_dirt", "[": "t_fence_rope" },
-      "furniture": { "H": "f_bench", "R": "f_trashcan" },
-      "place_items": [
-        { "item": "trash", "x": 0, "y": 0, "chance": 50 },
-        { "item": "shoes", "x": [ 1, 3 ], "y": 1, "chance": 25, "repeat": [ 2, 5 ] }
-      ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+      "furniture": { "b": "f_bench", "&": "f_trashcan" },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] }
+      },
+      "monsters": {
+        "$": { "monster": "GROUP_MALL", "chance": 1, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] }
+      }
     }
   },
   {
@@ -236,24 +244,24 @@
         "         ......         ",
         "  zzzzzzzz....zzzzzzzz  ",
         " z         ..         z ",
-        " z    ,HTH,.. t  *`*  z ",
-        " z  t ,HTH,..   *```* z ",
-        " z  R ..........````` z ",
+        " z    ,bTb,.. t  *`*  z ",
+        " z  t ,bTb,..   *```* z ",
+        " z  & ..........````` z ",
         " z ,,..,,  ..   *```* z ",
-        " z HH.,,,  ..    *`*  z ",
+        " z bb.,,,  ..    *`*  z ",
         " z TT.,,, ....    .   z ",
-        ".z HH.   .ssss.   . t z.",
+        ".z bb.   .ssss.   . t z.",
         ".. ,,.  .ss~~ss.  .   ..",
         ".........s~~~~s.........",
         ".........s~~~~s.........",
         "..   .  .ss~~ss.  .   ..",
         ".z   .   .ssss.   .   z.",
         " z   .    ....    . # z ",
-        " z t . t   ..     . H z ",
-        " z   ..    ..    .. H z ",
+        " z t . t   ..     . b z ",
+        " z   ..    ..    .. b z ",
         " z fss............  # z ",
         " z sAs  t  ..         z ",
-        " z fsf     ..  #HH# t z ",
+        " z fsf     ..  #bb# t z ",
         " z         ..         z ",
         "  zzzzzzzz....zzzzzzzz  ",
         "         ......         "
@@ -264,17 +272,33 @@
         ",": "t_dirt",
         ".": "t_pavement",
         "A": "t_sidewalk",
-        "H": "t_dirt",
-        "R": "t_dirt",
+        "b": "t_dirt",
+        "&": "t_dirt",
         "T": "t_dirt",
         "`": "t_floor",
         "f": "t_dirt",
         "s": "t_sidewalk",
-        "t": "t_tree",
+        "t": [ [ "t_tree", 4 ], "t_tree_birch", "t_tree_maple", "t_tree_willow", "t_tree_young" ],
         "z": "t_shrub",
         "~": "t_water_pool_shallow"
       },
-      "furniture": { "A": "f_statue", "H": "f_bench", "R": "f_trashcan", "T": "f_table", "f": "f_dahlia" },
+      "furniture": {
+        "A": "f_statue",
+        "b": "f_bench",
+        "&": "f_trashcan",
+        "T": "f_table",
+        "f": [
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ]
+      },
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
       "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
       "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
       "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
@@ -339,47 +363,46 @@
       "fill_ter": "t_grass",
       "rotation": [ 0, 3 ],
       "rows": [
-        " ,       ......  ,     ,",
-        "  zzzzzzzz....Pzzzzzzz  ",
-        " z---------++---------z ",
-        " z|#~~s              |z ",
-        " z|~~~s              |z ",
-        " z|~~ss         t    |z ",
-        " z|sss              ,|z,",
-        " z|                ,H|z ",
-        " z|                ,H|z ",
-        ".P|                ,H|z.",
-        "..|              t  ,|..",
-        "..+        P         +..",
-        "..+        R         +..",
-        "..|,                 |..",
-        ".z|H,                |P.",
-        " z|H,t               |z ",
-        " z|H,          t     |z ",
-        ",z|,                 |z ",
-        " z|     t            |z ",
-        " z|           ,,,    |z,",
-        " z|          ,HHH,   |z ",
-        " z---------++---------z ",
-        "  zzzzzzzP....zzzzzzzz  ",
-        "     ,   ......         "
+        "__________|++|__________",
+        "__zzzzzzzz|,,|Pzzzzzzz__",
+        "_z|||||||||++|||||||||z_",
+        "_z|#~~.   &,,,       |z_",
+        "_z|~~~.   ,,,        |z_",
+        "_z|~~..         t    |z_",
+        "_z|...              ,|z_",
+        "_z|                ,b|z_",
+        "_z|,               ,b|z_",
+        "_P|,,,             ,b|z_",
+        "|||&,            t  ,|||",
+        "+,+,,      P       ,,+,+",
+        "+,+,,,     &      ,,,+,+",
+        "|||,,              ,&|||",
+        "_z|b,               ,|P_",
+        "_z|b,t               |z_",
+        "_z|b,          t     |z_",
+        "_z|,        ,,       |z_",
+        "_z|     t  ,,,       |z_",
+        "_z|       ,,,,,,,    |z_",
+        "_z|      ,&,,,bbb,   |z_",
+        "_z|||||||||++|||||||||z_",
+        "__zzzzzzzP|,,|zzzzzzzz__",
+        "__________|++|__________"
       ],
       "terrain": {
         "+": "t_chaingate_c",
         ",": "t_dirt",
-        "-": "t_chainfence_h",
-        ".": "t_pavement",
-        "#": "t_rock",
-        "H": "t_dirt",
+        "|": "t_chainfence",
+        ".": "t_sidewalk",
+        "#": "t_water_pool_shallow",
+        "b": "t_dirt",
         "P": "t_dirt",
-        "R": "t_dirt",
+        "&": "t_dirt",
         "s": "t_sidewalk",
-        "t": "t_tree",
+        "t": [ "t_tree", "t_tree_maple", "t_tree_willow", "t_tree_birch" ],
         "z": "t_shrub",
-        "|": "t_chainfence_v",
-        "~": "t_water_sh"
+        "~": "t_water_pool_shallow"
       },
-      "furniture": { "H": "f_bench", "P": "f_sign", "R": "f_trashcan" },
+      "furniture": { "b": "f_bench", "P": "f_sign", "&": "f_trashcan", "#": "f_boulder_large" },
       "place_signs": [
         { "signage": "Scoop the Poop!", "x": 11, "y": 11 },
         { "signage": "DANGER!  Doggy Minefield!", "x": 1, "y": 9 },
@@ -387,9 +410,20 @@
         { "signage": "Watch your step!", "x": 14, "y": 1 },
         { "signage": "Use park at your own risk.", "x": 22, "y": 14 }
       ],
-      "place_items": [ { "item": "trash", "x": 11, "y": 12, "chance": 50 } ],
-      "place_item": [ { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 5, 10 ] } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_DOG", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
+      "place_item": [
+        { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] },
+        { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 2 },
+        { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
+      ],
+      "monsters": {
+        ",": { "monster": "GROUP_PARK_DOG", "chance": 2, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_DOG", "chance": 1, "repeat": [ 2, 4 ] }
+      }
     }
   },
   {
@@ -501,20 +535,20 @@
         ".||||||||||_.||||||||||.",
         "......._..........._....",
         ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tT#..#tt#..#tt#..#tt#.",
         ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tt#..#tt#..#tT#..#tTB.",
-        "_#tt#..Btt#..#tt#..#TT#.",
+        ".#tt#..#tt#..#tt#..#tt#.",
+        ".#tt#..#tt#..#tt#..#tt#.",
+        ".#tt#..#tt#..#tt#..#tt#.",
         "..._................._..",
         "..bb.&&.bb....bb.&&.bb..",
         "........_...............",
-        "............._..........",
-        "...a...............d..._",
-        ".................d_..d..",
-        "..._..a............d..d.",
-        ".7..a..###_....d.....d..",
-        "...................D....",
-        ".7u_..u7_.......7...u.._",
+        "........______.......__.",
+        "...a.......__......d..__",
+        ".__.........__...d...d..",
+        "..__..a............d..d.",
+        ".7..a..###__...d.....d..",
+        ".........____......d....",
+        ".7u_..u7___.....7...u...",
         "..7..7.....7...u..u...7.",
         ".u..u.c...u...1.7u.7u..u",
         "._.._..u7....c.....uo7.7",
@@ -523,29 +557,23 @@
       ],
       "terrain": {
         ".": "t_grass",
-        "1": "t_tree_young",
-        "7": "t_tree_maple",
-        "B": "t_dirt",
-        "D": "t_dirt",
-        "T": "t_dirt",
-        "_": "t_dirt",
-        "a": "t_tree_apple",
-        "c": "t_tree_birch",
-        "u": "t_underbrush",
-        "|": "t_fence_h"
+        "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
+        "7": [ [ "t_tree", 4 ], "t_tree_hickory", "t_tree_maple", "t_tree_pine", "t_tree_birch", "t_tree_young" ],
+        "_": [ [ "t_dirt", 2 ], "t_grass_dead" ],
+        "a": [ "t_tree_apple", "t_tree_peach", "t_tree_cherry", "t_tree_pear" ],
+        "c": [ "t_tree", "t_tree_hickory", "t_tree_maple", [ "t_tree_birch", 4 ], "t_tree_young" ],
+        "u": [ [ "t_underbrush", 5 ], "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
+        "|": "t_fence"
       },
       "furniture": {
         ".": [ [ "f_null", 40 ], "f_dandelion", "f_datura", "f_bluebell" ],
         "#": "f_bench",
         "&": "f_trashcan",
-        "0": "f_boulder_medium",
-        "B": "f_bench",
-        "D": "f_dandelion",
-        "T": "f_table",
+        "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
         "b": "f_brazier",
-        "d": "f_dandelion",
+        "d": [ "f_dandelion", "f_datura", "f_bluebell" ],
         "f": "f_bluebell",
-        "o": "f_boulder_small",
+        "o": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
         "t": "f_table"
       },
       "mapping": {
@@ -639,9 +667,7 @@
         "b": "f_bench",
         "d": "f_boulder_medium"
       },
-      "items": {
-        "T": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
-      },
+      "items": { "T": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
       "place_items": [
         { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 },
         { "chance": 10, "item": "magazines", "x": 21, "y": 14 },
@@ -664,55 +690,84 @@
     "object": {
       "fill_ter": "t_grass",
       "rows": [
-        "...___.......s..d..s....",
+        "...___.......s.....s....",
         "...___...*.......*.....s",
-        "..d.___d...s.7.u...7u...",
-        "....____...d..*.........",
+        "....___....s.7.u...7u...",
+        "....____......*.........",
         "......___.*......u...7.d",
         "......___...u...*...s...",
-        "..7....___....s.d.7...d.",
-        "..d.....___.d......*dd..",
-        "d......d___.....u...d...",
-        ".........___......d...u.",
-        "...0ttt0..__....d.d.....",
-        "..0-|t|-0.___.d.d...###.",
+        "..7....___....s...7...d.",
+        "........___........*ddd.",
+        "........___.....u..ddddd",
+        ".........___......ddd.u.",
+        "...0ttt0..__....ddd.....",
+        "..0-|t|-0.___.ddd...###.",
         "..t|ttt|t.___..d........",
-        "..ttttttt.____.....&7..d",
+        "..ttttttt.____.....&7...",
         "..t|ttt|td_____.........",
-        "..0-|t|-0.__d___.d.###..",
+        "..0-|t|-0.__d___...###..",
         "...0ttt0.___..__________",
-        ".....d..___...._________",
-        ".d.....____.....___f....",
-        ".......___.......___d.f.",
-        "...._____.....7.d.__....",
+        "........___...._________",
+        ".......____.....___f....",
+        ".......___.......___..f.",
+        "...._____.....7...__....",
         "_________.f###...f___...",
         "_______........f...___..",
         "...........f..d....___.."
       ],
       "terrain": {
-        "-": "t_wall_log",
+        "|": "t_wall_log",
         ".": "t_grass",
-        "7": [ [ "t_tree", 4 ], "t_tree_hickory",  "t_tree_apple", "t_tree_pine", "t_tree_peach", "t_tree_cherry", "t_tree_pear", "t_tree_young" ],
+        "7": [
+          [ "t_tree", 4 ],
+          "t_tree_hickory",
+          "t_tree_maple",
+          "t_tree_birch",
+          "t_tree_apple",
+          "t_tree_pine",
+          "t_tree_peach",
+          "t_tree_cherry",
+          "t_tree_pear",
+          "t_tree_young"
+        ],
         "_": "t_sidewalk",
-        "d": "t_dirt",
+        "d": [ "t_dirt", "t_grass_dead" ],
         "s": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
         "t": "t_thconc_floor",
         "u": "t_underbrush",
-        "|": "t_fence_h"
+        "-": "t_fence"
       },
       "furniture": {
         "#": "f_bench",
         "&": "f_trashcan",
-        "*": [ [ "f_datura", 4 ], "f_tulip", "f_dandelion" ],
+        "*": [
+          "f_dandelion",
+          "f_chicory",
+          "f_bluebell",
+          [ "f_datura", 6 ],
+          [ "f_flower_tulip", 2 ],
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          [ "f_dahlia", 3 ]
+        ],
         "0": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-        "f": [ [ "f_dandelion", 3 ], "f_datura", "f_bluebell" ]
+        "f": [
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ]
       },
       "items": {
         "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
         "d": { "item": "forest", "chance": 10 },
         "#": { "item": "trash", "chance": 5 }
       },
-      "monsters" {
+      "monsters": {
         "_": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
         "t": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
         ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
@@ -757,7 +812,7 @@
         "#": "t_shrub",
         ".": "t_sidewalk",
         "0": "t_sidewalk",
-        "7": "t_tree_maple",
+        "7": [ "t_tree_maple", "t_tree_birch", "t_tree_willow" ],
         "O": "t_sidewalk",
         "_": "t_grass",
         "w": "t_water_pool_shallow",
@@ -774,9 +829,7 @@
         "b": { "item": "trash", "chance": 2 },
         "|": { "item": "stoner", "chance": 1 }
       },
-      "monsters" {
-        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 }
-      }
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
     }
   },
   {
@@ -786,6 +839,7 @@
     "type": "mapgen",
     "weight": 100,
     "object": {
+      "fill_ter": "t_grass",
       "rows": [
         "..........____..........",
         "..........____..........",
@@ -798,57 +852,61 @@
         ".|.......cttttc__...f|..",
         ".|..ss...tttttt__....|..",
         ".|..ss...tbttbt__....|..",
-        ".|.......tbttbt__r...|..",
-        ".|.m.....tttttt__r...|..",
-        ".|.m.....cttttc__r#..|..",
-        ".|.m.S...tttttt__r...|..",
-        ".|.m.S...tttttt__r...|#.",
+        ".|.......tbttbt__R...|..",
+        ".|.m.....tttttt__R...|..",
+        ".|.m.....cttttc__R#..|..",
+        ".|.m.S...tttttt__R...|..",
+        ".|.m.S...tttttt__R...|#.",
         "#|...S...cbbvTcRRR...|4.",
         "#|.......cccccc#....#|..",
         ".|f........###.......|..",
         ".|..........#........|a.",
         ".|.4.............f.#.|#.",
         "#|#.................a|#.",
-        ".---------------------4.",
+        ".|||||||||||||||||||||4.",
         "...#...............#...."
       ],
       "terrain": {
         "#": "t_shrub",
-        "&": "t_grass",
-        "-": "t_chainfence_h",
-        ".": "t_grass",
         "4": "t_tree_pine",
-        "B": "t_grass",
-        "R": "t_railing_h",
+        "R": "t_railing",
         "S": "t_slide",
         "T": "t_thconc_floor",
         "_": "t_sidewalk",
-        "a": "t_shrub_blueberry",
+        "a": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
         "b": "t_thconc_floor",
         "c": "t_concrete_wall",
-        "f": "t_grass",
         "m": "t_monkey_bars",
-        "r": "t_railing_v",
         "s": "t_sandbox",
         "t": "t_thconc_floor",
         "v": "t_thconc_floor",
-        "{": "t_grass",
-        "|": "t_chainfence_v"
+        "|": "t_chainfence"
       },
       "furniture": {
         "&": "f_trashcan",
         "B": "f_bench",
         "T": "f_trashcan",
         "b": "f_bench",
-        "f": "f_dandelion",
+        "f": [
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ],
         "v": "f_vending_c",
         "{": "f_dumpster"
       },
-      "place_items": [
-        { "chance": 60, "item": "trash", "x": 13, "y": 16 },
-        { "chance": 60, "item": "trash", "x": 14, "y": 5 },
-        { "chance": 65, "item": "vending_drink_items", "x": 12, "y": 16 }
-      ]
+      "vendingmachines": { "v": { "item_group": "vending_drink" } },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] },
+        "T": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ]
+      },
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
     }
   }
 ]

From 0b5e101a4f8c37e97152c05fb293af2155cf4703 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:10:40 -0800
Subject: [PATCH 03/16] add palettes

---
 data/json/mapgen/park.json | 429 +++++++++++--------------------------
 1 file changed, 127 insertions(+), 302 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index 4bd99e26d2d1e..6c90c8f41a569 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -42,57 +42,34 @@
     "weight": 500,
     "object": {
       "rotation": [ 0, 3 ],
-      "fill_ter": "t_dirt",
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "             t          ",
-        "      t         ##      ",
-        "                ##      ",
-        "                        ",
-        "    mmm                 ",
-        "    mmm    s       bt   ",
-        "   tmmm    s       b    ",
-        "           s            ",
-        "           s            ",
-        "                        ",
-        "                        ",
-        "      b            t    ",
-        "     tb                 ",
-        "         bb&   t        ",
-        "         t              ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        "
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "'''''''''''''t''''''''''",
+          "''''''t'''''''''gg''''''",
+          "''''''''''''''''gg''''''",
+          "''''''''''''''''''''''''",
+          "''''mmm'''''''''''''''''",
+          "''''mmm''''h'''''''bt'''",
+          "'''tmmm''''h'''''''b''''",
+          "'''''''''''h''''''''''''",
+          "'''''''''''h''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''b''''''''''''t''''",
+          "'''''tb'''''''''''''''''",
+          "'''''''''bb&'''t''''''''",
+          "'''''''''t''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''",
+          "''''''''''''''''''''''''"
       ],
-      "terrain": {
-        " ": [ [ "t_grass", 15 ], "t_grass_dead", "t_dirt" ],
-        "#": "t_sandbox",
-        "b": "t_dirt",
-        "m": "t_monkey_bars",
-        "s": "t_slide",
-        "t": [ [ "t_tree", 4 ], "t_tree_birch", "t_tree_maple", "t_tree_willow", "t_tree_young" ]
-      },
-      "furniture": {
-        "b": "f_bench",
-        "&": "f_trashcan",
-        " ": [
-          [ "f_null", 200 ],
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ]
-      },
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "palettes": [ "park_scenic_palette" ],
       "monsters": { " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
       "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
     }
@@ -132,10 +109,7 @@
         "                        ",
         "                        "
       ],
-      "terrain": { "+": "t_chaingate_c", "|": "t_chainfence", ".": "t_pavement_y", "7": "t_backboard" },
-      "furniture": { "b": "f_bench", "&": "f_trashcan" },
-      "vendingmachines": { "V": { "item_group": "vending_drink" } },
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "palettes": [ "park_asphalt_palette" ],
       "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 5, "repeat": [ 1, 3 ] } }
     }
   },
@@ -174,10 +148,7 @@
         " |||||||||||||||||||||  ",
         "                        "
       ],
-      "terrain": { "+": "t_chaingate_c", "|": "t_chainfence", ".": "t_pavement_y", "[": "t_fence_rope" },
-      "furniture": { "b": "f_bench", "&": "f_trashcan" },
-      "vendingmachines": { "V": { "item_group": "vending_drink" } },
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "palettes": [ "park_asphalt_palette" ],
       "monsters": {
         ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 3, "repeat": [ 1, 3 ] },
         "b": { "monster": "GROUP_PARK_DOG", "chance": 3 }
@@ -191,7 +162,7 @@
     "//": "Volleyball Court",
     "weight": 300,
     "object": {
-      "fill_ter": "t_grass",
+      "fill_ter": "t_groundcover_urban",
       "rotation": [ 0, 3 ],
       "rows": [
         "&bbb                bbb&",
@@ -219,12 +190,8 @@
         "   ,,,,,,,,,[,,,,,,,,,  ",
         "&bbb                bbb&"
       ],
-      "terrain": { "$": "t_sand", ",": "t_dirt", ".": "t_pavement_y", "H": "t_dirt", "[": "t_fence_rope" },
-      "furniture": { "b": "f_bench", "&": "f_trashcan" },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] }
-      },
+      "palettes": [ "park_asphalt_palette" ],
+      "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
       "monsters": {
         "$": { "monster": "GROUP_MALL", "chance": 1, "repeat": [ 2, 4 ] },
         " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] }
@@ -266,39 +233,7 @@
         "  zzzzzzzz....zzzzzzzz  ",
         "         ......         "
       ],
-      "terrain": {
-        "#": "t_rock",
-        "*": "t_wall_wood",
-        ",": "t_dirt",
-        ".": "t_pavement",
-        "A": "t_sidewalk",
-        "b": "t_dirt",
-        "&": "t_dirt",
-        "T": "t_dirt",
-        "`": "t_floor",
-        "f": "t_dirt",
-        "s": "t_sidewalk",
-        "t": [ [ "t_tree", 4 ], "t_tree_birch", "t_tree_maple", "t_tree_willow", "t_tree_young" ],
-        "z": "t_shrub",
-        "~": "t_water_pool_shallow"
-      },
-      "furniture": {
-        "A": "f_statue",
-        "b": "f_bench",
-        "&": "f_trashcan",
-        "T": "f_table",
-        "f": [
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ]
-      },
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+      "palettes": [ "park_scenic_palette" ],
       "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
       "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
       "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
@@ -317,39 +252,29 @@
         "   ,   z ...... z     , ",
         ",    zzz .o..o. zzz,    ",
         " , zzz  z......z  zzz   ",
-        "  zz    H......H    zz, ",
-        "  z    tH......Ht    z  ",
-        " zz  t  H......H  t  zz ",
+        "  zz    b......b    zz, ",
+        "  z    tb......bt    z  ",
+        " zz  t  b......b  t  zz ",
         " z      z......z      z ",
         "zz  t   ........   t  zz",
-        "  zHHHz..........zHHHz  ",
+        "  zbbbz..........zbbbz  ",
         "..........ssss..........",
         ".o.......ssffss.......o.",
         ".........sfzzfs.........",
         ".........sfzzfs.........",
         ".o.......ssffss.......o.",
         "..........ssss..........",
-        "  zHHHz..........zHHHz  ",
+        "  zbbbz..........zbbbz  ",
         "zz  t   ........   t  zz",
         " z      z......z      z ",
-        " zz  t  H......H  t  zz ",
-        "  z    tH......Ht    z  ",
-        "  zz    H......H    zz ,",
+        " zz  t  b......b  t  zz ",
+        "  z    tb......bt    z  ",
+        "  zz    b......b    zz ,",
         ",  zzz  z......z  zzz   ",
         "     zzz .o..o. zzz ,   ",
         " , ,   z ...... z       "
       ],
-      "terrain": {
-        ",": "t_dirt",
-        ".": "t_pavement",
-        "H": "t_dirt",
-        "f": "t_dirt",
-        "o": "t_column",
-        "s": "t_sidewalk",
-        "t": "t_tree",
-        "z": "t_shrub"
-      },
-      "furniture": { "H": "f_bench", "f": "f_dahlia" },
+      "palettes": [ "park_scenic_palette" ],
       "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
     }
   },
@@ -360,7 +285,7 @@
     "//": "Dog Park",
     "weight": 500,
     "object": {
-      "fill_ter": "t_grass",
+      "fill_ter": "t_region_groundcover_urban",
       "rotation": [ 0, 3 ],
       "rows": [
         "__________|++|__________",
@@ -398,8 +323,8 @@
         "P": "t_dirt",
         "&": "t_dirt",
         "s": "t_sidewalk",
-        "t": [ "t_tree", "t_tree_maple", "t_tree_willow", "t_tree_birch" ],
-        "z": "t_shrub",
+        "t": "t_region_tree_shade",
+        "z": "t_region_shrub_decorative",
         "~": "t_water_pool_shallow"
       },
       "furniture": { "b": "f_bench", "P": "f_sign", "&": "f_trashcan", "#": "f_boulder_large" },
@@ -428,17 +353,38 @@
   },
   {
     "method": "json",
+    "om_terrain": "park",
+    "//": "Picnic Park",
+    "type": "mapgen",
+    "weight": 300,
     "object": {
-      "furniture": {
-        "#": "f_bench",
-        "&": "f_trashcan",
-        "0": "f_boulder_medium",
-        "b": "f_brazier",
-        "c": "f_cattails",
-        "f": "f_dandelion",
-        "i": "f_cattails",
-        "t": "f_table"
-      },
+      "fill_ter": "t_region_groundcover_urban",
+      "rows": [
+        "'ppppp''''''''''''''''''",
+        "'ppppp''''''''''''''''''",
+        "'pppppppppppppppp'''''''",
+        "'pppppppppppppppp'''''''",
+        "'PppppPppppPppppP''''u''",
+        "'PppppPppppPppppP'''''''",
+        "'PppppPppppPppppP'''''''",
+        "'PppppPppppPppppP'''''4'",
+        "'PppppPppppPppppP'''''''",
+        "'''''''''''ss'''''''''''",
+        "''''''&ssssssssss&''''e'",
+        "''''''sBBBBssBBBBs''''C'",
+        "'''''YsLLLLssLLLLsY'''''",
+        "''''''sBBBBssBBBBs''4'4'",
+        "'''t''ssssssssssssWWu'''",
+        "''''$$'''''''t'''WwwW'u'",
+        "'''$g$''''''''''Wwwwwi4'",
+        "''''''''''''''''Wwwwwi'4",
+        "''''''mm'h'''''WwwwwiI''",
+        "'''4''''''''''Wwwwwwi''u",
+        "''''''''''4'''WwwwwiI'u4",
+        "'4'''''4'''''''WWWi4'4''",
+        "'''u4'''4''0u'4u'''''u4u",
+        "''''''u''''u4''''u4'''''"
+      ],
       "place_items": [
         { "chance": 8, "item": "dogfight", "x": 2, "y": 12 },
         { "chance": 30, "item": "trash", "x": 6, "y": 10 },
@@ -455,71 +401,8 @@
         { "chance": 10, "item": "sports", "x": 11, "y": 16 },
         { "chance": 10, "item": "field", "x": 2, "y": 16 },
         { "chance": 10, "item": "field", "x": 1, "y": 13 }
-      ],
-      "sealed_item": {
-        "P": { "item": { "item": "seed_raw_dandelion" }, "furniture": "f_plant_harvest" },
-        "a": { "item": { "item": "seed_sunflower" }, "furniture": "f_plant_harvest" }
-      },
-      "rows": [
-        "._____...........d......",
-        "._____..................",
-        ".________________..d...d",
-        ".________________....7..",
-        ".p____p____p____p....u..",
-        ".p____p____p____p......d",
-        ".p____p____p____p..d....",
-        ".p____p____p____p.....4.",
-        "dp____p____p____p...d...",
-        "....f......ss...d.......",
-        "f.f...&ssssssssss&.7..e.",
-        "..ffd.s####ss####s....C.",
-        ".f..fbsttttssttttsb.d...",
-        "..fd..s####ss####s.d4.4d",
-        ".f.T..ssssssssssssWWu..d",
-        "d..dSS.......Td..WwwW.u.",
-        "f..SgS....d.....Wwwwwi4.",
-        "...dddddddd.....Wwwwwi.4",
-        ".....dmmdhd....Wwwwwic..",
-        "d..4.dddddd.P.Wwwwwwid.u",
-        "P.f.......4...Wwwwwic.u4",
-        ".4.P..d4P....d.WWWi4.4..",
-        "...u4P..4.P0u.4u...a.u4u",
-        ".P.dP.u..a.u4.Pd.u4.P..."
-      ],
-      "terrain": {
-        "#": "t_thconc_floor",
-        "&": "t_sidewalk",
-        ".": "t_grass",
-        "0": "t_grass",
-        "4": "t_tree_pine",
-        "7": "t_tree_peach",
-        "C": "t_covered_well",
-        "P": "t_grass",
-        "S": "t_sand",
-        "T": "t_tree_willow",
-        "W": "t_water_sh",
-        "_": "t_pavement",
-        "a": "t_dirt",
-        "b": "t_grass",
-        "c": "t_grass",
-        "d": "t_dirt",
-        "e": "t_water_pump",
-        "f": "t_grass",
-        "g": "t_sandbox",
-        "h": "t_slide",
-        "i": "t_water_sh",
-        "m": "t_monkey_bars",
-        "p": "t_pavement_y",
-        "s": "t_sidewalk",
-        "t": "t_thconc_floor",
-        "u": "t_underbrush",
-        "w": "t_water_dp"
-      }
-    },
-    "om_terrain": "park",
-    "//": "Picnic Park",
-    "type": "mapgen",
-    "weight": 300
+      ]
+    }
   },
   {
     "method": "json",
@@ -530,56 +413,32 @@
     "object": {
       "fill_ter": "t_grass",
       "rows": [
-        "...._................_..",
-        ".0ffffffff0._0ffffffff0_",
-        ".||||||||||_.||||||||||.",
-        "......._..........._....",
-        ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tt#..#tt#..#tt#..#tt#.",
-        ".#tt#..#tt#..#tt#..#tt#.",
-        "..._................._..",
-        "..bb.&&.bb....bb.&&.bb..",
-        "........_...............",
-        "........______.......__.",
-        "...a.......__......d..__",
-        ".__.........__...d...d..",
-        "..__..a............d..d.",
-        ".7..a..###__...d.....d..",
-        ".........____......d....",
-        ".7u_..u7___.....7...u...",
-        "..7..7.....7...u..u...7.",
-        ".u..u.c...u...1.7u.7u..u",
-        "._.._..u7....c.....uo7.7",
-        "7u.1ou.7u.c.u..u.7u17u.u",
-        ".7.u7._7..u.7.u7...u..7."
+        "''''_''''''''''''''''_''",
+        "'0ffffffff0'_0ffffffff0_",
+        "'||||||||||_'||||||||||'",
+        "'''''''_'''''''''''_''''",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'''_'''''''''''''''''_''",
+        "''YY'&&'YY''''YY'&&'YY''",
+        "''''''''_'''''''''''''''",
+        "''''''''______'''''''__'",
+        "'''a'''''''__''''''d''__",
+        "'__'''''''''__'''d'''d''",
+        "''__''a''''''''''''d''d'",
+        "'t''a''bbb__'''d'''''d''",
+        "'''''''''____''''''d''''",
+        "'tu_''ut___'''''t'''u'''",
+        "''t''t'''''t'''u''u'''t'",
+        "'u''u'c'''u'''1'tu'tu''u",
+        "'_''_''ut''''c'''''uOt't",
+        "tu'1Ou'tu'c'u''u'tu1tu'u",
+        "'t'ut'_t''u't'ut'''u''t'"
       ],
-      "terrain": {
-        ".": "t_grass",
-        "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
-        "7": [ [ "t_tree", 4 ], "t_tree_hickory", "t_tree_maple", "t_tree_pine", "t_tree_birch", "t_tree_young" ],
-        "_": [ [ "t_dirt", 2 ], "t_grass_dead" ],
-        "a": [ "t_tree_apple", "t_tree_peach", "t_tree_cherry", "t_tree_pear" ],
-        "c": [ "t_tree", "t_tree_hickory", "t_tree_maple", [ "t_tree_birch", 4 ], "t_tree_young" ],
-        "u": [ [ "t_underbrush", 5 ], "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
-        "|": "t_fence"
-      },
-      "furniture": {
-        ".": [ [ "f_null", 40 ], "f_dandelion", "f_datura", "f_bluebell" ],
-        "#": "f_bench",
-        "&": "f_trashcan",
-        "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-        "b": "f_brazier",
-        "d": [ "f_dandelion", "f_datura", "f_bluebell" ],
-        "f": "f_bluebell",
-        "o": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
-        "t": "f_table"
-      },
-      "mapping": {
-        "&": { "items": [ { "item": "trash", "chance": 80, "repeat": [ 2, 6 ] } ] },
-        "t": { "items": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 3 } ] }
-      },
+      "palettes": [ "park_scenic_palette" ],
       "place_items": [
         { "chance": 10, "item": "barbecue", "x": 3, "y": 11 },
         { "chance": 10, "item": "barbecue", "x": 4, "y": 11 },
@@ -608,66 +467,32 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "rows": [
-        "..0.d.O.O.O.0.0......_..",
-        "_......s.s.._.........._",
-        "___7.#######s.....c||||.",
-        ".....#HSSSS#s.b_..c+t&|.",
-        ".....#######s.b._.c|aT|.",
-        "..._.#HSSSS#..B._.c||||.",
-        ".....#######s.b...c|aT|.",
-        ".7...#HSSSS#._b_..c+t&|.",
-        "_....#######s...._c||||.",
-        "._...#######s...._..bB..",
-        "_*...#m#mmm#.__..._.....",
-        ".7.7_#m#m#m#..ss.ss._...",
-        ".....#m#m#m#ss#####.....",
-        "*..._#mmm#m#..#####s.b._",
-        "_.._.#######ss#####..b..",
-        ".7._.#mmmmm#s.#####s_b..",
-        "7.*..#######..#####...._",
-        "*.7....s.s.s..s...s_._..",
-        "._._7..._._..__.._....._",
-        ".77.*.7bbb...7.bbb...7..",
-        "7*......._7.............",
-        "..D7.7.....*......_..._.",
-        "7....*._7...._.....7....",
-        ".7*7...*.._...7.._......"
+        "''0'0'O'O'O'0'0''''''_''",
+        "_''''''$'$''_''''''''''_",
+        "___t'ggggggg$'''''q]]]]'",
+        "'''''ghhhhhg$'b_''q+:x]'",
+        "'''''ggggggg$'b'_'q]5X]'",
+        "'''_'ghhhhhg''b'_'q]]]]'",
+        "'''''ggggggg$'b'''q]5X]'",
+        "'t'''ghhhhhg'_b_''q+:x]'",
+        "_''''ggggggg$''''_q]]]]'",
+        "'_'''ggggggg$''''_''bb''",
+        "_''''gmgmmmg'__'''_'''''",
+        "'t't_gmgmgmg''$$'$$'_'''",
+        "'''''gmgmgmg$$ggggg'''''",
+        "''''_gmmmgmg''ggggg$'b'_",
+        "_''_'ggggggg$$ggggg''b''",
+        "'t'_'gmmmmmg$'ggggg$_b''",
+        "t''''ggggggg''ggggg''''_",
+        "''t''''$'$'$''$'''$_'_''",
+        "'_'_t'''_'_''__''_'''''_",
+        "'tt'''tbbb'''t'bbb'''t''",
+        "t''''''''_t'''''''''''''",
+        "'''t't''''''''''''_'''_'",
+        "t''''''_t''''_'''''t''''",
+        "'t't''''''_'''t''_''''''"
       ],
-      "terrain": {
-        "#": "t_sandbox",
-        "*": "t_grass",
-        "+": "t_door_c",
-        ".": "t_grass",
-        "0": "t_grass",
-        "7": [ "t_tree", "t_tree_maple" ],
-        "B": "t_dirt",
-        "D": "t_dirt",
-        "H": "t_sandbox",
-        "O": "t_grass",
-        "S": "t_slide",
-        "_": "t_dirt",
-        "b": "t_grass",
-        "c": "t_concrete",
-        "d": "t_dirt",
-        "m": "t_monkey_bars",
-        "s": "t_sand",
-        "|": "t_brick_wall"
-      },
-      "furniture": {
-        ".": [ [ "f_null", 40 ], "f_dandelion", "f_datura", "f_bluebell" ],
-        "&": "f_toilet",
-        "*": "f_datura",
-        "0": "f_boulder_medium",
-        "B": "f_bench",
-        "D": [ "f_datura", "f_dandelion" ],
-        "H": "f_ladder",
-        "O": "f_boulder_large",
-        "T": "f_trashcan",
-        "a": "f_sink",
-        "b": "f_bench",
-        "d": "f_boulder_medium"
-      },
-      "items": { "T": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
+      "palettes": [ "park_scenic_palette" ],
       "place_items": [
         { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 },
         { "chance": 10, "item": "magazines", "x": 21, "y": 14 },

From 4417b8db59292465707e8d8925361235887796a4 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:11:55 -0800
Subject: [PATCH 04/16] add park palettes

---
 data/json/mapgen_palettes/park_palette.json | 99 +++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 data/json/mapgen_palettes/park_palette.json

diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
new file mode 100644
index 0000000000000..7c9cd526e7924
--- /dev/null
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -0,0 +1,99 @@
+[
+  {
+    "type": "palette",
+    "id": "park_scenic_palette",
+    "terrain": {
+      "#": "t_rock",
+      "%": "t_sidewalk",
+      "*": "t_wall_wood",
+      ",": "t_dirt",
+      "_": [ [ "t_dirt", 5 ], "t_grass_dead" ],
+      ".": "t_pavement",
+      "'": "t_grass",
+      "`": "t_floor",
+      "&": "t_dirt",
+      "|": "t_fence",
+      "$": "t_sand",
+        "+": "t_door_c",
+        ":": "t_thconc_floor",
+        "]": "t_brick_wall",
+      "~": "t_water_pool_shallow",
+      "A": "t_sidewalk",
+      "a": "t_region_tree_fruit",
+      "b": "t_dirt",
+      "B": "t_thconc_floor",
+      "C": "t_covered_well",
+      "c": "t_region_tree",
+      "e": "t_water_pump",
+      "g": "t_sandbox",
+      "h": "t_slide",
+      "i": "t_water_sh",
+      "L": "t_thconc_floor",
+      "m": "t_monkey_bars",
+      "o": "t_column",
+      "P": "t_pavement_y",
+      "p": "t_pavement",
+      "q": "t_concrete",
+      "s": "t_sidewalk",
+      "t": "t_region_tree_shade",
+      "T": "t_dirt",
+      "u": "t_region_shrub",
+      "W": "t_water_sh",
+      "w": "t_water_dp",
+        "x": "t_thconc_floor",
+        "X": "t_thconc_floor",
+      "Y": "t_concrete",
+      "z": "t_region_shrub_decorative",
+      "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
+      "4": "t_region_tree_evergreen",
+        "5": "t_thconc_floor"
+    },
+    "furniture": {
+      "%": "f_trashcan",
+      "&": "f_trashcan",
+      "'": [ [ "f_null", 40 ], "f_region_flower" ],
+      "A": "f_statue",
+      "B": "f_bench",
+      "b": "f_bench",
+      "d": "f_region_weed",
+      "f": "f_region_flower_decorative",
+      "I": "f_cattails",
+      "i": "f_cattails",
+      "L": "f_table",
+      "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
+      "T": "f_table",
+        "x": "f_toilet",
+        "X": "f_trashcan",
+      "Y": "f_brazier",
+      "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
+        "5": "f_sink"
+    },
+    "items": {
+      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "b": { "item": "trash", "chance": 2 },
+      "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
+    }
+  },
+  {
+    "type": "palette",
+    "id": "park_asphalt_palette",
+    "terrain": {
+      "+": "t_chaingate_c",
+      "|": "t_chainfence",
+      ".": "t_pavement_y",
+      "7": "t_backboard",
+      "[": "t_fence_rope",
+      "$": "t_sand",
+      ",": "t_dirt"
+    },
+    "furniture": { "b": "f_bench", "&": "f_trashcan" },
+    "items": {
+      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "b": { "item": "trash", "chance": 2 }
+    }
+    "vendingmachines": { "V": { "item_group": "vending_drink" } }
+  }
+]
\ No newline at end of file

From 784ad1adc15bbb0e46670afcb3d4224b581f5c25 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:12:48 -0800
Subject: [PATCH 05/16] Update park_palette.json

---
 data/json/mapgen_palettes/park_palette.json | 822 +++++++++++++++++---
 1 file changed, 730 insertions(+), 92 deletions(-)

diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index 7c9cd526e7924..812c2c6e6a43e 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -1,99 +1,737 @@
 [
   {
-    "type": "palette",
-    "id": "park_scenic_palette",
-    "terrain": {
-      "#": "t_rock",
-      "%": "t_sidewalk",
-      "*": "t_wall_wood",
-      ",": "t_dirt",
-      "_": [ [ "t_dirt", 5 ], "t_grass_dead" ],
-      ".": "t_pavement",
-      "'": "t_grass",
-      "`": "t_floor",
-      "&": "t_dirt",
-      "|": "t_fence",
-      "$": "t_sand",
-        "+": "t_door_c",
-        ":": "t_thconc_floor",
-        "]": "t_brick_wall",
-      "~": "t_water_pool_shallow",
-      "A": "t_sidewalk",
-      "a": "t_region_tree_fruit",
-      "b": "t_dirt",
-      "B": "t_thconc_floor",
-      "C": "t_covered_well",
-      "c": "t_region_tree",
-      "e": "t_water_pump",
-      "g": "t_sandbox",
-      "h": "t_slide",
-      "i": "t_water_sh",
-      "L": "t_thconc_floor",
-      "m": "t_monkey_bars",
-      "o": "t_column",
-      "P": "t_pavement_y",
-      "p": "t_pavement",
-      "q": "t_concrete",
-      "s": "t_sidewalk",
-      "t": "t_region_tree_shade",
-      "T": "t_dirt",
-      "u": "t_region_shrub",
-      "W": "t_water_sh",
-      "w": "t_water_dp",
-        "x": "t_thconc_floor",
-        "X": "t_thconc_floor",
-      "Y": "t_concrete",
-      "z": "t_region_shrub_decorative",
-      "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
-      "4": "t_region_tree_evergreen",
-        "5": "t_thconc_floor"
-    },
-    "furniture": {
-      "%": "f_trashcan",
-      "&": "f_trashcan",
-      "'": [ [ "f_null", 40 ], "f_region_flower" ],
-      "A": "f_statue",
-      "B": "f_bench",
-      "b": "f_bench",
-      "d": "f_region_weed",
-      "f": "f_region_flower_decorative",
-      "I": "f_cattails",
-      "i": "f_cattails",
-      "L": "f_table",
-      "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
-      "T": "f_table",
-        "x": "f_toilet",
-        "X": "f_trashcan",
-      "Y": "f_brazier",
-      "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-        "5": "f_sink"
-    },
-    "items": {
-      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-      "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-      "b": { "item": "trash", "chance": 2 },
-      "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
-      "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
-      "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
+    "id": "park_playground_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [ [ "ice_cream_cart", 100 ], [ "food_cart", 200 ] ]
+  },
+  {
+    "name": "GROUP_PARK_PLAYGROUND",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] },
+      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 2, "pack_size": 1 }
+    ]
+  },
+  {
+    "name": "GROUP_PARK_SCENIC",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_rot", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
+    ]
+  },
+  {
+    "name": "GROUP_PARK_DOG",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_dog", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_dog_zombie_cop", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_dog_zombie_rot", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
+    ]
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Playground",
+    "weight": 500,
+    "object": {
+      "rotation": [ 0, 3 ],
+      "fill_ter": "t_region_groundcover_urban",
+      "rows": [
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "'''''''''''''t''''''''''",
+        "''''''t'''''''''gg''''''",
+        "''''''''''''''''gg''''''",
+        "''''''''''''''''''''''''",
+        "''''mmm'''''''''''''''''",
+        "''''mmm''''h'''''''bt'''",
+        "'''tmmm''''h'''''''b''''",
+        "'''''''''''h''''''''''''",
+        "'''''''''''h''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''b''''''''''''t''''",
+        "'''''tb'''''''''''''''''",
+        "'''''''''bb&'''t''''''''",
+        "'''''''''t''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''"
+      ],
+      "palettes": [ "park_scenic_palette" ],
+      "monsters": { " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
+      "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Basketball Court",
+    "weight": 700,
+    "object": {
+      "fill_ter": "t_pavement",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "                        ",
+        " |||||||||||||||||||||| ",
+        " +  . .   . 7 .   . . + ",
+        " |V . .   .   .   . .&| ",
+        " |& . .   .....   . . | ",
+        " |  .  .  .   .  .  . | ",
+        " |b .   .  ...  .   .b| ",
+        " |b .    .......    .b| ",
+        " |b .               .b| ",
+        " |b .      ...      .b| ",
+        " |b .     .   .     .b| ",
+        " |  ................. | ",
+        " |b .     .   .     .b| ",
+        " |b .      ...      .b| ",
+        " |b .               .b| ",
+        " |b .    .......    .b| ",
+        " |b .   .  ...  .   .b| ",
+        " |  .  .  .   .  .  . | ",
+        " |  . .   .....   . . | ",
+        " |& . .   .   .   . .&| ",
+        " +  . .   . 7 .   . . + ",
+        " |||||||||||||||||||||| ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "park_asphalt_palette" ],
+      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 5, "repeat": [ 1, 3 ] } }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Tennis Court",
+    "weight": 500,
+    "object": {
+      "fill_ter": "t_pavement",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "                        ",
+        " |||||||||||||||||||||& ",
+        " + ........[........ +  ",
+        " | ........[........ |V ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
+        " | .   ....[....   . |  ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
+        " | ........[........ |  ",
+        " | ........[........ |  ",
+        " |                   |  ",
+        " |                   |  ",
+        " | ........[........ |  ",
+        " | ........[........ |  ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
+        " | .   ....[....   . |  ",
+        " | .   .   [   .   . |b ",
+        " | .   .   [   .   . |b ",
+        " | ........[........ |& ",
+        " + ........[........ +  ",
+        " |||||||||||||||||||||  ",
+        "                        "
+      ],
+      "palettes": [ "park_asphalt_palette" ],
+      "monsters": {
+        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 3, "repeat": [ 1, 3 ] },
+        "b": { "monster": "GROUP_PARK_DOG", "chance": 3 }
+      }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Volleyball Court",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_groundcover_urban",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "&bbb                bbb&",
+        "   ,,,,,,,,,[,,,,,,,,,  ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "   ,,,,,,,,,[,,,,,,,,,  ",
+        "                        ",
+        "                        ",
+        "   ,,,,,,,,,[,,,,,,,,,  ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "  ,$$$$$$$$$[$$$$$$$$$, ",
+        "   ,,,,,,,,,[,,,,,,,,,  ",
+        "&bbb                bbb&"
+      ],
+      "palettes": [ "park_asphalt_palette" ],
+      "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
+      "monsters": {
+        "$": { "monster": "GROUP_MALL", "chance": 1, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] }
+      }
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "weight": 500,
+    "object": {
+      "fill_ter": "t_grass",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "         ......         ",
+        "  zzzzzzzz....zzzzzzzz  ",
+        " z         ..         z ",
+        " z    ,bTb,.. t  *`*  z ",
+        " z  t ,bTb,..   *```* z ",
+        " z  & ..........````` z ",
+        " z ,,..,,  ..   *```* z ",
+        " z bb.,,,  ..    *`*  z ",
+        " z TT.,,, ....    .   z ",
+        ".z bb.   .ssss.   . t z.",
+        ".. ,,.  .ss~~ss.  .   ..",
+        ".........s~~~~s.........",
+        ".........s~~~~s.........",
+        "..   .  .ss~~ss.  .   ..",
+        ".z   .   .ssss.   .   z.",
+        " z   .    ....    . # z ",
+        " z t . t   ..     . b z ",
+        " z   ..    ..    .. b z ",
+        " z fss............  # z ",
+        " z sAs  t  ..         z ",
+        " z fsf     ..  #bb# t z ",
+        " z         ..         z ",
+        "  zzzzzzzz....zzzzzzzz  ",
+        "         ......         "
+      ],
+      "palettes": [ "park_scenic_palette" ],
+      "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
+      "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "weight": 500,
+    "object": {
+      "fill_ter": "t_grass",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "   ,   z ...... z     , ",
+        ",    zzz .o..o. zzz,    ",
+        " , zzz  z......z  zzz   ",
+        "  zz    b......b    zz, ",
+        "  z    tb......bt    z  ",
+        " zz  t  b......b  t  zz ",
+        " z      z......z      z ",
+        "zz  t   ........   t  zz",
+        "  zbbbz..........zbbbz  ",
+        "..........ssss..........",
+        ".o.......ssffss.......o.",
+        ".........sfzzfs.........",
+        ".........sfzzfs.........",
+        ".o.......ssffss.......o.",
+        "..........ssss..........",
+        "  zbbbz..........zbbbz  ",
+        "zz  t   ........   t  zz",
+        " z      z......z      z ",
+        " zz  t  b......b  t  zz ",
+        "  z    tb......bt    z  ",
+        "  zz    b......b    zz ,",
+        ",  zzz  z......z  zzz   ",
+        "     zzz .o..o. zzz ,   ",
+        " , ,   z ...... z       "
+      ],
+      "palettes": [ "park_scenic_palette" ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Dog Park",
+    "weight": 500,
+    "object": {
+      "fill_ter": "t_region_groundcover_urban",
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "__________|++|__________",
+        "__zzzzzzzz|,,|Pzzzzzzz__",
+        "_z|||||||||++|||||||||z_",
+        "_z|#~~.   &,,,       |z_",
+        "_z|~~~.   ,,,        |z_",
+        "_z|~~..         t    |z_",
+        "_z|...              ,|z_",
+        "_z|                ,b|z_",
+        "_z|,               ,b|z_",
+        "_P|,,,             ,b|z_",
+        "|||&,            t  ,|||",
+        "+,+,,      P       ,,+,+",
+        "+,+,,,     &      ,,,+,+",
+        "|||,,              ,&|||",
+        "_z|b,               ,|P_",
+        "_z|b,t               |z_",
+        "_z|b,          t     |z_",
+        "_z|,        ,,       |z_",
+        "_z|     t  ,,,       |z_",
+        "_z|       ,,,,,,,    |z_",
+        "_z|      ,&,,,bbb,   |z_",
+        "_z|||||||||++|||||||||z_",
+        "__zzzzzzzP|,,|zzzzzzzz__",
+        "__________|++|__________"
+      ],
+      "terrain": {
+        "+": "t_chaingate_c",
+        ",": "t_dirt",
+        "|": "t_chainfence",
+        ".": "t_sidewalk",
+        "#": "t_water_pool_shallow",
+        "b": "t_dirt",
+        "P": "t_dirt",
+        "&": "t_dirt",
+        "s": "t_sidewalk",
+        "t": "t_region_tree_shade",
+        "z": "t_region_shrub_decorative",
+        "~": "t_water_pool_shallow"
+      },
+      "furniture": { "b": "f_bench", "P": "f_sign", "&": "f_trashcan", "#": "f_boulder_large" },
+      "place_signs": [
+        { "signage": "Scoop the Poop!", "x": 11, "y": 11 },
+        { "signage": "DANGER!  Doggy Minefield!", "x": 1, "y": 9 },
+        { "signage": "Dog Park: Off Leash Area", "x": 9, "y": 22 },
+        { "signage": "Watch your step!", "x": 14, "y": 1 },
+        { "signage": "Use park at your own risk.", "x": 22, "y": 14 }
+      ],
+      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
+      "place_item": [
+        { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] },
+        { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 2 },
+        { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] },
+        { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
+      ],
+      "monsters": {
+        ",": { "monster": "GROUP_PARK_DOG", "chance": 2, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_DOG", "chance": 1, "repeat": [ 2, 4 ] }
+      }
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Picnic Park",
+    "type": "mapgen",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_region_groundcover_urban",
+      "rows": [
+        "'ppppp''''''''''''''''''",
+        "'ppppp''''''''''''''''''",
+        "'pppppppppppppppp'''''''",
+        "'pppppppppppppppp'''''''",
+        "'PppppPppppPppppP''''u''",
+        "'PppppPppppPppppP'''''''",
+        "'PppppPppppPppppP'''''''",
+        "'PppppPppppPppppP'''''4'",
+        "'PppppPppppPppppP'''''''",
+        "'''''''''''ss'''''''''''",
+        "''''''&ssssssssss&''''e'",
+        "''''''sBBBBssBBBBs''''C'",
+        "'''''YsLLLLssLLLLsY'''''",
+        "''''''sBBBBssBBBBs''4'4'",
+        "'''t''ssssssssssssWWu'''",
+        "''''$$'''''''t'''WwwW'u'",
+        "'''$g$''''''''''Wwwwwi4'",
+        "''''''''''''''''Wwwwwi'4",
+        "''''''mm'h'''''WwwwwiI''",
+        "'''4''''''''''Wwwwwwi''u",
+        "''''''''''4'''WwwwwiI'u4",
+        "'4'''''4'''''''WWWi4'4''",
+        "'''u4'''4''0u'4u'''''u4u",
+        "''''''u''''u4''''u4'''''"
+      ],
+      "place_items": [
+        { "chance": 8, "item": "dogfight", "x": 2, "y": 12 },
+        { "chance": 30, "item": "trash", "x": 6, "y": 10 },
+        { "chance": 10, "item": "child_items", "x": 7, "y": 18 },
+        { "chance": 3, "item": "creepy", "x": 22, "y": 21 },
+        { "chance": 10, "item": "trash_forest", "x": 10, "y": 23 },
+        { "chance": 20, "item": "trash_forest", "x": 18, "y": 22 },
+        { "chance": 10, "item": "trash_forest", "x": 2, "y": 22 },
+        { "chance": 10, "item": "trash_forest", "x": 22, "y": 19 },
+        { "chance": 10, "item": "magazines", "x": 17, "y": 10 },
+        { "chance": 20, "item": "barbecue", "x": 18, "y": 12 },
+        { "chance": 20, "item": "barbecue", "x": 8, "y": 12 },
+        { "chance": 20, "item": "barbecue", "x": 5, "y": 12 },
+        { "chance": 10, "item": "sports", "x": 11, "y": 16 },
+        { "chance": 10, "item": "field", "x": 2, "y": 16 },
+        { "chance": 10, "item": "field", "x": 1, "y": 13 }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Picnic Park",
+    "type": "mapgen",
+    "weight": 200,
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        "''''_''''''''''''''''_''",
+        "'0ffffffff0'_0ffffffff0_",
+        "'||||||||||_'||||||||||'",
+        "'''''''_'''''''''''_''''",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'bTTb''bTTb''bTTb''bTTb'",
+        "'''_'''''''''''''''''_''",
+        "''YY'&&'YY''''YY'&&'YY''",
+        "''''''''_'''''''''''''''",
+        "''''''''______'''''''__'",
+        "'''a'''''''__''''''d''__",
+        "'__'''''''''__'''d'''d''",
+        "''__''a''''''''''''d''d'",
+        "'t''a''bbb__'''d'''''d''",
+        "'''''''''____''''''d''''",
+        "'tu_''ut___'''''t'''u'''",
+        "''t''t'''''t'''u''u'''t'",
+        "'u''u'c'''u'''1'tu'tu''u",
+        "'_''_''ut''''c'''''uOt't",
+        "tu'1Ou'tu'c'u''u'tu1tu'u",
+        "'t'ut'_t''u't'ut'''u''t'"
+      ],
+      "palettes": [ "park_scenic_palette" ],
+      "place_items": [
+        { "chance": 10, "item": "barbecue", "x": 3, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 4, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 21, "y": 11 },
+        { "chance": 10, "item": "barbecue", "x": 22, "y": 8 },
+        { "chance": 10, "item": "barbecue", "x": 3, "y": 7 },
+        { "chance": 10, "item": "snacks", "x": 2, "y": 6 },
+        { "chance": 10, "item": "magazines", "x": 8, "y": 3 },
+        { "chance": 10, "item": "field", "x": 13, "y": 17 },
+        { "chance": 10, "item": "field", "x": 21, "y": 13 },
+        { "chance": 10, "item": "field", "x": 12, "y": 11 },
+        { "chance": 8, "item": "dogfight", "x": 16, "y": 16 },
+        { "chance": 5, "item": "clutter_yard", "x": 19, "y": 15 },
+        { "chance": 5, "item": "football_items", "x": 8, "y": 12 },
+        { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
+        { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Playground",
+    "type": "mapgen",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_thconc_floor",
+      "rows": [
+        "''0'0'O'O'O'0'0''''''_''",
+        "_''''''$'$''_''''''''''_",
+        "___t'ggggggg$'''''q]]]]'",
+        "'''''ghhhhhg$'b_''q+:x]'",
+        "'''''ggggggg$'b'_'q]5X]'",
+        "'''_'ghhhhhg''b'_'q]]]]'",
+        "'''''ggggggg$'b'''q]5X]'",
+        "'t'''ghhhhhg'_b_''q+:x]'",
+        "_''''ggggggg$''''_q]]]]'",
+        "'_'''ggggggg$''''_''bb''",
+        "_''''gmgmmmg'__'''_'''''",
+        "'t't_gmgmgmg''$$'$$'_'''",
+        "'''''gmgmgmg$$ggggg'''''",
+        "''''_gmmmgmg''ggggg$'b'_",
+        "_''_'ggggggg$$ggggg''b''",
+        "'t'_'gmmmmmg$'ggggg$_b''",
+        "t''''ggggggg''ggggg''''_",
+        "''t''''$'$'$''$'''$_'_''",
+        "'_'_t'''_'_''__''_'''''_",
+        "'tt'''tbbb'''t'bbb'''t''",
+        "t''''''''_t'''''''''''''",
+        "'''t't''''''''''''_'''_'",
+        "t''''''_t''''_'''''t''''",
+        "'t't''''''_'''t''_''''''"
+      ],
+      "palettes": [ "park_scenic_palette" ],
+      "place_items": [
+        { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 },
+        { "chance": 10, "item": "magazines", "x": 21, "y": 14 },
+        { "chance": 10, "item": "child_items", "x": 17, "y": 15 },
+        { "chance": 10, "item": "child_items", "x": 15, "y": 15 },
+        { "chance": 10, "item": "snacks", "x": 14, "y": 6 },
+        { "chance": 10, "item": "toy_box", "x": 16, "y": 14 },
+        { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
+      ],
+      "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 18 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "type": "mapgen",
+    "weight": 300,
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        "...___.......s.....s....",
+        "...___...*.......*.....s",
+        "....___....s.7.u...7u...",
+        "....____......*.........",
+        "......___.*......u...7.d",
+        "......___...u...*...s...",
+        "..7....___....s...7...d.",
+        "........___........*ddd.",
+        "........___.....u..ddddd",
+        ".........___......ddd.u.",
+        "...0ttt0..__....ddd.....",
+        "..0-|t|-0.___.ddd...###.",
+        "..t|ttt|t.___..d........",
+        "..ttttttt.____.....&7...",
+        "..t|ttt|td_____.........",
+        "..0-|t|-0.__d___...###..",
+        "...0ttt0.___..__________",
+        "........___...._________",
+        ".......____.....___f....",
+        ".......___.......___..f.",
+        "...._____.....7...__....",
+        "_________.f###...f___...",
+        "_______........f...___..",
+        "...........f..d....___.."
+      ],
+      "terrain": {
+        "|": "t_wall_log",
+        ".": "t_grass",
+        "7": [
+          [ "t_tree", 4 ],
+          "t_tree_hickory",
+          "t_tree_maple",
+          "t_tree_birch",
+          "t_tree_apple",
+          "t_tree_pine",
+          "t_tree_peach",
+          "t_tree_cherry",
+          "t_tree_pear",
+          "t_tree_young"
+        ],
+        "_": "t_sidewalk",
+        "d": [ "t_dirt", "t_grass_dead" ],
+        "s": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
+        "t": "t_thconc_floor",
+        "u": "t_underbrush",
+        "-": "t_fence"
+      },
+      "furniture": {
+        "#": "f_bench",
+        "&": "f_trashcan",
+        "*": [
+          "f_dandelion",
+          "f_chicory",
+          "f_bluebell",
+          [ "f_datura", 6 ],
+          [ "f_flower_tulip", 2 ],
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          [ "f_dahlia", 3 ]
+        ],
+        "0": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 3 ], "f_boulder_large" ],
+        "f": [
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ]
+      },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "d": { "item": "forest", "chance": 10 },
+        "#": { "item": "trash", "chance": 5 }
+      },
+      "monsters": {
+        "_": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
+        "t": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
+        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
+      }
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Scenic Park",
+    "type": "mapgen",
+    "weight": 400,
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        "........................",
+        "........................",
+        "..#######__..__#######..",
+        "..#||||||&_.._&||||||#..",
+        "..#|#####__..__#####|#..",
+        "..#|#bbb___..___bbb#|#..",
+        "..#|#b_____.._____b#|#..",
+        "..#|#b_____.._____b#|#..",
+        "..#|#___7......7___#|#..",
+        ".._S____...OO...____S_..",
+        "..______..OwwO..______..",
+        ".........OwwwwO.........",
+        ".........OwwwwO.........",
+        "..______..OwwO..______..",
+        ".._S____...OO...____S_..",
+        "..#|#___7......7___#|#..",
+        "..#|#b_____.._____b#|#..",
+        "..#|#b_____.._____b#|#..",
+        "..#|#bbb___..___bbb#|#..",
+        "..#|#####__..__#####|#..",
+        "..#||||||&_.._&||||||#..",
+        "..#######__..__#######..",
+        "........................",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_shrub",
+        ".": "t_sidewalk",
+        "0": "t_sidewalk",
+        "7": [ "t_tree_maple", "t_tree_birch", "t_tree_willow" ],
+        "O": "t_sidewalk",
+        "_": "t_grass",
+        "w": "t_water_pool_shallow",
+        "|": "t_fence"
+      },
+      "furniture": {
+        "&": "f_trashcan",
+        "O": [ "f_boulder_small", [ "f_boulder_medium", 3 ], [ "f_boulder_large", 3 ] ],
+        "S": "f_statue",
+        "b": "f_bench"
+      },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "b": { "item": "trash", "chance": 2 },
+        "|": { "item": "stoner", "chance": 1 }
+      },
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
     }
   },
   {
-    "type": "palette",
-    "id": "park_asphalt_palette",
-    "terrain": {
-      "+": "t_chaingate_c",
-      "|": "t_chainfence",
-      ".": "t_pavement_y",
-      "7": "t_backboard",
-      "[": "t_fence_rope",
-      "$": "t_sand",
-      ",": "t_dirt"
-    },
-    "furniture": { "b": "f_bench", "&": "f_trashcan" },
-    "items": {
-      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-      "b": { "item": "trash", "chance": 2 }
+    "method": "json",
+    "om_terrain": "park",
+    "//": "Pavilion",
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_grass",
+      "rows": [
+        "..........____..........",
+        "..........____..........",
+        "..#.......____..........",
+        ".##.......____B......#..",
+        "...#......____B.........",
+        ".|........____&BB...#|..",
+        ".|........_______....|..",
+        ".|.......{_______....|#.",
+        ".|.......cttttc__...f|..",
+        ".|..ss...tttttt__....|..",
+        ".|..ss...tbttbt__....|..",
+        ".|.......tbttbt__R...|..",
+        ".|.m.....tttttt__R...|..",
+        ".|.m.....cttttc__R#..|..",
+        ".|.m.S...tttttt__R...|..",
+        ".|.m.S...tttttt__R...|#.",
+        "#|...S...cbbvTcRRR...|4.",
+        "#|.......cccccc#....#|..",
+        ".|f........###.......|..",
+        ".|..........#........|a.",
+        ".|.4.............f.#.|#.",
+        "#|#.................a|#.",
+        ".|||||||||||||||||||||4.",
+        "...#...............#...."
+      ],
+      "terrain": {
+        "#": "t_shrub",
+        "4": "t_tree_pine",
+        "R": "t_railing",
+        "S": "t_slide",
+        "T": "t_thconc_floor",
+        "_": "t_sidewalk",
+        "a": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
+        "b": "t_thconc_floor",
+        "c": "t_concrete_wall",
+        "m": "t_monkey_bars",
+        "s": "t_sandbox",
+        "t": "t_thconc_floor",
+        "v": "t_thconc_floor",
+        "|": "t_chainfence"
+      },
+      "furniture": {
+        "&": "f_trashcan",
+        "B": "f_bench",
+        "T": "f_trashcan",
+        "b": "f_bench",
+        "f": [
+          [ "f_dandelion", 6 ],
+          [ "f_chicory", 2 ],
+          [ "f_bluebell", 2 ],
+          "f_datura",
+          "f_flower_tulip",
+          "f_flower_spurge",
+          "f_black_eyed_susan",
+          "f_dahlia"
+        ],
+        "v": "f_vending_c",
+        "{": "f_dumpster"
+      },
+      "vendingmachines": { "v": { "item_group": "vending_drink" } },
+      "items": {
+        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+        "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] },
+        "T": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ]
+      },
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
     }
-    "vendingmachines": { "V": { "item_group": "vending_drink" } }
   }
-]
\ No newline at end of file
+]

From 71b061c014d67cb924055e9d9f803fa6b767a0aa Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:13:36 -0800
Subject: [PATCH 06/16] fix cp error

---
 data/json/mapgen_palettes/park_palette.json | 819 +++-----------------
 1 file changed, 89 insertions(+), 730 deletions(-)

diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index 812c2c6e6a43e..d4517e23b3897 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -1,737 +1,96 @@
 [
   {
-    "id": "park_playground_vehicles",
-    "type": "vehicle_group",
-    "vehicles": [ [ "ice_cream_cart", 100 ], [ "food_cart", 200 ] ]
-  },
-  {
-    "name": "GROUP_PARK_PLAYGROUND",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] },
-      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 2, "pack_size": 1 }
-    ]
-  },
-  {
-    "name": "GROUP_PARK_SCENIC",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_rot", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
-    ]
-  },
-  {
-    "name": "GROUP_PARK_DOG",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_dog", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_dog_zombie_cop", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_dog_zombie_rot", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
-    ]
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Playground",
-    "weight": 500,
-    "object": {
-      "rotation": [ 0, 3 ],
-      "fill_ter": "t_region_groundcover_urban",
-      "rows": [
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "'''''''''''''t''''''''''",
-        "''''''t'''''''''gg''''''",
-        "''''''''''''''''gg''''''",
-        "''''''''''''''''''''''''",
-        "''''mmm'''''''''''''''''",
-        "''''mmm''''h'''''''bt'''",
-        "'''tmmm''''h'''''''b''''",
-        "'''''''''''h''''''''''''",
-        "'''''''''''h''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''b''''''''''''t''''",
-        "'''''tb'''''''''''''''''",
-        "'''''''''bb&'''t''''''''",
-        "'''''''''t''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''",
-        "''''''''''''''''''''''''"
-      ],
-      "palettes": [ "park_scenic_palette" ],
-      "monsters": { " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
-      "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Basketball Court",
-    "weight": 700,
-    "object": {
-      "fill_ter": "t_pavement",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "                        ",
-        " |||||||||||||||||||||| ",
-        " +  . .   . 7 .   . . + ",
-        " |V . .   .   .   . .&| ",
-        " |& . .   .....   . . | ",
-        " |  .  .  .   .  .  . | ",
-        " |b .   .  ...  .   .b| ",
-        " |b .    .......    .b| ",
-        " |b .               .b| ",
-        " |b .      ...      .b| ",
-        " |b .     .   .     .b| ",
-        " |  ................. | ",
-        " |b .     .   .     .b| ",
-        " |b .      ...      .b| ",
-        " |b .               .b| ",
-        " |b .    .......    .b| ",
-        " |b .   .  ...  .   .b| ",
-        " |  .  .  .   .  .  . | ",
-        " |  . .   .....   . . | ",
-        " |& . .   .   .   . .&| ",
-        " +  . .   . 7 .   . . + ",
-        " |||||||||||||||||||||| ",
-        "                        ",
-        "                        "
-      ],
-      "palettes": [ "park_asphalt_palette" ],
-      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 5, "repeat": [ 1, 3 ] } }
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Tennis Court",
-    "weight": 500,
-    "object": {
-      "fill_ter": "t_pavement",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "                        ",
-        " |||||||||||||||||||||& ",
-        " + ........[........ +  ",
-        " | ........[........ |V ",
-        " | .   .   [   .   . |b ",
-        " | .   .   [   .   . |b ",
-        " | .   ....[....   . |  ",
-        " | .   .   [   .   . |b ",
-        " | .   .   [   .   . |b ",
-        " | ........[........ |  ",
-        " | ........[........ |  ",
-        " |                   |  ",
-        " |                   |  ",
-        " | ........[........ |  ",
-        " | ........[........ |  ",
-        " | .   .   [   .   . |b ",
-        " | .   .   [   .   . |b ",
-        " | .   ....[....   . |  ",
-        " | .   .   [   .   . |b ",
-        " | .   .   [   .   . |b ",
-        " | ........[........ |& ",
-        " + ........[........ +  ",
-        " |||||||||||||||||||||  ",
-        "                        "
-      ],
-      "palettes": [ "park_asphalt_palette" ],
-      "monsters": {
-        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 3, "repeat": [ 1, 3 ] },
-        "b": { "monster": "GROUP_PARK_DOG", "chance": 3 }
-      }
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Volleyball Court",
-    "weight": 300,
-    "object": {
-      "fill_ter": "t_groundcover_urban",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "&bbb                bbb&",
-        "   ,,,,,,,,,[,,,,,,,,,  ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "   ,,,,,,,,,[,,,,,,,,,  ",
-        "                        ",
-        "                        ",
-        "   ,,,,,,,,,[,,,,,,,,,  ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "  ,$$$$$$$$$[$$$$$$$$$, ",
-        "   ,,,,,,,,,[,,,,,,,,,  ",
-        "&bbb                bbb&"
-      ],
-      "palettes": [ "park_asphalt_palette" ],
-      "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
-      "monsters": {
-        "$": { "monster": "GROUP_MALL", "chance": 1, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] }
-      }
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "weight": 500,
-    "object": {
-      "fill_ter": "t_grass",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "         ......         ",
-        "  zzzzzzzz....zzzzzzzz  ",
-        " z         ..         z ",
-        " z    ,bTb,.. t  *`*  z ",
-        " z  t ,bTb,..   *```* z ",
-        " z  & ..........````` z ",
-        " z ,,..,,  ..   *```* z ",
-        " z bb.,,,  ..    *`*  z ",
-        " z TT.,,, ....    .   z ",
-        ".z bb.   .ssss.   . t z.",
-        ".. ,,.  .ss~~ss.  .   ..",
-        ".........s~~~~s.........",
-        ".........s~~~~s.........",
-        "..   .  .ss~~ss.  .   ..",
-        ".z   .   .ssss.   .   z.",
-        " z   .    ....    . # z ",
-        " z t . t   ..     . b z ",
-        " z   ..    ..    .. b z ",
-        " z fss............  # z ",
-        " z sAs  t  ..         z ",
-        " z fsf     ..  #bb# t z ",
-        " z         ..         z ",
-        "  zzzzzzzz....zzzzzzzz  ",
-        "         ......         "
-      ],
-      "palettes": [ "park_scenic_palette" ],
-      "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
-      "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "weight": 500,
-    "object": {
-      "fill_ter": "t_grass",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "   ,   z ...... z     , ",
-        ",    zzz .o..o. zzz,    ",
-        " , zzz  z......z  zzz   ",
-        "  zz    b......b    zz, ",
-        "  z    tb......bt    z  ",
-        " zz  t  b......b  t  zz ",
-        " z      z......z      z ",
-        "zz  t   ........   t  zz",
-        "  zbbbz..........zbbbz  ",
-        "..........ssss..........",
-        ".o.......ssffss.......o.",
-        ".........sfzzfs.........",
-        ".........sfzzfs.........",
-        ".o.......ssffss.......o.",
-        "..........ssss..........",
-        "  zbbbz..........zbbbz  ",
-        "zz  t   ........   t  zz",
-        " z      z......z      z ",
-        " zz  t  b......b  t  zz ",
-        "  z    tb......bt    z  ",
-        "  zz    b......b    zz ,",
-        ",  zzz  z......z  zzz   ",
-        "     zzz .o..o. zzz ,   ",
-        " , ,   z ...... z       "
-      ],
-      "palettes": [ "park_scenic_palette" ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
-    }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Dog Park",
-    "weight": 500,
-    "object": {
-      "fill_ter": "t_region_groundcover_urban",
-      "rotation": [ 0, 3 ],
-      "rows": [
-        "__________|++|__________",
-        "__zzzzzzzz|,,|Pzzzzzzz__",
-        "_z|||||||||++|||||||||z_",
-        "_z|#~~.   &,,,       |z_",
-        "_z|~~~.   ,,,        |z_",
-        "_z|~~..         t    |z_",
-        "_z|...              ,|z_",
-        "_z|                ,b|z_",
-        "_z|,               ,b|z_",
-        "_P|,,,             ,b|z_",
-        "|||&,            t  ,|||",
-        "+,+,,      P       ,,+,+",
-        "+,+,,,     &      ,,,+,+",
-        "|||,,              ,&|||",
-        "_z|b,               ,|P_",
-        "_z|b,t               |z_",
-        "_z|b,          t     |z_",
-        "_z|,        ,,       |z_",
-        "_z|     t  ,,,       |z_",
-        "_z|       ,,,,,,,    |z_",
-        "_z|      ,&,,,bbb,   |z_",
-        "_z|||||||||++|||||||||z_",
-        "__zzzzzzzP|,,|zzzzzzzz__",
-        "__________|++|__________"
-      ],
-      "terrain": {
-        "+": "t_chaingate_c",
-        ",": "t_dirt",
-        "|": "t_chainfence",
-        ".": "t_sidewalk",
-        "#": "t_water_pool_shallow",
-        "b": "t_dirt",
-        "P": "t_dirt",
-        "&": "t_dirt",
-        "s": "t_sidewalk",
-        "t": "t_region_tree_shade",
-        "z": "t_region_shrub_decorative",
-        "~": "t_water_pool_shallow"
-      },
-      "furniture": { "b": "f_bench", "P": "f_sign", "&": "f_trashcan", "#": "f_boulder_large" },
-      "place_signs": [
-        { "signage": "Scoop the Poop!", "x": 11, "y": 11 },
-        { "signage": "DANGER!  Doggy Minefield!", "x": 1, "y": 9 },
-        { "signage": "Dog Park: Off Leash Area", "x": 9, "y": 22 },
-        { "signage": "Watch your step!", "x": 14, "y": 1 },
-        { "signage": "Use park at your own risk.", "x": 22, "y": 14 }
-      ],
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
-      "place_item": [
-        { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] },
-        { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 2 },
-        { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] },
-        { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] },
-        { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] },
-        { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] },
-        { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
-      ],
-      "monsters": {
-        ",": { "monster": "GROUP_PARK_DOG", "chance": 2, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_DOG", "chance": 1, "repeat": [ 2, 4 ] }
-      }
-    }
-  },
-  {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Picnic Park",
-    "type": "mapgen",
-    "weight": 300,
-    "object": {
-      "fill_ter": "t_region_groundcover_urban",
-      "rows": [
-        "'ppppp''''''''''''''''''",
-        "'ppppp''''''''''''''''''",
-        "'pppppppppppppppp'''''''",
-        "'pppppppppppppppp'''''''",
-        "'PppppPppppPppppP''''u''",
-        "'PppppPppppPppppP'''''''",
-        "'PppppPppppPppppP'''''''",
-        "'PppppPppppPppppP'''''4'",
-        "'PppppPppppPppppP'''''''",
-        "'''''''''''ss'''''''''''",
-        "''''''&ssssssssss&''''e'",
-        "''''''sBBBBssBBBBs''''C'",
-        "'''''YsLLLLssLLLLsY'''''",
-        "''''''sBBBBssBBBBs''4'4'",
-        "'''t''ssssssssssssWWu'''",
-        "''''$$'''''''t'''WwwW'u'",
-        "'''$g$''''''''''Wwwwwi4'",
-        "''''''''''''''''Wwwwwi'4",
-        "''''''mm'h'''''WwwwwiI''",
-        "'''4''''''''''Wwwwwwi''u",
-        "''''''''''4'''WwwwwiI'u4",
-        "'4'''''4'''''''WWWi4'4''",
-        "'''u4'''4''0u'4u'''''u4u",
-        "''''''u''''u4''''u4'''''"
-      ],
-      "place_items": [
-        { "chance": 8, "item": "dogfight", "x": 2, "y": 12 },
-        { "chance": 30, "item": "trash", "x": 6, "y": 10 },
-        { "chance": 10, "item": "child_items", "x": 7, "y": 18 },
-        { "chance": 3, "item": "creepy", "x": 22, "y": 21 },
-        { "chance": 10, "item": "trash_forest", "x": 10, "y": 23 },
-        { "chance": 20, "item": "trash_forest", "x": 18, "y": 22 },
-        { "chance": 10, "item": "trash_forest", "x": 2, "y": 22 },
-        { "chance": 10, "item": "trash_forest", "x": 22, "y": 19 },
-        { "chance": 10, "item": "magazines", "x": 17, "y": 10 },
-        { "chance": 20, "item": "barbecue", "x": 18, "y": 12 },
-        { "chance": 20, "item": "barbecue", "x": 8, "y": 12 },
-        { "chance": 20, "item": "barbecue", "x": 5, "y": 12 },
-        { "chance": 10, "item": "sports", "x": 11, "y": 16 },
-        { "chance": 10, "item": "field", "x": 2, "y": 16 },
-        { "chance": 10, "item": "field", "x": 1, "y": 13 }
-      ]
-    }
-  },
-  {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Picnic Park",
-    "type": "mapgen",
-    "weight": 200,
-    "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "''''_''''''''''''''''_''",
-        "'0ffffffff0'_0ffffffff0_",
-        "'||||||||||_'||||||||||'",
-        "'''''''_'''''''''''_''''",
-        "'bTTb''bTTb''bTTb''bTTb'",
-        "'bTTb''bTTb''bTTb''bTTb'",
-        "'bTTb''bTTb''bTTb''bTTb'",
-        "'bTTb''bTTb''bTTb''bTTb'",
-        "'bTTb''bTTb''bTTb''bTTb'",
-        "'''_'''''''''''''''''_''",
-        "''YY'&&'YY''''YY'&&'YY''",
-        "''''''''_'''''''''''''''",
-        "''''''''______'''''''__'",
-        "'''a'''''''__''''''d''__",
-        "'__'''''''''__'''d'''d''",
-        "''__''a''''''''''''d''d'",
-        "'t''a''bbb__'''d'''''d''",
-        "'''''''''____''''''d''''",
-        "'tu_''ut___'''''t'''u'''",
-        "''t''t'''''t'''u''u'''t'",
-        "'u''u'c'''u'''1'tu'tu''u",
-        "'_''_''ut''''c'''''uOt't",
-        "tu'1Ou'tu'c'u''u'tu1tu'u",
-        "'t'ut'_t''u't'ut'''u''t'"
-      ],
-      "palettes": [ "park_scenic_palette" ],
-      "place_items": [
-        { "chance": 10, "item": "barbecue", "x": 3, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 4, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 21, "y": 11 },
-        { "chance": 10, "item": "barbecue", "x": 22, "y": 8 },
-        { "chance": 10, "item": "barbecue", "x": 3, "y": 7 },
-        { "chance": 10, "item": "snacks", "x": 2, "y": 6 },
-        { "chance": 10, "item": "magazines", "x": 8, "y": 3 },
-        { "chance": 10, "item": "field", "x": 13, "y": 17 },
-        { "chance": 10, "item": "field", "x": 21, "y": 13 },
-        { "chance": 10, "item": "field", "x": 12, "y": 11 },
-        { "chance": 8, "item": "dogfight", "x": 16, "y": 16 },
-        { "chance": 5, "item": "clutter_yard", "x": 19, "y": 15 },
-        { "chance": 5, "item": "football_items", "x": 8, "y": 12 },
-        { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
-        { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
-      ]
+    "type": "palette",
+    "id": "park_scenic_palette",
+    "terrain": {
+      "#": "t_rock",
+      "%": "t_sidewalk",
+      "*": "t_wall_wood",
+      ",": "t_dirt",
+      "_": [ [ "t_dirt", 5 ], "t_grass_dead" ],
+      ".": "t_pavement",
+      "'": "t_grass",
+      "`": "t_floor",
+      "&": "t_dirt",
+      "|": "t_fence",
+      "$": "t_sand",
+      "+": "t_door_c",
+      ":": "t_thconc_floor",
+      "]": "t_brick_wall",
+      "~": "t_water_pool_shallow",
+      "A": "t_sidewalk",
+      "a": "t_region_tree_fruit",
+      "b": "t_dirt",
+      "B": "t_thconc_floor",
+      "C": "t_covered_well",
+      "c": "t_region_tree",
+      "e": "t_water_pump",
+      "g": "t_sandbox",
+      "h": "t_slide",
+      "i": "t_water_sh",
+      "L": "t_thconc_floor",
+      "m": "t_monkey_bars",
+      "o": "t_column",
+      "P": "t_pavement_y",
+      "p": "t_pavement",
+      "q": "t_concrete",
+      "s": "t_sidewalk",
+      "t": "t_region_tree_shade",
+      "T": "t_dirt",
+      "u": "t_region_shrub",
+      "W": "t_water_sh",
+      "w": "t_water_dp",
+      "x": "t_thconc_floor",
+      "X": "t_thconc_floor",
+      "Y": "t_concrete",
+      "z": "t_region_shrub_decorative",
+      "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
+      "4": "t_region_tree_evergreen",
+      "5": "t_thconc_floor"
+    },
+    "furniture": {
+      "%": "f_trashcan",
+      "&": "f_trashcan",
+      "'": [ [ "f_null", 40 ], "f_region_flower" ],
+      "A": "f_statue",
+      "B": "f_bench",
+      "b": "f_bench",
+      "d": "f_region_weed",
+      "f": "f_region_flower_decorative",
+      "I": "f_cattails",
+      "i": "f_cattails",
+      "L": "f_table",
+      "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
+      "T": "f_table",
+      "x": "f_toilet",
+      "X": "f_trashcan",
+      "Y": "f_brazier",
+      "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
+      "5": "f_sink"
+    },
+    "items": {
+      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "b": { "item": "trash", "chance": 2 },
+      "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
     }
   },
   {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Playground",
-    "type": "mapgen",
-    "weight": 300,
-    "object": {
-      "fill_ter": "t_thconc_floor",
-      "rows": [
-        "''0'0'O'O'O'0'0''''''_''",
-        "_''''''$'$''_''''''''''_",
-        "___t'ggggggg$'''''q]]]]'",
-        "'''''ghhhhhg$'b_''q+:x]'",
-        "'''''ggggggg$'b'_'q]5X]'",
-        "'''_'ghhhhhg''b'_'q]]]]'",
-        "'''''ggggggg$'b'''q]5X]'",
-        "'t'''ghhhhhg'_b_''q+:x]'",
-        "_''''ggggggg$''''_q]]]]'",
-        "'_'''ggggggg$''''_''bb''",
-        "_''''gmgmmmg'__'''_'''''",
-        "'t't_gmgmgmg''$$'$$'_'''",
-        "'''''gmgmgmg$$ggggg'''''",
-        "''''_gmmmgmg''ggggg$'b'_",
-        "_''_'ggggggg$$ggggg''b''",
-        "'t'_'gmmmmmg$'ggggg$_b''",
-        "t''''ggggggg''ggggg''''_",
-        "''t''''$'$'$''$'''$_'_''",
-        "'_'_t'''_'_''__''_'''''_",
-        "'tt'''tbbb'''t'bbb'''t''",
-        "t''''''''_t'''''''''''''",
-        "'''t't''''''''''''_'''_'",
-        "t''''''_t''''_'''''t''''",
-        "'t't''''''_'''t''_''''''"
-      ],
-      "palettes": [ "park_scenic_palette" ],
-      "place_items": [
-        { "chance": 3, "item": "stash_drugs", "x": 21, "y": 3 },
-        { "chance": 10, "item": "magazines", "x": 21, "y": 14 },
-        { "chance": 10, "item": "child_items", "x": 17, "y": 15 },
-        { "chance": 10, "item": "child_items", "x": 15, "y": 15 },
-        { "chance": 10, "item": "snacks", "x": 14, "y": 6 },
-        { "chance": 10, "item": "toy_box", "x": 16, "y": 14 },
-        { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
-      ],
-      "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 18 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
-    }
-  },
-  {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "type": "mapgen",
-    "weight": 300,
-    "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "...___.......s.....s....",
-        "...___...*.......*.....s",
-        "....___....s.7.u...7u...",
-        "....____......*.........",
-        "......___.*......u...7.d",
-        "......___...u...*...s...",
-        "..7....___....s...7...d.",
-        "........___........*ddd.",
-        "........___.....u..ddddd",
-        ".........___......ddd.u.",
-        "...0ttt0..__....ddd.....",
-        "..0-|t|-0.___.ddd...###.",
-        "..t|ttt|t.___..d........",
-        "..ttttttt.____.....&7...",
-        "..t|ttt|td_____.........",
-        "..0-|t|-0.__d___...###..",
-        "...0ttt0.___..__________",
-        "........___...._________",
-        ".......____.....___f....",
-        ".......___.......___..f.",
-        "...._____.....7...__....",
-        "_________.f###...f___...",
-        "_______........f...___..",
-        "...........f..d....___.."
-      ],
-      "terrain": {
-        "|": "t_wall_log",
-        ".": "t_grass",
-        "7": [
-          [ "t_tree", 4 ],
-          "t_tree_hickory",
-          "t_tree_maple",
-          "t_tree_birch",
-          "t_tree_apple",
-          "t_tree_pine",
-          "t_tree_peach",
-          "t_tree_cherry",
-          "t_tree_pear",
-          "t_tree_young"
-        ],
-        "_": "t_sidewalk",
-        "d": [ "t_dirt", "t_grass_dead" ],
-        "s": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
-        "t": "t_thconc_floor",
-        "u": "t_underbrush",
-        "-": "t_fence"
-      },
-      "furniture": {
-        "#": "f_bench",
-        "&": "f_trashcan",
-        "*": [
-          "f_dandelion",
-          "f_chicory",
-          "f_bluebell",
-          [ "f_datura", 6 ],
-          [ "f_flower_tulip", 2 ],
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          [ "f_dahlia", 3 ]
-        ],
-        "0": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-        "f": [
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ]
-      },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "d": { "item": "forest", "chance": 10 },
-        "#": { "item": "trash", "chance": 5 }
-      },
-      "monsters": {
-        "_": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
-        "t": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
-        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
-      }
-    }
-  },
-  {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Scenic Park",
-    "type": "mapgen",
-    "weight": 400,
-    "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "........................",
-        "........................",
-        "..#######__..__#######..",
-        "..#||||||&_.._&||||||#..",
-        "..#|#####__..__#####|#..",
-        "..#|#bbb___..___bbb#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#___7......7___#|#..",
-        ".._S____...OO...____S_..",
-        "..______..OwwO..______..",
-        ".........OwwwwO.........",
-        ".........OwwwwO.........",
-        "..______..OwwO..______..",
-        ".._S____...OO...____S_..",
-        "..#|#___7......7___#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#bbb___..___bbb#|#..",
-        "..#|#####__..__#####|#..",
-        "..#||||||&_.._&||||||#..",
-        "..#######__..__#######..",
-        "........................",
-        "........................"
-      ],
-      "terrain": {
-        "#": "t_shrub",
-        ".": "t_sidewalk",
-        "0": "t_sidewalk",
-        "7": [ "t_tree_maple", "t_tree_birch", "t_tree_willow" ],
-        "O": "t_sidewalk",
-        "_": "t_grass",
-        "w": "t_water_pool_shallow",
-        "|": "t_fence"
-      },
-      "furniture": {
-        "&": "f_trashcan",
-        "O": [ "f_boulder_small", [ "f_boulder_medium", 3 ], [ "f_boulder_large", 3 ] ],
-        "S": "f_statue",
-        "b": "f_bench"
-      },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "b": { "item": "trash", "chance": 2 },
-        "|": { "item": "stoner", "chance": 1 }
-      },
-      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
-    }
-  },
-  {
-    "method": "json",
-    "om_terrain": "park",
-    "//": "Pavilion",
-    "type": "mapgen",
-    "weight": 100,
-    "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "..........____..........",
-        "..........____..........",
-        "..#.......____..........",
-        ".##.......____B......#..",
-        "...#......____B.........",
-        ".|........____&BB...#|..",
-        ".|........_______....|..",
-        ".|.......{_______....|#.",
-        ".|.......cttttc__...f|..",
-        ".|..ss...tttttt__....|..",
-        ".|..ss...tbttbt__....|..",
-        ".|.......tbttbt__R...|..",
-        ".|.m.....tttttt__R...|..",
-        ".|.m.....cttttc__R#..|..",
-        ".|.m.S...tttttt__R...|..",
-        ".|.m.S...tttttt__R...|#.",
-        "#|...S...cbbvTcRRR...|4.",
-        "#|.......cccccc#....#|..",
-        ".|f........###.......|..",
-        ".|..........#........|a.",
-        ".|.4.............f.#.|#.",
-        "#|#.................a|#.",
-        ".|||||||||||||||||||||4.",
-        "...#...............#...."
-      ],
-      "terrain": {
-        "#": "t_shrub",
-        "4": "t_tree_pine",
-        "R": "t_railing",
-        "S": "t_slide",
-        "T": "t_thconc_floor",
-        "_": "t_sidewalk",
-        "a": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
-        "b": "t_thconc_floor",
-        "c": "t_concrete_wall",
-        "m": "t_monkey_bars",
-        "s": "t_sandbox",
-        "t": "t_thconc_floor",
-        "v": "t_thconc_floor",
-        "|": "t_chainfence"
-      },
-      "furniture": {
-        "&": "f_trashcan",
-        "B": "f_bench",
-        "T": "f_trashcan",
-        "b": "f_bench",
-        "f": [
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ],
-        "v": "f_vending_c",
-        "{": "f_dumpster"
-      },
-      "vendingmachines": { "v": { "item_group": "vending_drink" } },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] },
-        "T": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ]
-      },
-      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
-    }
+    "type": "palette",
+    "id": "park_asphalt_palette",
+    "terrain": {
+      "+": "t_chaingate_c",
+      "|": "t_chainfence",
+      ".": "t_pavement_y",
+      "7": "t_backboard",
+      "[": "t_fence_rope",
+      "$": "t_sand",
+      ",": "t_dirt"
+    },
+    "furniture": { "b": "f_bench", "&": "f_trashcan" },
+    "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+    "vendingmachines": { "V": { "item_group": "vending_drink" } }
   }
 ]

From ad80a02d127d351a6a2e08e3cf25316b4a78b584 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 13:16:29 -0800
Subject: [PATCH 07/16] Update park_palette.json

---
 data/json/mapgen_palettes/park_palette.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index d4517e23b3897..217a5c8cd309a 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -28,6 +28,7 @@
       "g": "t_sandbox",
       "h": "t_slide",
       "i": "t_water_sh",
+      "l": "t_wall_log"
       "L": "t_thconc_floor",
       "m": "t_monkey_bars",
       "o": "t_column",
@@ -44,6 +45,7 @@
       "X": "t_thconc_floor",
       "Y": "t_concrete",
       "z": "t_region_shrub_decorative",
+      "Z": "t_region_shrub_fruit",
       "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
       "4": "t_region_tree_evergreen",
       "5": "t_thconc_floor"

From 7c07da997cd93f5387d95bcc83e8c622152fe932 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 13:17:23 -0800
Subject: [PATCH 08/16] continue palettizing

---
 data/json/mapgen/park.json | 108 ++++++++++---------------------------
 1 file changed, 29 insertions(+), 79 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index 6c90c8f41a569..a19719a52b54c 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -513,89 +513,39 @@
     "type": "mapgen",
     "weight": 300,
     "object": {
-      "fill_ter": "t_grass",
-      "rows": [
-        "...___.......s.....s....",
-        "...___...*.......*.....s",
-        "....___....s.7.u...7u...",
-        "....____......*.........",
-        "......___.*......u...7.d",
-        "......___...u...*...s...",
-        "..7....___....s...7...d.",
-        "........___........*ddd.",
-        "........___.....u..ddddd",
-        ".........___......ddd.u.",
-        "...0ttt0..__....ddd.....",
-        "..0-|t|-0.___.ddd...###.",
-        "..t|ttt|t.___..d........",
-        "..ttttttt.____.....&7...",
-        "..t|ttt|td_____.........",
-        "..0-|t|-0.__d___...###..",
-        "...0ttt0.___..__________",
-        "........___...._________",
-        ".......____.....___f....",
-        ".......___.......___..f.",
-        "...._____.....7...__....",
-        "_________.f###...f___...",
-        "_______........f...___..",
-        "...........f..d....___.."
+      "fill_ter": "t_grass",      "rows": [
+        "'''sss'''''''Z'''''Z''''",
+        "'''sss'''f'''''''f'''''Z",
+        "''''sss''''Z'c'u'''cu'''",
+        "''''ssss''''''f'''''''''",
+        "''''''sss'f''''''u'''c'_",
+        "''''''sss'''u'''f'''Z'''",
+        "''c''''sss''''Z'''c'''_'",
+        "''''''''sss''''''''f___'",
+        "''''''''sss'''''u''_____",
+        "'''''''''sss''''''___'u'",
+        "'''0:::0''ss''''___'''''",
+        "''0|l:l|0'sss'___'''bbb'",
+        "'':l:::l:'sss''_''''''''",
+        "'':::::::'ssss'''''&c'''",
+        "'':l:::l:_sssss'''''''''",
+        "''0|l:l|0'ss_sss'''bbb''",
+        "'''0:::0'sss''ssssssssss",
+        "''''''''sss''''sssssssss",
+        "'''''''ssss'''''sssd''''",
+        "'''''''sss'''''''sss''d'",
+        "''''sssss'''''c'''ss''''",
+        "sssssssss'dbbb'''dsss'''",
+        "sssssss''''''''d'''sss''",
+        "'''''''''''d''_''''sss''"
       ],
-      "terrain": {
-        "|": "t_wall_log",
-        ".": "t_grass",
-        "7": [
-          [ "t_tree", 4 ],
-          "t_tree_hickory",
-          "t_tree_maple",
-          "t_tree_birch",
-          "t_tree_apple",
-          "t_tree_pine",
-          "t_tree_peach",
-          "t_tree_cherry",
-          "t_tree_pear",
-          "t_tree_young"
-        ],
-        "_": "t_sidewalk",
-        "d": [ "t_dirt", "t_grass_dead" ],
-        "s": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
-        "t": "t_thconc_floor",
-        "u": "t_underbrush",
-        "-": "t_fence"
-      },
-      "furniture": {
-        "#": "f_bench",
-        "&": "f_trashcan",
-        "*": [
-          "f_dandelion",
-          "f_chicory",
-          "f_bluebell",
-          [ "f_datura", 6 ],
-          [ "f_flower_tulip", 2 ],
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          [ "f_dahlia", 3 ]
-        ],
-        "0": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-        "f": [
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ]
-      },
       "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "d": { "item": "forest", "chance": 10 },
-        "#": { "item": "trash", "chance": 5 }
+        "_": { "item": "forest", "chance": 10 }
       },
       "monsters": {
-        "_": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
-        "t": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
-        ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
+        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
       }
     }
   },

From 4dc81340c037ceea79f9f453996a4e4ff8654a19 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 13:31:56 -0800
Subject: [PATCH 09/16] Update park_palette.json

---
 data/json/mapgen_palettes/park_palette.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index 217a5c8cd309a..adba137dee67d 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -28,7 +28,7 @@
       "g": "t_sandbox",
       "h": "t_slide",
       "i": "t_water_sh",
-      "l": "t_wall_log"
+      "l": "t_wall_log",
       "L": "t_thconc_floor",
       "m": "t_monkey_bars",
       "o": "t_column",

From 3a403d0538aa65525914ade17f618fe10a5d6ea4 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 13:43:53 -0800
Subject: [PATCH 10/16] fix error in playground monster spawning

---
 data/json/mapgen/park.json | 68 ++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index a19719a52b54c..eb94b274e4060 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -44,33 +44,33 @@
       "rotation": [ 0, 3 ],
       "fill_ter": "t_region_groundcover_urban",
       "rows": [
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "'''''''''''''t''''''''''",
-          "''''''t'''''''''gg''''''",
-          "''''''''''''''''gg''''''",
-          "''''''''''''''''''''''''",
-          "''''mmm'''''''''''''''''",
-          "''''mmm''''h'''''''bt'''",
-          "'''tmmm''''h'''''''b''''",
-          "'''''''''''h''''''''''''",
-          "'''''''''''h''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''b''''''''''''t''''",
-          "'''''tb'''''''''''''''''",
-          "'''''''''bb&'''t''''''''",
-          "'''''''''t''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''",
-          "''''''''''''''''''''''''"
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "'''''''''''''t''''''''''",
+        "''''''t'''''''''gg''''''",
+        "''''''''''''''''gg''''''",
+        "''''''''''''''''''''''''",
+        "''''mmm'''''''''''''''''",
+        "''''mmm''''h'''''''bt'''",
+        "'''tmmm''''h'''''''b''''",
+        "'''''''''''h''''''''''''",
+        "'''''''''''h''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''b''''''''''''t''''",
+        "'''''tb'''''''''''''''''",
+        "'''''''''bb&'''t''''''''",
+        "'''''''''t''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''",
+        "''''''''''''''''''''''''"
       ],
       "palettes": [ "park_scenic_palette" ],
-      "monsters": { " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
+      "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
       "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
     }
   },
@@ -513,7 +513,8 @@
     "type": "mapgen",
     "weight": 300,
     "object": {
-      "fill_ter": "t_grass",      "rows": [
+      "fill_ter": "t_grass",
+      "rows": [
         "'''sss'''''''Z'''''Z''''",
         "'''sss'''f'''''''f'''''Z",
         "''''sss''''Z'c'u'''cu'''",
@@ -539,9 +540,7 @@
         "sssssss''''''''d'''sss''",
         "'''''''''''d''_''''sss''"
       ],
-      "items": {
-        "_": { "item": "forest", "chance": 10 }
-      },
+      "items": { "_": { "item": "forest", "chance": 10 } },
       "monsters": {
         "s": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
         ":": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
@@ -662,16 +661,7 @@
         "B": "f_bench",
         "T": "f_trashcan",
         "b": "f_bench",
-        "f": [
-          [ "f_dandelion", 6 ],
-          [ "f_chicory", 2 ],
-          [ "f_bluebell", 2 ],
-          "f_datura",
-          "f_flower_tulip",
-          "f_flower_spurge",
-          "f_black_eyed_susan",
-          "f_dahlia"
-        ],
+        "f": "f_region_flower_decorative",
         "v": "f_vending_c",
         "{": "f_dumpster"
       },

From 7f48b219d27ce0ff3bb3af05e6f0991b23d85d8e Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 15:04:08 -0800
Subject: [PATCH 11/16] finish palettizing parks

---
 data/json/mapgen/park.json                  | 161 ++++++----------
 data/json/mapgen_palettes/park_palette.json | 203 ++++++++++----------
 2 files changed, 164 insertions(+), 200 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index eb94b274e4060..4e68486552b54 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -557,53 +557,35 @@
     "object": {
       "fill_ter": "t_grass",
       "rows": [
-        "........................",
-        "........................",
-        "..#######__..__#######..",
-        "..#||||||&_.._&||||||#..",
-        "..#|#####__..__#####|#..",
-        "..#|#bbb___..___bbb#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#___7......7___#|#..",
-        ".._S____...OO...____S_..",
-        "..______..OwwO..______..",
-        ".........OwwwwO.........",
-        ".........OwwwwO.........",
-        "..______..OwwO..______..",
-        ".._S____...OO...____S_..",
-        "..#|#___7......7___#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#b_____.._____b#|#..",
-        "..#|#bbb___..___bbb#|#..",
-        "..#|#####__..__#####|#..",
-        "..#||||||&_.._&||||||#..",
-        "..#######__..__#######..",
-        "........................",
-        "........................"
+        "ssssssssssssssssssssssss",
+        "ssssssssssssssssssssssss",
+        "sszzzzzzz''ss''zzzzzzzss",
+        "ssz||||||&'ss'&||||||zss",
+        "ssz|zzzzz''ss''zzzzz|zss",
+        "ssz|zbbb'''ss'''bbbz|zss",
+        "ssz|zb'''''ss'''''bz|zss",
+        "ssz|zb'''''ss'''''bz|zss",
+        "ssz|z'''tsssssst'''z|zss",
+        "ss'A''''sssOOsss''''A'ss",
+        "ss''''''ssO~~Oss''''''ss",
+        "sssssssssO~~~~Osssssssss",
+        "sssssssssO~~~~Osssssssss",
+        "ss''''''ssO~~Oss''''''ss",
+        "ss'A''''sssOOsss''''A'ss",
+        "ssz|z'''tsssssst'''z|zss",
+        "ssz|zb'''''ss'''''bz|zss",
+        "ssz|zb'''''ss'''''bz|zss",
+        "ssz|zbbb'''ss'''bbbz|zss",
+        "ssz|zzzzz''ss''zzzzz|zss",
+        "ssz||||||&'ss'&||||||zss",
+        "sszzzzzzz''ss''zzzzzzzss",
+        "ssssssssssssssssssssssss",
+        "ssssssssssssssssssssssss"
       ],
-      "terrain": {
-        "#": "t_shrub",
-        ".": "t_sidewalk",
-        "0": "t_sidewalk",
-        "7": [ "t_tree_maple", "t_tree_birch", "t_tree_willow" ],
-        "O": "t_sidewalk",
-        "_": "t_grass",
-        "w": "t_water_pool_shallow",
-        "|": "t_fence"
-      },
-      "furniture": {
-        "&": "f_trashcan",
-        "O": [ "f_boulder_small", [ "f_boulder_medium", 3 ], [ "f_boulder_large", 3 ] ],
-        "S": "f_statue",
-        "b": "f_bench"
-      },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "b": { "item": "trash", "chance": 2 },
-        "|": { "item": "stoner", "chance": 1 }
-      },
-      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
+      "palettes": [ "park_scenic_palette" ],
+      "terrain": { "O": "t_sidewalk" },
+      "items": { "|": { "item": "stoner", "chance": 1 } },
+      "monsters": { "s": { "monster": "GROUP_PARK_SCENIC", "chance": 2 }, "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
     }
   },
   {
@@ -613,65 +595,40 @@
     "type": "mapgen",
     "weight": 100,
     "object": {
-      "fill_ter": "t_grass",
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
-        "..........____..........",
-        "..........____..........",
-        "..#.......____..........",
-        ".##.......____B......#..",
-        "...#......____B.........",
-        ".|........____&BB...#|..",
-        ".|........_______....|..",
-        ".|.......{_______....|#.",
-        ".|.......cttttc__...f|..",
-        ".|..ss...tttttt__....|..",
-        ".|..ss...tbttbt__....|..",
-        ".|.......tbttbt__R...|..",
-        ".|.m.....tttttt__R...|..",
-        ".|.m.....cttttc__R#..|..",
-        ".|.m.S...tttttt__R...|..",
-        ".|.m.S...tttttt__R...|#.",
-        "#|...S...cbbvTcRRR...|4.",
-        "#|.......cccccc#....#|..",
-        ".|f........###.......|..",
-        ".|..........#........|a.",
-        ".|.4.............f.#.|#.",
-        "#|#.................a|#.",
-        ".|||||||||||||||||||||4.",
-        "...#...............#...."
+        "''''''''''ssss''''''''''",
+        "''''''''''ssss''''''''''",
+        "''u'''''''ssss''''''''''",
+        "'uu'''''''ssssb''''''u''",
+        "'''u''''''ssssb'''''''''",
+        "'[''''''''ssss&bb'''u[''",
+        "'[''''''''sssssss''''[''",
+        "'['''''''{sssssss''''[u'",
+        "'['''''''Q::::Qss'''f[''",
+        "'[''gg'''::::::ss''''[''",
+        "'[''gg''':B::B:ss''''[''",
+        "'[''''''':B::B:ssR'''[''",
+        "'['m'''''::::::ssR'''[''",
+        "'['m'''''Q::::QssRu''[''",
+        "'['m'h'''::::::ssR'''[''",
+        "'['m'h'''::::::ssR'''[u'",
+        "u['''h'''QBBvXQRRR'''[4'",
+        "u['''''''QQQQQQu''''u[''",
+        "'[f''''''''uuu'''''''[''",
+        "'[''''''''''u''''''''[Z'",
+        "'['4'''''''''''''f'u'[u'",
+        "u[u'''''''''''''''''Z[u'",
+        "'[[[[[[[[[[[[[[[[[[[[[4'",
+        "'''u'''''''''''''''u''''"
       ],
-      "terrain": {
-        "#": "t_shrub",
-        "4": "t_tree_pine",
-        "R": "t_railing",
-        "S": "t_slide",
-        "T": "t_thconc_floor",
-        "_": "t_sidewalk",
-        "a": [ "t_shrub_blueberry", "t_shrub_strawberry", "t_shrub_raspberry" ],
-        "b": "t_thconc_floor",
-        "c": "t_concrete_wall",
-        "m": "t_monkey_bars",
-        "s": "t_sandbox",
-        "t": "t_thconc_floor",
-        "v": "t_thconc_floor",
-        "|": "t_chainfence"
-      },
-      "furniture": {
-        "&": "f_trashcan",
-        "B": "f_bench",
-        "T": "f_trashcan",
-        "b": "f_bench",
-        "f": "f_region_flower_decorative",
-        "v": "f_vending_c",
-        "{": "f_dumpster"
-      },
       "vendingmachines": { "v": { "item_group": "vending_drink" } },
-      "items": {
-        "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-        "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] },
-        "T": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ]
-      },
-      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
+      "items": { "X": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ] },
+      "monsters": {
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1 },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
+        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 2 }
+      }
     }
   }
 ]
diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index adba137dee67d..6987fca789bdc 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -1,98 +1,105 @@
-[
-  {
-    "type": "palette",
-    "id": "park_scenic_palette",
-    "terrain": {
-      "#": "t_rock",
-      "%": "t_sidewalk",
-      "*": "t_wall_wood",
-      ",": "t_dirt",
-      "_": [ [ "t_dirt", 5 ], "t_grass_dead" ],
-      ".": "t_pavement",
-      "'": "t_grass",
-      "`": "t_floor",
-      "&": "t_dirt",
-      "|": "t_fence",
-      "$": "t_sand",
-      "+": "t_door_c",
-      ":": "t_thconc_floor",
-      "]": "t_brick_wall",
-      "~": "t_water_pool_shallow",
-      "A": "t_sidewalk",
-      "a": "t_region_tree_fruit",
-      "b": "t_dirt",
-      "B": "t_thconc_floor",
-      "C": "t_covered_well",
-      "c": "t_region_tree",
-      "e": "t_water_pump",
-      "g": "t_sandbox",
-      "h": "t_slide",
-      "i": "t_water_sh",
-      "l": "t_wall_log",
-      "L": "t_thconc_floor",
-      "m": "t_monkey_bars",
-      "o": "t_column",
-      "P": "t_pavement_y",
-      "p": "t_pavement",
-      "q": "t_concrete",
-      "s": "t_sidewalk",
-      "t": "t_region_tree_shade",
-      "T": "t_dirt",
-      "u": "t_region_shrub",
-      "W": "t_water_sh",
-      "w": "t_water_dp",
-      "x": "t_thconc_floor",
-      "X": "t_thconc_floor",
-      "Y": "t_concrete",
-      "z": "t_region_shrub_decorative",
-      "Z": "t_region_shrub_fruit",
-      "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
-      "4": "t_region_tree_evergreen",
-      "5": "t_thconc_floor"
-    },
-    "furniture": {
-      "%": "f_trashcan",
-      "&": "f_trashcan",
-      "'": [ [ "f_null", 40 ], "f_region_flower" ],
-      "A": "f_statue",
-      "B": "f_bench",
-      "b": "f_bench",
-      "d": "f_region_weed",
-      "f": "f_region_flower_decorative",
-      "I": "f_cattails",
-      "i": "f_cattails",
-      "L": "f_table",
-      "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
-      "T": "f_table",
-      "x": "f_toilet",
-      "X": "f_trashcan",
-      "Y": "f_brazier",
-      "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
-      "5": "f_sink"
-    },
-    "items": {
-      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-      "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
-      "b": { "item": "trash", "chance": 2 },
-      "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
-      "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
-      "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
-    }
-  },
-  {
-    "type": "palette",
-    "id": "park_asphalt_palette",
-    "terrain": {
-      "+": "t_chaingate_c",
-      "|": "t_chainfence",
-      ".": "t_pavement_y",
-      "7": "t_backboard",
-      "[": "t_fence_rope",
-      "$": "t_sand",
-      ",": "t_dirt"
-    },
-    "furniture": { "b": "f_bench", "&": "f_trashcan" },
-    "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
-    "vendingmachines": { "V": { "item_group": "vending_drink" } }
-  }
-]
+[
+  {
+    "type": "palette",
+    "id": "park_scenic_palette",
+    "terrain": {
+      "#": "t_rock",
+      "%": "t_sidewalk",
+      "*": "t_wall_wood",
+      ",": "t_dirt",
+      "_": [ [ "t_dirt", 5 ], "t_grass_dead" ],
+      ".": "t_pavement",
+      "'": "t_grass",
+      "`": "t_floor",
+      "&": "t_dirt",
+      "|": "t_fence",
+      "$": "t_sand",
+      "+": "t_door_c",
+      ":": "t_thconc_floor",
+      "v": "t_thconc_floor",
+      "]": "t_brick_wall",
+      "~": "t_water_pool_shallow",
+      "A": "t_sidewalk",
+      "a": "t_region_tree_fruit",
+      "b": "t_dirt",
+      "B": "t_thconc_floor",
+      "C": "t_covered_well",
+      "c": "t_region_tree",
+      "e": "t_water_pump",
+      "g": "t_sandbox",
+      "h": "t_slide",
+      "i": "t_water_sh",
+      "l": "t_wall_log",
+      "L": "t_thconc_floor",
+      "m": "t_monkey_bars",
+      "o": "t_column",
+      "P": "t_pavement_y",
+      "p": "t_pavement",
+      "q": "t_concrete",
+      "Q": "t_concrete_wall",
+      "R": "t_railing",
+      "[": "t_chainfence",
+      "s": "t_sidewalk",
+      "t": "t_region_tree_shade",
+      "T": "t_dirt",
+      "u": "t_region_shrub",
+      "W": "t_water_sh",
+      "w": "t_water_dp",
+      "x": "t_thconc_floor",
+      "X": "t_thconc_floor",
+      "Y": "t_concrete",
+      "z": "t_region_shrub_decorative",
+      "Z": "t_region_shrub_fruit",
+      "1": [ [ "t_tree_young", 3 ], "t_shrub" ],
+      "4": "t_region_tree_evergreen",
+      "5": "t_thconc_floor"
+    },
+    "furniture": {
+      "%": "f_trashcan",
+      "&": "f_trashcan",
+      "'": [ [ "f_null", 40 ], "f_region_flower" ],
+      "{": "f_dumpster",
+      "A": "f_statue",
+      "B": "f_bench",
+      "b": "f_bench",
+      "d": "f_region_weed",
+      "f": "f_region_flower_decorative",
+      "I": "f_cattails",
+      "i": "f_cattails",
+      "L": "f_table",
+      "O": [ [ "f_boulder_small", 2 ], [ "f_boulder_medium", 4 ], "f_boulder_large" ],
+      "T": "f_table",
+      "v": "f_vending_c",
+      "x": "f_toilet",
+      "X": "f_trashcan",
+      "Y": "f_brazier",
+      "0": [ [ "f_boulder_medium", 3 ], "f_boulder_large" ],
+      "5": "f_sink"
+    },
+    "items": {
+      "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "%": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] },
+      "{": { "item": "trash", "chance": 100, "repeat": [ 5, 25 ] },
+      "b": { "item": "trash", "chance": 2 },
+      "L": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "T": [ { "item": "dining", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "trash", "chance": 2 } ],
+      "X": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }
+    }
+  },
+  {
+    "type": "palette",
+    "id": "park_asphalt_palette",
+    "terrain": {
+      "+": "t_chaingate_c",
+      "|": "t_chainfence",
+      ".": "t_pavement_y",
+      "7": "t_backboard",
+      "[": "t_fence_rope",
+      "$": "t_sand",
+      ",": "t_dirt"
+    },
+    "furniture": { "b": "f_bench", "&": "f_trashcan" },
+    "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } },
+    "vendingmachines": { "V": { "item_group": "vending_drink" } }
+  }
+]

From 100f9e8b50032452eaf5aa607d718f2d7cc4b387 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 15:50:45 -0800
Subject: [PATCH 12/16] update vehicles and monster groups and remove from the
 main file

---
 data/json/mapgen/park.json           | 80 +++++++++++-----------------
 data/json/monstergroups/zombies.json | 50 +++++++++++++++++
 data/json/vehicle_groups.json        |  5 ++
 3 files changed, 85 insertions(+), 50 deletions(-)
 create mode 100644 data/json/monstergroups/zombies.json

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index 4e68486552b54..e04e8466e09dc 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -1,39 +1,4 @@
 [
-  {
-    "id": "park_playground_vehicles",
-    "type": "vehicle_group",
-    "vehicles": [ [ "ice_cream_cart", 100 ], [ "food_cart", 200 ] ]
-  },
-  {
-    "name": "GROUP_PARK_PLAYGROUND",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] },
-      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 2, "pack_size": 1 }
-    ]
-  },
-  {
-    "name": "GROUP_PARK_SCENIC",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_rot", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
-    ]
-  },
-  {
-    "name": "GROUP_PARK_DOG",
-    "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "mon_zombie", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_zombie_dog", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_dog_zombie_cop", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_dog_zombie_rot", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
-    ]
-  },
   {
     "type": "mapgen",
     "method": "json",
@@ -71,7 +36,7 @@
       ],
       "palettes": [ "park_scenic_palette" ],
       "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
-      "place_vehicles": [ { "vehicle": "park_playground_vehicles", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
+      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -236,7 +201,8 @@
       "palettes": [ "park_scenic_palette" ],
       "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
       "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+      "place_monsters": [ { "monster": "GROUP_PARK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ],
+      "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -275,7 +241,8 @@
         " , ,   z ...... z       "
       ],
       "palettes": [ "park_scenic_palette" ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ]
+      "place_monsters": [ { "monster": "GROUP_PARK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ],
+      "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -401,7 +368,8 @@
         { "chance": 10, "item": "sports", "x": 11, "y": 16 },
         { "chance": 10, "item": "field", "x": 2, "y": 16 },
         { "chance": 10, "item": "field", "x": 1, "y": 13 }
-      ]
+      ],
+      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 }, "p": { "vehicle": "suburban_home", "chance": 1 } }
     }
   },
   {
@@ -455,7 +423,8 @@
         { "chance": 5, "item": "football_items", "x": 8, "y": 12 },
         { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
         { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
-      ]
+      ],
+      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 }, "p": { "vehicle": "suburban_home", "chance": 1 } }
     }
   },
   {
@@ -503,7 +472,15 @@
         { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
       ],
       "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 18 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 3 ] } ]
+      "monsters": {
+        "'": {
+          "monster": "GROUP_PARK",
+          "chance": 1,
+          "repeat": [ 1, 3 ],
+          "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] },
+          "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
+        }
+      }
     }
   },
   {
@@ -542,10 +519,11 @@
       ],
       "items": { "_": { "item": "forest", "chance": 10 } },
       "monsters": {
-        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 3, 5 ] },
-        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
-        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1, "repeat": [ 1, 2 ] }
-      }
+        "s": { "monster": "GROUP_PARK", "chance": 1, "repeat": [ 3, 5 ] },
+        ":": { "monster": "GROUP_PARK", "chance": 2 },
+        "'": { "monster": "GROUP_PARK", "chance": 1, "repeat": [ 1, 2 ] }
+      },
+      "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -585,7 +563,8 @@
       "palettes": [ "park_scenic_palette" ],
       "terrain": { "O": "t_sidewalk" },
       "items": { "|": { "item": "stoner", "chance": 1 } },
-      "monsters": { "s": { "monster": "GROUP_PARK_SCENIC", "chance": 2 }, "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1 } }
+      "monsters": { "s": { "monster": "GROUP_PARK", "chance": 2 }, "'": { "monster": "GROUP_PARK", "chance": 1 } },
+      "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -625,10 +604,11 @@
       "vendingmachines": { "v": { "item_group": "vending_drink" } },
       "items": { "X": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ] },
       "monsters": {
-        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 1 },
-        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 2 },
-        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 2 }
-      }
+        "'": { "monster": "GROUP_PARK", "chance": 1 },
+        ":": { "monster": "GROUP_PARK", "chance": 2 },
+        "s": { "monster": "GROUP_PARK", "chance": 2 }
+      },
+      "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   }
 ]
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
new file mode 100644
index 0000000000000..de5ed535e8a42
--- /dev/null
+++ b/data/json/monstergroups/zombies.json
@@ -0,0 +1,50 @@
+[
+  {
+    "name": "GROUP_PARK",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_child", "freq": 100, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_tough", "freq": 75, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_zombie_fat", "freq": 50, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_rot", "freq": 50, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_brainless", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_dog", "freq": 25, "cost_multiplier": 1, "pack_size": [ 2, 3 ] }
+    ]
+  },
+  {
+    "name": "GROUP_PARK_PLAYGROUND",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie_child", "freq": 295, "cost_multiplier": 1, "pack_size": [ 5, 12 ] },
+      { "monster": "mon_zombie", "freq": 100, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_tough", "freq": 75, "cost_multiplier": 3 },
+      { "monster": "mon_zombie_fat", "freq": 50, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_rot", "freq": 50, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 3 },
+      { "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_brainless", "freq": 25, "cost_multiplier": 2 }
+    ]
+  },
+  {
+    "name": "GROUP_PARK_DOG",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_zombie", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_dog", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_dog_zombie_cop", "freq": 25, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_dog_zombie_rot", "freq": 125, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_tough", "freq": 75, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_zombie_fat", "freq": 50, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_rot", "freq": 50, "cost_multiplier": 1, "pack_size": [ 2, 3 ] },
+      { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_brainless", "freq": 25, "cost_multiplier": 1 }
+    ]
+  }
+]
diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
index d1dc96df6c8a3..3f08c63026ac3 100644
--- a/data/json/vehicle_groups.json
+++ b/data/json/vehicle_groups.json
@@ -610,5 +610,10 @@
       [ "ambulance", 300 ],
       [ "fire_truck", 150 ]
     ]
+  },
+  {
+    "id": "park_playground_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [ [ "ice_cream_cart", 100 ], [ "food_cart", 200 ], [ "bicycle", 150 ], [ "bicycle_dirt", 125 ], [ "tricycle", 5 ] ]
   }
 ]

From 396ff41e7d79cbdf0596502fd7a60cb88e6d6903 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 16:38:36 -0800
Subject: [PATCH 13/16] fix errors caught on playtest

---
 data/json/mapgen/park.json           | 70 ++++++++++++++--------------
 data/json/monstergroups/zombies.json |  2 +-
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index e04e8466e09dc..41ff19e6c6c59 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -35,7 +35,7 @@
         "''''''''''''''''''''''''"
       ],
       "palettes": [ "park_scenic_palette" ],
-      "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] } },
+      "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] } },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -75,7 +75,7 @@
         "                        "
       ],
       "palettes": [ "park_asphalt_palette" ],
-      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 5, "repeat": [ 1, 3 ] } }
+      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 20, "repeat": [ 1, 3 ] } }
     }
   },
   {
@@ -115,8 +115,8 @@
       ],
       "palettes": [ "park_asphalt_palette" ],
       "monsters": {
-        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 3, "repeat": [ 1, 3 ] },
-        "b": { "monster": "GROUP_PARK_DOG", "chance": 3 }
+        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] },
+        "b": { "monster": "GROUP_PARK_DOG", "chance": 100 }
       }
     }
   },
@@ -127,7 +127,7 @@
     "//": "Volleyball Court",
     "weight": 300,
     "object": {
-      "fill_ter": "t_groundcover_urban",
+      "fill_ter": "t_region_groundcover_urban",
       "rotation": [ 0, 3 ],
       "rows": [
         "&bbb                bbb&",
@@ -158,8 +158,8 @@
       "palettes": [ "park_asphalt_palette" ],
       "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
       "monsters": {
-        "$": { "monster": "GROUP_MALL", "chance": 1, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] }
+        "$": { "monster": "GROUP_MALL", "chance": 100, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] }
       }
     }
   },
@@ -199,9 +199,8 @@
         "         ......         "
       ],
       "palettes": [ "park_scenic_palette" ],
-      "place_items": [ { "item": "trash", "x": 4, "y": 5, "chance": 50 } ],
       "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 2, 4 ] } ],
       "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -241,7 +240,7 @@
         " , ,   z ...... z       "
       ],
       "palettes": [ "park_scenic_palette" ],
-      "place_monsters": [ { "monster": "GROUP_PARK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 2, 4 ] } ],
+      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 2, 4 ] } ],
       "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -302,10 +301,10 @@
         { "signage": "Watch your step!", "x": 14, "y": 1 },
         { "signage": "Use park at your own risk.", "x": 22, "y": 14 }
       ],
-      "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] } },
+      "items": { "&": { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] } },
       "place_item": [
         { "item": "bag_plastic", "x": 10, "y": 11, "repeat": [ 10, 50 ] },
-        { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 2 },
+        { "item": "feces_dog", "x": [ 3, 20 ], "y": [ 3, 20 ], "chance": 200 },
         { "item": "feces_dog", "x": 3, "y": 10, "repeat": [ 1, 10 ] },
         { "item": "feces_dog", "x": 10, "y": 3, "repeat": [ 1, 10 ] },
         { "item": "feces_dog", "x": 20, "y": 13, "repeat": [ 1, 10 ] },
@@ -313,8 +312,8 @@
         { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
       ],
       "monsters": {
-        ",": { "monster": "GROUP_PARK_DOG", "chance": 2, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_DOG", "chance": 1, "repeat": [ 2, 4 ] }
+        ",": { "monster": "GROUP_PARK_DOG", "chance": 50, "repeat": [ 2, 4 ] },
+        " ": { "monster": "GROUP_PARK_DOG", "chance": 100, "repeat": [ 2, 4 ] }
       }
     }
   },
@@ -352,19 +351,20 @@
         "'''u4'''4''0u'4u'''''u4u",
         "''''''u''''u4''''u4'''''"
       ],
+      "palettes": [ "park_scenic_palette" ],
       "place_items": [
         { "chance": 8, "item": "dogfight", "x": 2, "y": 12 },
         { "chance": 30, "item": "trash", "x": 6, "y": 10 },
         { "chance": 10, "item": "child_items", "x": 7, "y": 18 },
         { "chance": 3, "item": "creepy", "x": 22, "y": 21 },
         { "chance": 10, "item": "trash_forest", "x": 10, "y": 23 },
-        { "chance": 20, "item": "trash_forest", "x": 18, "y": 22 },
+        { "chance": 500, "item": "trash_forest", "x": 18, "y": 22 },
         { "chance": 10, "item": "trash_forest", "x": 2, "y": 22 },
         { "chance": 10, "item": "trash_forest", "x": 22, "y": 19 },
         { "chance": 10, "item": "magazines", "x": 17, "y": 10 },
-        { "chance": 20, "item": "barbecue", "x": 18, "y": 12 },
-        { "chance": 20, "item": "barbecue", "x": 8, "y": 12 },
-        { "chance": 20, "item": "barbecue", "x": 5, "y": 12 },
+        { "chance": 500, "item": "barbecue", "x": 18, "y": 12 },
+        { "chance": 500, "item": "barbecue", "x": 8, "y": 12 },
+        { "chance": 500, "item": "barbecue", "x": 5, "y": 12 },
         { "chance": 10, "item": "sports", "x": 11, "y": 16 },
         { "chance": 10, "item": "field", "x": 2, "y": 16 },
         { "chance": 10, "item": "field", "x": 1, "y": 13 }
@@ -424,7 +424,7 @@
         { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
         { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
       ],
-      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 }, "p": { "vehicle": "suburban_home", "chance": 1 } }
+      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -473,14 +473,10 @@
       ],
       "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
       "monsters": {
-        "'": {
-          "monster": "GROUP_PARK",
-          "chance": 1,
-          "repeat": [ 1, 3 ],
-          "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 1, "repeat": [ 1, 3 ] },
-          "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
-        }
-      }
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 1, 3 ] },
+        "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] }
+      },
+      "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
   {
@@ -517,11 +513,12 @@
         "sssssss''''''''d'''sss''",
         "'''''''''''d''_''''sss''"
       ],
-      "items": { "_": { "item": "forest", "chance": 10 } },
+      "palettes": [ "park_scenic_palette" ],
+      "items": { "_": { "item": "forest", "chance": 4 } },
       "monsters": {
-        "s": { "monster": "GROUP_PARK", "chance": 1, "repeat": [ 3, 5 ] },
-        ":": { "monster": "GROUP_PARK", "chance": 2 },
-        "'": { "monster": "GROUP_PARK", "chance": 1, "repeat": [ 1, 2 ] }
+        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 3, 5 ] },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 100 },
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 1, 2 ] }
       },
       "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
@@ -563,7 +560,7 @@
       "palettes": [ "park_scenic_palette" ],
       "terrain": { "O": "t_sidewalk" },
       "items": { "|": { "item": "stoner", "chance": 1 } },
-      "monsters": { "s": { "monster": "GROUP_PARK", "chance": 2 }, "'": { "monster": "GROUP_PARK", "chance": 1 } },
+      "monsters": { "s": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }, "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 } },
       "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -601,12 +598,13 @@
         "'[[[[[[[[[[[[[[[[[[[[[4'",
         "'''u'''''''''''''''u''''"
       ],
+      "palettes": [ "park_scenic_palette" ],
       "vendingmachines": { "v": { "item_group": "vending_drink" } },
-      "items": { "X": [ { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 65 } ] },
+      "items": { "X": [ { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 25 } ] },
       "monsters": {
-        "'": { "monster": "GROUP_PARK", "chance": 1 },
-        ":": { "monster": "GROUP_PARK", "chance": 2 },
-        "s": { "monster": "GROUP_PARK", "chance": 2 }
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 50 },
+        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }
       },
       "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
index de5ed535e8a42..d84a1661eb067 100644
--- a/data/json/monstergroups/zombies.json
+++ b/data/json/monstergroups/zombies.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "GROUP_PARK",
+    "name": "GROUP_PARK_SCENIC",
     "type": "monstergroup",
     "default": "mon_null",
     "monsters": [

From 778c35731e887fb2e56128af4f6046bedfafbeed Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 16:54:02 -0800
Subject: [PATCH 14/16] Update park.json

---
 data/json/mapgen/park.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index 41ff19e6c6c59..4bb4c5e801e79 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -379,7 +379,7 @@
     "type": "mapgen",
     "weight": 200,
     "object": {
-      "fill_ter": "t_grass",
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
         "''''_''''''''''''''''_''",
         "'0ffffffff0'_0ffffffff0_",
@@ -434,7 +434,7 @@
     "type": "mapgen",
     "weight": 300,
     "object": {
-      "fill_ter": "t_thconc_floor",
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
         "''0'0'O'O'O'0'0''''''_''",
         "_''''''$'$''_''''''''''_",
@@ -486,7 +486,7 @@
     "type": "mapgen",
     "weight": 300,
     "object": {
-      "fill_ter": "t_grass",
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
         "'''sss'''''''Z'''''Z''''",
         "'''sss'''f'''''''f'''''Z",

From 69df4be0d74637b49e41b02f14b0db74b285bbec Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 26 Nov 2019 17:03:08 -0800
Subject: [PATCH 15/16] tweak monster spawning

---
 data/json/mapgen/park.json | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index 4bb4c5e801e79..c2c1b0ebb43c8 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -35,7 +35,7 @@
         "''''''''''''''''''''''''"
       ],
       "palettes": [ "park_scenic_palette" ],
-      "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] } },
+      "monsters": { "'": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 70 } },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -75,7 +75,7 @@
         "                        "
       ],
       "palettes": [ "park_asphalt_palette" ],
-      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 20, "repeat": [ 1, 3 ] } }
+      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 20 }, " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 200 } }
     }
   },
   {
@@ -115,7 +115,7 @@
       ],
       "palettes": [ "park_asphalt_palette" ],
       "monsters": {
-        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] },
+        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 50 },
         "b": { "monster": "GROUP_PARK_DOG", "chance": 100 }
       }
     }
@@ -158,8 +158,8 @@
       "palettes": [ "park_asphalt_palette" ],
       "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
       "monsters": {
-        "$": { "monster": "GROUP_MALL", "chance": 100, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] }
+        "$": { "monster": "GROUP_PARK_SCENIC", "chance": 50 },
+        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100 }
       }
     }
   },
@@ -200,7 +200,7 @@
       ],
       "palettes": [ "park_scenic_palette" ],
       "place_item": [ { "item": "char_smoker", "x": 7, "y": 7 } ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 2, 4 ] } ],
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 20 } },
       "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -240,7 +240,7 @@
         " , ,   z ...... z       "
       ],
       "palettes": [ "park_scenic_palette" ],
-      "place_monsters": [ { "monster": "GROUP_PARK_SCENIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 2, 4 ] } ],
+      "monsters": { ".": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }, " ": { "monster": "GROUP_PARK_SCENIC", "chance": 100 } },
       "vehicles": { ".": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -312,8 +312,8 @@
         { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
       ],
       "monsters": {
-        ",": { "monster": "GROUP_PARK_DOG", "chance": 50, "repeat": [ 2, 4 ] },
-        " ": { "monster": "GROUP_PARK_DOG", "chance": 100, "repeat": [ 2, 4 ] }
+        ",": { "monster": "GROUP_PARK_DOG", "chance": 30 },
+        " ": { "monster": "GROUP_PARK_DOG", "chance": 60 }
       }
     }
   },
@@ -369,6 +369,7 @@
         { "chance": 10, "item": "field", "x": 2, "y": 16 },
         { "chance": 10, "item": "field", "x": 1, "y": 13 }
       ],
+      "monsters": { "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 }, "s": { "monster": "GROUP_PARK_SCENIC", "chance": 20 } },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 }, "p": { "vehicle": "suburban_home", "chance": 1 } }
     }
   },
@@ -424,6 +425,7 @@
         { "chance": 5, "item": "stoner", "x": 7, "y": 16 },
         { "chance": 5, "item": "forage_mushroom", "x": 3, "y": 21 }
       ],
+      "monsters": { "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 }, "_": { "monster": "GROUP_PARK_SCENIC", "chance": 20 } },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },
@@ -473,8 +475,8 @@
       ],
       "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
       "monsters": {
-        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 1, 3 ] },
-        "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100, "repeat": [ 1, 3 ] }
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 60 },
+        "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 40 }
       },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
@@ -516,9 +518,9 @@
       "palettes": [ "park_scenic_palette" ],
       "items": { "_": { "item": "forest", "chance": 4 } },
       "monsters": {
-        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 3, 5 ] },
-        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 100 },
-        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100, "repeat": [ 1, 2 ] }
+        "s": { "monster": "GROUP_PARK_SCENIC", "chance": 40 },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 50 },
+        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 }
       },
       "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
@@ -603,7 +605,7 @@
       "items": { "X": [ { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 25 } ] },
       "monsters": {
         "'": { "monster": "GROUP_PARK_SCENIC", "chance": 100 },
-        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 50 },
+        ":": { "monster": "GROUP_PARK_SCENIC", "chance": 60 },
         "s": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }
       },
       "vehicles": { "s": { "vehicle": "park_playground_vehicles", "chance": 1 } }

From dae789a7c7a2073f5a9cd7541f93b6c4cf3533f2 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Thu, 28 Nov 2019 14:52:38 -0800
Subject: [PATCH 16/16] Update park.json

---
 data/json/mapgen/park.json | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/data/json/mapgen/park.json b/data/json/mapgen/park.json
index c2c1b0ebb43c8..d2195d66e181d 100644
--- a/data/json/mapgen/park.json
+++ b/data/json/mapgen/park.json
@@ -75,7 +75,10 @@
         "                        "
       ],
       "palettes": [ "park_asphalt_palette" ],
-      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 20 }, " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 200 } }
+      "monsters": {
+        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 20 },
+        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 200 }
+      }
     }
   },
   {
@@ -114,10 +117,7 @@
         "                        "
       ],
       "palettes": [ "park_asphalt_palette" ],
-      "monsters": {
-        ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 50 },
-        "b": { "monster": "GROUP_PARK_DOG", "chance": 100 }
-      }
+      "monsters": { ".": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 50 }, "b": { "monster": "GROUP_PARK_DOG", "chance": 100 } }
     }
   },
   {
@@ -157,10 +157,7 @@
       ],
       "palettes": [ "park_asphalt_palette" ],
       "items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
-      "monsters": {
-        "$": { "monster": "GROUP_PARK_SCENIC", "chance": 50 },
-        " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100 }
-      }
+      "monsters": { "$": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }, " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100 } }
     }
   },
   {
@@ -311,10 +308,7 @@
         { "item": "feces_dog", "x": 20, "y": 10, "repeat": [ 1, 10 ] },
         { "item": "feces_dog", "x": 11, "y": 12, "repeat": [ 5, 20 ] }
       ],
-      "monsters": {
-        ",": { "monster": "GROUP_PARK_DOG", "chance": 30 },
-        " ": { "monster": "GROUP_PARK_DOG", "chance": 60 }
-      }
+      "monsters": { ",": { "monster": "GROUP_PARK_DOG", "chance": 30 }, " ": { "monster": "GROUP_PARK_DOG", "chance": 60 } }
     }
   },
   {
@@ -474,10 +468,7 @@
         { "chance": 10, "item": "toy_box", "x": 14, "y": 13 }
       ],
       "place_toilets": [ { "x": 21, "y": 3 }, { "x": 21, "y": 5 } ],
-      "monsters": {
-        "'": { "monster": "GROUP_PARK_SCENIC", "chance": 60 },
-        "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 40 }
-      },
+      "monsters": { "'": { "monster": "GROUP_PARK_SCENIC", "chance": 60 }, "g": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 40 } },
       "vehicles": { "'": { "vehicle": "park_playground_vehicles", "chance": 1 } }
     }
   },