More decoration blocks

This commit is contained in:
Anuken
2022-01-20 15:49:47 -05:00
parent 0e790e61f2
commit 8fc7aff7ef
11 changed files with 22 additions and 5 deletions

View File

@@ -40,7 +40,7 @@ public class Blocks{
//environment
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce,
dacite, rhyolite, rhyoliteCrater, roughRhyolite, regolith, yellowStone, redIce,
arkyciteFloor, arkyicStone,
redmat, bluemat,
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
@@ -50,7 +50,7 @@ public class Blocks{
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
//boulders
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder,
arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder, rhyoliteBoulder,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
pebbles, tendrils,
@@ -367,6 +367,11 @@ public class Blocks{
blendGroup = rhyolite;
}};
roughRhyolite = new Floor("rough-rhyolite"){{
attributes.set(Attribute.water, -1f);
variants = 3;
}};
steamVent = new SteamVent("steam-vent"){{
parent = blendGroup = rhyolite;
attributes.set(Attribute.vent, 1f);
@@ -519,7 +524,7 @@ public class Blocks{
}};
rhyoliteWall = new StaticWall("rhyolite-wall"){{
rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = this;
rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this;
attributes.set(Attribute.silicate, 1f);
}};
@@ -688,6 +693,11 @@ public class Blocks{
redIce.asFloor().decoration = this;
}};
rhyoliteBoulder = new Prop("rhyolite-boulder"){{
variants = 3;
rhyolite.asFloor().decoration = roughRhyolite.asFloor().decoration = this;
}};
metalFloor = new Floor("metal-floor", 0);
metalFloorDamaged = new Floor("metal-floor-damaged", 3);

View File

@@ -2538,7 +2538,7 @@ public class UnitTypes{
drownTimeMultiplier = 2f;
hovering = true;
visualElevation = 0.65f;
visualElevation = 0.4f;
groundLayer = Layer.legUnit;
weapons.add(new Weapon("bulwark-weapon"){{

View File

@@ -169,6 +169,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
median(3, 0.6, Blocks.slag);
pass((x, y) -> {
//rough rhyolite
if(noise(x, y + 600 + x, 5, 0.86f, 60f, 1f) < 0.41f && floor == Blocks.rhyolite){
floor = Blocks.roughRhyolite;
}
if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){
block = Blocks.arkyicWall;
}
@@ -244,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
//vents
outer:
for(Tile tile : tiles){
if(floor == Blocks.rhyolite && rand.chance(0.0011)){
if(floor == Blocks.rhyolite && rand.chance(0.0015)){
int radius = 2;
for(int x = -radius; x <= radius; x++){
for(int y = -radius; y <= radius; y++){