From 510008606594d33696f9cbf2f8cc4546f85be52c Mon Sep 17 00:00:00 2001
From: Brian Fopiano <mypsn1550@gmail.com>
Date: Sun, 13 Sep 2020 14:44:08 -0700
Subject: [PATCH] Swamp Changes

---
 biomes/swamp-dark-oak-denmyre.json            | 38 ++++++++++
 ...ntains.json => swamp-mountain-forest.json} | 69 ++++++++++++++++++-
 ...p-roofed.json => swamp-roofed-forest.json} | 16 ++++-
 biomes/swamp-roofed-marsh.json                | 47 +------------
 regions/swamp.json                            |  4 +-
 5 files changed, 123 insertions(+), 51 deletions(-)
 rename biomes/{swamp-mountains.json => swamp-mountain-forest.json} (83%)
 rename biomes/{swamp-roofed.json => swamp-roofed-forest.json} (96%)

diff --git a/biomes/swamp-dark-oak-denmyre.json b/biomes/swamp-dark-oak-denmyre.json
index bab410da..28228330 100644
--- a/biomes/swamp-dark-oak-denmyre.json
+++ b/biomes/swamp-dark-oak-denmyre.json
@@ -197,6 +197,44 @@
         },
         {
             "chance": 0.3,
+            "edit": [
+                {
+                    "find": [
+                        {"block":"spruce_leaves"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "oak_leaves"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "find": [
+                        {"block": "birch_leaves"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "dark_oak_leaves"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "find": [
+                        {"block": "dark_oak_fence"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "dark_oak_leaves"
+                            }
+                        ]
+                    }
+                }
+            ],
             "density": 2,
             "rotation": {
                 "yAxis": {
diff --git a/biomes/swamp-mountains.json b/biomes/swamp-mountain-forest.json
similarity index 83%
rename from biomes/swamp-mountains.json
rename to biomes/swamp-mountain-forest.json
index 4d94f414..fde9243e 100644
--- a/biomes/swamp-mountains.json
+++ b/biomes/swamp-mountain-forest.json
@@ -108,7 +108,7 @@
             }
         },
         {
-            "chance": 1,
+            "chance": 0.05,
             "rotation": {
                 "yAxis": {
                     "min": 0,
@@ -138,6 +138,73 @@
                 "z": 0
             }
         },
+        {
+            "chance": 0.7,
+            "edit": [
+                {
+                    "find": [
+                        {"block":"spruce_leaves"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "oak_leaves"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "find": [
+                        {"block": "birch_leaves"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "dark_oak_leaves"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "find": [
+                        {"block": "dark_oak_fence"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "dark_oak_leaves"
+                            }
+                        ]
+                    }
+                }
+            ],
+            "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+            },
+            "place": [
+                "roofed-wayward/taller-roof-1",
+                "roofed-wayward/taller-roof-2",
+                "roofed-wayward/taller-roof-3",
+                "roofed-wayward/taller-roof-4",
+                "roofed-wayward/taller-roof-5",
+                "roofed-wayward/taller-roof-6",
+                "roofed-wayward/taller-roof-7",
+                "roofed-wayward/taller-roof-8",
+                "roofed-wayward/taller-roof-9",
+                "roofed-wayward/taller-roof-10"
+            ],
+            "translate": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            }
+        },
         {
             "chance": 0.18,
             "edit": [
diff --git a/biomes/swamp-roofed.json b/biomes/swamp-roofed-forest.json
similarity index 96%
rename from biomes/swamp-roofed.json
rename to biomes/swamp-roofed-forest.json
index c6f476f2..67d5d47a 100644
--- a/biomes/swamp-roofed.json
+++ b/biomes/swamp-roofed-forest.json
@@ -91,7 +91,7 @@
     ],
     "objects": [
         {
-            "chance": 0.5,
+            "chance": 0.05,
             "edit": [
                 {
                     "find": [
@@ -148,7 +148,7 @@
             }
         },
         {
-            "chance": 0.5,
+            "chance": 0.7,
             "edit": [
                 {
                     "find": [
@@ -173,6 +173,18 @@
                             }
                         ]
                     }
+                },
+                {
+                    "find": [
+                        {"block": "dark_oak_fence"}
+                    ],
+                    "replace": {
+                        "palette": [
+                            {
+                                "block": "dark_oak_leaves"
+                            }
+                        ]
+                    }
                 }
             ],
             "rotation": {
diff --git a/biomes/swamp-roofed-marsh.json b/biomes/swamp-roofed-marsh.json
index a7a2701e..889e4bf3 100644
--- a/biomes/swamp-roofed-marsh.json
+++ b/biomes/swamp-roofed-marsh.json
@@ -88,55 +88,10 @@
                             }
                         ]
                     }
-                }
-            ],
-            "rotation": {
-                "yAxis": {
-                    "min": 0,
-                    "max": 0,
-                    "interval": 90,
-                    "enabled": true
-                },
-                "enabled": true
-            },
-            "place": [
-                "roofed-wayward/med-1",
-                "roofed-wayward/med-2",
-                "roofed-wayward/med-3",
-                "roofed-wayward/med-4",
-                "roofed-wayward/med-5",
-                "roofed-wayward/med-6",
-                "roofed-wayward/med-7",
-                "roofed-wayward/med-8",
-                "roofed-wayward/med-9",
-                "roofed-wayward/med-10",
-                "roofed-wayward/med-11",
-                "roofed-wayward/med-12"
-            ],
-            "translate": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            }
-        },
-        {
-            "chance": 0.5,
-            "edit": [
-                {
-                    "find": [
-                        {"block":"spruce_leaves"}
-                    ],
-                    "replace": {
-                        "palette": [
-                            {
-                                "block": "oak_leaves"
-                            }
-                        ]
-                    }
                 },
                 {
                     "find": [
-                        {"block": "birch_leaves"}
+                        {"block": "dark_oak_fence"}
                     ],
                     "replace": {
                         "palette": [
diff --git a/regions/swamp.json b/regions/swamp.json
index f95e9840..20f2a2f2 100644
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -39,8 +39,8 @@
         }
     ],
     "landBiomes": [
-        "swamp-roofed",
-        "swamp-mountains",
+        "swamp-roofed-forest",
+        "swamp-mountain-forest",
         "swamp-willow-forest",
         "swamp-roofed-marsh"
     ],