From 2cfe4a8b86429c50418f0a675bef4e34db2b13ea Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 17 Jul 2021 19:58:45 -0700 Subject: [PATCH] Merged MEsa --- biomes/{mesa => hot}/msa-beach.json | 0 biomes/{mesa => hot}/msa-blue.json | 0 biomes/{mesa => hot}/msa-cliffs.json | 0 biomes/{mesa => hot}/msa-dark.json | 8 +++---- biomes/{mesa => hot}/msa-green.json | 0 biomes/{mesa => hot}/msa-mesa.json | 16 +++++++------- .../{mesa => hot}/msa-plateau-dirt-high.json | 0 biomes/{mesa => hot}/msa-plateau-dirt.json | 0 biomes/{mesa => hot}/msa-plateau-high.json | 2 +- biomes/{mesa => hot}/msa-plateau.json | 2 +- biomes/{mesa => hot}/msa-red.json | 0 biomes/{mesa => hot}/msa-valleys.json | 0 biomes/{mesa => hot}/msa-yellow.json | 2 +- biomes/swamp/swa-marsh-rotten.json | 12 ++++++++++ regions/frozen.json | 10 ++++----- regions/hot.json | 22 +++++++++---------- regions/mushroom.json | 4 ++-- regions/ocean.json | 4 ++-- regions/swamp.json | 10 ++++----- regions/temperate.json | 20 ++++++++--------- regions/tropical.json | 22 +++++++++---------- regions/tundra.json | 12 +++++----- 22 files changed, 79 insertions(+), 67 deletions(-) rename biomes/{mesa => hot}/msa-beach.json (100%) rename biomes/{mesa => hot}/msa-blue.json (100%) rename biomes/{mesa => hot}/msa-cliffs.json (100%) rename biomes/{mesa => hot}/msa-dark.json (97%) rename biomes/{mesa => hot}/msa-green.json (100%) rename biomes/{mesa => hot}/msa-mesa.json (95%) rename biomes/{mesa => hot}/msa-plateau-dirt-high.json (100%) rename biomes/{mesa => hot}/msa-plateau-dirt.json (100%) rename biomes/{mesa => hot}/msa-plateau-high.json (98%) rename biomes/{mesa => hot}/msa-plateau.json (99%) rename biomes/{mesa => hot}/msa-red.json (100%) rename biomes/{mesa => hot}/msa-valleys.json (100%) rename biomes/{mesa => hot}/msa-yellow.json (98%) diff --git a/biomes/mesa/msa-beach.json b/biomes/hot/msa-beach.json similarity index 100% rename from biomes/mesa/msa-beach.json rename to biomes/hot/msa-beach.json diff --git a/biomes/mesa/msa-blue.json b/biomes/hot/msa-blue.json similarity index 100% rename from biomes/mesa/msa-blue.json rename to biomes/hot/msa-blue.json diff --git a/biomes/mesa/msa-cliffs.json b/biomes/hot/msa-cliffs.json similarity index 100% rename from biomes/mesa/msa-cliffs.json rename to biomes/hot/msa-cliffs.json diff --git a/biomes/mesa/msa-dark.json b/biomes/hot/msa-dark.json similarity index 97% rename from biomes/mesa/msa-dark.json rename to biomes/hot/msa-dark.json index 662f6f78..670a81c1 100644 --- a/biomes/mesa/msa-dark.json +++ b/biomes/hot/msa-dark.json @@ -5,10 +5,10 @@ "derivative": "SHATTERED_SAVANNA", "vanillaDerivative": "ERODED_BADLANDS", "children": [ - "mesa/msa-cliffs", - "mesa/msa-red", - "mesa/msa-green", - "mesa/msa-blue" + "hot/msa-cliffs", + "hot/msa-red", + "hot/msa-green", + "hot/msa-blue" ], "generators": [ { diff --git a/biomes/mesa/msa-green.json b/biomes/hot/msa-green.json similarity index 100% rename from biomes/mesa/msa-green.json rename to biomes/hot/msa-green.json diff --git a/biomes/mesa/msa-mesa.json b/biomes/hot/msa-mesa.json similarity index 95% rename from biomes/mesa/msa-mesa.json rename to biomes/hot/msa-mesa.json index e961b17a..e40211e6 100644 --- a/biomes/mesa/msa-mesa.json +++ b/biomes/hot/msa-mesa.json @@ -10,14 +10,14 @@ "ERODED_BADLANDS" ], "children": [ - "mesa/msa-valleys", - "mesa/msa-red", - "mesa/msa-blue", - "mesa/msa-dark", - "mesa/msa-green", - "mesa/msa-red", - "mesa/msa-yellow", - "mesa/msa-blue" + "hot/msa-valleys", + "hot/msa-red", + "hot/msa-blue", + "hot/msa-dark", + "hot/msa-green", + "hot/msa-red", + "hot/msa-yellow", + "hot/msa-blue" ], "generators": [{ "min": 25, diff --git a/biomes/mesa/msa-plateau-dirt-high.json b/biomes/hot/msa-plateau-dirt-high.json similarity index 100% rename from biomes/mesa/msa-plateau-dirt-high.json rename to biomes/hot/msa-plateau-dirt-high.json diff --git a/biomes/mesa/msa-plateau-dirt.json b/biomes/hot/msa-plateau-dirt.json similarity index 100% rename from biomes/mesa/msa-plateau-dirt.json rename to biomes/hot/msa-plateau-dirt.json diff --git a/biomes/mesa/msa-plateau-high.json b/biomes/hot/msa-plateau-high.json similarity index 98% rename from biomes/mesa/msa-plateau-high.json rename to biomes/hot/msa-plateau-high.json index 9d626589..eea354e2 100644 --- a/biomes/mesa/msa-plateau-high.json +++ b/biomes/hot/msa-plateau-high.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["mesa/msa-plateau-dirt-high"], + "children": ["hot/msa-plateau-dirt-high"], "generators": [ { "min": 55, diff --git a/biomes/mesa/msa-plateau.json b/biomes/hot/msa-plateau.json similarity index 99% rename from biomes/mesa/msa-plateau.json rename to biomes/hot/msa-plateau.json index 97ce71fb..ec3cb1a9 100644 --- a/biomes/mesa/msa-plateau.json +++ b/biomes/hot/msa-plateau.json @@ -9,7 +9,7 @@ "BADLANDS_PLATEAU", "ERODED_BADLANDS" ], - "children": ["mesa/msa-plateau-dirt"], + "children": ["hot/msa-plateau-dirt"], "generators": [ { "min": 35, diff --git a/biomes/mesa/msa-red.json b/biomes/hot/msa-red.json similarity index 100% rename from biomes/mesa/msa-red.json rename to biomes/hot/msa-red.json diff --git a/biomes/mesa/msa-valleys.json b/biomes/hot/msa-valleys.json similarity index 100% rename from biomes/mesa/msa-valleys.json rename to biomes/hot/msa-valleys.json diff --git a/biomes/mesa/msa-yellow.json b/biomes/hot/msa-yellow.json similarity index 98% rename from biomes/mesa/msa-yellow.json rename to biomes/hot/msa-yellow.json index be27862f..91449252 100644 --- a/biomes/mesa/msa-yellow.json +++ b/biomes/hot/msa-yellow.json @@ -4,7 +4,7 @@ "rarity": 1, "color": "#BDBF05", "vanillaDerivative": "BADLANDS", - "children": ["mesa/msa-dark"], + "children": ["hot/msa-dark"], "generators": [ { "min": 9, diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/swa-marsh-rotten.json index 841d5f59..d0e2fbaf 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -9,6 +9,18 @@ "max": 3, "generator": "mountain" }], + "customDerivitives": [ + { + "id": "swamprottenmarsh", + "grassColor": "#36750A", + "spawnRarity": 20, + "spawns": [ + { + "type": "SLIME" + } + ] + } + ], "layers": [ { "style": {"style": "IRIS"}, diff --git a/regions/frozen.json b/regions/frozen.json index 756d6df6..edc3990d 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -43,31 +43,31 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 25 }, { "entity": "cow", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 25 }, { "entity": "pig", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 25 }, { "entity": "sheep", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 25 }, { "entity": "polar-bear", "maxSpawns": 2, "minSpawns": 1, - "rarity": 6 + "rarity": 20 } ], "deposits": [ diff --git a/regions/hot.json b/regions/hot.json index 26ca3966..60cc5082 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -9,12 +9,12 @@ "hot/sav-forest", "hot/sav-plateau", "hot/sav-acacia-denmyre", - "mesa/msa-plateau", - "mesa/msa-valleys", - "mesa/msa-plateau-high", - "mesa/msa-valleys", - "mesa/msa-mesa", - "mesa/msa-cliffs" + "hot/msa-plateau", + "hot/msa-valleys", + "hot/msa-plateau-high", + "hot/msa-valleys", + "hot/msa-mesa", + "hot/msa-cliffs" ], "shoreBiomes": ["hot/hot-beach"], "seaBiomes": ["ocean/oce-hot-ocean"], @@ -36,30 +36,30 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 6 + "rarity": 12 }, { "entity": "donkey", "maxSpawns": 3, "minSpawns": 1, - "rarity": 25 + "rarity": 50 }, { "entity": "mule", "maxSpawns": 3, "minSpawns": 1, - "rarity": 25 + "rarity": 50 },{ "entity": "rabbit", "maxSpawns": 1, "minSpawns": 1, - "rarity": 10 + "rarity": 20 }, { "entity": "wanderingtrader", "maxSpawns": 1, "minSpawns": 1, - "rarity": 100 + "rarity": 190 } ], "spotBiomes": [{ diff --git a/regions/mushroom.json b/regions/mushroom.json index d497eb9a..ab9740ef 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -129,12 +129,12 @@ "entity": "mooshroom", "maxSpawns": 4, "minSpawns": 1, - "rarity": 6 + "rarity": 12 }, { "entity": "cow", "maxSpawns": 2, - "rarity": 10 + "rarity": 20 } ], "shoreHeightMin": 3.2, diff --git a/regions/ocean.json b/regions/ocean.json index db099826..a2b1672d 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -29,12 +29,12 @@ { "entity": "glowsquid", "maxSpawns": 2, - "rarity": 20 + "rarity": 40 }, { "entity": "drowned", "maxSpawns": 2, - "rarity": 25 + "rarity": 45 } ], "rarity": 3, diff --git a/regions/swamp.json b/regions/swamp.json index 45fd073a..fbdb2640 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -35,31 +35,31 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 8 + "rarity": 16 }, { "entity": "cow", "maxSpawns": 2, "minSpawns": 1, - "rarity": 8 + "rarity": 16 }, { "entity": "pig", "maxSpawns": 2, "minSpawns": 1, - "rarity": 4 + "rarity": 8 }, { "entity": "sheep", "maxSpawns": 2, "minSpawns": 1, - "rarity": 6 + "rarity": 12 }, { "entity": "wolf", "maxSpawns": 2, "minSpawns": 1, - "rarity": 14 + "rarity": 28 } ], "biomeImplosionRatio": 0.26, diff --git a/regions/temperate.json b/regions/temperate.json index f3858352..eefd4ed0 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -36,61 +36,61 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "cow", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "pig", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "sheep", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "wolf", "maxSpawns": 2, "minSpawns": 0, - "rarity": 9 + "rarity": 18 }, { "entity": "goat", "maxSpawns": 2, "minSpawns": 0, - "rarity": 19 + "rarity": 38 }, { "entity": "horse", "maxSpawns": 3, "minSpawns": 0, - "rarity": 30 + "rarity": 60 }, { "entity": "llama", "maxSpawns": 3, "minSpawns": 0, - "rarity": 30 + "rarity": 65 }, { "entity": "fox", "maxSpawns": 1, "minSpawns": 0, - "rarity": 20 + "rarity": 40 }, { "entity": "bee", "maxSpawns": 1, "minSpawns": 0, - "rarity": 15 + "rarity": 30 } ], "shoreRatio": 0.1, diff --git a/regions/tropical.json b/regions/tropical.json index 4c60c252..88daf5ba 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -47,67 +47,67 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 18 }, { "entity": "cow", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 18 }, { "entity": "pig", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 18 }, { "entity": "sheep", "maxSpawns": 2, "minSpawns": 1, - "rarity": 9 + "rarity": 18 }, { "entity": "wolf", "maxSpawns": 2, "minSpawns": 1, - "rarity": 29 + "rarity": 39 }, { "entity": "ocelot", "maxSpawns": 2, "minSpawns": 0, - "rarity": 5 + "rarity": 10 }, { "entity": "parrot", "maxSpawns": 2, "minSpawns": 1, - "rarity": 10 + "rarity": 15 }, { "entity": "turtle", "maxSpawns": 1, "minSpawns": 1, - "rarity": 50 + "rarity": 80 }, { "entity": "panda", "maxSpawns": 3, "minSpawns": 1, - "rarity": 20 + "rarity": 40 }, { "entity": "pandaUwU", "maxSpawns": 1, "minSpawns": 1, - "rarity": 100 + "rarity": 150 }, { "entity": "aeternum", "maxSpawns": 1, "minSpawns": 1, - "rarity": 150 + "rarity": 200 } ], "jigsawStructures": [{ diff --git a/regions/tundra.json b/regions/tundra.json index feccbb7f..8ce4c837 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -35,37 +35,37 @@ "entity": "chicken", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "cow", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "pig", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "sheep", "maxSpawns": 2, "minSpawns": 1, - "rarity": 7 + "rarity": 14 }, { "entity": "wolf", "maxSpawns": 2, "minSpawns": 1, - "rarity": 19 + "rarity": 29 }, { "entity": "polar-bear", "maxSpawns": 2, "minSpawns": 1, - "rarity": 10 + "rarity": 20 } ], "riverBiomes": ["ocean/oce-tun-river"],