From bad2f87d7f4d0889a206602ac0d2fd43e2198d23 Mon Sep 17 00:00:00 2001
From: Brian Fopiano <mypsn1550@gmail.com>
Date: Fri, 7 Aug 2020 15:36:36 -0700
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 overworld/biomes/swamp-mountains.json     | 10 ++++++++
 overworld/biomes/swamp-roofed.json        | 10 ++++++++
 overworld/biomes/swamp-willow-forest.json | 10 ++++++++
 overworld/dimensions/overworld.json       | 26 +++++++++++----------
 overworld/regions/frozen.json             |  1 +
 overworld/regions/swamp.json              | 28 +----------------------
 6 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/overworld/biomes/swamp-mountains.json b/overworld/biomes/swamp-mountains.json
index 3296a58b..ccb9e8aa 100644
--- a/overworld/biomes/swamp-mountains.json
+++ b/overworld/biomes/swamp-mountains.json
@@ -24,6 +24,16 @@
             ]
         }
     ],
+    "structures": [
+        {
+            "tileset": "murky-stronghold",
+            "zoom": 1.14,
+            "ratio": 0.59,
+            "height": 67,
+            "rarity": 44,
+            "shuffle": 16
+        }
+    ],
     "objects": [
         {
             "chance": 0.000256,
diff --git a/overworld/biomes/swamp-roofed.json b/overworld/biomes/swamp-roofed.json
index 270bc1e2..f09b5291 100644
--- a/overworld/biomes/swamp-roofed.json
+++ b/overworld/biomes/swamp-roofed.json
@@ -236,6 +236,16 @@
             }
         }
     ],
+    "structures": [
+        {
+            "tileset": "murky-stronghold",
+            "zoom": 1.15,
+            "ratio": 0.58,
+            "height": 53,
+            "rarity": 41,
+            "shuffle": 11
+        }
+    ],
     "children": [
         "swamp-dark-oak-denmyre"
     ],
diff --git a/overworld/biomes/swamp-willow-forest.json b/overworld/biomes/swamp-willow-forest.json
index e73283ce..dfceff9a 100644
--- a/overworld/biomes/swamp-willow-forest.json
+++ b/overworld/biomes/swamp-willow-forest.json
@@ -33,6 +33,16 @@
             ]
         }
     ],
+    "structures": [
+        {
+            "tileset": "murky-stronghold",
+            "zoom": 1.14,
+            "ratio": 0.59,
+            "height": 58,
+            "rarity": 37,
+            "shuffle": 16
+        }
+    ],
     "wall": 
     {
         "dispersion": "SCATTER",
diff --git a/overworld/dimensions/overworld.json b/overworld/dimensions/overworld.json
index b8c49895..3eef9fe2 100644
--- a/overworld/dimensions/overworld.json
+++ b/overworld/dimensions/overworld.json
@@ -1,11 +1,12 @@
 {
     "environment": "NORMAL",
     "regions": [
+        "hot",
+        "tropical",
+        "mushroom",
+        "swamp",
         "temperate",
         "tundra",
-        "tropical",
-        "hot",
-        "swamp",
         "frozen"
     ],
     "mirrorCeiling": false,
@@ -38,7 +39,8 @@
     "caveShift": -11,
     "focus": "",
     "fluidHeight": 99,
-    "biomeZoom": 1.72,
+    "biomeZoom": 2.88,
+    "continentalShuffle": 99,
     "regionZoom": 2.245,
     "continentZoom": 1,
     "dimensionAngleDeg": 19,
@@ -122,8 +124,8 @@
             "maxHeight": 18,
             "minSize": 2,
             "maxSize": 6,
-            "minPerChunk": 2,
-            "maxPerChunk": 5,
+            "minPerChunk": 1,
+            "maxPerChunk": 2,
             "varience": 4,
             "palette": [
                 "DIAMOND_ORE"
@@ -134,8 +136,8 @@
             "maxHeight": 40,
             "minSize": 5,
             "maxSize": 9,
-            "minPerChunk": 4,
-            "maxPerChunk": 6,
+            "minPerChunk": 1,
+            "maxPerChunk": 5,
             "varience": 7,
             "palette": [
                 "minecraft:redstone_ore[lit=false]"
@@ -159,7 +161,7 @@
             "minSize": 3,
             "maxSize": 8,
             "minPerChunk": 0,
-            "maxPerChunk": 2,
+            "maxPerChunk": 1,
             "varience": 5,
             "palette": [
                 "LAPIS_ORE"
@@ -170,8 +172,8 @@
             "maxHeight": 122,
             "minSize": 6,
             "maxSize": 9,
-            "minPerChunk": 5,
-            "maxPerChunk": 8,
+            "minPerChunk": 4,
+            "maxPerChunk": 9,
             "varience": 7,
             "palette": [
                 "IRON_ORE"
@@ -182,7 +184,7 @@
             "maxHeight": 175,
             "minSize": 9,
             "maxSize": 12,
-            "minPerChunk": 6,
+            "minPerChunk": 5,
             "maxPerChunk": 10,
             "varience": 9,
             "palette": [
diff --git a/overworld/regions/frozen.json b/overworld/regions/frozen.json
index 8c9d6326..b2d4deec 100644
--- a/overworld/regions/frozen.json
+++ b/overworld/regions/frozen.json
@@ -1,5 +1,6 @@
 {
     "name": "Frozen",
+    "rarity": 2,
     "biomeImplosionRatio": 0.25,
     "shoreHeightMin": 2.2,
     "shoreHeightMax": 4.2,
diff --git a/overworld/regions/swamp.json b/overworld/regions/swamp.json
index 01240765..ff0a7826 100644
--- a/overworld/regions/swamp.json
+++ b/overworld/regions/swamp.json
@@ -1,5 +1,6 @@
 {
     "name": "Swamp",
+    "rarity": 2,
     "biomeImplosionRatio": 0.26,
     "shoreHeightMin": 3.2,
     "shoreHeightMax": 6.2,
@@ -8,7 +9,6 @@
     "landBiomes": [
         "swamp-roofed",
         "swamp-mountains",
-        "swamp-mushroom",
         "swamp-willow-forest"
     ],
     "seaBiomes": [
@@ -18,16 +18,6 @@
         "swamp-beach"
 
     ],
-    "structures": [
-        {
-            "tileset": "example",
-            "zoom": 1.125,
-            "ratio": 0.57,
-            "height": 24,
-            "rarity": 28,
-            "shuffle": 16
-        }
-    ],
     "caveBiomes":[
         "swamp-murky-cavern"
     ],
@@ -44,21 +34,5 @@
                 "COAL_ORE"
             ]
         }
-    ],
-    "spotBiomes":[
-        {
-            "biome": "swamp-crimson-mushroom",
-            "type": "LAND",
-            "scale": 0.78,
-            "rarity": 262,
-            "shuffle": 44
-        },
-        {
-            "biome": "swamp-warped-mushroom",
-            "type": "LAND",
-            "scale": 0.77,
-            "rarity": 261,
-            "shuffle": 44
-        }
     ]
 }
\ No newline at end of file