From 015f0bbc23c92766401d89523dc65e077880696a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 14 Jul 2025 01:56:20 -0400
Subject: [PATCH] And yet another floor

---
 .../environment/crux-floor-7-autotile.aseprite | Bin 0 -> 5685 bytes
 .../environment/crux-floor-7-autotile.png      | Bin 0 -> 1149 bytes
 core/assets/icons/icons.properties             |   1 +
 core/src/mindustry/content/Blocks.java         |  17 ++++++++++++-----
 gradle.properties                              |   2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..de23d4ea8589297dcaddfe747125b495c5b06f86
GIT binary patch
literal 5685
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png
new file mode 100644
index 0000000000000000000000000000000000000000..eba9b8cb2b083ffd3820a9476e4ab0174f9021a5
GIT binary patch
literal 1149
zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+7>k44ofy`glX=O&z+&#{
z;uumf=j|NFpeF`AuI(!=-8V0bFuU`g;ecXWw*mL6)kYyQr_YsJ+gIgZW&O8pqDzwI
zD;pd8*!^{mQFZ6<F`Q{-@Ze*dAj70!Ss%p~A0L10?UR(6J$p|-@42-<_3Z~yhUeQC
zZVNwMqnqr^*zoyxz|FPk^HwaAVz8)}uYSATUH+n7j%ZVs@Sneb-rT-<vSLrns^qG3
zEUW7Gt=-zq*zoyw0Q<pdf4#TezvZ0y_G&c4xqSD`$#T!H*M-m8ypylt^XZ;#zA68%
z*_yC2oLg^v%1!t4wjN&brbUyly=&cCdFShP!->X@Q|2w`dZ$>z8eqBK>{#snBTutV
zZf<zu!JP13@o4P(jz3%lDeQNh-yd7YP_ZW_?0si;Th#BHkzc<%ZLBM2&=FrJxiMvr
z@oV?RQSoKm8j>5+_H2F;J8>Rk+VaHBU;9q*H@cTyu>F!3!0y49xgg>_TdTstdxDV+
z7EfO)e_2<;e&CJG?-#!=uDF)}EAGHGwP{m6y_x^`{Hp!pU0*$!k5-v$uyB6ugJ=$T
z&(W%|@gDCl#uw}_;%nZ1?p^%+<rn4}XZr?^_gt9^VDhgRPAc+>yuQ0YK;??H6Ik*u
z!x!cZvyCa=KL5D+tJ=~20OQxZ01ly7vJ3ep$Xs$*cu$baF=?;#7v>B67xw?S^<3Kh
z{N<PIKicXTCf*Z8$X{Wc<SeCeZMUPM$BOb6uq4Pa7jlwLzIpy}^Vjc9bq&m~pccz2
zST1RF+N&(mbfn7s1^WW|1@#}do;UBCxBN2y2j0I7N_({t@++8C+D!u1ls7v~2zbu{
zmIOIw!ObI+Zk~Uf{`x)ZUk3IoP>Zb`ikuh)dVk%_ypi))Xu7uR4}l$J98t;d4<3pA
zpWX0z@wWFjoiFPiP+gU71c~%qJ7xivRJYq{M-)p<8SL)eTiTtnAZ_w2-^Iz*n`c~_
z!++lY`ua&Pe*Fr%_mq)K(cSUoA63)e?l+_AjTxrQKH;_gbN-vH^|^mvNhZ9PpCH-#
z_S+f3i*0<3ERNP*v%j7Zz1p&wp-JH!NAya*iS{e!F+RBSK}W%o#i59!;fVmlNkxW9
z&I~H;@XX+QpZmedgr30E&nx~$U*nHwEU23!xGihu=F}VwhJre%nIX&!&%ZC;aCe@i
z(ye#X3~n9#w|u$$`eRq78O*ugXT(wU=Kkh?uXGune_y!Ccm3b(phUltui^9So-G$U
z^3z(G8J-`POk6$9GWyuND#s&ITjhS<dUoe)-iJDdh4%#Kv8uFRKf?L7@5FhA&HLxu
zN56Ob!Bw!W`o4$TjaLHi*%dfm^=!GQc#q#fU`pW4V~_qa+<Z6H)bG22$KK90AL<&8
kATYy*#&kx6AJ5ra%63(o@UTWQFfcH9y85}Sb4q9e0A6}2k^lez

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index c3f4c0a6cc..594c419296 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -607,3 +607,4 @@
 63075=colored-floor|block-colored-floor-ui
 63074=crux-floor-5|block-crux-floor-5-ui
 63073=crux-floor-6|block-crux-floor-6-ui
+63072=crux-floor-7|block-crux-floor-7-ui
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 483b750426..7c68a43226 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -11,6 +11,7 @@ import mindustry.entities.effect.*;
 import mindustry.entities.part.DrawPart.*;
 import mindustry.entities.part.*;
 import mindustry.entities.pattern.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
@@ -58,7 +59,7 @@ public class Blocks{
     shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
     arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
-    darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, coloredFloor,
+    darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, coloredFloor,
     pebbles, tendrils,
 
     //ores
@@ -811,16 +812,12 @@ public class Blocks{
 
         cruxFloor1 = new Floor("crux-floor-1"){{
             autotile = true;
-            emitLight = true;
             drawEdgeOut = false;
             drawEdgeIn = false;
         }};
 
         cruxFloor2 = new Floor("crux-floor-2"){{
             autotile = true;
-            //emitLight = true;
-            //lightRadius = 30f;
-            //lightColor = Team.crux.color.cpy().a(0.3f);
             drawEdgeOut = false;
             drawEdgeIn = false;
         }};
@@ -847,6 +844,16 @@ public class Blocks{
             autotile = true;
             drawEdgeOut = false;
             drawEdgeIn = false;
+
+            emitLight = true;
+            lightRadius = 30f;
+            lightColor = Team.crux.color.cpy().a(0.3f);
+        }};
+
+        cruxFloor7 = new Floor("crux-floor-7"){{
+            autotile = true;
+            drawEdgeOut = false;
+            drawEdgeIn = false;
         }};
 
         coloredFloor = new ColoredFloor("colored-floor"){{
diff --git a/gradle.properties b/gradle.properties
index 543e664edd..5e1d3a2b35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=bd8d9520a4
+archash=ae3b50eaca