From 063937f74c8b7bae5da122bf3ba2c09c8787e428 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 8 Jun 2021 12:34:17 -0700 Subject: [PATCH] Drop Generator Complexity --- biomes/frozen-hills.json | 12 +++++++++- biomes/frozen-pine-plains.json | 7 +++++- biomes/frozen-river.json | 2 +- biomes/hot-desert-mountains.json | 2 +- biomes/hot-mesa-river.json | 2 +- biomes/hot-oasis.json | 2 +- biomes/hot-ocean.json | 2 +- biomes/hot-river.json | 4 ++-- biomes/mountain-forest-hills.json | 7 +++++- biomes/mountain-forest.json | 7 +++++- biomes/mountain-middle.json | 2 +- biomes/mountain-plains.json | 7 +++++- biomes/mountain-river-soft.json | 2 +- biomes/mushroom-lake.json | 2 +- biomes/mushroom-ocean-soft.json | 2 +- biomes/ocean-steep.json | 2 +- biomes/ocean-warm-bottom.json | 2 +- biomes/ocean-warm.json | 2 +- biomes/swamp-ocean-tree.json | 2 +- biomes/swamp-ocean.json | 2 +- biomes/temperate-river-loud.json | 2 +- biomes/temperate-soft-river.json | 2 +- biomes/tropical-ocean.json | 2 +- biomes/tundra-lake.json | 2 +- biomes/tundra-river.json | 2 +- generators/mountain-gen.json | 40 ------------------------------- generators/mountain-land.json | 26 -------------------- generators/mountainous.json | 40 ------------------------------- generators/ocean-steep.json | 16 ------------- generators/ocean-steep.json.bak | 16 ------------- generators/soft-river.json | 17 ------------- 31 files changed, 56 insertions(+), 181 deletions(-) delete mode 100644 generators/mountain-gen.json delete mode 100644 generators/mountain-land.json delete mode 100644 generators/mountainous.json delete mode 100644 generators/ocean-steep.json delete mode 100644 generators/ocean-steep.json.bak delete mode 100644 generators/soft-river.json diff --git a/biomes/frozen-hills.json b/biomes/frozen-hills.json index 6e714afb..7ced4741 100644 --- a/biomes/frozen-hills.json +++ b/biomes/frozen-hills.json @@ -5,7 +5,17 @@ "rarity": 3, "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 10, "min": 6 } diff --git a/biomes/frozen-pine-plains.json b/biomes/frozen-pine-plains.json index 72622865..950a31b7 100644 --- a/biomes/frozen-pine-plains.json +++ b/biomes/frozen-pine-plains.json @@ -7,7 +7,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 6, "min": 7 } diff --git a/biomes/frozen-river.json b/biomes/frozen-river.json index 86791f51..bf2eb314 100644 --- a/biomes/frozen-river.json +++ b/biomes/frozen-river.json @@ -153,7 +153,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -19 } diff --git a/biomes/hot-desert-mountains.json b/biomes/hot-desert-mountains.json index 326667f0..9b2962a8 100644 --- a/biomes/hot-desert-mountains.json +++ b/biomes/hot-desert-mountains.json @@ -178,7 +178,7 @@ { "min": 82, "max": 114, - "generator": "mountainous" + "generator": "mountain" } ], "loot": { diff --git a/biomes/hot-mesa-river.json b/biomes/hot-mesa-river.json index dedb6d85..592f1316 100644 --- a/biomes/hot-mesa-river.json +++ b/biomes/hot-mesa-river.json @@ -57,7 +57,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -4, "min": -15 } diff --git a/biomes/hot-oasis.json b/biomes/hot-oasis.json index 5fc44762..1ad168de 100644 --- a/biomes/hot-oasis.json +++ b/biomes/hot-oasis.json @@ -4,7 +4,7 @@ "vanillaDerivative": "DESERT", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -7, "min": -8 } diff --git a/biomes/hot-ocean.json b/biomes/hot-ocean.json index e7de357b..ced92ba9 100644 --- a/biomes/hot-ocean.json +++ b/biomes/hot-ocean.json @@ -218,7 +218,7 @@ { "min": 11, "max": 7, - "generator": "ocean-steep" + "generator": "canyon-steep" } ], "loot": { diff --git a/biomes/hot-river.json b/biomes/hot-river.json index 57be78d9..184f55da 100644 --- a/biomes/hot-river.json +++ b/biomes/hot-river.json @@ -35,10 +35,10 @@ } ] } - ], + ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -5, "min": -15 } diff --git a/biomes/mountain-forest-hills.json b/biomes/mountain-forest-hills.json index 2abcc466..ccaa9cde 100644 --- a/biomes/mountain-forest-hills.json +++ b/biomes/mountain-forest-hills.json @@ -24,7 +24,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 5, + "min": 2 + }, + { + "generator": "mountain", "max": 4, "min": 3 } diff --git a/biomes/mountain-forest.json b/biomes/mountain-forest.json index 2abcc466..ccaa9cde 100644 --- a/biomes/mountain-forest.json +++ b/biomes/mountain-forest.json @@ -24,7 +24,12 @@ ], "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 5, + "min": 2 + }, + { + "generator": "mountain", "max": 4, "min": 3 } diff --git a/biomes/mountain-middle.json b/biomes/mountain-middle.json index 75ae0d39..723ba6bf 100644 --- a/biomes/mountain-middle.json +++ b/biomes/mountain-middle.json @@ -26,7 +26,7 @@ "min": 0 }, { - "generator": "mountain-plain", + "generator": "plain", "max": 95, "min": 40 } diff --git a/biomes/mountain-plains.json b/biomes/mountain-plains.json index 7bb82023..e361357c 100644 --- a/biomes/mountain-plains.json +++ b/biomes/mountain-plains.json @@ -13,7 +13,12 @@ }, "generators": [ { - "generator": "mountain-plain", + "generator": "plain", + "max": 10, + "min": 6 + }, + { + "generator": "mountain", "max": 8, "min": 7 } diff --git a/biomes/mountain-river-soft.json b/biomes/mountain-river-soft.json index 73629e44..91c5debd 100644 --- a/biomes/mountain-river-soft.json +++ b/biomes/mountain-river-soft.json @@ -107,7 +107,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -32, "min": -40 } diff --git a/biomes/mushroom-lake.json b/biomes/mushroom-lake.json index 7ff8cd93..e9ea33ca 100644 --- a/biomes/mushroom-lake.json +++ b/biomes/mushroom-lake.json @@ -350,7 +350,7 @@ { "min": -30, "max": -10, - "generator": "soft-river" + "generator": "river" } ], "derivative": "MUSHROOM_FIELDS", diff --git a/biomes/mushroom-ocean-soft.json b/biomes/mushroom-ocean-soft.json index 20514e30..52af2219 100644 --- a/biomes/mushroom-ocean-soft.json +++ b/biomes/mushroom-ocean-soft.json @@ -265,7 +265,7 @@ { "min": -31, "max": -7, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/ocean-steep.json b/biomes/ocean-steep.json index b439d7fa..4f716a0e 100644 --- a/biomes/ocean-steep.json +++ b/biomes/ocean-steep.json @@ -4,7 +4,7 @@ "vanillaDerivative": "OCEAN", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -5, "min": -25 } diff --git a/biomes/ocean-warm-bottom.json b/biomes/ocean-warm-bottom.json index 0add9b70..7e37fed7 100644 --- a/biomes/ocean-warm-bottom.json +++ b/biomes/ocean-warm-bottom.json @@ -4,7 +4,7 @@ "vanillaDerivative": "WARM_OCEAN", "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -30, "min": -40 } diff --git a/biomes/ocean-warm.json b/biomes/ocean-warm.json index f0bb023f..c1122ae4 100644 --- a/biomes/ocean-warm.json +++ b/biomes/ocean-warm.json @@ -13,7 +13,7 @@ "childShrinkFactor": 1.0, "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -19 } diff --git a/biomes/swamp-ocean-tree.json b/biomes/swamp-ocean-tree.json index aa320d6b..adade079 100644 --- a/biomes/swamp-ocean-tree.json +++ b/biomes/swamp-ocean-tree.json @@ -302,7 +302,7 @@ { "min": -1, "max": 0, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/swamp-ocean.json b/biomes/swamp-ocean.json index 12a5fa66..c782125b 100644 --- a/biomes/swamp-ocean.json +++ b/biomes/swamp-ocean.json @@ -215,7 +215,7 @@ { "min": -2, "max": 0, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/temperate-river-loud.json b/biomes/temperate-river-loud.json index d46ceeba..ee5862f9 100644 --- a/biomes/temperate-river-loud.json +++ b/biomes/temperate-river-loud.json @@ -167,7 +167,7 @@ ], "generators": [ { - "generator": "ocean-steep", + "generator": "canyon-steep", "max": -10, "min": -30 } diff --git a/biomes/temperate-soft-river.json b/biomes/temperate-soft-river.json index 4bfa58a0..747d747d 100644 --- a/biomes/temperate-soft-river.json +++ b/biomes/temperate-soft-river.json @@ -167,7 +167,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -40, "min": -50 } diff --git a/biomes/tropical-ocean.json b/biomes/tropical-ocean.json index eb641464..03e6dfd8 100644 --- a/biomes/tropical-ocean.json +++ b/biomes/tropical-ocean.json @@ -361,7 +361,7 @@ { "min": -38, "max": -20, - "generator": "soft-river" + "generator": "river" } ], "loot": { diff --git a/biomes/tundra-lake.json b/biomes/tundra-lake.json index d05c497a..30951a4c 100644 --- a/biomes/tundra-lake.json +++ b/biomes/tundra-lake.json @@ -501,7 +501,7 @@ { "min": -30, "max": -15, - "generator": "soft-river" + "generator": "river" } ], "derivative": "SNOWY_TUNDRA", diff --git a/biomes/tundra-river.json b/biomes/tundra-river.json index 236771c9..70fbf99f 100644 --- a/biomes/tundra-river.json +++ b/biomes/tundra-river.json @@ -185,7 +185,7 @@ ], "generators": [ { - "generator": "soft-river", + "generator": "river", "max": -10, "min": -27 } diff --git a/generators/mountain-gen.json b/generators/mountain-gen.json deleted file mode 100644 index 86c44143..00000000 --- a/generators/mountain-gen.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 18 - }, - "seed": 530530, - "composite": [ - { - "seed": 5346, - "style": { - "style": "TRIOCTAVE_FRACTAL_CUBIC", - "zoom": 1.7, - "fracture": { - "style": "IRIS_THICK", - "zoom": 0.8, - "exponent": 1.2, - "multiplier": 55 - } - }, - "exponent": 4, - "negative": true - }, - { - "seed": 1714, - "style": { - "style": "IRIS_THICK", - "zoom": 0.6, - "exponent": 0.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.7, - "multiplier": 50 - } - }, - "negative": true, - "opacity": 0.1 - } - ] -} \ No newline at end of file diff --git a/generators/mountain-land.json b/generators/mountain-land.json deleted file mode 100644 index 819783b8..00000000 --- a/generators/mountain-land.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "interpolator": { - "function": "HERMITE_STARCAST_12", - "horizontalScale": 15 - }, - "seed": 9875476, - "composite": [ - { - "seed": 5644, - "style": { - "style": "IRIS", - "zoom": 1.9, - "fracture": { - "style": "PERLIN_IRIS_DOUBLE", - "zoom": 0.8, - "multiplier": 30, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.2, - "multiplier": 10 - } - } - } - } - ] -} \ No newline at end of file diff --git a/generators/mountainous.json b/generators/mountainous.json deleted file mode 100644 index e15f85c6..00000000 --- a/generators/mountainous.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 10 - }, - "seed": 133434, - "composite": [ - { - "seed": 2343, - "style": { - "style": "BIOCTAVE_FRACTAL_CUBIC", - "zoom": 1.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.2, - "multiplier": 50 - } - }, - "exponent": 4, - "negative": true - }, - { - "seed": 1714, - "style": { - "style": "BIOCTAVE_FRACTAL_BILLOW_SIMPLEX", - "zoom": 0.6, - "exponent": 0.7, - "fracture": { - "style": "SIMPLEX", - "zoom": 0.8, - "exponent": 0.2, - "multiplier": 50 - } - }, - "negative": true, - "opacity": 0.1 - } - ] -} \ No newline at end of file diff --git a/generators/ocean-steep.json b/generators/ocean-steep.json deleted file mode 100644 index 3de946fe..00000000 --- a/generators/ocean-steep.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 6 - }, - "seed": 2133, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file diff --git a/generators/ocean-steep.json.bak b/generators/ocean-steep.json.bak deleted file mode 100644 index 3de946fe..00000000 --- a/generators/ocean-steep.json.bak +++ /dev/null @@ -1,16 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 6 - }, - "seed": 2133, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file diff --git a/generators/soft-river.json b/generators/soft-river.json deleted file mode 100644 index 5e8138b1..00000000 --- a/generators/soft-river.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "interpolator": { - "function": "BILINEAR_STARCAST_9", - "horizontalScale": 30 - }, - "seed": 2133, - "exponent": 1.125, - "composite": [ - { - "seed": 12323, - "style": { - "style": "IRIS", - "zoom": 0.9 - } - } - ] -} \ No newline at end of file