diff --git a/build.gradle b/build.gradle index 42d08b8c5b..95f1e4da10 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { gdxVersion = '1.9.8' roboVMVersion = '2.3.0' aiVersion = '1.8.1' - uCoreVersion = '16ae6ef' + uCoreVersion = ' b6d22d5' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/world/WorldGenerator.java b/core/src/io/anuke/mindustry/world/WorldGenerator.java index a7fd5f9ae1..035ad3b320 100644 --- a/core/src/io/anuke/mindustry/world/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/world/WorldGenerator.java @@ -105,7 +105,7 @@ public class WorldGenerator { for(int i = ores.size-1; i >= 0; i --){ OreEntry entry = ores.get(i); - if(entry.noise.octaveNoise2D(2, 0.7, 1f / (20 + i*4), x, y)/2f + + if(entry.noise.octaveNoise2D(2, 0.7, 1f / (2 + i*2), x, y)/2f + entry.ridge.getValue(x, y, 1f / (28 + i*4)) >= 2.0f - entry.frequency*4.0f && entry.ridge.getValue(x+9999, y+9999, 1f/100f) > 0.4){ tile.setFloor(entry.block); diff --git a/server/src/io/anuke/mindustry/server/mapgen/ProcGen.java b/server/src/io/anuke/mindustry/server/mapgen/ProcGen.java index 8e374d24d9..160d327f19 100644 --- a/server/src/io/anuke/mindustry/server/mapgen/ProcGen.java +++ b/server/src/io/anuke/mindustry/server/mapgen/ProcGen.java @@ -5,7 +5,7 @@ import io.anuke.ucore.noise.RidgedPerlin; import io.anuke.ucore.noise.Simplex; public class ProcGen { - public RidgedPerlin rid = new RidgedPerlin(1, 1, 1); + public RidgedPerlin rid = new RidgedPerlin(1, 1); public Simplex sim = new Simplex(); public Map generate(GenProperties props){