diff --git a/src/main/java/ninja/bytecode/iris/Settings.java b/src/main/java/ninja/bytecode/iris/Settings.java index 7e23510e2..e65fe2b53 100644 --- a/src/main/java/ninja/bytecode/iris/Settings.java +++ b/src/main/java/ninja/bytecode/iris/Settings.java @@ -15,7 +15,7 @@ public class Settings public boolean loadonstart = true; public int compilerThreads = 4; public int compilerPriority = Thread.MAX_PRIORITY; - public int decorationAccuracy = 3; + public int decorationAccuracy = 1; } public static class GeneratorSettings @@ -23,7 +23,7 @@ public class Settings public double horizontalZoom = 1; // 0.525 public double heightFracture = 155; public double landScale = 0.205; - public double landChance = 0.6; + public double landChance = 0.67; public double roughness = 1.333; public double heightMultiplier = 0.806; public double heightExponentBase = 1; @@ -33,6 +33,7 @@ public class Settings public double baseHeight = 0.165; public int seaLevel = 63; public double caveDensity = 0; + public double caveScale = 1.45; public double biomeScale = 2; public boolean flatBedrock = false; public boolean doSchematics = true; diff --git a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java index b8d3d4a9a..e9335743e 100644 --- a/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java +++ b/src/main/java/ninja/bytecode/iris/generator/layer/GenLayerCaves.java @@ -25,8 +25,7 @@ public class GenLayerCaves extends GenLayer caveHeight = new CNG(rng.nextParallelRNG(-100001), 1D, 7).scale(0.00222); caveGirth = new CNG(rng.nextParallelRNG(-100002), 1D, 12).scale(0.03); caveClamp = new CNG(rng.nextParallelRNG(-10000), 1D, 3).scale(0.1422); - caveVeins = new MaxingGenerator(rng.nextParallelRNG(-99999), 22, 0.002, 1, (g) -> g.fractureWith(new CNG(rng.nextParallelRNG(-5555), 1D, 4).scale(0.02), 70)); - + caveVeins = new MaxingGenerator(rng.nextParallelRNG(-99999), 22, 0.002 * Iris.settings.gen.caveScale, 1, (g) -> g.fractureWith(new CNG(rng.nextParallelRNG(-5555), 1D, 4).scale(0.02), 70)); } public void genCaves(double wxx, double wzx, int x, int z, int s, IrisGenerator g) @@ -49,8 +48,8 @@ public class GenLayerCaves extends GenLayer if(caveVeins.hasBorder(3, width, wxx - (19949D * itr), wzx + (19949D * itr))) { double r = (((caveGirth.noise(wxx, wzx, width)) * variance) + height) / 2D; - - for(int i = (int) -r; i < r; i++) + int f = 3; + for(int i = (int) -r; i < r && f >= 0; i++) { if(i + height > s) { @@ -66,7 +65,6 @@ public class GenLayerCaves extends GenLayer g.setBlock(x, (int) (elevation + i) - 55, z, Material.AIR); } } - } } }