Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Worldgen changes

Browse Source
This commit is contained in:
Anuken
2018-08-27 16:04:55 -04:00
parent 28c13c8e52
commit 9b57550f3d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets-raw/sprites/mechs/mechs/tau-mech.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 306 B

core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
+10 -10
View File
@@ -146,11 +146,11 @@ public class WorldGenerator{
if(genOres){ if(genOres){
Array<OreEntry> baseOres = Array.with( Array<OreEntry> baseOres = Array.with(
new OreEntry(Items.copper, 0.3f, seed), new OreEntry(Items.copper, 0.3f, seed),
new OreEntry(Items.coal, 0.284f, seed), new OreEntry(Items.coal, 0.284f, seed),
new OreEntry(Items.lead, 0.28f, seed), new OreEntry(Items.lead, 0.28f, seed),
new OreEntry(Items.titanium, 0.27f, seed), new OreEntry(Items.titanium, 0.27f, seed),
new OreEntry(Items.thorium, 0.26f, seed) new OreEntry(Items.thorium, 0.26f, seed)
); );
Array<OreEntry> ores = new Array<>(); 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 iceridge = rid.getValue(x+99999, y, 1f / 300f) + sim3.octaveNoise2D(2, 1f, 1f/14f, x, y)/11f;
double elevation = elevationOf(x, y, detailed); 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 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; int lerpDst = 20;
lerpDst *= lerpDst; lerpDst *= lerpDst;
@@ -272,14 +272,14 @@ public class WorldGenerator{
floor = Blocks.water; floor = Blocks.water;
}else if(elevation < 0.85){ }else if(elevation < 0.85){
floor = Blocks.sand; floor = Blocks.sand;
}else if (elevation < 2.5 && temp > 0.4){
floor = Blocks.sand;
}else if(temp < 0.42){ }else if(temp < 0.42){
floor = Blocks.snow; floor = Blocks.snow;
}else if(temp < 0.5){ }else if(temp < 0.5){
floor = Blocks.stone; floor = Blocks.stone;
}else if(temp < 0.55){
floor = Blocks.grass;
}else if(temp < 0.6){ }else if(temp < 0.6){
floor = Blocks.sand; floor = Blocks.grass;
}else if(temp + ridge/2f < 0.8 || elevation < 1.3){ }else if(temp + ridge/2f < 0.8 || elevation < 1.3){
floor = Blocks.blackstone; floor = Blocks.blackstone;
@@ -313,7 +313,7 @@ public class WorldGenerator{
double elevationOf(int x, int y, boolean detailed){ double elevationOf(int x, int y, boolean detailed){
double ridge = rid.getValue(x, y, 1f / 400f); 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{ public static class GenResult{