From b6988e631e8c2b5d3e33dbcd3169f717245eaa46 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 1 Dec 2021 22:38:21 -0500
Subject: [PATCH] arkycite floor + fixes

---
 .../sprites/blocks/environment/arkyic-stone1.png  | Bin 0 -> 277 bytes
 .../sprites/blocks/environment/arkyic-stone2.png  | Bin 0 -> 271 bytes
 .../sprites/blocks/environment/arkyic-stone3.png  | Bin 0 -> 301 bytes
 core/assets/icons/icons.properties                |   1 +
 core/assets/shaders/arkycite.frag                 |   4 ++--
 core/src/mindustry/content/Blocks.java            |   6 +++++-
 .../maps/planet/ErekirPlanetGenerator.java        |   6 +++++-
 7 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/arkyic-stone1.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/arkyic-stone2.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/arkyic-stone3.png

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 0000000000000000000000000000000000000000..3e8d77902d14d30fb34cf9cf13886847b45e2c12
GIT binary patch
literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#&q+i<R9J=Wm%9zaFbqV`hB^=6GV5dl?~##JY5><xl^{m+A*rL>_-X;~k(2~!
z+Fs8C!lbxMmo~FL768C}C0s1v1qXmI3Y>!%1w1Qm3NYX;=t*Ein`;rD0uOkKJ6Avp
z2Z$ZeRR25n>M>*|x8Eoo(9WJJ&;tiLM$ij33s}LW`$jbaHe4mZYPng!E4P41z-#_u
zf!@>#xO@cFi^#L}pA<VV0$vng!znkR2RtjltX}fq{cggMZT}Nsz^%{wV1YCL66#IJ
b{>Z!mV^%+CXlt3n00000NkvXXu0mjfg7t0c

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..83afe7df886550270b2eb8087217e73636abaa04
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Cp}#pLn2z=
zPB-LhHsEo!7mVgRaH6z|>D|GJl9mj{bE8%Ys2}^=seN&O(-*m8eG6wlJI<GSE%oxf
zs51s`3=SV!R<mXuWL%KX>UYq!ah89KNWuZ{3;c~@spnj6Sxq0j-t>`0r=TH(QG1SB
zLhEi0na|=GS`(~_HJI+pq;27vqO#=mm2d^eqN1CnXQoUjTCe%TlQEQk$u!>A)=JTh
zi9L^&?cT+x&%J>`jZt@w;>&w2>WyJb>z~@PiWwveHL1%m0I`9I;_vNmISZe<OLInW
RG6Oxu;OXk;vd$@?2>?)FV=@2$

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f8772bcc9557ad89b9f4df15c6b877d814726c61
GIT binary patch
literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#=Sf6CR9J<@mOB!IFbqUDo^%|5lI!FIxkrvn$pNU7Dj9=iB+DyjOU&?|e-gLn
z>+yy$+qzp{RWmOW03iJnZWf4w1HgS0Sb|ptB4?}$FyI>WAkYhJfr$bmVdre?t_!fC
zIUKlHfhceeuL?xZI!{rEM#4pbk#OL&1--NPT<NB3$b#nS+5$$^bPKThg-d|hth&#D
z6zMS2uAw&j+D)oGKL|v3MrnLVA-W1pz+1!$0q-7r<5~fx1Z@i}2iVk(qa<o$MImB!
z#P4^smH7!o{BT;5BH%4a9yqfZ(R)El=4HYMViI0td94|q00000NkvXXu0mjfPn&o6

literal 0
HcmV?d00001

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;
             }
         });