From 47a65fd0403f883d7d6b9096b41bb0ff6cf32f18 Mon Sep 17 00:00:00 2001 From: Dan Macbook Date: Fri, 14 Aug 2020 08:18:25 -0400 Subject: [PATCH] Tweaks --- overworld/dimensions/overworld.json | 15 +- overworld/overworld.code-workspace | 431 +++++++++++++++++++++++----- 2 files changed, 373 insertions(+), 73 deletions(-) diff --git a/overworld/dimensions/overworld.json b/overworld/dimensions/overworld.json index 44886e36..7f87f8a5 100644 --- a/overworld/dimensions/overworld.json +++ b/overworld/dimensions/overworld.json @@ -13,8 +13,10 @@ ], "mirrorCeiling": false, "decorate": true, - "placeObjects": true, + "placeObjects": false, "postProcessing": true, + "carving": false, + "caves": false, "postProcessors": [ { "phase": 0, @@ -29,23 +31,22 @@ "processor": "waterlogger" } ], - "carving": true, "carvingZoom": 3.5, "carvingMin": 115, "carvingMax": 239, "carvingSliverThickness": 5.5, "carvingRippleThickness": 3, "carvingEnvelope": 0.335, - "caves": true, "vanillaStructures": true, "caveScale": 1, "caveShift": -11, "focus": "", "fluidHeight": 99, - "biomeZoom": 2.88, - "continentalShuffle": 99, - "regionZoom": 2.245, - "continentZoom": 1, + "biomeZoom": 1, + "regionZoom": 6.5, + "regionStyle": "CELLULAR_IRIS_DOUBLE", + "continentalStyle": "CELLULAR_IRIS_DOUBLE", + "continentZoom": 0.22, "dimensionAngleDeg": 19, "terrainZoom": 1, "landZoom": 1.25, diff --git a/overworld/overworld.code-workspace b/overworld/overworld.code-workspace index 7e51b37e..32294f7a 100644 --- a/overworld/overworld.code-workspace +++ b/overworld/overworld.code-workspace @@ -367,6 +367,111 @@ } }, "properties": { + "continentalStyle": { + "description": "The placement style of land/sea", + "type": "string", + "enum": [ + "STATIC", + "STATIC_FINE", + "STATIC_ULTRA_FINE", + "IRIS", + "IRIS_DOUBLE", + "IRIS_THICK", + "IRIS_HALF", + "SIMPLEX", + "FRACTAL_SMOKE", + "VASCULAR_THIN", + "SIMPLEX_CELLS", + "SIMPLEX_VASCULAR", + "FRACTAL_WATER", + "PERLIN", + "PERLIN_IRIS", + "PERLIN_IRIS_HALF", + "PERLIN_IRIS_DOUBLE", + "PERLIN_IRIS_THICK", + "FRACTAL_BILLOW_PERLIN", + "BIOCTAVE_FRACTAL_BILLOW_PERLIN", + "FRACTAL_BILLOW_SIMPLEX", + "FRACTAL_FBM_SIMPLEX", + "FRACTAL_BILLOW_IRIS", + "FRACTAL_FBM_IRIS", + "FRACTAL_BILLOW_IRIS_HALF", + "FRACTAL_FBM_IRIS_HALF", + "FRACTAL_BILLOW_IRIS_THICK", + "FRACTAL_FBM_IRIS_THICK", + "FRACTAL_RM_SIMPLEX", + "BIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "BIOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "TRIOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUADOCTAVE_FRACTAL_RM_SIMPLEX", + "QUADOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUADOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_RM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUINTOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEXOCTAVE_FRACTAL_RM_SIMPLEX", + "SEXOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEXOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_RM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEPTOCTAVE_FRACTAL_FBM_SIMPLEX", + "OCTOCTAVE_FRACTAL_RM_SIMPLEX", + "OCTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "OCTOCTAVE_FRACTAL_FBM_SIMPLEX", + "NONOCTAVE_FRACTAL_RM_SIMPLEX", + "NONOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "NONOCTAVE_FRACTAL_FBM_SIMPLEX", + "VIGOCTAVE_FRACTAL_RM_SIMPLEX", + "VIGOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "VIGOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_SIMPLEX", + "TRIOCTAVE_SIMPLEX", + "QUADOCTAVE_SIMPLEX", + "QUINTOCTAVE_SIMPLEX", + "SEXOCTAVE_SIMPLEX", + "SEPTOCTAVE_SIMPLEX", + "OCTOCTAVE_SIMPLEX", + "NONOCTAVE_SIMPLEX", + "VIGOCTAVE_SIMPLEX", + "GLOB", + "GLOB_IRIS", + "GLOB_IRIS_HALF", + "GLOB_IRIS_DOUBLE", + "GLOB_IRIS_THICK", + "CUBIC", + "FRACTAL_CUBIC", + "FRACTAL_CUBIC_IRIS", + "FRACTAL_CUBIC_IRIS_THICK", + "FRACTAL_CUBIC_IRIS_HALF", + "FRACTAL_CUBIC_IRIS_DOUBLE", + "BIOCTAVE_FRACTAL_CUBIC", + "TRIOCTAVE_FRACTAL_CUBIC", + "QUADOCTAVE_FRACTAL_CUBIC", + "CUBIC_IRIS", + "CUBIC_IRIS_HALF", + "CUBIC_IRIS_DOUBLE", + "CUBIC_IRIS_THICK", + "CELLULAR", + "CELLULAR_IRIS", + "CELLULAR_IRIS_THICK", + "CELLULAR_IRIS_DOUBLE", + "CELLULAR_IRIS_HALF", + "CELLULAR_HEIGHT", + "CELLULAR_HEIGHT_IRIS", + "CELLULAR_HEIGHT_IRIS_DOUBLE", + "CELLULAR_HEIGHT_IRIS_THICK", + "CELLULAR_HEIGHT_IRIS_HALF", + "VASCULAR", + "FLAT", + "VASCULAR_IRIS", + "VASCULAR_IRIS_DOUBLE", + "VASCULAR_IRIS_THICK", + "VASCULAR_IRIS_HALF" + ] + }, "decorate": { "description": "Generate decorations or not", "type": "boolean" @@ -576,18 +681,117 @@ "type": "integer", "minimum": 0 }, - "regionShuffle": { - "maximum": 8192, - "description": "The shuffle of regions", - "type": "number", - "minimum": 0 - }, "coordFractureDistance": { "maximum": 8192, "description": "Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.", "type": "number", "minimum": 0 }, + "regionStyle": { + "description": "The placement style of regions", + "type": "string", + "enum": [ + "STATIC", + "STATIC_FINE", + "STATIC_ULTRA_FINE", + "IRIS", + "IRIS_DOUBLE", + "IRIS_THICK", + "IRIS_HALF", + "SIMPLEX", + "FRACTAL_SMOKE", + "VASCULAR_THIN", + "SIMPLEX_CELLS", + "SIMPLEX_VASCULAR", + "FRACTAL_WATER", + "PERLIN", + "PERLIN_IRIS", + "PERLIN_IRIS_HALF", + "PERLIN_IRIS_DOUBLE", + "PERLIN_IRIS_THICK", + "FRACTAL_BILLOW_PERLIN", + "BIOCTAVE_FRACTAL_BILLOW_PERLIN", + "FRACTAL_BILLOW_SIMPLEX", + "FRACTAL_FBM_SIMPLEX", + "FRACTAL_BILLOW_IRIS", + "FRACTAL_FBM_IRIS", + "FRACTAL_BILLOW_IRIS_HALF", + "FRACTAL_FBM_IRIS_HALF", + "FRACTAL_BILLOW_IRIS_THICK", + "FRACTAL_FBM_IRIS_THICK", + "FRACTAL_RM_SIMPLEX", + "BIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "BIOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "TRIOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUADOCTAVE_FRACTAL_RM_SIMPLEX", + "QUADOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUADOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_RM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUINTOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEXOCTAVE_FRACTAL_RM_SIMPLEX", + "SEXOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEXOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_RM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEPTOCTAVE_FRACTAL_FBM_SIMPLEX", + "OCTOCTAVE_FRACTAL_RM_SIMPLEX", + "OCTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "OCTOCTAVE_FRACTAL_FBM_SIMPLEX", + "NONOCTAVE_FRACTAL_RM_SIMPLEX", + "NONOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "NONOCTAVE_FRACTAL_FBM_SIMPLEX", + "VIGOCTAVE_FRACTAL_RM_SIMPLEX", + "VIGOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "VIGOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_SIMPLEX", + "TRIOCTAVE_SIMPLEX", + "QUADOCTAVE_SIMPLEX", + "QUINTOCTAVE_SIMPLEX", + "SEXOCTAVE_SIMPLEX", + "SEPTOCTAVE_SIMPLEX", + "OCTOCTAVE_SIMPLEX", + "NONOCTAVE_SIMPLEX", + "VIGOCTAVE_SIMPLEX", + "GLOB", + "GLOB_IRIS", + "GLOB_IRIS_HALF", + "GLOB_IRIS_DOUBLE", + "GLOB_IRIS_THICK", + "CUBIC", + "FRACTAL_CUBIC", + "FRACTAL_CUBIC_IRIS", + "FRACTAL_CUBIC_IRIS_THICK", + "FRACTAL_CUBIC_IRIS_HALF", + "FRACTAL_CUBIC_IRIS_DOUBLE", + "BIOCTAVE_FRACTAL_CUBIC", + "TRIOCTAVE_FRACTAL_CUBIC", + "QUADOCTAVE_FRACTAL_CUBIC", + "CUBIC_IRIS", + "CUBIC_IRIS_HALF", + "CUBIC_IRIS_DOUBLE", + "CUBIC_IRIS_THICK", + "CELLULAR", + "CELLULAR_IRIS", + "CELLULAR_IRIS_THICK", + "CELLULAR_IRIS_DOUBLE", + "CELLULAR_IRIS_HALF", + "CELLULAR_HEIGHT", + "CELLULAR_HEIGHT_IRIS", + "CELLULAR_HEIGHT_IRIS_DOUBLE", + "CELLULAR_HEIGHT_IRIS_THICK", + "CELLULAR_HEIGHT_IRIS_HALF", + "VASCULAR", + "FLAT", + "VASCULAR_IRIS", + "VASCULAR_IRIS_DOUBLE", + "VASCULAR_IRIS_THICK", + "VASCULAR_IRIS_HALF" + ] + }, "carvingMax": { "maximum": 256, "description": "The maximum height carving happens at", @@ -725,12 +929,6 @@ "description": "Generate caves or not.", "type": "boolean" }, - "continentalShuffle": { - "maximum": 8192, - "description": "The shuffle of land vs sea", - "type": "number", - "minimum": 0 - }, "carvingRippleThickness": { "maximum": 512, "description": "The thickness of ripples on carved walls", @@ -3018,6 +3216,111 @@ "type": "number", "minimum": 1.0E-4 }, + "childStyle": { + "description": "If this biome has children biomes, and the gen layer chooses one of this biomes children, How will it be shaped?", + "type": "string", + "enum": [ + "STATIC", + "STATIC_FINE", + "STATIC_ULTRA_FINE", + "IRIS", + "IRIS_DOUBLE", + "IRIS_THICK", + "IRIS_HALF", + "SIMPLEX", + "FRACTAL_SMOKE", + "VASCULAR_THIN", + "SIMPLEX_CELLS", + "SIMPLEX_VASCULAR", + "FRACTAL_WATER", + "PERLIN", + "PERLIN_IRIS", + "PERLIN_IRIS_HALF", + "PERLIN_IRIS_DOUBLE", + "PERLIN_IRIS_THICK", + "FRACTAL_BILLOW_PERLIN", + "BIOCTAVE_FRACTAL_BILLOW_PERLIN", + "FRACTAL_BILLOW_SIMPLEX", + "FRACTAL_FBM_SIMPLEX", + "FRACTAL_BILLOW_IRIS", + "FRACTAL_FBM_IRIS", + "FRACTAL_BILLOW_IRIS_HALF", + "FRACTAL_FBM_IRIS_HALF", + "FRACTAL_BILLOW_IRIS_THICK", + "FRACTAL_FBM_IRIS_THICK", + "FRACTAL_RM_SIMPLEX", + "BIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "BIOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_RM_SIMPLEX", + "TRIOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "TRIOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUADOCTAVE_FRACTAL_RM_SIMPLEX", + "QUADOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUADOCTAVE_FRACTAL_FBM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_RM_SIMPLEX", + "QUINTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "QUINTOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEXOCTAVE_FRACTAL_RM_SIMPLEX", + "SEXOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEXOCTAVE_FRACTAL_FBM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_RM_SIMPLEX", + "SEPTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "SEPTOCTAVE_FRACTAL_FBM_SIMPLEX", + "OCTOCTAVE_FRACTAL_RM_SIMPLEX", + "OCTOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "OCTOCTAVE_FRACTAL_FBM_SIMPLEX", + "NONOCTAVE_FRACTAL_RM_SIMPLEX", + "NONOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "NONOCTAVE_FRACTAL_FBM_SIMPLEX", + "VIGOCTAVE_FRACTAL_RM_SIMPLEX", + "VIGOCTAVE_FRACTAL_BILLOW_SIMPLEX", + "VIGOCTAVE_FRACTAL_FBM_SIMPLEX", + "BIOCTAVE_SIMPLEX", + "TRIOCTAVE_SIMPLEX", + "QUADOCTAVE_SIMPLEX", + "QUINTOCTAVE_SIMPLEX", + "SEXOCTAVE_SIMPLEX", + "SEPTOCTAVE_SIMPLEX", + "OCTOCTAVE_SIMPLEX", + "NONOCTAVE_SIMPLEX", + "VIGOCTAVE_SIMPLEX", + "GLOB", + "GLOB_IRIS", + "GLOB_IRIS_HALF", + "GLOB_IRIS_DOUBLE", + "GLOB_IRIS_THICK", + "CUBIC", + "FRACTAL_CUBIC", + "FRACTAL_CUBIC_IRIS", + "FRACTAL_CUBIC_IRIS_THICK", + "FRACTAL_CUBIC_IRIS_HALF", + "FRACTAL_CUBIC_IRIS_DOUBLE", + "BIOCTAVE_FRACTAL_CUBIC", + "TRIOCTAVE_FRACTAL_CUBIC", + "QUADOCTAVE_FRACTAL_CUBIC", + "CUBIC_IRIS", + "CUBIC_IRIS_HALF", + "CUBIC_IRIS_DOUBLE", + "CUBIC_IRIS_THICK", + "CELLULAR", + "CELLULAR_IRIS", + "CELLULAR_IRIS_THICK", + "CELLULAR_IRIS_DOUBLE", + "CELLULAR_IRIS_HALF", + "CELLULAR_HEIGHT", + "CELLULAR_HEIGHT_IRIS", + "CELLULAR_HEIGHT_IRIS_DOUBLE", + "CELLULAR_HEIGHT_IRIS_THICK", + "CELLULAR_HEIGHT_IRIS_HALF", + "VASCULAR", + "FLAT", + "VASCULAR_IRIS", + "VASCULAR_IRIS_DOUBLE", + "VASCULAR_IRIS_THICK", + "VASCULAR_IRIS_HALF" + ] + }, "structures": { "minItems": 1, "description": "A list of structure tilesets", @@ -3559,6 +3862,7 @@ "biomeZoom", "biomeScatter" ], + "childStyle": ["children"], "childShrinkFactor": ["children"], "biomeStyle": [ "biomeStyle", @@ -5326,56 +5630,6 @@ } }, "properties": { - "islandBiomes": { - "minItems": 1, - "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", - "type": "array", - "items": {"type": "string"} - }, - "islandBiomeZoom": { - "description": "How large island biomes are in this region", - "type": "number", - "minimum": 1.0E-4 - }, - "spotBiomes": { - "minItems": 1, - "description": "Spot biomes splotch themselves across this region like lakes", - "type": "array", - "items": {"$ref": "#/definitions/irisregionspot"} - }, - "skylandBiomeZoom": { - "description": "How large skyland biomes are in this region", - "type": "number", - "minimum": 1.0E-4 - }, - "caveBiomes": { - "minItems": 1, - "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", - "type": "array", - "items": {"type": "string"} - }, - "shoreHeightMin": { - "description": "The min shore height", - "type": "number", - "minimum": 0 - }, - "shoreBiomes": { - "minItems": 1, - "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", - "type": "array", - "items": {"type": "string"} - }, - "skylandBiomes": { - "minItems": 1, - "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", - "type": "array", - "items": {"type": "string"} - }, - "shoreHeightZoom": { - "description": "The varience of the shore height", - "type": "number", - "minimum": 1.0E-4 - }, "shoreRatio": { "maximum": 1, "description": "The shore ration (How much percent of land should be a shore)", @@ -5388,22 +5642,34 @@ "type": "array", "items": {"$ref": "#/definitions/irisregionridge"} }, - "biomeShuffle": { - "description": "The scrambling between biomes", - "type": "number", - "minimum": 0 + "islandBiomes": { + "minItems": 1, + "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", + "type": "array", + "items": {"type": "string"} }, "shoreBiomeZoom": { "description": "How large shore biomes are in this region", "type": "number", "minimum": 1.0E-4 }, + "islandBiomeZoom": { + "description": "How large island biomes are in this region", + "type": "number", + "minimum": 1.0E-4 + }, "structures": { "minItems": 1, "description": "A list of structure tilesets", "type": "array", "items": {"$ref": "#/definitions/irisstructureplacement"} }, + "spotBiomes": { + "minItems": 1, + "description": "Spot biomes splotch themselves across this region like lakes", + "type": "array", + "items": {"$ref": "#/definitions/irisregionspot"} + }, "caveBiomeZoom": { "description": "How large cave biomes are in this region", "type": "number", @@ -5426,6 +5692,11 @@ "type": "number", "minimum": 1.0E-4 }, + "skylandBiomeZoom": { + "description": "How large skyland biomes are in this region", + "type": "number", + "minimum": 1.0E-4 + }, "seaBiomes": { "minItems": 1, "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", @@ -5438,6 +5709,12 @@ "type": "array", "items": {"$ref": "#/definitions/irisdepositgenerator"} }, + "caveBiomes": { + "minItems": 1, + "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", + "type": "array", + "items": {"type": "string"} + }, "landBiomeZoom": { "description": "How large land biomes are in this region", "type": "number", @@ -5449,6 +5726,23 @@ "type": "array", "items": {"$ref": "#/definitions/iriseffect"} }, + "shoreHeightMin": { + "description": "The min shore height", + "type": "number", + "minimum": 0 + }, + "shoreBiomes": { + "minItems": 1, + "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", + "type": "array", + "items": {"type": "string"} + }, + "skylandBiomes": { + "minItems": 1, + "description": "A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.", + "type": "array", + "items": {"type": "string"} + }, "name": { "minLength": 2, "description": "The name of the region", @@ -5459,6 +5753,11 @@ "type": "number", "minimum": 0 }, + "shoreHeightZoom": { + "description": "The varience of the shore height", + "type": "number", + "minimum": 1.0E-4 + }, "rarity": { "maximum": 256, "description": "The rarity of the region",