arkycite floor + fixes

This commit is contained in:
Anuken 2021-12-01 22:38:21 -05:00
parent 585affeeee
commit b6988e631e
7 changed files with 13 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

View File

@ -468,3 +468,4 @@
63238=arkycite-floor|block-arkycite-floor-ui 63238=arkycite-floor|block-arkycite-floor-ui
63237=arkycite|liquid-arkycite-ui 63237=arkycite|liquid-arkycite-ui
63236=chemical-combustion-chamber|block-chemical-combustion-chamber-ui 63236=chemical-combustion-chamber|block-chemical-combustion-chamber-ui
63235=arkyic-stone|block-arkyic-stone-ui

View File

@ -1,6 +1,6 @@
#define HIGHP #define HIGHP
#define S1 vec4(96.0, 131.0, 66.0, 78.0) / 255.0 #define S1 vec4(96.0, 131.0, 66.0, 255.0) / 255.0
#define S2 vec3(132.0, 169.0, 79.0) / 255.0 #define S2 vec3(132.0, 169.0, 79.0) / 255.0
#define S3 vec3(210.0, 221.0, 118.0) / 255.0 #define S3 vec3(210.0, 221.0, 118.0) / 255.0
@ -46,7 +46,7 @@ void main(){
color.rgb = S2; color.rgb = S2;
} }
if(orig.r > 0.01){ if(orig.g > 0.01){
color = max(S1, color); color = max(S1, color);
} }

View File

@ -39,7 +39,7 @@ public class Blocks{
//environment //environment
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty, 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, regolith, yellowStone, redIce,
arkyciteFloor, arkyciteFloor, arkyicStone,
redmat, bluemat, redmat, bluemat,
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
redweed, purbush, coralChunk, yellowCoral, redweed, purbush, coralChunk, yellowCoral,
@ -405,6 +405,10 @@ public class Blocks{
albedo = 0.9f; albedo = 0.9f;
}}; }};
arkyicStone = new Floor("arkyic-stone"){{
variants = 3;
}};
redmat = new Floor("redmat"); redmat = new Floor("redmat");
bluemat = new Floor("bluemat"); bluemat = new Floor("bluemat");

View File

@ -137,8 +137,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
//arkycite //arkycite
pass((x, y) -> { pass((x, y) -> {
if(noise(x + 300, y - x*1.6f + 100, 4, 0.81f, 86f, 1f) > 0.71f/* && floor == Blocks.yellowStone*/){ float noise = noise(x + 300, y - x*1.6f + 100, 4, 0.81f, 96f, 1f);
if(noise > 0.71f){
floor = Blocks.arkyciteFloor; floor = Blocks.arkyciteFloor;
}else if(noise > 0.65){
floor = Blocks.arkyicStone;
} }
}); });