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

Merge

Browse Source
This commit is contained in:
Anuken
2021-06-09 17:15:22 -04:00
parent 8c32c00e2b
commit 1ce6772601
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Blocks.java
View File

@@ -308,6 +308,7 @@ public class Blocks implements ContentList{
}}; }};
graphiticStone = new Floor("graphitic-stone"){{ graphiticStone = new Floor("graphitic-stone"){{
attributes.set(Attribute.water, -1f);
variants = 4; variants = 4;
}}; }};

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

@@ -17,9 +17,6 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class ErekirPlanetGenerator extends PlanetGenerator{ public class ErekirPlanetGenerator extends PlanetGenerator{
RidgedPerlin rid = new RidgedPerlin(1, 2);
RidgedPerlin crid = new RidgedPerlin(2, 3);
public float scl = 2f; public float scl = 2f;
public float heightScl = 1f, octaves = 8, persistence = 0.7f, heightPow = 3f, heightMult = 1.5f; public float heightScl = 1f, octaves = 8, persistence = 0.7f, heightPow = 3f, heightMult = 1.5f;
@@ -91,11 +88,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
tile.block = tile.floor.asFloor().wall; tile.block = tile.floor.asFloor().wall;
if(rid.getValue(position.x, position.y, position.z, 25) > 0.2){ if(RidgedPerlin.noise3d(1, position.x, position.y, position.z, 2, 25) > 0.2){
tile.block = Blocks.air; tile.block = Blocks.air;
} }
if(crid.getValue(position.x, position.y + 4f, position.z, 7f) > 0.7){ if(RidgedPerlin.noise3d(2, position.x, position.y + 4f, position.z, 3, 7f) > 0.7){
tile.floor = Blocks.graphiticStone; tile.floor = Blocks.graphiticStone;
} }
} }
@@ -175,7 +172,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
} }
}); });
Vars.state.rules.environment = Env.scorching | Env.terrestrial; Vars.state.rules.environment = Env.scorching | Env.terrestrial | Env.groundWater;
Schematics.placeLaunchLoadout(spawnX, spawnY); Schematics.placeLaunchLoadout(spawnX, spawnY);
} }
} }