diff --git a/IrisDimension.md b/IrisDimension.md index 2876ae01..f393c837 100644 --- a/IrisDimension.md +++ b/IrisDimension.md @@ -23,7 +23,6 @@ "fluidPalette": ["WATER"], "caves": true, "preventLeafDecay": false, - "caveBiomeZoom": 1, "placeObjects": true, "shoreZoom": 1, "deposits": [], @@ -101,9 +100,6 @@ ## landZoom > This zooms in the land space -## caveBiomeZoom -> This zooms in the cave biome space - ## shoreZoom > This can zoom the shores diff --git a/IrisRegion.md b/IrisRegion.md index 63efcbb6..637d3265 100644 --- a/IrisRegion.md +++ b/IrisRegion.md @@ -4,17 +4,16 @@ { "shoreRatio": 0.13, "ridgeBiomes": [], - "spotBiomes": [], - "landBiomes": [], - "biomeImplosionRatio": 0.4, - "seaBiomes": [], - "deposits": [], - "caveBiomes": [], "shoreHeightMin": 1.2, "shoreBiomes": [], "name": "A Region", "shoreHeightMax": 3.2, - "shoreHeightZoom": 3.14 + "spotBiomes": [], + "landBiomes": [], + "shoreHeightZoom": 3.14, + "biomeImplosionRatio": 0.4, + "seaBiomes": [], + "deposits": [] } ``` @@ -45,9 +44,6 @@ ## shoreBiomes > A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents. -## caveBiomes -> A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents. - ## ridgeBiomes > Ridge biomes create a vein-like network like rivers through this region diff --git a/IrisRegionRidge.md b/IrisRegionRidge.md index 75e7ae6a..7db4ee19 100644 --- a/IrisRegionRidge.md +++ b/IrisRegionRidge.md @@ -2,7 +2,6 @@ > A ridge config ```json { - "as": "DEFER", "chance": 0.75, "thickness": 0.125, "scale": 5, @@ -19,9 +18,6 @@ ## type > The type this biome should override (land sea or shore) -## as -> What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type - ## chance > The chance this biome will be placed in a given spot diff --git a/IrisRegionSpot.md b/IrisRegionSpot.md index fa7f4858..a8e97348 100644 --- a/IrisRegionSpot.md +++ b/IrisRegionSpot.md @@ -2,7 +2,6 @@ > A spot config ```json { - "as": "DEFER", "scale": 1, "type": "LAND", "shuffle": 128, @@ -16,9 +15,6 @@ ## type > Where this spot overrides. Land sea or shore -## as -> What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type - ## scale > The scale of splotches diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-1.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-1.iob new file mode 100644 index 00000000..60dfe52f Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-1.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-10.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-10.iob new file mode 100644 index 00000000..36e7b72f Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-10.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-2.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-2.iob new file mode 100644 index 00000000..a66133b4 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-2.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-3.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-3.iob new file mode 100644 index 00000000..325ef959 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-3.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-4.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-4.iob new file mode 100644 index 00000000..ef8c4954 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-4.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-5.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-5.iob new file mode 100644 index 00000000..c05bc4d2 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-5.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-6.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-6.iob new file mode 100644 index 00000000..1ab30796 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-6.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-7.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-7.iob new file mode 100644 index 00000000..a1ea0256 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-7.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-8.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-8.iob new file mode 100644 index 00000000..ee35ebf2 Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-8.iob differ diff --git a/core.clutter/objects/denmyre/oak-denmyre-clutter-9.iob b/core.clutter/objects/denmyre/oak-denmyre-clutter-9.iob new file mode 100644 index 00000000..259e266d Binary files /dev/null and b/core.clutter/objects/denmyre/oak-denmyre-clutter-9.iob differ diff --git a/core.trees/objects/jungle-remade/J11.iob b/core.trees/objects/jungle-remade/J11.iob index 5a37b473..48cee754 100644 Binary files a/core.trees/objects/jungle-remade/J11.iob and b/core.trees/objects/jungle-remade/J11.iob differ diff --git a/core.trees/objects/jungle-remade/J12.iob b/core.trees/objects/jungle-remade/J12.iob index 12ae030c..04ad5c72 100644 Binary files a/core.trees/objects/jungle-remade/J12.iob and b/core.trees/objects/jungle-remade/J12.iob differ diff --git a/core.trees/objects/jungle-remade/J13.iob b/core.trees/objects/jungle-remade/J13.iob index ad44bfb1..587cc278 100644 Binary files a/core.trees/objects/jungle-remade/J13.iob and b/core.trees/objects/jungle-remade/J13.iob differ diff --git a/core.trees/objects/jungle-remade/J4.iob b/core.trees/objects/jungle-remade/J4.iob index 071b3497..bd6616c5 100644 Binary files a/core.trees/objects/jungle-remade/J4.iob and b/core.trees/objects/jungle-remade/J4.iob differ diff --git a/core.trees/objects/jungle-remade/J5.iob b/core.trees/objects/jungle-remade/J5.iob index 87161bee..5baabecf 100644 Binary files a/core.trees/objects/jungle-remade/J5.iob and b/core.trees/objects/jungle-remade/J5.iob differ diff --git a/core.trees/objects/jungle-remade/J6.iob b/core.trees/objects/jungle-remade/J6.iob index 33a3ce37..6e24dd6d 100644 Binary files a/core.trees/objects/jungle-remade/J6.iob and b/core.trees/objects/jungle-remade/J6.iob differ diff --git a/core.trees/objects/jungle-remade/J7.iob b/core.trees/objects/jungle-remade/J7.iob index c82c8aa1..e432ea02 100644 Binary files a/core.trees/objects/jungle-remade/J7.iob and b/core.trees/objects/jungle-remade/J7.iob differ diff --git a/core.trees/objects/jungle-remade/J8.iob b/core.trees/objects/jungle-remade/J8.iob index dc80f51a..8b5bc749 100644 Binary files a/core.trees/objects/jungle-remade/J8.iob and b/core.trees/objects/jungle-remade/J8.iob differ diff --git a/core.trees/objects/jungle-remade/J9.iob b/core.trees/objects/jungle-remade/J9.iob index b870308b..504bee84 100644 Binary files a/core.trees/objects/jungle-remade/J9.iob and b/core.trees/objects/jungle-remade/J9.iob differ diff --git a/core.trees/objects/jungle-remade/bbjungle-1.iob b/core.trees/objects/jungle-remade/bbjungle-1.iob new file mode 100644 index 00000000..bd9c4e90 Binary files /dev/null and b/core.trees/objects/jungle-remade/bbjungle-1.iob differ diff --git a/core.trees/objects/jungle-remade/bjungle-1.iob b/core.trees/objects/jungle-remade/bjungle-1.iob index 06ba7391..cd7e6024 100644 Binary files a/core.trees/objects/jungle-remade/bjungle-1.iob and b/core.trees/objects/jungle-remade/bjungle-1.iob differ diff --git a/core.trees/objects/jungle-remade/bjungle-2.iob b/core.trees/objects/jungle-remade/bjungle-2.iob index 56b498d2..8880781f 100644 Binary files a/core.trees/objects/jungle-remade/bjungle-2.iob and b/core.trees/objects/jungle-remade/bjungle-2.iob differ diff --git a/core.trees/objects/jungle-remade/bjungle-3.iob b/core.trees/objects/jungle-remade/bjungle-3.iob index 64521da9..a2126010 100644 Binary files a/core.trees/objects/jungle-remade/bjungle-3.iob and b/core.trees/objects/jungle-remade/bjungle-3.iob differ diff --git a/core.trees/objects/jungle-remade/bjungle-4.iob b/core.trees/objects/jungle-remade/bjungle-4.iob index 4a99dcae..5ce38923 100644 Binary files a/core.trees/objects/jungle-remade/bjungle-4.iob and b/core.trees/objects/jungle-remade/bjungle-4.iob differ diff --git a/core.trees/objects/jungle-remade/bjungle-5.iob b/core.trees/objects/jungle-remade/bjungle-5.iob index 0d9b70f0..501a0a5c 100644 Binary files a/core.trees/objects/jungle-remade/bjungle-5.iob and b/core.trees/objects/jungle-remade/bjungle-5.iob differ diff --git a/core.trees/objects/jungle-remade/j2.iob b/core.trees/objects/jungle-remade/j2.iob index fc224506..2cf16228 100644 Binary files a/core.trees/objects/jungle-remade/j2.iob and b/core.trees/objects/jungle-remade/j2.iob differ diff --git a/core.trees/objects/jungle-remade/j3.iob b/core.trees/objects/jungle-remade/j3.iob index 60f10e2e..5a54bd8e 100644 Binary files a/core.trees/objects/jungle-remade/j3.iob and b/core.trees/objects/jungle-remade/j3.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-1.iob b/core.trees/objects/oak-medium/oak-denmyre-1.iob new file mode 100644 index 00000000..a0975133 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-1.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-10.iob b/core.trees/objects/oak-medium/oak-denmyre-10.iob new file mode 100644 index 00000000..a3020378 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-10.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-11.iob b/core.trees/objects/oak-medium/oak-denmyre-11.iob new file mode 100644 index 00000000..8d79edc0 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-11.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-12.iob b/core.trees/objects/oak-medium/oak-denmyre-12.iob new file mode 100644 index 00000000..30fb4233 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-12.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-13.iob b/core.trees/objects/oak-medium/oak-denmyre-13.iob new file mode 100644 index 00000000..632dfb4d Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-13.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-14.iob b/core.trees/objects/oak-medium/oak-denmyre-14.iob new file mode 100644 index 00000000..74e1deeb Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-14.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-15.iob b/core.trees/objects/oak-medium/oak-denmyre-15.iob new file mode 100644 index 00000000..688662cc Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-15.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-16.iob b/core.trees/objects/oak-medium/oak-denmyre-16.iob new file mode 100644 index 00000000..2091a3ea Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-16.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-2.iob b/core.trees/objects/oak-medium/oak-denmyre-2.iob new file mode 100644 index 00000000..ddb3a0a6 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-2.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-3.iob b/core.trees/objects/oak-medium/oak-denmyre-3.iob new file mode 100644 index 00000000..ae54247c Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-3.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-4.iob b/core.trees/objects/oak-medium/oak-denmyre-4.iob new file mode 100644 index 00000000..436913b1 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-4.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-5.iob b/core.trees/objects/oak-medium/oak-denmyre-5.iob new file mode 100644 index 00000000..c8aeba62 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-5.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-6.iob b/core.trees/objects/oak-medium/oak-denmyre-6.iob new file mode 100644 index 00000000..31c67373 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-6.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-7.iob b/core.trees/objects/oak-medium/oak-denmyre-7.iob new file mode 100644 index 00000000..2c014276 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-7.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-8.iob b/core.trees/objects/oak-medium/oak-denmyre-8.iob new file mode 100644 index 00000000..d5cc2a0e Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-8.iob differ diff --git a/core.trees/objects/oak-medium/oak-denmyre-9.iob b/core.trees/objects/oak-medium/oak-denmyre-9.iob new file mode 100644 index 00000000..172f62a0 Binary files /dev/null and b/core.trees/objects/oak-medium/oak-denmyre-9.iob differ diff --git a/iris.overworld.magical/biomes/magical-honey-dioptra.json b/iris.overworld.magical/biomes/magical-honey-dioptra.json index 6f5c133f..cafcda69 100644 --- a/iris.overworld.magical/biomes/magical-honey-dioptra.json +++ b/iris.overworld.magical/biomes/magical-honey-dioptra.json @@ -2,8 +2,8 @@ "name": "Honey Dioptra", "layers": [ { - "minHeight": 3, - "maxHeight": 6, + "minHeight": 1, + "maxHeight": 1, "dispersion": "SCATTER", "palette": [ "GRASS_PATH", @@ -32,7 +32,7 @@ ], "objects": [ { - "chance": 0.01, + "chance": 0.2, "density": 1, "rotation": { "yAxis": { @@ -62,8 +62,8 @@ } }, { - "chance": 0.3, - "density": 3, + "chance": 0.1, + "density": 2, "rotation": { "yAxis": { "min": 0, @@ -92,8 +92,8 @@ } }, { - "chance": 0.4, - "density": 3, + "chance": 0.1, + "density": 2, "rotation": { "yAxis": { "min": 0, diff --git a/iris.overworld.temperate/biomes/temperate-denmyre.json b/iris.overworld.swamp/biomes/swamp-oak-denmyre.json similarity index 50% rename from iris.overworld.temperate/biomes/temperate-denmyre.json rename to iris.overworld.swamp/biomes/swamp-oak-denmyre.json index 705393b7..4066b5eb 100644 --- a/iris.overworld.temperate/biomes/temperate-denmyre.json +++ b/iris.overworld.swamp/biomes/swamp-oak-denmyre.json @@ -34,7 +34,7 @@ "decorators": [ { "zoom": 0.01, - "chance": 0.09, + "chance": 0.1, "palette": ["DEAD_BUSH", "BROWN_MUSHROOM"], "dispersion": "WISPY", "variance": "SCATTER" @@ -46,6 +46,16 @@ "dispersion": "SCATTER", "variance": "SCATTER" }, + { + "zoom": 0.3, + "chance": 0.03, + "palette": [ + "minecraft:stone_button[face=floor,facing=east,powered=false]", + "minecraft:stone_button[face=floor,facing=south,powered=false]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, { "zoom": 0.3, "chance": 0.017, @@ -69,30 +79,57 @@ }, "place": [ - "creepy-oak/FantasyOak1", - "creepy-oak/FantasyOak2", - "creepy-oak/FantasyOak3", - "creepy-oak/FantasyOak4", - "creepy-oak/FantasyOak5", - "creepy-oak/FantasyOak6", - "creepy-oak/FantasyOak7", - "creepy-oak/FantasyOak8", - "creepy-oak/FantasyOak9", - "creepy-oak/FantasyOak10", - "creepy-oak/FantasyOak11", - "creepy-oak/FantasyOak12", - "creepy-oak/FantasyOak13", - "creepy-oak/FantasyOak14", - "creepy-oak/FantasyOak15", - "creepy-oak/FantasyOak16", - "creepy-oak/FantasyOak17", - "creepy-oak/FantasyOak18", - "creepy-oak/FantasyOak19" + "oak-medium/oak-denmyre-1", + "oak-medium/oak-denmyre-2", + "oak-medium/oak-denmyre-3", + "oak-medium/oak-denmyre-4", + "oak-medium/oak-denmyre-5", + "oak-medium/oak-denmyre-6", + "oak-medium/oak-denmyre-7", + "oak-medium/oak-denmyre-8", + "oak-medium/oak-denmyre-9", + "oak-medium/oak-denmyre-10", + "oak-medium/oak-denmyre-11", + "oak-medium/oak-denmyre-12" + ], "translate": { "x": 0, - "y": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.3, + "density": 2, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": false + }, + "enabled": false + }, + "place": [ + + "denmyre/oak-denmyre-clutter-1", + "denmyre/oak-denmyre-clutter-2", + "denmyre/oak-denmyre-clutter-3", + "denmyre/oak-denmyre-clutter-4", + "denmyre/oak-denmyre-clutter-5", + "denmyre/oak-denmyre-clutter-6", + "denmyre/oak-denmyre-clutter-7", + "denmyre/oak-denmyre-clutter-8", + "denmyre/oak-denmyre-clutter-9", + "denmyre/oak-denmyre-clutter-10" + + + ], + "translate": { + "x": 0, + "y": -1, "z": 0 } } @@ -109,7 +146,7 @@ "max": 3 } ], - "derivative": "DESERT", + "derivative": "SWAMP", "biomeDispersion": "WISPY", "biomeZoom": 60 } \ No newline at end of file diff --git a/iris.overworld.swamp/biomes/swamp-ocean.json b/iris.overworld.swamp/biomes/swamp-ocean.json index cbcb5ba1..74b3afeb 100644 --- a/iris.overworld.swamp/biomes/swamp-ocean.json +++ b/iris.overworld.swamp/biomes/swamp-ocean.json @@ -4,8 +4,11 @@ { "minHeight": 3, "maxHeight": 6, + "dispersion": "WISPY", "palette": [ - "SAND" + "dirt", + "SAND", + "CLAY" ] }, { @@ -50,7 +53,7 @@ "decorators":[ { "zoom": 20, - "chance": 0.07, + "chance": 0.4, "palette": [ "SEAGRASS" ], diff --git a/iris.overworld.swamp/regions/swamp.json b/iris.overworld.swamp/regions/swamp.json index db9986f5..a6d60d7b 100644 --- a/iris.overworld.swamp/regions/swamp.json +++ b/iris.overworld.swamp/regions/swamp.json @@ -6,7 +6,8 @@ "shoreHeightZoom": 1.13, "landBiomes": [ "swamp-roofed", - "swamp-mountains" + "swamp-mountains", + "swamp-oak-denmyre" ], "seaBiomes": [ "swamp-ocean"