diff --git a/IrisBiomeDecorator.md b/IrisBiomeDecorator.md index e05c6512..00e4a232 100644 --- a/IrisBiomeDecorator.md +++ b/IrisBiomeDecorator.md @@ -25,7 +25,7 @@ > If this decorator has a height more than 1 this changes how it picks the height between your maxes. Scatter = random, Wispy = wavy heights ## partOf -> Tells iris where this decoration is a part of. I.e. SHORE_LINE +> Tells iris where this decoration is a part of. I.e. SHORE_LINE or SEA_SURFACE ## stackMin > The minimum repeat stack height (setting to 3 would stack 3 of on top of each other diff --git a/core.trees/objects/pine/sup-pine-1.iob b/core.trees/objects/pine/sup-pine-1.iob new file mode 100644 index 00000000..acdf4300 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-1.iob differ diff --git a/core.trees/objects/pine/sup-pine-10.iob b/core.trees/objects/pine/sup-pine-10.iob new file mode 100644 index 00000000..555de16b Binary files /dev/null and b/core.trees/objects/pine/sup-pine-10.iob differ diff --git a/core.trees/objects/pine/sup-pine-11.iob b/core.trees/objects/pine/sup-pine-11.iob new file mode 100644 index 00000000..21021797 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-11.iob differ diff --git a/core.trees/objects/pine/sup-pine-12.iob b/core.trees/objects/pine/sup-pine-12.iob new file mode 100644 index 00000000..95385b9a Binary files /dev/null and b/core.trees/objects/pine/sup-pine-12.iob differ diff --git a/core.trees/objects/pine/sup-pine-13.iob b/core.trees/objects/pine/sup-pine-13.iob new file mode 100644 index 00000000..e473d028 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-13.iob differ diff --git a/core.trees/objects/pine/sup-pine-2.iob b/core.trees/objects/pine/sup-pine-2.iob new file mode 100644 index 00000000..726b6597 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-2.iob differ diff --git a/core.trees/objects/pine/sup-pine-3.iob b/core.trees/objects/pine/sup-pine-3.iob new file mode 100644 index 00000000..b265db66 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-3.iob differ diff --git a/core.trees/objects/pine/sup-pine-4.iob b/core.trees/objects/pine/sup-pine-4.iob new file mode 100644 index 00000000..0b4d38e2 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-4.iob differ diff --git a/core.trees/objects/pine/sup-pine-5.iob b/core.trees/objects/pine/sup-pine-5.iob new file mode 100644 index 00000000..f4ba8860 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-5.iob differ diff --git a/core.trees/objects/pine/sup-pine-6.iob b/core.trees/objects/pine/sup-pine-6.iob new file mode 100644 index 00000000..94fcaa11 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-6.iob differ diff --git a/core.trees/objects/pine/sup-pine-7.iob b/core.trees/objects/pine/sup-pine-7.iob new file mode 100644 index 00000000..4a7c2f56 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-7.iob differ diff --git a/core.trees/objects/pine/sup-pine-8.iob b/core.trees/objects/pine/sup-pine-8.iob new file mode 100644 index 00000000..40cba5c2 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-8.iob differ diff --git a/core.trees/objects/pine/sup-pine-9.iob b/core.trees/objects/pine/sup-pine-9.iob new file mode 100644 index 00000000..064029d2 Binary files /dev/null and b/core.trees/objects/pine/sup-pine-9.iob differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree1.iob b/core.trees/objects/savanna-gen/SavanaGENTree1.iob deleted file mode 100644 index 1d29bca0..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree1.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree10.iob b/core.trees/objects/savanna-gen/SavanaGENTree10.iob deleted file mode 100644 index f6fc7774..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree10.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree12.iob b/core.trees/objects/savanna-gen/SavanaGENTree12.iob deleted file mode 100644 index dabac518..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree12.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree13.iob b/core.trees/objects/savanna-gen/SavanaGENTree13.iob deleted file mode 100644 index 0aac596b..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree13.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree14.iob b/core.trees/objects/savanna-gen/SavanaGENTree14.iob deleted file mode 100644 index f036ecf7..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree14.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree15.iob b/core.trees/objects/savanna-gen/SavanaGENTree15.iob deleted file mode 100644 index cf741ae1..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree15.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree16.iob b/core.trees/objects/savanna-gen/SavanaGENTree16.iob deleted file mode 100644 index f9846160..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree16.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree17.iob b/core.trees/objects/savanna-gen/SavanaGENTree17.iob deleted file mode 100644 index 450bd6f8..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree17.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree2.iob b/core.trees/objects/savanna-gen/SavanaGENTree2.iob deleted file mode 100644 index 3d1f4a12..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree2.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree3.iob b/core.trees/objects/savanna-gen/SavanaGENTree3.iob deleted file mode 100644 index 8c1f4dad..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree3.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree4.iob b/core.trees/objects/savanna-gen/SavanaGENTree4.iob deleted file mode 100644 index ed98eb45..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree4.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree5.iob b/core.trees/objects/savanna-gen/SavanaGENTree5.iob deleted file mode 100644 index b8a3b9e5..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree5.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree6.iob b/core.trees/objects/savanna-gen/SavanaGENTree6.iob deleted file mode 100644 index 7f17ae31..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree6.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree7.iob b/core.trees/objects/savanna-gen/SavanaGENTree7.iob deleted file mode 100644 index 5a3cd672..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree7.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree8.iob b/core.trees/objects/savanna-gen/SavanaGENTree8.iob deleted file mode 100644 index 9e735507..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree8.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/SavanaGENTree9.iob b/core.trees/objects/savanna-gen/SavanaGENTree9.iob deleted file mode 100644 index a9ba0548..00000000 Binary files a/core.trees/objects/savanna-gen/SavanaGENTree9.iob and /dev/null differ diff --git a/core.trees/objects/savanna-gen/savannaD-1.iob b/core.trees/objects/savanna-gen/savannaD-1.iob new file mode 100644 index 00000000..537505b1 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaD-1.iob differ diff --git a/core.trees/objects/savanna-gen/savannaD-2.iob b/core.trees/objects/savanna-gen/savannaD-2.iob new file mode 100644 index 00000000..55e8f485 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaD-2.iob differ diff --git a/core.trees/objects/savanna-gen/savannaD-3.iob b/core.trees/objects/savanna-gen/savannaD-3.iob new file mode 100644 index 00000000..28ff1be5 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaD-3.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-1.iob b/core.trees/objects/savanna-gen/savannaF-1.iob new file mode 100644 index 00000000..7c2a7802 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-1.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-10.iob b/core.trees/objects/savanna-gen/savannaF-10.iob new file mode 100644 index 00000000..52872380 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-10.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-11.iob b/core.trees/objects/savanna-gen/savannaF-11.iob new file mode 100644 index 00000000..c95da986 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-11.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-13.iob b/core.trees/objects/savanna-gen/savannaF-13.iob new file mode 100644 index 00000000..413a46c1 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-13.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-14.iob b/core.trees/objects/savanna-gen/savannaF-14.iob new file mode 100644 index 00000000..f741b22b Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-14.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-15.iob b/core.trees/objects/savanna-gen/savannaF-15.iob new file mode 100644 index 00000000..8a107364 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-15.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-16.iob b/core.trees/objects/savanna-gen/savannaF-16.iob new file mode 100644 index 00000000..cb028c58 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-16.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-17.iob b/core.trees/objects/savanna-gen/savannaF-17.iob new file mode 100644 index 00000000..b1e50838 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-17.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-2.iob b/core.trees/objects/savanna-gen/savannaF-2.iob new file mode 100644 index 00000000..a3325a0f Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-2.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-3.iob b/core.trees/objects/savanna-gen/savannaF-3.iob new file mode 100644 index 00000000..b01c3700 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-3.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-4.iob b/core.trees/objects/savanna-gen/savannaF-4.iob new file mode 100644 index 00000000..022e0de2 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-4.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-5.iob b/core.trees/objects/savanna-gen/savannaF-5.iob new file mode 100644 index 00000000..46e5a525 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-5.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-6.iob b/core.trees/objects/savanna-gen/savannaF-6.iob new file mode 100644 index 00000000..79d9407b Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-6.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-7.iob b/core.trees/objects/savanna-gen/savannaF-7.iob new file mode 100644 index 00000000..4f211c9c Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-7.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-8.iob b/core.trees/objects/savanna-gen/savannaF-8.iob new file mode 100644 index 00000000..82cba519 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-8.iob differ diff --git a/core.trees/objects/savanna-gen/savannaF-9.iob b/core.trees/objects/savanna-gen/savannaF-9.iob new file mode 100644 index 00000000..70900649 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaF-9.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-1.iob b/core.trees/objects/savanna-gen/savannaS-1.iob new file mode 100644 index 00000000..22610ddc Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-1.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-2.iob b/core.trees/objects/savanna-gen/savannaS-2.iob new file mode 100644 index 00000000..a55fd41c Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-2.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-3.iob b/core.trees/objects/savanna-gen/savannaS-3.iob new file mode 100644 index 00000000..fa0b8fe2 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-3.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-4.iob b/core.trees/objects/savanna-gen/savannaS-4.iob new file mode 100644 index 00000000..adba1d9b Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-4.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-5.iob b/core.trees/objects/savanna-gen/savannaS-5.iob new file mode 100644 index 00000000..1444dcc4 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-5.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-6.iob b/core.trees/objects/savanna-gen/savannaS-6.iob new file mode 100644 index 00000000..3a17b758 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-6.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-7.iob b/core.trees/objects/savanna-gen/savannaS-7.iob new file mode 100644 index 00000000..826adfae Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-7.iob differ diff --git a/core.trees/objects/savanna-gen/savannaS-8.iob b/core.trees/objects/savanna-gen/savannaS-8.iob new file mode 100644 index 00000000..6f021058 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannaS-8.iob differ diff --git a/core.trees/objects/savanna-gen/savannas-10.iob b/core.trees/objects/savanna-gen/savannas-10.iob new file mode 100644 index 00000000..a7dcc042 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannas-10.iob differ diff --git a/core.trees/objects/savanna-gen/savannas-11.iob b/core.trees/objects/savanna-gen/savannas-11.iob new file mode 100644 index 00000000..4592201d Binary files /dev/null and b/core.trees/objects/savanna-gen/savannas-11.iob differ diff --git a/core.trees/objects/savanna-gen/savannas-12.iob b/core.trees/objects/savanna-gen/savannas-12.iob new file mode 100644 index 00000000..c9e47362 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannas-12.iob differ diff --git a/core.trees/objects/savanna-gen/savannas-9.iob b/core.trees/objects/savanna-gen/savannas-9.iob new file mode 100644 index 00000000..7ac3e621 Binary files /dev/null and b/core.trees/objects/savanna-gen/savannas-9.iob differ diff --git a/iris.overworld.hot/biomes/hot-savanna.json b/iris.overworld.hot/biomes/hot-savanna.json new file mode 100644 index 00000000..a15682dd --- /dev/null +++ b/iris.overworld.hot/biomes/hot-savanna.json @@ -0,0 +1,171 @@ +{ + "name": "Savanna", + "layers": [ + { + "dispersion": "WISPY", + "terrainZoom": 0.75, + "palette": [ + "GRASS_BLOCK" + + + ] + }, + { + "minHeight": 2, + "maxHeight": 4, + "palette": [ + "DIRT" + ] + }, + { + "minHeight": 6, + "maxHeight": 18, + "dispersion": "SCATTER", + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ] + } + ], + "decorators": [ + { + "zoom": 0.3, + "chance": 0.001, + "palette": [ + "DEAD_BUSH" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.03, + "palette": [ + "GRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 0.3, + "chance": 0.12, + "palette": [ + "TALL_GRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + ], + "generators":[ + { + "generator": "plain", + "min": 4, + "max": 9 + } + ], + "objects": [ + { + "chance": 0.1, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "savanna-gen/savannaD-1", + "savanna-gen/savannaD-2", + "savanna-gen/savannaD-3" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.05, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "savanna-gen/savannaF-1", + "savanna-gen/savannaF-2", + "savanna-gen/savannaF-3", + "savanna-gen/savannaF-4", + "savanna-gen/savannaF-5", + "savanna-gen/savannaF-6", + "savanna-gen/savannaF-7", + "savanna-gen/savannaF-8", + "savanna-gen/savannaF-9", + "savanna-gen/savannaF-10", + "savanna-gen/savannaF-11", + "savanna-gen/savannaF-12", + "savanna-gen/savannaF-13", + "savanna-gen/savannaF-14" + ], + "translate": { + "x": 0, + "y": -1, + "z": 0 + } + }, + { + "chance": 0.03, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "savanna-gen/savannaS-1", + "savanna-gen/savannaS-2", + "savanna-gen/savannaS-3", + "savanna-gen/savannaS-4", + "savanna-gen/savannaS-5", + "savanna-gen/savannaS-6", + "savanna-gen/savannaS-7", + "savanna-gen/savannaS-8", + "savanna-gen/savannas-9", + "savanna-gen/savannas-10", + "savanna-gen/savannas-11", + "savanna-gen/savannas-12" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + + ], + "derivative": "SAVANNA", + "biomeDispersion": "WISPY", + "biomeZoom": 20, + "biomeScatter": [ + "SAVANNA", + "DESERT" + ], + "biomeSkyScatter": [ + "DESERT", + "SAVANNA" + ] +} \ No newline at end of file diff --git a/iris.overworld.hot/regions/hot.json b/iris.overworld.hot/regions/hot.json index c4523db8..099da0af 100644 --- a/iris.overworld.hot/regions/hot.json +++ b/iris.overworld.hot/regions/hot.json @@ -7,7 +7,8 @@ "landBiomes": [ "hot-desert", "hot-dry-forest", - "hot-desert-red" + "hot-desert-red", + "hot-savanna" ], "seaBiomes": [ diff --git a/iris.overworld/dimensions/overworld.json b/iris.overworld/dimensions/overworld.json index 26dca3e9..10d5da37 100644 --- a/iris.overworld/dimensions/overworld.json +++ b/iris.overworld/dimensions/overworld.json @@ -22,6 +22,7 @@ "caveScale": 1, "caveShift": 9, "caves": true, + "mirrorCeiling": false, "focus": "", "deposits": [ {