From 27ef44c5776399564eda154f81ecfc0e0ea27dfc Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Mon, 3 Aug 2020 22:30:53 -0400
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 overworld/biomes/hot-beach.json      | 14 ++++++++++++++
 overworld/biomes/swamp-beach.json    | 14 ++++++++++++++
 overworld/biomes/swamp-ocean.json    |  3 ++-
 overworld/biomes/tropical-beach.json | 14 ++++++++++++++
 overworld/biomes/tundra-beach.json   | 14 ++++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/overworld/biomes/hot-beach.json b/overworld/biomes/hot-beach.json
index 657f5321..14ca0a74 100644
--- a/overworld/biomes/hot-beach.json
+++ b/overworld/biomes/hot-beach.json
@@ -45,6 +45,20 @@
             ],
             "dispersion": "SCATTER",
             "variance": "SCATTER"
+        },
+        {
+            "zoom": 5,
+            "verticalZoom": 5,
+            "chance": 0.11,
+            "partOf": "SHORE_LINE",
+            "stackMin": 1,
+            "stackMax": 2,
+            "palette": [
+                "SUGAR_CANE"
+            ],
+            "verticalVariance": "WISPY",
+            "dispersion": "WISPY",
+            "variance": "SCATTER"
         }
     ],
     "generators":[
diff --git a/overworld/biomes/swamp-beach.json b/overworld/biomes/swamp-beach.json
index 7dc25f3d..1e52d40a 100644
--- a/overworld/biomes/swamp-beach.json
+++ b/overworld/biomes/swamp-beach.json
@@ -51,6 +51,20 @@
             ],
             "dispersion": "SCATTER",
             "variance": "SCATTER"
+        },
+        {
+            "zoom": 5,
+            "verticalZoom": 5,
+            "chance": 0.12,
+            "partOf": "SHORE_LINE",
+            "stackMin": 2,
+            "stackMax": 3,
+            "palette": [
+                "SUGAR_CANE"
+            ],
+            "verticalVariance": "WISPY",
+            "dispersion": "WISPY",
+            "variance": "SCATTER"
         }
     ],
     "generators":[
diff --git a/overworld/biomes/swamp-ocean.json b/overworld/biomes/swamp-ocean.json
index 9eb88b3f..5820ff27 100644
--- a/overworld/biomes/swamp-ocean.json
+++ b/overworld/biomes/swamp-ocean.json
@@ -38,10 +38,11 @@
         },
         {
             "zoom": 20,
-            "chance": 0.1,
+            "chance": 0.09,
             "palette": [
                 "LILY_PAD"
             ],
+            "partOf": "SEA_SURFACE",
             "dispersion": "SCATTER",
             "variance": "SCATTER"
         }
diff --git a/overworld/biomes/tropical-beach.json b/overworld/biomes/tropical-beach.json
index ad545f5c..02c7ac03 100644
--- a/overworld/biomes/tropical-beach.json
+++ b/overworld/biomes/tropical-beach.json
@@ -26,6 +26,20 @@
             ],
             "dispersion": "SCATTER",
             "variance": "SCATTER"
+        },
+        {
+            "zoom": 5,
+            "verticalZoom": 5,
+            "chance": 0.23,
+            "partOf": "SHORE_LINE",
+            "stackMin": 1,
+            "stackMax": 3,
+            "palette": [
+                "SUGAR_CANE"
+            ],
+            "verticalVariance": "WISPY",
+            "dispersion": "WISPY",
+            "variance": "SCATTER"
         }
     ],
     "slab": {
diff --git a/overworld/biomes/tundra-beach.json b/overworld/biomes/tundra-beach.json
index 9c3f99e6..48488519 100644
--- a/overworld/biomes/tundra-beach.json
+++ b/overworld/biomes/tundra-beach.json
@@ -38,6 +38,20 @@
             ],
             "dispersion": "SCATTER",
             "variance": "SCATTER"
+        },
+        {
+            "zoom": 5,
+            "verticalZoom": 5,
+            "chance": 0.09,
+            "partOf": "SHORE_LINE",
+            "stackMin": 1,
+            "stackMax": 3,
+            "palette": [
+                "SUGAR_CANE"
+            ],
+            "verticalVariance": "WISPY",
+            "dispersion": "WISPY",
+            "variance": "SCATTER"
         }
     ],
     "generators":[