From 71c21fb21bf448d5feb338424bbc16f463b557f5 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sat, 17 Jul 2021 20:43:00 -0700 Subject: [PATCH] d --- biomes/frozen/fzn-beach.json | 1 + biomes/frozen/fzn-hills.json | 1 + biomes/frozen/fzn-mountain-cliffs.json | 1 + biomes/frozen/fzn-mountain-middle.json | 1 + biomes/frozen/fzn-mountain.json | 1 + biomes/frozen/fzn-mountains.json | 1 + biomes/frozen/fzn-peak.json | 1 + biomes/frozen/fzn-pine-hills.json | 1 + biomes/frozen/fzn-pine-plains.json | 1 + biomes/frozen/fzn-pines.json | 1 + biomes/frozen/fzn-plains.json | 1 + biomes/frozen/fzn-redwood-forest.json | 1 + biomes/frozen/fzn-spruce-hills.json | 1 + biomes/frozen/fzn-spruce-plains.json | 1 + biomes/frozen/fzn-vander.json | 1 + biomes/swamp/swa-marsh-rotten.json | 9 +++++---- biomes/tropical/tro-bamboo-forest.json | 8 ++++---- biomes/tropical/tro-highlands.json | 2 +- biomes/tropical/tro-mountain-extreme.json | 6 +++--- biomes/tropical/tro-mountain-middle.json | 4 ++-- biomes/tropical/tro-mountain.json | 2 +- biomes/tropical/tro-plains-hills.json | 2 +- biomes/tropical/tro-rainforest-hills.json | 2 +- biomes/tropical/tro-rainforest-island.json | 4 ++-- biomes/tropical/tro-rainforest-wicked.json | 4 ++-- biomes/tropical/tro-volcanic-plains.json | 9 +++++++++ biomes/tropical/tro-volcanoes-lava.json | 9 +++++++++ biomes/tropical/tro-volcanoes.json | 9 +++++++++ biomes/tropical/tro-wilds.json | 2 +- regions/tropical.json | 8 ++------ 30 files changed, 67 insertions(+), 28 deletions(-) diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index d056cea0..f0184232 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -26,6 +26,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-hills.json b/biomes/frozen/fzn-hills.json index ba6ef947..1ec21e5a 100644 --- a/biomes/frozen/fzn-hills.json +++ b/biomes/frozen/fzn-hills.json @@ -35,6 +35,7 @@ "id": "fznhills", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/fzn-mountain-cliffs.json index e3526adc..73754b99 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -36,6 +36,7 @@ "customDerivitives": [{ "id": "fznmountaincliff", "downfallType": "snow", + "temperature": -3, "waterColor": "#216FC4", "fogColor": "#B8D0E1", "waterFogColor": "#216FC4", diff --git a/biomes/frozen/fzn-mountain-middle.json b/biomes/frozen/fzn-mountain-middle.json index 9ed52341..f61381b3 100644 --- a/biomes/frozen/fzn-mountain-middle.json +++ b/biomes/frozen/fzn-mountain-middle.json @@ -21,6 +21,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-mountain.json b/biomes/frozen/fzn-mountain.json index 952e5037..83f828e0 100644 --- a/biomes/frozen/fzn-mountain.json +++ b/biomes/frozen/fzn-mountain.json @@ -13,6 +13,7 @@ "id": "fznmountain", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/fzn-mountains.json index a8a40bd7..717e0ac9 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/fzn-mountains.json @@ -12,6 +12,7 @@ "id": "fznmountains", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-peak.json b/biomes/frozen/fzn-peak.json index 17892865..8c8dad04 100644 --- a/biomes/frozen/fzn-peak.json +++ b/biomes/frozen/fzn-peak.json @@ -8,6 +8,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-pine-hills.json b/biomes/frozen/fzn-pine-hills.json index 1741d1f7..8164de53 100644 --- a/biomes/frozen/fzn-pine-hills.json +++ b/biomes/frozen/fzn-pine-hills.json @@ -34,6 +34,7 @@ "customDerivitives": [{ "id": "fznpinehills", "downfallType": "snow", + "temperature": -3, "waterColor": "#216FC4", "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", diff --git a/biomes/frozen/fzn-pine-plains.json b/biomes/frozen/fzn-pine-plains.json index ff9bc72b..6d1587ae 100644 --- a/biomes/frozen/fzn-pine-plains.json +++ b/biomes/frozen/fzn-pine-plains.json @@ -22,6 +22,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/fzn-pines.json index 4c0e8f45..33c7a454 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/fzn-pines.json @@ -40,6 +40,7 @@ "id": "fznpines", "waterColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/fzn-plains.json index 71e0703b..b5d99c37 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/fzn-plains.json @@ -23,6 +23,7 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/fzn-redwood-forest.json index ea4fe253..82566ab8 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -21,6 +21,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-spruce-hills.json b/biomes/frozen/fzn-spruce-hills.json index 51f45082..63d78497 100644 --- a/biomes/frozen/fzn-spruce-hills.json +++ b/biomes/frozen/fzn-spruce-hills.json @@ -36,6 +36,7 @@ "waterColor": "#216FC4", "fogColor": "#A6D1FF", "downfallType": "snow", + "temperature": -3, "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" diff --git a/biomes/frozen/fzn-spruce-plains.json b/biomes/frozen/fzn-spruce-plains.json index e28d5c40..dc585c16 100644 --- a/biomes/frozen/fzn-spruce-plains.json +++ b/biomes/frozen/fzn-spruce-plains.json @@ -37,6 +37,7 @@ "waterFogColor": "#216FC4", "foliageColor": "#B8D0E1", "downfallType": "snow", + "temperature": -3, "fogColor": "#A6D1FF", "grassColor": "#D0E1FF" }], diff --git a/biomes/frozen/fzn-vander.json b/biomes/frozen/fzn-vander.json index 060b9719..459ea0de 100644 --- a/biomes/frozen/fzn-vander.json +++ b/biomes/frozen/fzn-vander.json @@ -36,6 +36,7 @@ "fogColor": "#A6D1FF", "waterFogColor": "#216FC4", "downfallType": "snow", + "temperature": -3, "foliageColor": "#B8D0E1", "grassColor": "#D0E1FF" }], diff --git a/biomes/swamp/swa-marsh-rotten.json b/biomes/swamp/swa-marsh-rotten.json index d0e2fbaf..8a5d2dfa 100644 --- a/biomes/swamp/swa-marsh-rotten.json +++ b/biomes/swamp/swa-marsh-rotten.json @@ -5,14 +5,15 @@ "derivative": "SWAMP_HILLS", "vanillaDerivative": "SWAMP", "generators": [{ - "min": 7, - "max": 3, - "generator": "mountain" + "min": -5, + "max": 4, + "generator": "plain" }], "customDerivitives": [ { "id": "swamprottenmarsh", - "grassColor": "#36750A", + "waterColor": "#684D1A", + "grassColor": "#5C581A", "spawnRarity": 20, "spawns": [ { diff --git a/biomes/tropical/tro-bamboo-forest.json b/biomes/tropical/tro-bamboo-forest.json index 05d9f68e..10a62c8a 100644 --- a/biomes/tropical/tro-bamboo-forest.json +++ b/biomes/tropical/tro-bamboo-forest.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "trobamboo", - "foliageColor": "#44A906", + "foliageColor": "#20A52F", "grassColor": "#1E7307", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", @@ -99,7 +99,7 @@ "replace": {"palette": [{"block": "air"}]} }, { - "find": [{"block": "acacia_leaves"}], + "find": [{"block": "birch_leaves"}], "replace": {"palette": [{ "block": "jungle_leaves", "data": {"persistent": true} @@ -107,11 +107,11 @@ }, { "find": [{"block": "stripped_birch_log"}], - "replace": {"palette": [{"block": "stripped_jungle_log"}]} + "replace": {"palette": [{"block": "jungle_wood"}]} }, { "find": [{"block": "stripped_birch_wood"}], - "replace": {"palette": [{"block": "stripped_jungle_wood"}]} + "replace": {"palette": [{"block": "oak_wood"}]} } ], "place": [ diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index 19adb1b5..4c272ad2 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohighlands", - "foliageColor": "#40C42B", + "foliageColor": "#478F04", "grassColor": "#41A726", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2", diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index 5ace1524..d24efcb6 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -12,10 +12,10 @@ }], "customDerivitives": [{ "id": "tromtnextreme", - "foliageColor": "#40C42B", + "foliageColor": "#32A520", "grassColor": "#5CCA52", - "waterColor": "#3AB2A2", - "waterFogColor": "#3AB2A2", + "waterColor": "#3FE727", + "waterFogColor": "#3FE727", "category": "jungle" }], "layers": [ diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index be0959f5..0087d6c3 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -19,8 +19,8 @@ ], "customDerivitives": [{ "id": "tromtnmiddle", - "foliageColor": "#40C42B", - "grassColor": "#1E7307", + "foliageColor": "#478F04", + "grassColor": "#3FE727", "waterColor": "#3AB2A2", "fogColor": "#6DCA87", "category": "jungle" diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index ffd1b666..e04ac040 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -12,7 +12,7 @@ }], "customDerivitives": [{ "id": "tromountain", - "foliageColor": "#40C42B", + "foliageColor": "#478F04", "grassColor": "#5CCA52", "category": "jungle", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index c96ae9ea..9516a23e 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/tro-plains-hills.json @@ -12,7 +12,7 @@ "customDerivitives": [{ "id": "troplainshills", "foliageColor": "#40C42B", - "grassColor": "#1E7307", + "grassColor": "#3FE727", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index 55490b1f..e599422f 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -11,7 +11,7 @@ }], "customDerivitives": [{ "id": "trohills", - "foliageColor": "#40C42B", + "foliageColor": "#16AA27", "grassColor": "#41A726", "category": "jungle", "waterColor": "#3AB2A2", diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/tro-rainforest-island.json index 1aecb2b9..60d1a1e4 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/tro-rainforest-island.json @@ -11,8 +11,8 @@ }], "customDerivitives": [{ "id": "troisle", - "foliageColor": "#40C42B", - "grassColor": "#2DAF09", + "foliageColor": "#16AA27", + "grassColor": "#3FE727", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/tro-rainforest-wicked.json index 230567ba..c22cbea3 100644 --- a/biomes/tropical/tro-rainforest-wicked.json +++ b/biomes/tropical/tro-rainforest-wicked.json @@ -2,7 +2,7 @@ "name": "Tropical Rainforest Wicked", "derivative": "MODIFIED_JUNGLE", "rarity": 1, - "color": "10EF15#", + "color": "#10EF15", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", "children": [ "tropical/tro-rainforest-hills", @@ -12,7 +12,7 @@ "customDerivitives": [{ "id": "trowkd", "foliageColor": "#478F04", - "grassColor": "#197300", + "grassColor": "#26AC00", "category": "jungle", "waterColor": "#3AB2A2", "waterFogColor": "#3AB2A2" diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/tro-volcanic-plains.json index 04353851..7062586a 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -10,6 +10,15 @@ "max": 190, "generator": "mountain" }], + "customDerivitives": [ + { + "id": "trovolcanoplains", + "grassColor": "#9BC20D", + "foliageColor": "#9CD320", + "fogColor": "#DD793C", + "downfallType": "none" + } + ], "layers": [ { "style": { diff --git a/biomes/tropical/tro-volcanoes-lava.json b/biomes/tropical/tro-volcanoes-lava.json index c980e9cd..183ce214 100644 --- a/biomes/tropical/tro-volcanoes-lava.json +++ b/biomes/tropical/tro-volcanoes-lava.json @@ -4,6 +4,15 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#50AF52", + "customDerivitives": [ + { + "id": "trovolcanolava", + "grassColor": "#BDBF0B", + "foliageColor": "#BDBF0B", + "fogColor": "#DD793C", + "downfallType": "none" + } + ], "generators": [ { "generator": "mountain", diff --git a/biomes/tropical/tro-volcanoes.json b/biomes/tropical/tro-volcanoes.json index 57247faf..c1b4a7d3 100644 --- a/biomes/tropical/tro-volcanoes.json +++ b/biomes/tropical/tro-volcanoes.json @@ -4,6 +4,15 @@ "vanillaDerivative": "THE_VOID", "rarity": 1, "color": "#609F61", + "customDerivitives": [ + { + "id": "trovolcanolava", + "grassColor": "#BDBF0B", + "foliageColor": "#BDBF0B", + "fogColor": "#DD793C", + "downfallType": "none" + } + ], "children": ["tropical/tro-volcanoes-lava"], "generators": [ { diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json index dc0d733b..e07e43d2 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -11,7 +11,7 @@ "generator": "mountain" }], "customDerivitives": [{ - "id": "tromtnextreme", + "id": "trowilds", "foliageColor": "#2C8806", "grassColor": "#183F0E", "waterColor": "#11BA89", diff --git a/regions/tropical.json b/regions/tropical.json index 88daf5ba..71d07d57 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -5,15 +5,9 @@ "tropical/tro-rainforest", "tropical/tro-plains", "tropical/tro-bamboo-forest", - "tropical/tro-plains", "tropical/tro-rainforest-wicked", - "tropical/tro-wilds", "tropical/tro-volcanic-plains", - "tropical/tro-mountain-extreme", "tropical/tro-mountain", - "tropical/tro-plains", - "tropical/tro-mountain", - "tropical/tro-plains", "tropical/tro-mountain-extreme", "tropical/tro-wilds", "tropical/tro-plains-hills" @@ -21,9 +15,11 @@ "shoreBiomes": [ "tropical/tro-island-beach", "tropical/tro-beach", + "tropical/tro-submerged-volcanic", "tropical/tro-beach-bamboo" ], "seaBiomes": [ + "tropical/tro-submerged-volcanic", "ocean/oce-tro-ocean", "ocean/oce-tro-river-soft" ],