From f67c981d8876d9cae734b883227b75b7804f7a32 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 6 Jul 2021 02:30:49 -0700 Subject: [PATCH] dwa --- biomes/hot/desert-dunes.json | 1 - biomes/hot/oasis-red.json | 53 ------------------------------------ biomes/hot/oasis.json | 17 +++--------- biomes/hot/ocean.json | 1 - loot/beach-clutter.json | 2 +- loot/cactus-clutter.json | 2 +- loot/cave-clutter.json | 2 +- loot/global-clutter.json | 2 +- loot/ocean-clutter.json | 2 +- loot/snow-clutter.json | 2 +- regions/hot.json | 15 ++++++---- 11 files changed, 19 insertions(+), 80 deletions(-) delete mode 100644 biomes/hot/oasis-red.json diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json index a321a180..27e92cf9 100644 --- a/biomes/hot/desert-dunes.json +++ b/biomes/hot/desert-dunes.json @@ -2,7 +2,6 @@ "name": "Hot Desert Dunes", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "children": ["hot/oasis"], "generators": [{ "generator": "smooth-dunes", "max": 23, diff --git a/biomes/hot/oasis-red.json b/biomes/hot/oasis-red.json deleted file mode 100644 index 1b475618..00000000 --- a/biomes/hot/oasis-red.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Hot Oasis", - "derivative": "DESERT", - "vanillaDerivative": "DESERT", - "generators": [{ - "generator": "plain", - "max": -7, - "min": -8 - }], - "layers": [ - { - "minHeight": 3, - "maxHeight": 10, - "slopeCondition": { - "minimumSlope": 4.5, - "maximumSlope": 20 - }, - "palette": [{"block": "terracotta"}] - }, - { - "minHeight": 5, - "maxHeight": 5, - "style": {"style": "FRACTAL_WATER"}, - "zoom": 0.7, - "palette": [ - { - "weight": 1, - "block": "red_sand" - }, - { - "weight": 1, - "block": "smooth_red_sandstone" - } - ] - } - ], - "decorators": [ - { - "verticalZoom": 5, - "chance": 0.005, - "variance": {"style": "STATIC"}, - "stackMax": 5, - "style": {"style": "STATIC"}, - "palette": [{"block": "cactus"}], - "heightVariance": {"style": "IRIS"}, - "stackMin": 1 - }, - { - "chance": 0.005, - "palette": [{"block": "dead_bush"}] - } - ] -} diff --git a/biomes/hot/oasis.json b/biomes/hot/oasis.json index f5c8bd99..f9b3db7e 100644 --- a/biomes/hot/oasis.json +++ b/biomes/hot/oasis.json @@ -4,19 +4,10 @@ "vanillaDerivative": "DESERT", "generators": [{ "generator": "plain", - "max": -7, - "min": -8 + "max": 7, + "min": -2 }], "layers": [ - { - "minHeight": 3, - "maxHeight": 10, - "slopeCondition": { - "minimumSlope": 4.5, - "maximumSlope": 20 - }, - "palette": [{"block": "terracotta"}] - }, { "minHeight": 5, "maxHeight": 5, @@ -25,11 +16,11 @@ "palette": [ { "weight": 1, - "block": "sand" + "block": "grass_block" }, { "weight": 1, - "block": "smooth_sandstone" + "block": "moss_block" } ] } diff --git a/biomes/hot/ocean.json b/biomes/hot/ocean.json index 62dccba8..ecca2d31 100644 --- a/biomes/hot/ocean.json +++ b/biomes/hot/ocean.json @@ -4,7 +4,6 @@ "vanillaDerivative": "WARM_OCEAN", "children": [ "hot/river", - "hot/oasis", "hot/ocean-cliffs" ], "generators": [{ diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index 798c5f89..023f848d 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -2,7 +2,7 @@ "name": "Beach Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "sugar_cane", diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index 05420d6b..9c6213ba 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -2,7 +2,7 @@ "name": "Cactus Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "cactus", diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 62ad32f1..d4bd1230 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -2,7 +2,7 @@ "name": "Cave Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "torch", diff --git a/loot/global-clutter.json b/loot/global-clutter.json index b674e324..731c0709 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -2,7 +2,7 @@ "name": "Global Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "stone", diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index ccbd6c97..384898fd 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -2,7 +2,7 @@ "name": "Ocean Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "wet_sponge", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index 7100f2ce..a67e9b1d 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -2,7 +2,7 @@ "name": "Snow Clutter", "rarity": 1, "maxPicked": 2, - "minPicked": 0, + "minPicked": 1, "loot": [ { "type": "snowball", diff --git a/regions/hot.json b/regions/hot.json index f55335f8..ead8af7b 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -2,15 +2,9 @@ "name": "Hot", "landBiomes": [ "hot/desert-red", - "hot/desert-dunes-red", - "hot/desert-dunes", "hot/desert" ], "shoreBiomes": [ - "hot/beach-grass", - "hot/beach", - "hot/beach", - "hot/beach", "hot/beach" ], "seaBiomes": ["hot/ocean"], @@ -27,6 +21,15 @@ "zoom": 5 } }, + "spotBiomes": [ + { + "biome": "hot/oasis", + "scale": 5, + "type": "SEA", + "shuffle": 328, + "rarity": 36 + } + ], "biomeImplosionRatio": 0.25, "deposits": [ {