From 900a62699071f23d3dce2d9332c9137c3834ce48 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:44:46 -0700 Subject: [PATCH 1/6] Fixing redundancy in frozen biome --- biomes/frozen-mountain-cliffs.json | 256 ++++++++++++++++++++++----- biomes/frozen-mountain-middle.json | 7 +- biomes/frozen-mountain.json | 4 +- biomes/frozen-mountains-cliffs.json | 260 ---------------------------- biomes/frozen-plains-hills.json | 184 -------------------- 5 files changed, 223 insertions(+), 488 deletions(-) delete mode 100644 biomes/frozen-mountains-cliffs.json delete mode 100644 biomes/frozen-plains-hills.json diff --git a/biomes/frozen-mountain-cliffs.json b/biomes/frozen-mountain-cliffs.json index 89df0555..868dd169 100644 --- a/biomes/frozen-mountain-cliffs.json +++ b/biomes/frozen-mountain-cliffs.json @@ -1,14 +1,206 @@ { - "vanillaDerivative": "SNOWY_TAIGA", - "name": "Frozen mountains cliffs", + "vanillaDerivative": "SNOWY_MOUNTAINS", + "biomeSkyScatter": [ + "SNOWY_TAIGA", + "SNOWY_MOUNTAINS" + ], + "objects": [ + { + "chance": 0.02, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/ic-1", + "ice-spikes/ic-2", + "ice-spikes/ic-3", + "ice-spikes/ic-4", + "ice-spikes/ic-5", + "ice-spikes/ic-6", + "ice-spikes/ic-7", + "ice-spikes/ic-8", + "ice-spikes/ic-9", + "ice-spikes/ic-10", + "ice-spikes/ic-11", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { + "chance": 0.5, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": true + }, + "place": [ + "frosted-spruce/large-5", + "frosted-spruce/large-6", + "frosted-spruce/large-7", + "frosted-spruce/large-8", + "frosted-spruce/large-9", + "frosted-spruce/large-10", + "frosted-spruce/large-12", + "frosted-spruce/large-13", + "frosted-spruce/large-14", + "frosted-spruce/large-15", + "frosted-spruce/large-16", + "frosted-spruce/large-17", + "frosted-spruce/large-18", + "frosted-spruce/large-19", + "frosted-spruce/large-20", + "frosted-spruce/large-21", + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.01, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": true + }, + "place": [ + "frosted-spruce/large-22", + "frosted-spruce/large-23", + "frosted-spruce/large-24", + "frosted-spruce/large-25" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.05, + "density": 3, + "snow": 0.35, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/ice-spec-1", + "ice-spikes/ice-spec-2", + "ice-spikes/ice-spec-3", + "ice-spikes/ice-spec-4", + "ice-spikes/ice-spec-5" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "biomeZoom": 30, + "derivative": "SNOWY_TAIGA_MOUNTAINS", + "biomeStyle": { + "style": "IRIS" + }, + "decorators": [ + { + "chance": 1, + "variance": { + "style": "IRIS", + "zoom": 0.2 + }, + "palette": [ + { + "data": { + "layers": 1 + }, + "block": "snow" + }, + { + "data": { + "layers": 2 + }, + "block": "snow" + }, + { + "data": { + "layers": 3 + }, + "block": "snow" + }, + { + "data": { + "layers": 4 + }, + "block": "snow" + } + ] + } + ], + "entityInitialSpawns": [ + { + "entity": "sheep", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + }, + { + "entity": "wolf", + "maxSpawns": 1, + "minSpawns": 1, + "rarity": 6 + } + ], + "children": [ + "frozen-peak", + "frozen-mountains", + "frozen-vander" + ], + "name": "Frozen Mountains", "layers": [ { - "minHeight": 1, - "maxHeight": 1, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3.295 - }, + "minHeight": 2, + "maxHeight": 3, "palette": [ { "block": "snow_block" @@ -16,17 +208,11 @@ ] }, { - "minHeight": 1, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 3.95 - }, + "minHeight": 2, + "maxHeight": 4, "palette": [ { - "block": "gravel" - }, - { - "block": "cyan_terracotta" + "block": "packed_ice" } ] }, @@ -37,13 +223,11 @@ "style": "STATIC" }, "palette": [ - { - "block": "stone" - }, { "block": "andesite" }, { + "weight": 2, "block": "stone" } ] @@ -51,36 +235,26 @@ ], "generators": [ { - "min": 11, - "max": 32, - "generator": "plain" - }, - { - "min": 12, - "max": 62, - "generator": "cracked-cliffs" + "min": 14, + "max": 65, + "generator": "plain-cliffs" } ], - "biomeZoom": 30, - "derivative": "SNOWY_TAIGA", - "biomeStyle": { - "style": "IRIS" - }, + "childShrinkFactor": 20, "wall": { + "style": { + "style": "IRIS" + }, "palette": [ { - "block": "stone" - }, - { - "block": "andesite" + "block": "packed_ice" } ] }, "biomeScatter": [ - "PLAINS", + "SNOWY_TAIGA_MOUNTAINS", "TAIGA_HILLS", "MOUNTAINS", - "SWAMP" - ], - "rarity": 19 + "ICE_SPIKES" + ] } \ No newline at end of file diff --git a/biomes/frozen-mountain-middle.json b/biomes/frozen-mountain-middle.json index 2c55c4f2..62868d91 100644 --- a/biomes/frozen-mountain-middle.json +++ b/biomes/frozen-mountain-middle.json @@ -115,10 +115,13 @@ "wall": { "palette": [ { - "block": "stone" + "block": "ice" }, { - "block": "andesite" + "block": "ice" + }, + { + "block": "cave_air" } ] } diff --git a/biomes/frozen-mountain.json b/biomes/frozen-mountain.json index d42c403f..88190ad2 100644 --- a/biomes/frozen-mountain.json +++ b/biomes/frozen-mountain.json @@ -9,7 +9,9 @@ "exponent": 4 }, "children": [ - "frozen-mountain-middle" + "frozen-mountain-middle", + "frozen-peak", + "frozen-mountains-cliffs" ], "biomeScatter": [ "PLAINS", diff --git a/biomes/frozen-mountains-cliffs.json b/biomes/frozen-mountains-cliffs.json deleted file mode 100644 index 868dd169..00000000 --- a/biomes/frozen-mountains-cliffs.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "vanillaDerivative": "SNOWY_MOUNTAINS", - "biomeSkyScatter": [ - "SNOWY_TAIGA", - "SNOWY_MOUNTAINS" - ], - "objects": [ - { - "chance": 0.02, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", - "ice-spikes/sp-1", - "ice-spikes/sp-2", - "ice-spikes/sp-3", - "ice-spikes/sp-4", - "ice-spikes/sp-5", - "ice-spikes/tp-1", - "ice-spikes/tp-2", - "ice-spikes/tp-3", - "ice-spikes/tp-4" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.5, - "density": 3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": false - }, - "enabled": true - }, - "place": [ - "frosted-spruce/large-5", - "frosted-spruce/large-6", - "frosted-spruce/large-7", - "frosted-spruce/large-8", - "frosted-spruce/large-9", - "frosted-spruce/large-10", - "frosted-spruce/large-12", - "frosted-spruce/large-13", - "frosted-spruce/large-14", - "frosted-spruce/large-15", - "frosted-spruce/large-16", - "frosted-spruce/large-17", - "frosted-spruce/large-18", - "frosted-spruce/large-19", - "frosted-spruce/large-20", - "frosted-spruce/large-21", - "frosted-spruce/large-22", - "frosted-spruce/large-23", - "frosted-spruce/large-24", - "frosted-spruce/large-25" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.01, - "density": 3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": false - }, - "enabled": true - }, - "place": [ - "frosted-spruce/large-22", - "frosted-spruce/large-23", - "frosted-spruce/large-24", - "frosted-spruce/large-25" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ice-spec-1", - "ice-spikes/ice-spec-2", - "ice-spikes/ice-spec-3", - "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "biomeZoom": 30, - "derivative": "SNOWY_TAIGA_MOUNTAINS", - "biomeStyle": { - "style": "IRIS" - }, - "decorators": [ - { - "chance": 1, - "variance": { - "style": "IRIS", - "zoom": 0.2 - }, - "palette": [ - { - "data": { - "layers": 1 - }, - "block": "snow" - }, - { - "data": { - "layers": 2 - }, - "block": "snow" - }, - { - "data": { - "layers": 3 - }, - "block": "snow" - }, - { - "data": { - "layers": 4 - }, - "block": "snow" - } - ] - } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "children": [ - "frozen-peak", - "frozen-mountains", - "frozen-vander" - ], - "name": "Frozen Mountains", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "andesite" - }, - { - "weight": 2, - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 14, - "max": 65, - "generator": "plain-cliffs" - } - ], - "childShrinkFactor": 20, - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "packed_ice" - } - ] - }, - "biomeScatter": [ - "SNOWY_TAIGA_MOUNTAINS", - "TAIGA_HILLS", - "MOUNTAINS", - "ICE_SPIKES" - ] -} \ No newline at end of file diff --git a/biomes/frozen-plains-hills.json b/biomes/frozen-plains-hills.json deleted file mode 100644 index 8176c83e..00000000 --- a/biomes/frozen-plains-hills.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "vanillaDerivative": "SNOWY_TAIGA_HILLS", - "decorators": [ - { - "chance": 1, - "variance": { - "style": "IRIS", - "zoom": 0.2 - }, - "palette": [ - { - "data": { - "layers": 1 - }, - "block": "snow" - }, - { - "data": { - "layers": 2 - }, - "block": "snow" - }, - { - "data": { - "layers": 3 - }, - "block": "snow" - }, - { - "data": { - "layers": 4 - }, - "block": "snow" - } - ] - } - ], - "objects": [ - { - "chance": 0.01, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", - "ice-spikes/sp-1", - "ice-spikes/sp-2", - "ice-spikes/sp-3", - "ice-spikes/sp-4", - "ice-spikes/sp-5", - "ice-spikes/tp-1", - "ice-spikes/tp-2", - "ice-spikes/tp-3", - "ice-spikes/tp-4" - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.05, - "density": 3, - "snow": 0.35, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "ice-spikes/ice-spec-1", - "ice-spikes/ice-spec-2", - "ice-spikes/ice-spec-3", - "ice-spikes/ice-spec-4", - "ice-spikes/ice-spec-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "name": "Frozen Hills", - "layers": [ - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "snow_block" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 5, - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "wolf", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], - "derivative": "ICE_SPIKES", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } -} \ No newline at end of file From 55efa2111baa41f39142fa18f7dfc8cc58405ad4 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:25 -0700 Subject: [PATCH 2/6] Fixed redundancy in hot region --- biomes/hot-desert-hills.json | 196 ----------------------------- biomes/hot-desert.json | 3 + biomes/hot-mesa-cliffs-yellow.json | 192 ---------------------------- biomes/hot-mesa-cliffs.json | 2 +- biomes/hot-mesa-dark.json | 1 - biomes/hot-mesa.json | 2 +- biomes/hot-ocean.json | 6 + regions/hot-red-desert.json | 70 ----------- regions/hot.json | 1 - 9 files changed, 11 insertions(+), 462 deletions(-) delete mode 100644 biomes/hot-desert-hills.json delete mode 100644 biomes/hot-mesa-cliffs-yellow.json delete mode 100644 regions/hot-red-desert.json diff --git a/biomes/hot-desert-hills.json b/biomes/hot-desert-hills.json deleted file mode 100644 index d127e81e..00000000 --- a/biomes/hot-desert-hills.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "vanillaDerivative": "DESERT", - "decorators": [ - { - "verticalZoom": 5, - "chance": 0.001, - "variance": { - "style": "STATIC" - }, - "stackMax": 5, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "cactus" - } - ], - "heightVariance": { - "style": "IRIS" - }, - "stackMin": 1 - }, - { - "chance": 0.00135, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "polished_blackstone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "polished_blackstone_button" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.05, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "rarity": 2, - "name": "Desert Hills", - "layers": [ - { - "palette": [ - { - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 9, - "palette": [ - { - "block": "sandstone" - } - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "stone" - }, - { - "block": "andesite" - }, - { - "block": "stone" - } - ] - } - ], - "generators": [ - { - "min": 5, - "max": 9, - "generator": "plain" - } - ], - "loot": { - "tables": [ - "cactus-clutter" - ] - }, - "derivative": "DESERT", - "wall": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "sandstone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "smooth_sandstone_slab" - }, - { - "weight": 2, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index f16b02a2..cb398164 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -9,6 +9,9 @@ "min": -8 } ], + "children": [ + "hot-oasis" + ], "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/hot-mesa-cliffs-yellow.json b/biomes/hot-mesa-cliffs-yellow.json deleted file mode 100644 index 224041dd..00000000 --- a/biomes/hot-mesa-cliffs-yellow.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "vanillaDerivative": "BADLANDS_PLATEAU", - "decorators": [ - { - "chance": 0.009, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "data": { - "face": "floor", - "powered": false, - "facing": "east" - }, - "block": "stone_button" - }, - { - "data": { - "face": "floor", - "powered": false, - "facing": "south" - }, - "block": "stone_button" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.01, - "variance": { - "style": "STATIC" - }, - "zoom": 0.3, - "palette": [ - { - "block": "dead_bush" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "name": "Yellow Mesa", - "layers": [ - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "white_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 4, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "red_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 2, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "yellow_terracotta" - } - ] - }, - { - "minHeight": 3, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "terracotta" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 1, - "style": { - "style": "STATIC" - }, - "palette": [ - { - "block": "brown_terracotta" - } - ] - } - ], - "generators": [ - { - "min": 1, - "max": 6, - "generator": "plain" - }, - { - "min": 9, - "max": 35, - "generator": "mountain" - } - ], - "derivative": "SHATTERED_SAVANNA", - "lockLayers": true, - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "red_terracotta" - }, - { - "block": "gray_terracotta" - }, - { - "block": "yellow_terracotta" - } - ] - }, - "rarity": 9 -} \ No newline at end of file diff --git a/biomes/hot-mesa-cliffs.json b/biomes/hot-mesa-cliffs.json index ee96cabd..1f4ad96c 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/hot-mesa-cliffs.json @@ -1,7 +1,7 @@ { "vanillaDerivative": "BADLANDS_PLATEAU", "children": [ - "hot-mesa-cliffs-yellow" + "hot-mesa-cliffs" ], "decorators": [ { diff --git a/biomes/hot-mesa-dark.json b/biomes/hot-mesa-dark.json index 5904a438..1363f39d 100644 --- a/biomes/hot-mesa-dark.json +++ b/biomes/hot-mesa-dark.json @@ -147,7 +147,6 @@ "childShrinkFactor": 0.35, "children": [ "hot-mesa-cliffs", - "hot-mesa-cliffs-yellow", "hot-mesa-red", "hot-mesa-green", "hot-mesa-blue" diff --git a/biomes/hot-mesa.json b/biomes/hot-mesa.json index 20e4882a..045fd14f 100644 --- a/biomes/hot-mesa.json +++ b/biomes/hot-mesa.json @@ -9,7 +9,7 @@ ], "children": [ "hot-mesa-valleys", - "hot-mesa-blue", + "hot-mesa-red", "hot-mesa-blue", "hot-mesa-dark", "hot-mesa-green", diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index 0a75011f..254f5908 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -1,5 +1,11 @@ { "vanillaDerivative": "WARM_OCEAN", + "children": [ + "hot-desert", + "hot-desert", + "hot-river", + "hot-ocean-cliffs" + ], "decorators": [ { "chance": 0.0009, diff --git a/regions/hot-red-desert.json b/regions/hot-red-desert.json deleted file mode 100644 index 5759ff5e..00000000 --- a/regions/hot-red-desert.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "riverBiomes": [ - "hot-river" - ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], - "spotBiomes": [ - { - "biome": "hot-ocean", - "scale": 5, - "type": "SEA", - "shuffle": 328, - "rarity": 36 - } - ], - "landBiomes": [ - "hot-mountain-plains", - "hot-mountain", - "hot-mountain-plains" - - - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-river" - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, - "deposits": [ - { - "minHeight": 8, - "maxPerChunk": 12, - "maxHeight": 57, - "minPerChunk": 7, - "minSize": 12, - "maxSize": 22, - "palette": [ - { - "block": "blackstone" - } - ], - "varience": 4 - } - ], - "riverRarity": 1, - "landBiomeZoom": 1.25, - "shoreHeightMin": 1.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "Red desert", - "shoreHeightMax": 2.2, - "shoreHeightZoom": 1.14, - "riverThickness": 0.006, - "rarity": 8 -} \ No newline at end of file diff --git a/regions/hot.json b/regions/hot.json index 309faa56..86359ba2 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -58,7 +58,6 @@ "hot-desert-red", "hot-desert", "hot-desert-dunes", - "hot-volcanic", "hot-desert-red", "hot-desert", "hot-desert-dunes-red", From 212b594a7a327f0230bde5a68cb6c68d4cd2bef6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 17:58:36 -0700 Subject: [PATCH 3/6] >:( --- regions/mosaic.json | 103 -------------------------------------------- 1 file changed, 103 deletions(-) delete mode 100644 regions/mosaic.json diff --git a/regions/mosaic.json b/regions/mosaic.json deleted file mode 100644 index 0de06ae9..00000000 --- a/regions/mosaic.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "landBiomes": [ - "mosaic-lith-black", - "mosaic-lith-green", - "mosaic-lith-purple", - "mosaic-lith-red", - "mosaic-lith-white", - "mosaic-lith-cyan" - ], - "biomeImplosionRatio": 0.25, - "seaBiomes": [ - "hot-ocean" - ], - "deposits": [ - { - "minHeight": 25, - "maxPerChunk": 3, - "maxHeight": 50, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "gold_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 30, - "minPerChunk": 1, - "minSize": 3, - "maxSize": 5, - "palette": [ - { - "block": "lapis_ore" - } - ], - "varience": 5 - }, - { - "minHeight": 11, - "maxPerChunk": 15, - "maxHeight": 99, - "minPerChunk": 5, - "minSize": 14, - "maxSize": 21, - "palette": [ - { - "data": { - "axis": "x" - }, - "block": "basalt" - }, - { - "data": { - "axis": "y" - }, - "block": "basalt" - }, - { - "data": { - "axis": "z" - }, - "block": "basalt" - } - ], - "varience": 5 - } - ], - "caveBiomes": [ - "hot-sandy-cave" - ], - "landBiomeZoom": 1.25, - "effects": [ - { - "particleAltX": 0.001, - "particleAltY": 0.00885, - "particleAltZ": 0.001, - "chance": 2, - "particleEffect": "CAMPFIRE_SIGNAL_SMOKE", - "particleOffset": 0, - "interval": 1350, - "particleCount": 0 - } - ], - "shoreHeightMin": 3.2, - "shoreBiomes": [ - "hot-beach" - ], - "name": "The Mosaics", - "shoreHeightMax": 6.2, - "loot": { - "tables": [ - "hot-food", - "hot-treasure" - ] - }, - "shoreHeightZoom": 1.14, - "rarity": 150 -} \ No newline at end of file From 61b3980df5957f228c1e7ef0bc2cb8312923a048 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:08:51 -0700 Subject: [PATCH 4/6] redundandy in mountains --- ...s-hills.json => mountain-plain-hills.json} | 0 biomes/mountain-plains.json | 2 + regions/mountain.json | 6 +- regions/mountains.json | 114 ------------------ 4 files changed, 6 insertions(+), 116 deletions(-) rename biomes/{mountains-plains-hills.json => mountain-plain-hills.json} (100%) delete mode 100644 regions/mountains.json diff --git a/biomes/mountains-plains-hills.json b/biomes/mountain-plain-hills.json similarity index 100% rename from biomes/mountains-plains-hills.json rename to biomes/mountain-plain-hills.json diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index e361357c..6f198f1b 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -5,6 +5,8 @@ "children": [ "mountain-forest", "mountain-hills", + "mountains-plains-hills", + "mountain-lake", "mountain-forest-hills" ], "childStyle": { diff --git a/regions/mountain.json b/regions/mountain.json index 6ee48fe7..fcab7695 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -20,9 +20,11 @@ ], "landBiomes": [ "mountain", + "mountain-hills", + "mountain-forest-hills", + "mountain-forest", "mountain-plains", - "mountain-plains", - "mountain-plains", + "mountain-cliffs", "mountain" ], "biomeImplosionRatio": 0.25, diff --git a/regions/mountains.json b/regions/mountains.json deleted file mode 100644 index 99e8c39e..00000000 --- a/regions/mountains.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "name": "Mountains", - "landBiomes": [ - "mountains-plains", - "mountain-main", - "temperate-lake" - ], - "seaBiomes": [ - "temperate-soft-river", - "temperate-river-loud" - ], - "biomeImplosionRatio": 0.7, - "shoreBiomes": [ - "mountain-beach" - ], - "caveBiomes": [ - "tundra-spiked-cavern", - "temperate-lit-cavern" - ], - "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.001, - "place": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" - ], - "edit": [ - { - "find": [ - { - "block": "gold_block" - } - ], - "replace": { - "palette": [ - { - "block": "air" - } - ] - }, - "chance": 0.1 - }, - { - "find": [ - { - "block": "netherrack" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.07 - }, - { - "find": [ - { - "block": "obsidian" - } - ], - "replace": { - "palette": [ - { - "block": "crying_obsidian" - } - ] - }, - "chance": 0.15 - }, - { - "find": [ - { - "block": "lava" - } - ], - "replace": { - "palette": [ - { - "block": "magma_block" - } - ] - }, - "chance": 0.20 - } - ], - "mode": "VACUUM", - "carvingSupport": "SURFACE_ONLY" - } - ], - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - } -} From 8031491dc893d740e12af94e6b0e77bcebac6c2b Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:15:34 -0700 Subject: [PATCH 5/6] mush/rock tweaks --- biomes/mushroom-ocean-soft.json | 342 ----------------------------- biomes/ocean-steep.json | 204 ----------------- biomes/rocky-mountains-cliffs.json | 4 + regions/mushroom.json | 8 +- 4 files changed, 8 insertions(+), 550 deletions(-) delete mode 100644 biomes/mushroom-ocean-soft.json delete mode 100644 biomes/ocean-steep.json diff --git a/biomes/mushroom-ocean-soft.json b/biomes/mushroom-ocean-soft.json deleted file mode 100644 index 52af2219..00000000 --- a/biomes/mushroom-ocean-soft.json +++ /dev/null @@ -1,342 +0,0 @@ -{ - "decorators": [ - { - "chance": 0.06, - "variance": { - "style": "STATIC" - }, - "zoom": 20, - "palette": [ - { - "block": "seagrass" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.0006, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "block": "soul_sand" - }, - { - "block": "magma_block" - } - ], - "style": { - "style": "STATIC" - } - }, - { - "chance": 0.1, - "verticalZoom": 20, - "variance": { - "style": "STATIC" - }, - "stackMax": 9, - "zoom": 1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "style": { - "style": "STATIC" - }, - "heightVariance": { - "style": "STATIC" - }, - "stackMin": 1 - }, - { - "chance": 0.005, - "variance": { - "style": "STATIC" - }, - "zoom": 1, - "palette": [ - { - "data": { - "waterlogged": true, - "pickles": 1 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 2 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 3 - }, - "block": "sea_pickle" - }, - { - "data": { - "waterlogged": true, - "pickles": 4 - }, - "block": "sea_pickle" - } - ], - "style": { - "style": "STATIC" - } - } - ], - "objects": [ - { - "chance": 0.1, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" - ], - "edit": [ - { - "find": [ - { - "block": "oak_stairs" - } - ], - "replace": { - "palette": [ - { - "block": "oak_planks" - } - ] - } - } - ], - "translate": { - "x": 0, - "y": -4, - "z": 0 - } - }, - { - "chance": 0.3, - "edit": [ - { - "find": [ - { - "block": "shroomlight" - } - ], - "replace": { - "palette": [ - { - "block": "mushroom_stem" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.25, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "underwater": true, - "place": [ - "lumoshroom/subnauti-1", - "lumoshroom/subnauti-2", - "lumoshroom/subnauti-3", - "lumoshroom/subnauti-4", - "lumoshroom/subnauti-5", - "lumoshroom/subnauti-6", - "lumoshroom/subnauti-7", - "lumoshroom/subnauti-8", - "lumoshroom/subnauti-9", - "lumoshroom/subnauti-10" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "vanillaDerivative": "OCEAN", - "name": "Mushroom Ocean soft", - "layers": [ - { - "minHeight": 2, - "maxHeight": 3, - "style": { - "style": "STATIC" - }, - "zoom": 0.825, - "palette": [ - { - "block": "clay" - }, - { - "block": "stone" - }, - { - "block": "cobblestone" - }, - { - "block": "andesite" - }, - { - "block": "gravel" - } - ] - }, - { - "palette": [ - { - "block": "dirt" - } - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - { - "weight": 2, - "block": "dirt" - }, - { - "block": "coarse_dirt" - } - ] - } - ], - "generators": [ - { - "min": -31, - "max": -7, - "generator": "river" - } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, - "features": [ - { - "rarity": 48, - "zone": { - "convergeToHeight": 70, - "strength": 0.85, - "blockRadius": 32, - "interpolationRadius": 16, - "interpolator": "BILINEAR_STARCAST_9" - } - } - ], - "derivative": "OCEAN", - "wall": { - "style": { - "style": "IRIS" - }, - "palette": [ - { - "block": "clay" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "red_sand" - }, - { - "block": "smooth_red_sandstone" - }, - { - "block": "smooth_sandstone" - }, - { - "block": "sand" - }, - { - "block": "smooth_red_sandstone" - } - ] - }, - "slab": { - "style": { - "style": "STATIC" - }, - "palette": [ - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "stone_slab" - }, - { - "data": { - "waterlogged": false, - "type": "bottom" - }, - "block": "andesite_slab" - }, - { - "weight": 1, - "block": "air" - } - ] - } -} \ No newline at end of file diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json deleted file mode 100644 index 0b6bac65..00000000 --- a/biomes/ocean-steep.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "name": "Ocean Steep", - "derivative": "OCEAN", - "vanillaDerivative": "OCEAN", - "generators": [ - { - "generator": "plain", - "max": -5, - "min": -25 - } - ], - "layers": [ - { - "minHeight": 2, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 0, - "maximumSlope": 3 - }, - "style": { - "style": "FRACTAL_FBM_IRIS" - }, - "zoom": 0.6, - "palette": [ - { - "block": "sand" - }, - { - "block": "clay" - }, - { - "block": "sand" - }, - { - "block": "gravel" - }, - { - "block": "sand" - }, - { - "block": "dirt" - }, - { - "weight": 2, - "block": "sand" - } - ] - }, - { - "minHeight": 2, - "maxHeight": 2, - "palette": [ - { - "block": "gravel" - } - ] - } - ], - "decorators": [ - { - "chance": 0.1, - "palette": [ - { - "block": "kelp_plant" - } - ], - "stackMin": 4, - "stackMax": 10 - }, - { - "chance": 0.05, - "palette": [ - { - "block": "seagrass" - } - ] - }, - { - "chance": 0.05, - "palette": [ - { - "block": "tall_seagrass", - "data": { - "half": "lower" - } - } - ], - "topPalette": [ - { - "block": "tall_seagrass", - "data": { - "half": "upper" - } - } - ] - } - ], - "objects": [ - { - "place": [ - "ships/generic" - ], - "chance": 0.01, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - }, - { - "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" - ], - "chance": 1, - "mode": "FAST_MIN_HEIGHT", - "underwater": true, - "waterloggable": true, - "edit": [ - { - "find": [ - { - "block": "grass_block" - }, - { - "block": "dirt" - } - ], - "replace": { - "palette": [ - { - "block": "clay" - } - ] - } - }, - { - "find": [ - { - "block": "tall_grass" - }, - { - "block": "grass" - } - ], - "replace": { - "palette": [ - { - "block": "seagrass" - } - ] - } - } - ] - }, - { - "place": [ - "landform/underwater/ellipsoid-1" - ], - "chance": 0.5, - "underwater": true, - "mode": "CENTER_HEIGHT", - "edit": [ - { - "find": [ - { - "block": "clay" - } - ], - "replace": { - "style": { - "style": "GLOB", - "zoom": 0.02 - }, - "palette": [ - { - "weight": 2, - "block": "clay" - }, - { - "weight": 1, - "block": "cave_air" - } - ] - } - } - ] - }, - { - "place": [ - "ships/generic" - ], - "chance": 0.005, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true - } - ] -} \ No newline at end of file diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountains-cliffs.json index 16e017b7..d3d1b17a 100644 --- a/biomes/rocky-mountains-cliffs.json +++ b/biomes/rocky-mountains-cliffs.json @@ -29,6 +29,10 @@ } } ], + "children": [ + "rocky-mountains", + "rocky-ocean" + ], "vanillaDerivative": "MODIFIED_GRAVELLY_MOUNTAINS", "objects": [ { diff --git a/regions/mushroom.json b/regions/mushroom.json index e4496e83..9cdf1e48 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -42,20 +42,20 @@ "scale": 0.78, "type": "LAND", "shuffle": 44, - "rarity": 262 + "rarity": 52 }, { "biome": "mushroom-warped-forest", "scale": 0.77, "type": "LAND", "shuffle": 44, - "rarity": 261 + "rarity": 31 } ], "landBiomes": [ "mushroom-forest", - "mushroom-plains", - "mushroom-warped-forest" + "mushroom-forest-hills", + "mushroom-plains" ], "biomeImplosionRatio": 0.25, "seaBiomes": [ From 6798ed19502f824e5c113c197f60dec3f0a5acb2 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 18:31:39 -0700 Subject: [PATCH 6/6] Swamp patches --- ...rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} | 0 biomes/rocky-mountains.json | 2 +- biomes/swamp-ocean-tree.json | 4 ++-- regions/swamp.json | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) rename biomes/{rocky-mountains-cliffs.json => rocky-mountain-cliffs.json} (100%) diff --git a/biomes/rocky-mountains-cliffs.json b/biomes/rocky-mountain-cliffs.json similarity index 100% rename from biomes/rocky-mountains-cliffs.json rename to biomes/rocky-mountain-cliffs.json diff --git a/biomes/rocky-mountains.json b/biomes/rocky-mountains.json index d46d5430..0eec1754 100644 --- a/biomes/rocky-mountains.json +++ b/biomes/rocky-mountains.json @@ -44,7 +44,7 @@ "style": "IRIS" }, "children": [ - "rocky-mountains-cliffs" + "rocky-mountain-cliffs" ], "decorators": [ { diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index adade079..0524cc31 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -156,7 +156,7 @@ ], "translate": { "x": 0, - "y": -4, + "y": -6, "z": 0 } }, @@ -244,7 +244,7 @@ } }, "translate": { - "y": -4 + "y": -6 } } ], diff --git a/regions/swamp.json b/regions/swamp.json index 53852594..c1cfadba 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -37,6 +37,7 @@ "swamp-willow-forest", "swamp-lake", "swamp-roofed-wayward", + "swamp-mountain-forest", "swamp-marsh" ], "biomeImplosionRatio": 0.26, @@ -61,7 +62,8 @@ } ], "caveBiomes": [ - "swamp-murky-cavern" + "swamp-murky-cavern", + "swamp-murky-cavern-gleaming" ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02,