This commit is contained in:
Anuken
2021-06-12 10:54:58 -04:00
parent 4b695a5047
commit 9a8c9dff17
3 changed files with 20 additions and 4 deletions

View File

@@ -37,10 +37,11 @@ public class Blocks implements ContentList{
//environment
air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space,
dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redmat, bluemat,
dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce,
redmat, bluemat,
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
redweed, purbush, coralChunk, glowBlob, yellowCoral,
regolithWall, yellowStoneWall, rhyoliteWall, carbonWall,
regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall,
graphiticStone,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
@@ -312,6 +313,12 @@ public class Blocks implements ContentList{
variants = 4;
}};
redIce = new Floor("red-ice"){{
dragMultiplier = 0.4f;
speedMultiplier = 0.9f;
attributes.set(Attribute.water, 0.4f);
}};
redmat = new Floor("redmat");
bluemat = new Floor("bluemat");
@@ -396,6 +403,12 @@ public class Blocks implements ContentList{
graphiticStone.asFloor().wall = this;
}};
redIceWall = new StaticWall("red-ice-wall"){{
variants = 2;
redIce.asFloor().wall = this;
}};
sandWall = new StaticWall("sand-wall"){{
variants = 2;
sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;

View File

@@ -71,7 +71,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
if(ice < 0.6){
if(result == Blocks.rhyolite || result == Blocks.yellowStone || result == Blocks.regolith){
return Blocks.ice;
return Blocks.redIce;
}
}
@@ -104,7 +104,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
if(temp > 0.7){
pass((x, y) -> {
if(floor != Blocks.ice){
if(floor != Blocks.redIce){
float noise = noise(x + 782, y, 7, 0.8f, 310f, 1f);
if(noise > 0.67f){
if(noise > 0.72f){