mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Crystal biome gen tweaks

Browse Source
This commit is contained in:
Anuken 2022-01-29 10:52:46 -05:00
parent 0579c9e6c9
commit 77dc453e75
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/aware.msav
View File

Binary file not shown.

6
core/src/mindustry/maps/planet/AsteroidGenerator.java
View File

@ -117,10 +117,6 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
wallOre(Blocks.beryllicStoneWall, Blocks.wallOreBeryl, 50f, 0.62f * berylliumScale);
//TODO:
//- enemy wave spawns
//- never ending
//titanium
pass((x, y) -> {
if(floor != Blocks.stone) return;
@ -142,7 +138,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
zoom = 1f;
camPos = new Vec3(1.2388899f, 1.6047299f, 2.4758825f);
}};
//state.rules.backgroundTexture = "sprites/space.png";
state.rules.dragMultiplier = 0.7f; //yes, space actually has 0 drag but true 0% drag is very annoying
state.rules.borderDarkness = false;
state.rules.environment = Env.space;

18
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@ -24,6 +24,8 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
public static float arkThresh = 0.28f, arkScl = 0.83f;
public static int arkSeed = 7, arkOct = 2;
public static float liqThresh = 0.64f, liqScl = 87f, redThresh = 3.1f, noArkThresh = 0.3f;
public static int crystalSeed = 8, crystalOct = 2;
public static float crystalScl = 0.9f, crystalMag = 0.3f;
Block[] terrain = {Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.carbonStone};
@ -44,6 +46,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
@Override
public Color getColor(Vec3 position){
Block block = getBlock(position);
//more obvious color
if(block == Blocks.crystallineStone) block = Blocks.crystalFloor;
//TODO this might be too green
//if(block == Blocks.beryllicStone) block = Blocks.arkyicStone;
return Tmp.c1.set(block.mapColor).a(1f - block.albedo);
}
@ -71,16 +79,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
float height = rawHeight(position);
Tmp.v31.set(position);
//position = Tmp.v33.set(position).scl(scl);
//float temp = Simplex.noise3d(seed, 8, 0.6, 1f/2f, 10f + position.x, 10f + position.y + 99f, 10f + position.z);
//Mathf.clamp((int)(temp * arr.length), 0, arr[0].length - 1)
height *= 1.2f;
height = Mathf.clamp(height);
Block result = terrain[Mathf.clamp((int)(height * terrain.length), 0, terrain.length - 1)];
//TODO veins?
if(ice < 0.3){
if(ice < 0.3 + Math.abs(Ridged.noise3d(seed + crystalSeed, position.x + 4f, position.y + 8f, position.z + 1f, crystalOct, crystalScl)) * crystalMag){
return Blocks.crystallineStone;
}
@ -268,12 +272,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
}
}else if(!nearWall(x, y)){
if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 55f, 1f) > 0.76f/* && floor == Blocks.yellowStone*/){
if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 55f, 1f) > 0.76f){
ore = Blocks.oreTungsten;
}
//TODO design ore generation so it doesn't overlap
if(noise(x + 999, y + 600 - x, 4, 0.63f, 45f, 1f) < 0.29f && floor == Blocks.crystallineStone){
if(noise(x + 999, y + 600 - x, 4, 0.63f, 45f, 1f) < 0.27f && floor == Blocks.crystallineStone){
ore = Blocks.oreCrystalThorium;
}