mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-09 10:18:40 +07:00
arkycite floor + fixes
This commit is contained in:
parent
585affeeee
commit
b6988e631e
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone1.png
Normal file
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 277 B |
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone2.png
Normal file
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 271 B |
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone3.png
Normal file
BIN
core/assets-raw/sprites/blocks/environment/arkyic-stone3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 301 B |
@ -468,3 +468,4 @@
|
||||
63238=arkycite-floor|block-arkycite-floor-ui
|
||||
63237=arkycite|liquid-arkycite-ui
|
||||
63236=chemical-combustion-chamber|block-chemical-combustion-chamber-ui
|
||||
63235=arkyic-stone|block-arkyic-stone-ui
|
||||
|
@ -1,6 +1,6 @@
|
||||
#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 S3 vec3(210.0, 221.0, 118.0) / 255.0
|
||||
|
||||
@ -46,7 +46,7 @@ void main(){
|
||||
color.rgb = S2;
|
||||
}
|
||||
|
||||
if(orig.r > 0.01){
|
||||
if(orig.g > 0.01){
|
||||
color = max(S1, color);
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,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,
|
||||
arkyciteFloor,
|
||||
arkyciteFloor, arkyicStone,
|
||||
redmat, bluemat,
|
||||
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
|
||||
redweed, purbush, coralChunk, yellowCoral,
|
||||
@ -405,6 +405,10 @@ public class Blocks{
|
||||
albedo = 0.9f;
|
||||
}};
|
||||
|
||||
arkyicStone = new Floor("arkyic-stone"){{
|
||||
variants = 3;
|
||||
}};
|
||||
|
||||
redmat = new Floor("redmat");
|
||||
bluemat = new Floor("bluemat");
|
||||
|
||||
|
@ -137,8 +137,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
|
||||
//arkycite
|
||||
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;
|
||||
}else if(noise > 0.65){
|
||||
floor = Blocks.arkyicStone;
|
||||
}
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user