diff --git a/README.md b/README.md index c5c6311d..0e24a8b2 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Contributors & creators: - [Brian](https://github.com/NextdoorPsycho) (Created the origin (overworld v1) content in the pack. most of the objects and biomes are of his making, and free to use for anyone who owns iris) - [Coco](https://github.com/CocoTheOwner/) (Did much of the bugfixing, configuration tweaks, merges, early v2 development) - [Cyberpwn](https://github.com/cyberpwnn) (Much of the early Bases and development of the iris plugin) +- [Espen](https://github.com/espen96) (Cave, Ore, and Other improvements) - [K530](https://github.com/K530-hub) (Biome reworks, and mountain generation) - [RaydenKonig](https://github.com/RaydenKonig) (Innovative ideas and configurations) diff --git a/biomes/frozen-mountains-cliffs.json b/biomes/frozen-mountains-cliffs.json index a63a4fcf..868dd169 100644 --- a/biomes/frozen-mountains-cliffs.json +++ b/biomes/frozen-mountains-cliffs.json @@ -84,7 +84,7 @@ "x": 0, "y": -1, "z": 0 - }, + } }, { "chance": 0.01, diff --git a/biomes/frozen-redwoods-forest.json b/biomes/frozen-redwood-forest.json similarity index 100% rename from biomes/frozen-redwoods-forest.json rename to biomes/frozen-redwood-forest.json diff --git a/biomes/hot-desert-dunes.json b/biomes/hot-desert-dunes.json index 08871164..ba27dacb 100644 --- a/biomes/hot-desert-dunes.json +++ b/biomes/hot-desert-dunes.json @@ -6,7 +6,7 @@ { "generator": "dunes", "max": 30, - "min": 10 + "min": 10 } ], "jigsawStructures": [ @@ -109,8 +109,8 @@ ] }, { - "chance": 0.000000000000000000000000000000000000000000000000000000000000000000001, - "mode": "MIN_HEIGHT", + "chance": 0.0000001, + "mode": "STILT", "rotation": { "yAxis": { "min": 0, @@ -121,7 +121,10 @@ "enabled": true }, "place": [ - "pryamid/pyramid-extreme" + "pryamid/pyramid-extreme", + "void/void", + "void/void", + "void/void" ], "translate": { "x": 0, diff --git a/biomes/hot-desert-mountains.json b/biomes/hot-desert-mountains.json index 4f05e998..326667f0 100644 --- a/biomes/hot-desert-mountains.json +++ b/biomes/hot-desert-mountains.json @@ -104,6 +104,7 @@ }, { "chance": 0.001, + "mode": "VACUUM", "density": 1, "rotation": { "yAxis": { @@ -130,22 +131,6 @@ ], "name": "Desert Mountains", "layers": [ - { - "minHeight": 1, - "maxHeight": 2, - "slopeCondition": { - "minimumSlope": 4.75 - }, - "palette": [ - { - "block": "yellow_concrete_powder", - "weight": 2 - }, - { - "block": "sand" - } - ] - }, { "style": { "style": "STATIC" @@ -193,7 +178,7 @@ { "min": 82, "max": 114, - "generator": "plain-cliffs" + "generator": "mountainous" } ], "loot": { diff --git a/biomes/hot-desert-red.json b/biomes/hot-desert-red.json index 4264f712..d1b98b61 100644 --- a/biomes/hot-desert-red.json +++ b/biomes/hot-desert-red.json @@ -5,8 +5,8 @@ "generators": [ { "generator": "desert-dunes", - "max": 30, - "min": 1 + "max": 35, + "min": 25 } ], "layers": [ diff --git a/biomes/hot-desert.json b/biomes/hot-desert.json index 79562351..3e64364f 100644 --- a/biomes/hot-desert.json +++ b/biomes/hot-desert.json @@ -118,6 +118,7 @@ }, { "chance": 0.0001, + "mode": "VACUUM", "rotation": { "yAxis": { "min": 0, diff --git a/biomes/hot-desert.json.bak b/biomes/hot-desert.json.bak deleted file mode 100644 index bd09c553..00000000 --- a/biomes/hot-desert.json.bak +++ /dev/null @@ -1,207 +0,0 @@ -{ - "name": "Desert Hills", - "derivative": "DESERT", - "vanillaDerivative": "DESERT", - "generators": [ - { - "generator": "smooth-land", - "max": 18, - "min": -8 - } - ], - "entityInitialSpawns": [ - { - "entity": "cow", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - }, - { - "entity": "chicken", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 6 - } - ], - "objects": [ - { - "name": "standard-surface-portals", - "chance": 0.00505, - "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" - }, - { - "chance": 0.001, - "density": 3, - "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" - ] - }, - { - "chance": 0.001, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "global-clutter/sphinxToomb-1", - "global-clutter/BrokSphinxToomb-1" - ], - "clamp": { - "maximumHeight": 73 - }, - "translate": { - "x": 0, - "y": -3, - "z": 0 - } - } - ], - "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": "sand" - }, - { - "weight": 1, - "block": "smooth_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" - } - ] - } - ] -} \ No newline at end of file diff --git a/biomes/hot-mesa-cliffs-yellow.json b/biomes/hot-mesa-cliffs-yellow.json index 718b533f..224041dd 100644 --- a/biomes/hot-mesa-cliffs-yellow.json +++ b/biomes/hot-mesa-cliffs-yellow.json @@ -62,8 +62,8 @@ "name": "Yellow Mesa", "layers": [ { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 4, "style": { "style": "STATIC" }, @@ -74,8 +74,8 @@ ] }, { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 3, "style": { "style": "STATIC" }, @@ -86,8 +86,8 @@ ] }, { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 4, "style": { "style": "STATIC" }, @@ -98,8 +98,8 @@ ] }, { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 3, "style": { "style": "STATIC" }, @@ -110,7 +110,7 @@ ] }, { - "minHeight": 2, + "minHeight": 3, "maxHeight": 2, "style": { "style": "STATIC" @@ -122,8 +122,8 @@ ] }, { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 3, "style": { "style": "STATIC" }, @@ -134,8 +134,8 @@ ] }, { - "minHeight": 1, - "maxHeight": 1, + "minHeight": 3, + "maxHeight": 3, "style": { "style": "STATIC" }, @@ -160,19 +160,14 @@ ], "generators": [ { - "min": 3, + "min": 1, "max": 6, "generator": "plain" }, { "min": 9, - "max": 38, + "max": 35, "generator": "mountain" - }, - { - "min": 14, - "max": 40, - "generator": "plain-cliffs" } ], "derivative": "SHATTERED_SAVANNA", diff --git a/biomes/hot-mesa-cliffs.json b/biomes/hot-mesa-cliffs.json index c2170a42..ee96cabd 100644 --- a/biomes/hot-mesa-cliffs.json +++ b/biomes/hot-mesa-cliffs.json @@ -1,5 +1,8 @@ { "vanillaDerivative": "BADLANDS_PLATEAU", + "children": [ + "hot-mesa-cliffs-yellow" + ], "decorators": [ { "chance": 0.009, @@ -136,13 +139,18 @@ ], "generators": [ { - "min": 11, - "max": 28, + "min": 1, + "max": 6, + "generator": "plain" + }, + { + "min": 9, + "max": 30, "generator": "mountain" }, { - "min": 14, - "max": 50, + "min": 15, + "max": 60, "generator": "plain-cliffs" } ], diff --git a/biomes/hot-mesa.json b/biomes/hot-mesa.json index fd5b5973..20e4882a 100644 --- a/biomes/hot-mesa.json +++ b/biomes/hot-mesa.json @@ -8,7 +8,15 @@ "ERODED_BADLANDS" ], "children": [ - "hot-mesa-valleys" + "hot-mesa-valleys", + "hot-mesa-blue", + "hot-mesa-blue", + "hot-mesa-dark", + "hot-mesa-green", + "hot-mesa-red", + "hot-mesa-yellow", + "hot-mesa-blue" + ], "childStyle": { "style": "GLOB", diff --git a/biomes/mushroom-forest-hills.json b/biomes/mushroom-forest-hills.json index 407ae23d..1cb202b7 100644 --- a/biomes/mushroom-forest-hills.json +++ b/biomes/mushroom-forest-hills.json @@ -92,7 +92,7 @@ "mushroom-red/small-organell-r-9", "mushroom-red/small-organell-r-10" ], - "mode": "VACUUM", + "mode": "MIN_HEIGHT", "translate": { "x": 0, "y": -1, diff --git a/biomes/mushroom-forest.json b/biomes/mushroom-forest.json index 6ecc1796..4af83fc3 100644 --- a/biomes/mushroom-forest.json +++ b/biomes/mushroom-forest.json @@ -165,7 +165,7 @@ "chance": 0.20 } ], - "mode": "VACUUM", + "mode": "MIN_HEIGHT", "carvingSupport": "SURFACE_ONLY" }, { @@ -192,7 +192,7 @@ "mushroom-red/small-organell-r-9", "mushroom-red/small-organell-r-10" ], - "mode": "VACUUM", + "mode": "MIN_HEIGHT", "translate": { "x": 0, "y": -1, @@ -239,7 +239,7 @@ "mushroom-red/small-organell-r-9", "mushroom-red/small-organell-r-10" ], - "mode": "VACUUM", + "mode": "MIN_HEIGHT", "translate": { "x": 0, "y": -1, diff --git a/biomes/swamp-willow-forest.json b/biomes/swamp-willow-forest.json index 1b436ca1..ebd93bc9 100644 --- a/biomes/swamp-willow-forest.json +++ b/biomes/swamp-willow-forest.json @@ -1,6 +1,24 @@ { "vanillaDerivative": "DARK_FOREST", "effects": [ + { + "interval": 65656, + "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "soundDistance": 3, + "volume": 6.2, + "minPitch": 1.6, + "maxPitch": 1.35, + "chance": 11 + }, + { + "interval": 56565, + "sound": "AMBIENT_SOUL_SAND_VALLEY_MOOD", + "soundDistance": 3, + "volume": 6.2, + "minPitch": 0.4, + "maxPitch": 0.2, + "chance": 5 + }, { "particleAltX": 0.0101, "particleAltY": -0.033885, diff --git a/biomes/temperate-flower-forest.json b/biomes/temperate-flower-forest.json index 021a195b..101aa7ce 100644 --- a/biomes/temperate-flower-forest.json +++ b/biomes/temperate-flower-forest.json @@ -26,9 +26,9 @@ }, { "entity": "bee", - "maxSpawns": 4, + "maxSpawns": 5, "minSpawns": 1, - "rarity": 7 + "rarity": 3 } ], "objects": [{ diff --git a/biomes/temperate-plateau.json b/biomes/temperate-plateau.json index 64f5b9eb..43ec5dc6 100644 --- a/biomes/temperate-plateau.json +++ b/biomes/temperate-plateau.json @@ -169,6 +169,7 @@ }, { "chance": 1, + "mode": "MIN_HEIGHT", "density": 2, "rotation": { "yAxis": { @@ -227,7 +228,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -1, "z": 0 } }, @@ -242,6 +243,7 @@ }, "enabled": true }, + "mode": "MIN_HEIGHT", "place": [ "hazel-oak/taller-oak-1", "hazel-oak/taller-oak-2", @@ -258,6 +260,7 @@ }, { "chance": 0.001, + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, @@ -284,6 +287,7 @@ }, { "chance": 0.001, + "mode": "MIN_HEIGHT", "rotation": { "yAxis": { "min": 0, @@ -325,7 +329,7 @@ }, { "block": "grass" - }, + }, { "block": "grass" }, @@ -365,7 +369,7 @@ } ] }, - { + { "chance": 0.02, "variance": { "style": "STATIC" @@ -377,7 +381,7 @@ } ] }, - { + { "chance": 0.03, "variance": { "style": "STATIC" @@ -389,7 +393,7 @@ } ] }, - { + { "chance": 0.05, "variance": { "style": "STATIC" @@ -402,7 +406,7 @@ } ] }, - { + { "chance": 0.05, "variance": { "style": "STATIC" diff --git a/biomes/tropical-mountain.json b/biomes/tropical-mountain.json index ceeddc58..43556663 100644 --- a/biomes/tropical-mountain.json +++ b/biomes/tropical-mountain.json @@ -171,6 +171,7 @@ "tree/jungle/8", "tree/jungle/9" ], + "mode": "MIN_HEIGHT", "chance": 1, "rotation": { "enabled": true, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index b77a9665..cfd767b6 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -14,31 +14,28 @@ "mountain", "ocean", "tropical-mountain", + "savanna", + "tundra", "temperate", - "savanna", - "temperate", - "ocean", "frozen", "hot", - "tundra", "tropical", - "temperate", - "mesa" + "mesa", + "ocean" ], "seaBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" }, "seaZoom": 1.25, - "biomeZoom": 8.09, - + "biomeZoom": 8, "lootTries": 32, "caveBiomeStyle": { "style": "CELLULAR_IRIS_DOUBLE" }, "continentZoom": 1, "postProcessing": true, - "postProcessCaves":true, - "Nipple-Remover":true, + "postProcessCaves": true, + "Nipple-Remover": true, "landBiomeStyle": { "style": "CELLULAR", "fracture": { @@ -137,15 +134,12 @@ ] }, "coordFractureDistance": 926, - - - "carving": true, "carveLayers": [ { "style": { "style": "IRIS_DOUBLE", - "zoom": 1.0, + "zoom": 1, "fracture": { "multiplier": 5, "style": "FRACTAL_SMOKE", @@ -157,7 +151,6 @@ "minHeight": -40, "maxHeight": 70 }, - { "style": { "style": "PERLIN_IRIS_HALF", @@ -173,12 +166,9 @@ "minHeight": -50, "maxHeight": 100 } - - ], "caves": true, "caveLayers": [ - { "canBreakSurface": true, "caveThickness": 0.5, @@ -189,7 +179,6 @@ "generator": { "style": "SIMPLEX", "zoom": 2 - } }, "verticalSlope": { @@ -201,7 +190,6 @@ } } }, - { "canBreakSurface": false, "caveThickness": 0.5, @@ -212,7 +200,6 @@ "generator": { "style": "IRIS", "zoom": 2 - } }, "verticalSlope": { @@ -236,7 +223,6 @@ "generator": { "style": "PERLIN", "zoom": 2 - } }, "verticalSlope": { @@ -269,7 +255,6 @@ } } }, - "landChance": 0.69, "preventLeafDecay": true, "version": 2, @@ -350,9 +335,9 @@ { "minHeight": 2, "maxPerChunk": 2, - "maxHeight": 18, - "minPerChunk": 1, - "minSize": 2, + "maxHeight": 30, + "minPerChunk": 0, + "minSize": 1, "maxSize": 5, "palette": [ { @@ -365,7 +350,7 @@ "minHeight": 4, "maxPerChunk": 5, "maxHeight": 40, - "minPerChunk": 1, + "minPerChunk": 0, "minSize": 5, "maxSize": 8, "palette": [ @@ -382,7 +367,7 @@ "minHeight": 3, "maxPerChunk": 2, "maxHeight": 67, - "minPerChunk": 1, + "minPerChunk": 0, "minSize": 1, "maxSize": 3, "palette": [ @@ -410,7 +395,7 @@ "minHeight": 1, "maxPerChunk": 9, "maxHeight": 120, - "minPerChunk": 9, + "minPerChunk": 8, "minSize": 3, "maxSize": 8, "palette": [ @@ -463,4 +448,4 @@ "name": "Overworld", "regionZoom": 20, "dimensionAngleDeg": 19 -} +} \ No newline at end of file diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 83a0c880..59290684 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -2,6 +2,7 @@ "name": "Global Clutter", "rarity": 4, "maxPicked": 3, + "minPicked": 2, "loot": [ { "type": "stone", diff --git a/loot/global-tools.json b/loot/global-tools.json index ff044d37..74cc1206 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -1,7 +1,7 @@ { "name": "Global Tools", "rarity": 1, - "maxPicked": 1, + "maxPicked": 3, "minPicked": 0, "loot": [ { diff --git a/loot/global-treasure.json b/loot/global-treasure.json index 7c2e1fad..b0f890ea 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -1,8 +1,8 @@ { "name": "Global Treasure", "rarity": 1, - "maxPicked": 1, - "minPicked": 0, + "maxPicked": 4, + "minPicked": 1, "loot": [ { "type": "diamond", @@ -19,7 +19,13 @@ { "type": "name_tag", "maxamount": 1, - "rarity": 42, + "rarity": 10, + "slottypes": "STORAGE" + }, + { + "type": "obsidian", + "maxamount": 1, + "rarity": 3, "slottypes": "STORAGE" }, { @@ -43,6 +49,7 @@ { "type": "redstone", "maxamount": 11, + "minAmount": 4, "rarity": 4, "slottypes": "STORAGE" } diff --git a/regions/frozen.json b/regions/frozen.json index f09d98ec..348da1dc 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -30,11 +30,12 @@ "landBiomes": [ "frozen-plains", "frozen-pines", - "frozen-hills", "frozen-plains", "frozen-mountain", + "frozen-redwood-forest", "frozen-hills", - "frozen-pine-plains" + "frozen-pine-plains", + "frozen-spruce-plains" ], "biomeImplosionRatio": 0.25, "seaBiomes": [ diff --git a/regions/hot-red-desert.json b/regions/hot-red-desert.json index e558cf2d..5759ff5e 100644 --- a/regions/hot-red-desert.json +++ b/regions/hot-red-desert.json @@ -21,12 +21,11 @@ } ], "landBiomes": [ - "hot-mountain-plains", "hot-mountain-plains", "hot-mountain", - "hot-mountain-plains", "hot-mountain-plains" + ], "biomeImplosionRatio": 0.25, "seaBiomes": [ diff --git a/regions/hot.json b/regions/hot.json index b215f047..2b13a1e7 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -55,8 +55,24 @@ } ], "landBiomes": [ + "hot-desert-red", "hot-desert", - "hot-desert-dunes" + "hot-desert-dunes", + "hot-desert-mountains", + "hot-dry-forest", + "hot-savanna", + "hot-volcanic", + "hot-mesa", + "hot-desert-red", + "hot-desert", + "hot-desert-dunes", + "hot-desert-mountains", + "hot-dry-forest", + "hot-savanna", + "hot-volcanic", + "hot-mesa", + "hot-mesa-cliffs" + ], "biomeImplosionRatio": 0.25, "seaBiomes": [ diff --git a/regions/tundra.json b/regions/tundra.json index 1755399b..a53ea29d 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -7,9 +7,12 @@ "tundra-redwoods-forest", "tundra-sequia-redwoods", "tundra-forest", + "tundra-bonsai-forest", "tundra-spruce-denmyre", "tundra-lake", "tundra-mountains", + "tundra-mountains", + "tundra-mountains-cliffs", "mountain-forest" ], "biomeImplosionRatio": 0.25,