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

More crystals

Browse Source
This commit is contained in:
Anuken
2022-01-18 22:47:31 -05:00
parent 19ddc1dd65
commit 7240da5016
10 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ public class Blocks{
ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
//boulders
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, crystallineBoulder,
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
pebbles, tendrils,
@@ -657,12 +657,16 @@ public class Blocks{
arkyicStone.asFloor().decoration = this;
}};
//TODO better visuals, maybe make tree
crystalCluster = new TallBlock("crystal-cluster"){{
variants = 3;
clipSize = 128f;
}};
vibrantCrystalCluster = new TallBlock("vibrant-crystal-cluster"){{
variants = 3;
clipSize = 128f;
}};
crystallineBoulder = new Prop("crystalline-boulder"){{
variants = 2;
crystallineStone.asFloor().decoration = this;

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

@@ -215,13 +215,15 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
ore = Blocks.oreCrystalThorium;
}
if(noise(x + 999, y + 600 - x, 5, 0.8f, 50f, 1f) < 0.38f && floor == Blocks.crystallineStone){
floor = Blocks.crystalFloor;
}
}
if(block == Blocks.air && floor == Blocks.crystallineStone && rand.chance(0.08) && nearWall(x, y) && !near(x, y, 4, Blocks.crystalCluster)){
block = Blocks.crystalCluster;
if(noise(x + 999, y + 600 - x, 5, 0.8f, 50f, 1f) < 0.38f && floor == Blocks.crystallineStone){
floor = Blocks.crystalFloor;
}
if(block == Blocks.air && (floor == Blocks.crystallineStone || floor == Blocks.crystalFloor) && rand.chance(0.09) && nearWall(x, y)
&& !near(x, y, 4, Blocks.crystalCluster) && !near(x, y, 4, Blocks.vibrantCrystalCluster)){
block = floor == Blocks.crystalFloor ? Blocks.vibrantCrystalCluster : Blocks.crystalCluster;
}
});