From b0291b9f8713e30466cba2d96dfa8bf07ce8384e Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Jul 2021 04:55:38 -0700 Subject: [PATCH] Merges --- dimensions/overworld.json | 4 +- regions/mountain.json | 112 ------------------------------ regions/tropical-mountain.json | 121 --------------------------------- regions/tropical.json | 10 ++- regions/tundra.json | 12 +++- 5 files changed, 19 insertions(+), 240 deletions(-) delete mode 100644 regions/mountain.json delete mode 100644 regions/tropical-mountain.json diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 513939f4..9d43efa5 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -14,13 +14,11 @@ "exponent": 10.1 }, "REGIONS": "Contains the list of regions and their placement style", - "regionZoom": 15, + "regionZoom": 7, "regions": [ "mushroom", "swamp", - "mountain", "ocean", - "tropical-mountain", "tundra", "temperate", "frozen", diff --git a/regions/mountain.json b/regions/mountain.json deleted file mode 100644 index 4b85e789..00000000 --- a/regions/mountain.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "name": "Mountains", - "landBiomes": [ - "mountain/mtn-mountain", - "mountain/mtn-hills", - "mountain/mtn-forest-hills", - "mountain/mtn-forest", - "mountain/mtn-plains", - "mountain/mtn-cliffs", - "mountain/mtn-mountain" - ], - "shoreBiomes": ["mountain/mtn-beach"], - "seaBiomes": ["ocean/oce-mtn-river-soft"], - "caveBiomes": [ - "cave/old-cavern", - "cave/cracked-cavern", - "cave/tundra-cavern" - ], - "riverBiomes": ["ocean/oce-mtn-river"], - "jigsawStructures": [{ - "structure": "murky_stronghold", - "rarity": 750 - }], - "biomeImplosionRatio": 0.25, - "landBiomeZoom": 1.85, - "deposits": [ - { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 122, - "minPerChunk": 0, - "minSize": 4, - "maxSize": 12, - "palette": [ - {"block": "iron_ore"}, - {"block": "coal_ore"} - ], - "varience": 4 - }, - { - "minHeight": 15, - "maxPerChunk": 4, - "maxHeight": 122, - "minPerChunk": 2, - "minSize": 4, - "maxSize": 8, - "palette": [ - { - "weight": 9, - "block": "emerald_ore" - }, - {"block": "coal_ore"} - ], - "varience": 4 - } - ], - "objects": [{ - "heightmap": { - "seed": 1337, - "style": { - "style": "SIMPLEX", - "multiplier": 10 - }, - "offsetY": 5 - }, - "chance": 0.05, - "bottom": true, - "density": 1, - "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" - ], - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "enabled": true, - "xAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "yAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "translate": { - "yRandom": 10, - "y": 2 - } - }], - "loot": { - "mode": "ADD", - "multiplier": 1, - "tables": [ - "global-clutter", - "global-tools", - "cold-food", - "cold-treasure" - ] - }, - "shoreHeightMin": 2.2, - "shoreHeightMax": 1.2, - "shoreHeightZoom": 1.14, - "riverThickness": 0.5, - "rarity": 3 -} diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json deleted file mode 100644 index 49a78416..00000000 --- a/regions/tropical-mountain.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "name": "Tropical mountain", - "landBiomes": [ - "tropical/tro-plains", - "tropical/tro-mountain", - "tropical/tro-plains", - "tropical/tro-mountain-extreme", - "tropical/tro-wilds", - "tropical/tro-plains-hills" - ], - "shoreBiomes": ["tropical/tro-beach"], - "seaBiomes": [ - "ocean/oce-tro-river-steep", - "ocean/oce-tro-river-soft" - ], - "riverBiomes": [ - "ocean/oce-tro-river-steep", - "ocean/oce-tro-river-soft" - ], - "biomeImplosionRatio": 0.25, - "objects": [{ - "heightmap": { - "seed": 1337, - "style": { - "style": "SIMPLEX", - "multiplier": 10 - }, - "offsetY": 5 - }, - "chance": 0.05, - "bottom": true, - "density": 1, - "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" - ], - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "enabled": true, - "xAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "yAxis": { - "interval": 90, - "max": 360, - "min": 0 - }, - "translate": { - "yRandom": 10, - "y": 2 - } - }], - "loot": { - "mode": "ADD", - "multiplier": 1, - "tables": [ - "global-clutter", - "global-tools", - "global-treasure", - "tropical-treasure", - "tropical-food", - "forest-food" - ] - }, - "deposits": [ - { - "minHeight": 15, - "maxPerChunk": 2, - "maxHeight": 122, - "minPerChunk": 0, - "minSize": 4, - "maxSize": 12, - "palette": [ - {"block": "iron_ore"}, - {"block": "coal_ore"} - ], - "varience": 4 - }, - { - "minHeight": 15, - "maxPerChunk": 4, - "maxHeight": 122, - "minPerChunk": 2, - "minSize": 4, - "maxSize": 8, - "palette": [ - { - "weight": 9, - "block": "emerald_ore" - }, - {"block": "coal_ore"} - ], - "varience": 4 - } - ], - "riverRarity": 1, - "caveBiomes": ["cave/old-cavern"], - "landBiomeZoom": 2, - "riverStyle": { - "style": "VASCULAR", - "zoom": 4.77, - "fracture": { - "multiplier": 240, - "style": "IRIS", - "zoom": 5 - } - }, - "shoreHeightMin": 2.2, - "shoreHeightMax": 1.2, - "shoreHeightZoom": 1.14, - "riverThickness": 0.025, - "rarity": 1 -} diff --git a/regions/tropical.json b/regions/tropical.json index cb826d29..75c4907b 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -9,7 +9,13 @@ "tropical/tro-wilds", "tropical/tro-volcanic-plains", "tropical/tro-mountain-extreme", - "tropical/tro-mountain" + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain", + "tropical/tro-plains", + "tropical/tro-mountain-extreme", + "tropical/tro-wilds", + "tropical/tro-plains-hills" ], "shoreBiomes": [ "tropical/tro-island-beach", @@ -151,5 +157,5 @@ } ], "shoreHeightZoom": 2.14, - "rarity": 1 + "rarity": 5 } diff --git a/regions/tundra.json b/regions/tundra.json index c63eba32..6f43b92a 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -10,7 +10,14 @@ "tundra/tun-lake", "tundra/tun-mountains", "tundra/tun-mountains", - "tundra/tun-mountains-cliffs" + "tundra/tun-mountains-cliffs", + "mountain/mtn-mountain", + "mountain/mtn-hills", + "mountain/mtn-forest-hills", + "mountain/mtn-forest", + "mountain/mtn-plains", + "mountain/mtn-cliffs", + "mountain/mtn-mountain" ], "shoreBiomes": ["tundra/tun-beach"], "seaBiomes": ["ocean/oce-tun-river"], @@ -51,6 +58,7 @@ "mode": "ADD", "multiplier": 1, "tables": [ + "global-clutter", "global-tools", "cold-treasure", @@ -99,5 +107,5 @@ }], "shoreHeightZoom": 1.14, "riverThickness": 0.025, - "rarity": 1 + "rarity": 2 }