diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png new file mode 100644 index 0000000000..3e8d77902d Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png new file mode 100644 index 0000000000..83afe7df88 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png b/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png new file mode 100644 index 0000000000..f8772bcc95 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/arkyic-stone3.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index d3722ead30..d1838a03de 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -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 diff --git a/core/assets/shaders/arkycite.frag b/core/assets/shaders/arkycite.frag index acbd4ab7c5..863b3f6d64 100644 --- a/core/assets/shaders/arkycite.frag +++ b/core/assets/shaders/arkycite.frag @@ -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); } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d4b5e10099..b21ecd1620 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -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"); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 42e9ec6205..3c586b2134 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -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; } });