diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png index 414d812edc..4f5246f8c8 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech.png differ diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 31c313e376..c131093bff 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -146,11 +146,11 @@ public class WorldGenerator{ if(genOres){ Array baseOres = Array.with( - new OreEntry(Items.copper, 0.3f, seed), - new OreEntry(Items.coal, 0.284f, seed), - new OreEntry(Items.lead, 0.28f, seed), - new OreEntry(Items.titanium, 0.27f, seed), - new OreEntry(Items.thorium, 0.26f, seed) + new OreEntry(Items.copper, 0.3f, seed), + new OreEntry(Items.coal, 0.284f, seed), + new OreEntry(Items.lead, 0.28f, seed), + new OreEntry(Items.titanium, 0.27f, seed), + new OreEntry(Items.thorium, 0.26f, seed) ); Array ores = new Array<>(); @@ -248,7 +248,7 @@ public class WorldGenerator{ double iceridge = rid.getValue(x+99999, y, 1f / 300f) + sim3.octaveNoise2D(2, 1f, 1f/14f, x, y)/11f; double elevation = elevationOf(x, y, detailed); double temp = vn.noise(x, y, 1f / 300f) * sim3.octaveNoise2D(detailed ? 2 : 1, 1, 1f / 13f, x, y)/13f - + sim3.octaveNoise2D(detailed ? 12 : 9, 0.6, 1f / 920f, x, y); + + sim3.octaveNoise2D(detailed ? 12 : 9, 0.6, 1f / 1020f, x, y); int lerpDst = 20; lerpDst *= lerpDst; @@ -272,14 +272,14 @@ public class WorldGenerator{ floor = Blocks.water; }else if(elevation < 0.85){ floor = Blocks.sand; + }else if (elevation < 2.5 && temp > 0.4){ + floor = Blocks.sand; }else if(temp < 0.42){ floor = Blocks.snow; }else if(temp < 0.5){ floor = Blocks.stone; - }else if(temp < 0.55){ - floor = Blocks.grass; }else if(temp < 0.6){ - floor = Blocks.sand; + floor = Blocks.grass; }else if(temp + ridge/2f < 0.8 || elevation < 1.3){ floor = Blocks.blackstone; @@ -313,7 +313,7 @@ public class WorldGenerator{ double elevationOf(int x, int y, boolean detailed){ double ridge = rid.getValue(x, y, 1f / 400f); - return sim.octaveNoise2D(detailed ? 7 : 4, 0.62, 1f / 640, x, y) * 6.1 - 1 - ridge; + return sim.octaveNoise2D(detailed ? 7 : 4, 0.62, 1f / 740, x, y) * 6.1 - 1 - ridge; } public static class GenResult{