From 9b57550f3d19d9e6d9525ff21c9ada6692505e3c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Aug 2018 16:04:55 -0400
Subject: [PATCH] Worldgen changes

---
 .../sprites/mechs/mechs/tau-mech.png          | Bin 322 -> 306 bytes
 .../maps/generation/WorldGenerator.java       |  20 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png
index 414d812edc1364ddc86519bd51b38ce74bcc36bf..4f5246f8c858db20cef1e448f9b9582c69987ab6 100644
GIT binary patch
delta 248
zcmX@aw25hgQ@yYm%Lc{6#taM$7d>4ZLp07`4N&B3b`Y48t>qsp$icF+;US}kN`J<x
z*;)@6Ip#TDSi-;Jh>7DT1|DBgCdbtu!Y|%yEvjh<oqY1mnR86H=V+XqAigx>Q)OV6
z#>sy>?m8*^+zv|0{Pg(9t4B7P`d$|$WTh5guE_mZWGC3^dz-0{U$Wvv%B*EK&;IJv
z{2_I3*=`|k8&;;kNh^=+WtsOpfhS&Koo&sIj8%LL5Bl}mHnQ6rNj!Fxob>ejt#6H*
z0uL0K8EjUYXZSv-JojtmXTB|J9+^HtQo>QfYwsU>#%%s2aP|MG_hlIv7#KWV{an^L
HB{Ts5i?nQR

delta 265
zcmdnQbckt!Q$4SqW@2n-Dgy(<Lr)jS5RLO!C+PPzJBS>szr04qRZ!W@$0OUqL3NUI
z&Z^m3rx>*?*c>O@I;8pvtFW&~+`Q63;l-+to723xzA)9kdV2c%d)tcho|k&|XxtS!
z-+f6n)9jF#a9^++|C9EU_Rr$D=1=~#sATK?fZu0%=5v1Ey_TW=MV{`djHVmP9kx?0
zmTWIOBFQ<~q}Z%TW3lDU(*ZA2^feZ5oT%)%S@GlJjV%wm?Dk!*-I@~-JYSl@?C-2~
z`J8sPf9fnHx?X-?cRfGn2}crt!~D<sn}k{(zAC-?TslS7;#9N6spbh&XWads_L*H;
YDSWlWZB+#Z1_lOCS3j3^PD}|+0E(G++5i9m

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<OreEntry> 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<OreEntry> 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{