diff --git a/.gitignore b/.gitignore index 4238010c..9d049133 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .DS_Store *.code-workspace + +overworld/_docs/ diff --git a/overworld/biomes/temperate-birch-forest.json b/overworld/biomes/temperate-birch-forest.json index 5cd73aa5..6d7e4520 100644 --- a/overworld/biomes/temperate-birch-forest.json +++ b/overworld/biomes/temperate-birch-forest.json @@ -1,174 +1,224 @@ { - "name": "Birch Forest", - "layers": [ - { - "style": {"style": "STATIC"}, - "zoom": 0.656, - "palette": [ - "GRASS_BLOCK", - "GRASS_BLOCK", - "GRASS_BLOCK", - "GRASS_BLOCK", - "GRAVEL" - - ] - }, - { - "palette": [ - "DIRT" - ] - }, - { - "minHeight": 1, - "maxHeight": 3, - "palette": [ - "DIRT", - "COARSE_DIRT" - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "style": {"style": "STATIC"}, - "palette": [ - "STONE", - "ANDESITE", - "STONE" - ] - } - ], - "wall": + "name": "Birch Forest", + "layers": [ { - "style": {"style": "STATIC"}, - "palette": [ - "STONE", - "ANDESITE", - "STONE" - ] + "style": { + "style": "STATIC" + }, + "zoom": 0.656, + "palette": [ + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRASS_BLOCK", + "GRAVEL" + ] }, - "decorators": [ - { - "zoom": 0.1, - "chance": 0.09, - "palette": ["GRASS", "ALLIUM", "POPPY","DANDELION", "AZURE_BLUET", "PINK_TULIP", "LILY_OF_THE_VALLEY"], - "style": {"style": "STATIC"}, - "variance": {"style": "STATIC"} - }, - { - "zoom": 0.3, - "chance": 0.4, - "palette": ["GRASS"], - "style": {"style": "STATIC"}, - "variance": {"style": "STATIC"} - }, - { - "zoom": 0.3, - "chance": 0.017, - "palette": ["TALL_GRASS"], - "style": {"style": "STATIC"}, - "variance": {"style": "STATIC"} - } - ], - "objects": [ - { - "chance": 0.00375, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "camp/camp" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 1, - "density": 4, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - - "birch-antioch/antioch-3", - "birch-antioch/antioch-4", - "birch-antioch/antioch-5", - "birch-antioch/antioch-6", - "birch-antioch/antioch-7", - "birch-antioch/antioch-8", - "birch-antioch/antioch-9", - "birch-antioch/antioch-10", - "birch-antioch/antioch-11", - "birch-antioch/antioch-12", - "birch-antioch/antioch-13" - - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.08, - "density": 4, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - - "birch-antioch/antioch-3-b", - "birch-antioch/antioch-4-b", - "birch-antioch/antioch-5-b", - "birch-antioch/antioch-6-b" - - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } - ], - "generators":[ - { - "generator": "plain", - "min": 4, - "max": 7 - } - ], - "derivative": "PLAINS", - "biomeStyle": {"style": "IRIS"}, - "biomeZoom": 60, - "biomeScatter": [ - "FOREST", - "PLAINS" - ], - "biomeSkyScatter": [ - "FOREST", - "JUNGLE" - ], - "children": [ - "temperate-birch-denmyre" + { + "palette": [ + "DIRT" + ] + }, + { + "minHeight": 1, + "maxHeight": 3, + "palette": [ + "DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "style": { + "style": "STATIC" + }, + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + } + ], + "wall": { + "style": { + "style": "STATIC" + }, + "palette": [ + "STONE", + "ANDESITE", + "STONE" ] + }, + "decorators": [ + { + "zoom": 0.1, + "chance": 0.09, + "palette": [ + "GRASS", + "ALLIUM", + "POPPY", + "DANDELION", + "AZURE_BLUET", + "PINK_TULIP", + "LILY_OF_THE_VALLEY" + ], + "style": { + "style": "STATIC" + }, + "variance": { + "style": "STATIC" + } + }, + { + "zoom": 0.3, + "chance": 0.4, + "palette": [ + "GRASS" + ], + "style": { + "style": "STATIC" + }, + "variance": { + "style": "STATIC" + } + }, + { + "zoom": 0.3, + "chance": 0.017, + "palette": [ + "TALL_GRASS" + ], + "style": { + "style": "STATIC" + }, + "variance": { + "style": "STATIC" + } + } + ], + "objects": [ + { + "chance": 0.00375, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "camp/camp" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 1, + "density": 4, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "birch-antioch/antioch-3", + "birch-antioch/antioch-4", + "birch-antioch/antioch-5", + "birch-antioch/antioch-6", + "birch-antioch/antioch-7", + "birch-antioch/antioch-8", + "birch-antioch/antioch-9", + "birch-antioch/antioch-10", + "birch-antioch/antioch-11", + "birch-antioch/antioch-12", + "birch-antioch/antioch-13" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.08, + "density": 4, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "birch-remade/b1", + "birch-remade/b2", + "birch-remade/b3", + "birch-remade/b4" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.08, + "density": 4, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "birch-antioch/antioch-3-b", + "birch-antioch/antioch-4-b", + "birch-antioch/antioch-5-b", + "birch-antioch/antioch-6-b" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], + "generators": [ + { + "generator": "plain", + "min": 4, + "max": 7 + } + ], + "derivative": "PLAINS", + "biomeStyle": { + "style": "IRIS" + }, + "biomeZoom": 60, + "biomeScatter": [ + "FOREST", + "PLAINS" + ], + "biomeSkyScatter": [ + "FOREST", + "JUNGLE" + ], + "children": [ + "temperate-birch-denmyre" + ] } \ No newline at end of file diff --git a/overworld/biomes/temperate-oak-forest.json b/overworld/biomes/temperate-oak-forest.json index 126d8cf5..9d8f6cf9 100644 --- a/overworld/biomes/temperate-oak-forest.json +++ b/overworld/biomes/temperate-oak-forest.json @@ -68,7 +68,7 @@ }, "objects": [ { - "chance": 0.05, + "chance": 0.07, "rotation": { "yAxis": { "min": 0, @@ -124,7 +124,7 @@ } }, { - "chance": 0.5, + "chance": 0.7, "rotation": { "yAxis": { "min": 0, diff --git a/overworld/biomes/temperate-ocean-deep.json b/overworld/biomes/temperate-ocean-deep.json index 4b39b5d8..7fe04c79 100644 --- a/overworld/biomes/temperate-ocean-deep.json +++ b/overworld/biomes/temperate-ocean-deep.json @@ -3,13 +3,20 @@ "rarity": 6, "layers": [ { - "minHeight": 12, - "maxHeight": 22, + "minHeight": 2, + "maxHeight": 3, "style": { - "style": "STATIC" + "style": "FRACTAL_FBM_IRIS" }, - "zoom": 0.825, + "zoom": 0.725, "palette": [ + "SAND", + "CLAY", + "SAND", + "GRAVEL", + "SAND", + "DIRT", + "SAND", "SAND" ] }, @@ -49,13 +56,16 @@ ], "translate": { "x": 0, - "y": -2, + "y": -3, "z": 0 } }, { "chance": 0.05, "underwater": true, + "clamp": { + "minimumHeight": 4 + }, "density": 1, "rotation": { "yAxis": { @@ -67,18 +77,19 @@ "enabled": true }, "place": [ - "ships/gall-2", "ships/gall-1", + "ships/gall-2", "ships/gall-3" + ], "translate": { "x": 0, - "y": -4, + "y": 0, "z": 0 } }, { - "chance": 0.05, + "chance": 0.01, "underwater": true, "rotation": { "yAxis": { @@ -106,8 +117,8 @@ "generators": [ { "generator": "plain-chaotic", - "min": -79, - "max": -2 + "min": -75, + "max": -4 } ], "decorators": [ diff --git a/overworld/biomes/temperate-ocean.json b/overworld/biomes/temperate-ocean.json index 20b05f21..ec2c15b7 100644 --- a/overworld/biomes/temperate-ocean.json +++ b/overworld/biomes/temperate-ocean.json @@ -5,7 +5,7 @@ "minHeight": 2, "maxHeight": 3, "style": { - "style": "STATIC" + "style": "FRACTAL_FBM_IRIS" }, "zoom": 0.825, "palette": [ diff --git a/overworld/biomes/tropical-coral-ocean-cliffs.json b/overworld/biomes/tropical-coral-ocean-cliffs.json index a6c55a97..ba689510 100644 --- a/overworld/biomes/tropical-coral-ocean-cliffs.json +++ b/overworld/biomes/tropical-coral-ocean-cliffs.json @@ -1421,9 +1421,8 @@ }, { "zoom": 1, - "chance": 0.001, + "chance": 0.004, "palette": [ - "minecraft:sea_pickle[pickles=1,waterlogged=true]", "minecraft:sea_pickle[pickles=2,waterlogged=true]", "minecraft:sea_pickle[pickles=3,waterlogged=true]", "minecraft:sea_pickle[pickles=4,waterlogged=true]" diff --git a/overworld/biomes/tropical-coral-ocean.json b/overworld/biomes/tropical-coral-ocean.json index 6d513d81..37b5f6fd 100644 --- a/overworld/biomes/tropical-coral-ocean.json +++ b/overworld/biomes/tropical-coral-ocean.json @@ -1329,9 +1329,8 @@ }, { "zoom": 1, - "chance": 0.004, + "chance": 0.008, "palette": [ - "minecraft:sea_pickle[pickles=1,waterlogged=true]", "minecraft:sea_pickle[pickles=2,waterlogged=true]", "minecraft:sea_pickle[pickles=3,waterlogged=true]", "minecraft:sea_pickle[pickles=4,waterlogged=true]" diff --git a/overworld/biomes/tropical-ocean.json b/overworld/biomes/tropical-ocean.json index 875ef98f..9fd37fdb 100644 --- a/overworld/biomes/tropical-ocean.json +++ b/overworld/biomes/tropical-ocean.json @@ -139,7 +139,7 @@ "decorators":[ { "zoom": 1, - "chance": 0.05, + "chance": 0.03, "stackMin": 1, "stackMax": 3, "palette": [ @@ -188,7 +188,7 @@ "zoom": 1, "stackMax": 9, "stackMin": 1, - "chance": 0.225, + "chance": 0.125, "palette": [ "KELP_PLANT" ], @@ -249,9 +249,8 @@ }, { "zoom": 1, - "chance": 0.001, + "chance": 0.0025, "palette": [ - "minecraft:sea_pickle[pickles=1,waterlogged=true]", "minecraft:sea_pickle[pickles=2,waterlogged=true]", "minecraft:sea_pickle[pickles=3,waterlogged=true]", "minecraft:sea_pickle[pickles=4,waterlogged=true]" diff --git a/overworld/generators/plain.json b/overworld/generators/plain.json index d672341f..42de25a9 100644 --- a/overworld/generators/plain.json +++ b/overworld/generators/plain.json @@ -3,6 +3,7 @@ "interpolationScale": 272, "seed": 7246661, "composite": [{ + "style": { "style": "IRIS_DOUBLE", "zoom": 0.87, diff --git a/overworld/objects/birch-remade/b1.iob b/overworld/objects/birch-remade/b1.iob new file mode 100644 index 00000000..c8cd2a91 Binary files /dev/null and b/overworld/objects/birch-remade/b1.iob differ diff --git a/overworld/objects/birch-remade/b2.iob b/overworld/objects/birch-remade/b2.iob new file mode 100644 index 00000000..cf021c2b Binary files /dev/null and b/overworld/objects/birch-remade/b2.iob differ diff --git a/overworld/objects/birch-remade/b3.iob b/overworld/objects/birch-remade/b3.iob new file mode 100644 index 00000000..f0a87368 Binary files /dev/null and b/overworld/objects/birch-remade/b3.iob differ diff --git a/overworld/objects/birch-remade/b4.iob b/overworld/objects/birch-remade/b4.iob new file mode 100644 index 00000000..60bd74ba Binary files /dev/null and b/overworld/objects/birch-remade/b4.iob differ diff --git a/overworld/objects/ships/gall-1.iob b/overworld/objects/ships/gall-1.iob index 4d0132e6..77f0e5c1 100644 Binary files a/overworld/objects/ships/gall-1.iob and b/overworld/objects/ships/gall-1.iob differ