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

Name cleanup

Browse Source
This commit is contained in:
Anuken
2021-06-22 16:52:48 -04:00
parent 1630e1a7fb
commit d4b6073c01
11 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ public class Blocks implements ContentList{
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
redweed, purbush, coralChunk, yellowCoral,
regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall,
ferricStone, ferricCraters, graphiticStone, beryllicStone,
ferricStone, ferricCraters, carbonStone, beryllicStone,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
@@ -307,7 +307,7 @@ public class Blocks implements ContentList{
attributes.set(Attribute.water, -1f);
}};
graphiticStone = new Floor("graphitic-stone"){{
carbonStone = new Floor("carbon-stone"){{
attributes.set(Attribute.water, -1f);
variants = 4;
}};
@@ -397,7 +397,7 @@ public class Blocks implements ContentList{
}};
carbonWall = new StaticWall("carbon-wall"){{
graphiticStone.asFloor().wall = this;
carbonStone.asFloor().wall = this;
}};
ferricStoneWall = new StaticWall("ferric-stone-wall"){{
@@ -487,7 +487,7 @@ public class Blocks implements ContentList{
carbonBoulder = new Prop("carbon-boulder"){{
variants = 2;
graphiticStone.asFloor().decoration = this;
carbonStone.asFloor().decoration = this;
}};
ferricBoulder = new Prop("ferric-boulder"){{

8
core/src/mindustry/content/Planets.java
View File

@@ -69,14 +69,18 @@ public class Planets implements ContentList{
meshLoader = () -> {
Seq<GenericMesh> meshes = new Seq<>();
Color color = Color.valueOf("57504b");
Color color = Blocks.ferricStoneWall.mapColor;
Rand rand = new Rand(2);
meshes.add(new NoiseMesh(this, 0, 2, color, radius, 2, 0.55f, 0.45f, 14f));
int am = rand.random(3, 7);
//TODO gier variants with different names and different resource distributions
for(int j = 0; j < am; j++){
meshes.add(new MatMesh(new NoiseMesh(this, j + 1, 1, color, 0.022f + rand.random(0.039f), 2, 0.6f, 0.38f, 20f), new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f)))));
meshes.add(new MatMesh(
new NoiseMesh(this, j + 1, 1, 0.022f + rand.random(0.039f), 2, 0.6f, 0.38f, 20f,
color, Blocks.carbonWall.mapColor, 3, 0.6f, 0.38f, 0.6f),
new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f)))));
}
return new MultiMesh(meshes.toArray(GenericMesh.class));