From f6745a6b802742700fd594245a06abd80e94b4b4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 21 Jul 2025 02:29:10 -0400
Subject: [PATCH] Reordered floors

---
 .../blocks/environment/crux-floor-1.png       | Bin 121 -> 251 bytes
 .../blocks/environment/crux-floor-11.png      | Bin 0 -> 198 bytes
 .../blocks/environment/crux-floor-12.png      | Bin 0 -> 548 bytes
 .../environment/crux-floor-4-autotile.png     | Bin 1161 -> 1085 bytes
 .../environment/crux-floor-8-autotile.png     | Bin 1085 -> 1161 bytes
 ...oor-4-mid-2.png => crux-floor-8-mid-2.png} | Bin
 core/assets/bundles/bundle.properties         |   2 +-
 core/src/mindustry/content/Blocks.java        |   3 +--
 8 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-11.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-12.png
 rename core/assets-raw/sprites/blocks/environment/{crux-floor-4-mid-2.png => crux-floor-8-mid-2.png} (100%)

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1.png
index 66f26a95bfd636d9f5418b162307ac982af3710e..d20970e1fa147754b5c2f49a86f9b12f631626e8 100644
GIT binary patch
delta 209
zcmb>Y%{alZeygX8V@O2n(d*uP2NXD10!}-=IeX{Zov%u7*LALxcaVs<HNz&D?Q!6#
zuS*>7Ztb({e0^r;ZogT+v!rCxxEvIwG32vwKj=(g-XoyYz}{pMxY;Ej=-FMakAIsq
zTrM*UcEk%W61*#-Ab40}k-%lk1_vGXiRMkFoVJ2*0^hU>-1TOa<M^1G(ksBcMo_Ck
z)roh5Qx2n!!0m?E7S05A$ByI2*Jw1xIRrbXEPC0<ab!K`#g06#2_53alai9!zs7xH
QU|?YIboFyt=akR{06GR$;{X5v

delta 78
zcmey(SUJJa!`RcsF(jh(?Kwk61_O>G2bN#DCHcRoi)UJQW6a&__T6*OS~8#jhe<q9
VX-tA_$DE=-;-0R4F6*2UngDE!8211G

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11.png b/core/assets-raw/sprites/blocks/environment/crux-floor-11.png
new file mode 100644
index 0000000000000000000000000000000000000000..31720bc1b92965af06b31fb177e015d052f1fabf
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U}*4k
zaSVxQeS38yXM=%&+r!{ImWz7Vl3xBhJmcI0zFS=q7TupC=Wy@ow?AU?d5a8FovtMR
z0eyyBytZ5i#1Al9Eo))=z{<2B`<zBY{DIG6G1u3Y-Vxhy<SxUt9o!FmV{Gyrb?e^m
zlxZ~8i{H=culvVdprL}hpy6G#BjXPy#siG%AC4**CN4g5o`HdZ!PC{xWt~$(69C9)
BNeuu1

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12.png b/core/assets-raw/sprites/blocks/environment/crux-floor-12.png
new file mode 100644
index 0000000000000000000000000000000000000000..f514f879fe46f3a0bd799e10c8e222479895e291
GIT binary patch
literal 548
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7%w)
z;usRqdUm>f_mu>JWA(=GkL=w#sX=DZhV}%-X}2Od4k^|N*-wr?bm-WzYfc}eIUb2_
z(mV7pR&kAIn$9HC)46<i>>qw@H238=-#;^5t<$FJhs6nvvzh<m86r;c78si!Xny>7
z4@0?0K2J_qL|jAo_x$Iq6HZ2mO5DmfVlbHWcf!pHJ*mc0hpKqj9p1<vf1W?<86$51
zbE$=56I0s+mZ0r*;SOq>qJ@>rs^2j7vQK3{%`uBZU|~Q&sL-ZBuIj3wcl-i(KQ`Rz
zytT0KUd?_7(IZnXSF289W0>*ghuMxOM*bCxS&J*I_aE`m<a+vaO^cG_q<=Rf7<(3!
zcYEt_t_+Af<7HuVWD9$4hPT*npM!4POtT*R-9BH1QB!F7W}#(mB6BOBez?8xn^?+x
z&4^S5hWCH69aygjo%i=jnf1UeD>>dW<lOPi#j{Q+HgRlNXp*nZ8gn2-f%ANts*kXY
zqzIGm>yMdr7n|1`ZFnuhGnr$?A(zBSQN>fYxhUD}tX{p=MYx``Y<|<~N!MDgIC@-{
z?*Dco>!bFKTOu-VCR^<4zRb!i@cx~v{FJSNIgHc3E)=MW-5$&SDQ*4!KNdCz#5Qft
zYT?RZHYh*O{h@N>3GNTtt8H&o+;{%J?9KnSn~eV${MvV%d!Ukfh=GBD!PC{xWt~$(
F699w}>-7Kt

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png
index ed83b0e931e642a8bddc998c48c8c5a18c78ffa4..f3bbc7bbc32af3c3d1c9e6ae44959b7e597bc630 100644
GIT binary patch
literal 1085
zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+7>k44ofy`glX=O&!2I3Q
z#WAE}&f7Vsb8kC{xT;P~kT9I!yX~Dr=#J(uLQBN;?{=I%q1M2xtgA8mhJdN@pB{_i
z`4#8i=rr5;zmE-ga>C~K^yAAfuiH@frha<e){4J2wXrokf4=>3KI>?@`q|k7`RC<%
z9o8#7c>QBC<BLF+8rk~zU2GO|?<ZZ~_y5=CD8=*l_vzR@oA&d4{^8{1ZM(|;d;fVO
zsla|e)NJjRtb1p4Kfjl6JKi^!GwRF!BmPVQP3r@XJXK=J<cRuaf872`joRH$0*gLg
z{cG={;bhBV8h`Wu`F;kc2a-((O&JtFa61+WuE=Bhv+vKF+y&9XbABG3>#$tS;<Nkq
zrr22z&dmR#cVHpsxj&KdY`J?uG-F0A$c1GLQDTho$KypB!dwqr|0vGBz*X==>7P{$
zYe3Tbtr)V!9v+GRe1G?~2l1i}x0J3p2Ygm;eejCmir7NArdjf;EUQ@-Y~%PUaODq&
zqQ#2t0Di}_;otuYECdPFr2e<JXX0o~=U}_e&~iYZ<)rI^U7R0&f7)EmnCDyYOgx`?
z?yLuA<nOW<WHuSs7b%|rJJGr^I^W5E->-+Wz5l&g`#_i1@oc|Hlk0ufoJ@|ax+wxW
z|BN!cLGEZ_uy3g3_`uBa;4wRg0gI`;y+ecIil09iA3SDn=$B`(t7G`F_s0*$Ge2=-
ztIt>Y?>}JYIM6S`^oK#IZi>JIc7adIq!>*FBXGG8m(dCznfL71{qKBTWTBjs|G(F-
z??2f(@9+7Ko9h^yHrUx;|I>eU@qg8S|DJw)`Q@YY+4?0@!p^?rt*fsyws$x?yYc?~
z`7tb3W(Q}^-^*Q)-DJGKLi)uOmh^uw>>9j<=lq;3?a1d_@a+68&O24YbAC40HheC%
zxu?4RYR;x9VP~J6*8Qw+UcL+|1<!nQW9y^)_B{Qv*1}s})OXHjS-=v%xZ|`d$0dO+
zZ|eK{<qv#lyzseIUV#A~M@&49XOHtU$lEj2{9*X;k@>*;qsRFZ&f&%vX39SV8{&W&
tR}6Iwe;9r+{?kAH{PA6s*#6HjA<z3;<G1@i7#J8BJYD@<);T3K0RX@X3TglV

delta 1128
zcmdnX(aAZ%pq|Cq)5S5QV$R#SzD2hUcv?e!`zCmnT~WNXZgTGVd*1}E>CL>Oc=L+n
z)rC1iEI%0@*6#k(Gmpo1qJqky`}5}2@734zWjUM~tDf@b`S$78Uv62qLAZm@>fh$p
z$sK$~AWC7!kMp<XGnjNbe%ycR*Ystf%FWl3|L6Rh^VeU9O{!kO!o;Cq-xG#v1M?Nn
z|9y0P8!_p}^cUj24BlR=<lC-XH2!xqn8CMUY51SjMGUhTy!(HIt2df3ioN|IuHHCZ
zJ@C`+=s$n|K7Vz8|NlP||JJUHYP%*sQ{}nc>X7(cNe#`!cdQk^rXPGKYb?&NWnXy6
zYX;j_H}?82SovP?qDVpSr26gv={>W!yRUs`({4N{*w3(6EBMx|X<u{~*|APA%$O;d
z)bO@@f~oh~#V?|nrZL~)DtNCWy*8gUL#SgPM@B8T!?Fg|rRN_gw?%E)r<$Pb@b>P~
zxs8jzu4Ra2)zQ4W=D2+1eI^|i)^;`yK3)MCDX?#ktZvBG4}P<7=d*3g>g}sc7cPBY
z#Nx1ja>upnDKi+imCrvmH=>$n%f8TAJONTIcmDV8;mD{xZ4%0~-L#Z*E#sGU`Hjys
z7d-8p=~jDp^FG#)d8`YvUp==L{CXhG^W@vZO4C<2$lQDHBGPWiFwv2j1#0(3#y#un
z_bwLwuQ>HUT)_U={X6*z?xoZ#R$49JXum&Y@^Ot?mbJgMEE}$LZvXaNJ~qBvtTv;W
z<E7zEX$O9@j({uQIiy`QURO7lHaytic*LRBH|9J0ji!6^`>(k(&t$rA(Dik66R(oP
zudsw>js^QzZzw4JC^^6;s8FlD!I4GUWx|OI3<no7HaRo1wEtzC^5v#{g2Icx^*=Le
zeQ(GoOxPFNCc&`RUVd%9<W{E%DiSaL{saYYF~gUCHCy(vUU6ecSt}EJDYc&Akr*Tx
zGa4RTU^tjq&#-)hJ;T?V@&_i_aeZSiShJq>H?zcr?_D<-#Ppe>?kk_YdnkJ1nY&?M
z-R<~K)RuMHy=L&z(R92oGU?T2hWf4w6Gq+zJ?6p(q+MhLOPV4U$EPrSu`;)^eSBUM
z99<a=4^oO5*6UkTEl_cME&1QOwvU0ivbwTW?TTfsRDywr@RL`}CJYQ;JT|npDhPyq
zTC@B2arTO*T2?21oS)XVxMRU%`)G^K7YdL6&t$p85)tt6f4-=LaDwBJ|EIO;4|tVT
zxvU9gRKLc^0ZAc8r#d`i`<k&&`o?STU0rSrU%LA)zLfm`NV7rhz$NW}p_ZWR;QnXz
zWQSP{-DQ7V`<wN-xpe(EfBW|0dd<Sc+x9&<t>XTk`^u%}Z|oCfijS;&u=qX4y+i*P
zxNgl$tY=WoUBAJ;As{}xe&3YSpA+rYYX4?da9rPaL;e7RoUa43#^bXrHM)D4U#Lv{
z%gD#}n|VSWB;pSLV`$#^EzQ8ap>e_Y*bVj#jB92#urVZ@WYJ-1ba)<_{+Itt4Nu?d
Ub+ZpMFfcH9y85}Sb4q9e02gKq6951J

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png
index f3bbc7bbc32af3c3d1c9e6ae44959b7e597bc630..ed83b0e931e642a8bddc998c48c8c5a18c78ffa4 100644
GIT binary patch
delta 1128
zcmdnX(aAZ%pq|Cq)5S5QV$R#SzD2hUcv?e!`zCmnT~WNXZgTGVd*1}E>CL>Oc=L+n
z)rC1iEI%0@*6#k(Gmpo1qJqky`}5}2@734zWjUM~tDf@b`S$78Uv62qLAZm@>fh$p
z$sK$~AWC7!kMp<XGnjNbe%ycR*Ystf%FWl3|L6Rh^VeU9O{!kO!o;Cq-xG#v1M?Nn
z|9y0P8!_p}^cUj24BlR=<lC-XH2!xqn8CMUY51SjMGUhTy!(HIt2df3ioN|IuHHCZ
zJ@C`+=s$n|K7Vz8|NlP||JJUHYP%*sQ{}nc>X7(cNe#`!cdQk^rXPGKYb?&NWnXy6
zYX;j_H}?82SovP?qDVpSr26gv={>W!yRUs`({4N{*w3(6EBMx|X<u{~*|APA%$O;d
z)bO@@f~oh~#V?|nrZL~)DtNCWy*8gUL#SgPM@B8T!?Fg|rRN_gw?%E)r<$Pb@b>P~
zxs8jzu4Ra2)zQ4W=D2+1eI^|i)^;`yK3)MCDX?#ktZvBG4}P<7=d*3g>g}sc7cPBY
z#Nx1ja>upnDKi+imCrvmH=>$n%f8TAJONTIcmDV8;mD{xZ4%0~-L#Z*E#sGU`Hjys
z7d-8p=~jDp^FG#)d8`YvUp==L{CXhG^W@vZO4C<2$lQDHBGPWiFwv2j1#0(3#y#un
z_bwLwuQ>HUT)_U={X6*z?xoZ#R$49JXum&Y@^Ot?mbJgMEE}$LZvXaNJ~qBvtTv;W
z<E7zEX$O9@j({uQIiy`QURO7lHaytic*LRBH|9J0ji!6^`>(k(&t$rA(Dik66R(oP
zudsw>js^QzZzw4JC^^6;s8FlD!I4GUWx|OI3<no7HaRo1wEtzC^5v#{g2Icx^*=Le
zeQ(GoOxPFNCc&`RUVd%9<W{E%DiSaL{saYYF~gUCHCy(vUU6ecSt}EJDYc&Akr*Tx
zGa4RTU^tjq&#-)hJ;T?V@&_i_aeZSiShJq>H?zcr?_D<-#Ppe>?kk_YdnkJ1nY&?M
z-R<~K)RuMHy=L&z(R92oGU?T2hWf4w6Gq+zJ?6p(q+MhLOPV4U$EPrSu`;)^eSBUM
z99<a=4^oO5*6UkTEl_cME&1QOwvU0ivbwTW?TTfsRDywr@RL`}CJYQ;JT|npDhPyq
zTC@B2arTO*T2?21oS)XVxMRU%`)G^K7YdL6&t$p85)tt6f4-=LaDwBJ|EIO;4|tVT
zxvU9gRKLc^0ZAc8r#d`i`<k&&`o?STU0rSrU%LA)zLfm`NV7rhz$NW}p_ZWR;QnXz
zWQSP{-DQ7V`<wN-xpe(EfBW|0dd<Sc+x9&<t>XTk`^u%}Z|oCfijS;&u=qX4y+i*P
zxNgl$tY=WoUBAJ;As{}xe&3YSpA+rYYX4?da9rPaL;e7RoUa43#^bXrHM)D4U#Lv{
z%gD#}n|VSWB;pSLV`$#^EzQ8ap>e_Y*bVj#jB92#urVZ@WYJ-1ba)<_{+Itt4Nu?d
Ub+ZpMFfcH9y85}Sb4q9e02gKq6951J

literal 1085
zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+7>k44ofy`glX=O&!2I3Q
z#WAE}&f7Vsb8kC{xT;P~kT9I!yX~Dr=#J(uLQBN;?{=I%q1M2xtgA8mhJdN@pB{_i
z`4#8i=rr5;zmE-ga>C~K^yAAfuiH@frha<e){4J2wXrokf4=>3KI>?@`q|k7`RC<%
z9o8#7c>QBC<BLF+8rk~zU2GO|?<ZZ~_y5=CD8=*l_vzR@oA&d4{^8{1ZM(|;d;fVO
zsla|e)NJjRtb1p4Kfjl6JKi^!GwRF!BmPVQP3r@XJXK=J<cRuaf872`joRH$0*gLg
z{cG={;bhBV8h`Wu`F;kc2a-((O&JtFa61+WuE=Bhv+vKF+y&9XbABG3>#$tS;<Nkq
zrr22z&dmR#cVHpsxj&KdY`J?uG-F0A$c1GLQDTho$KypB!dwqr|0vGBz*X==>7P{$
zYe3Tbtr)V!9v+GRe1G?~2l1i}x0J3p2Ygm;eejCmir7NArdjf;EUQ@-Y~%PUaODq&
zqQ#2t0Di}_;otuYECdPFr2e<JXX0o~=U}_e&~iYZ<)rI^U7R0&f7)EmnCDyYOgx`?
z?yLuA<nOW<WHuSs7b%|rJJGr^I^W5E->-+Wz5l&g`#_i1@oc|Hlk0ufoJ@|ax+wxW
z|BN!cLGEZ_uy3g3_`uBa;4wRg0gI`;y+ecIil09iA3SDn=$B`(t7G`F_s0*$Ge2=-
ztIt>Y?>}JYIM6S`^oK#IZi>JIc7adIq!>*FBXGG8m(dCznfL71{qKBTWTBjs|G(F-
z??2f(@9+7Ko9h^yHrUx;|I>eU@qg8S|DJw)`Q@YY+4?0@!p^?rt*fsyws$x?yYc?~
z`7tb3W(Q}^-^*Q)-DJGKLi)uOmh^uw>>9j<=lq;3?a1d_@a+68&O24YbAC40HheC%
zxu?4RYR;x9VP~J6*8Qw+UcL+|1<!nQW9y^)_B{Qv*1}s})OXHjS-=v%xZ|`d$0dO+
zZ|eK{<qv#lyzseIUV#A~M@&49XOHtU$lEj2{9*X;k@>*;qsRFZ&f&%vX39SV8{&W&
tR}6Iwe;9r+{?kAH{PA6s*#6HjA<z3;<G1@i7#J8BJYD@<);T3K0RX@X3TglV

diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-mid-2.png b/core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/environment/crux-floor-4-mid-2.png
rename to core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index a7164a71db..9034485d7a 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1680,7 +1680,7 @@ block.metal-floor-3.name = Metal Floor 3
 block.metal-floor-4.name = Metal Floor 4
 block.metal-floor-5.name = Metal Floor 5
 block.metal-floor-damaged.name = Damaged Metal Floor
-block.colored-floor.name = Colored Floor 
+block.colored-floor.name = Colored Floor
 block.colored-wall.name = Colored Wall
 block.character-overlay.name = Character Overlay
 block.character-overlay-white.name = Character Overlay (White)
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 5a7c4e3b20..39c646818c 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -62,7 +62,6 @@ public class Blocks{
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     //old metal floors
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
-
     //new metal floors
     cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, cruxFloor10, cruxFloor11, cruxFloor12,
 
@@ -843,7 +842,6 @@ public class Blocks{
             autotile = true;
             drawEdgeOut = false;
             drawEdgeIn = false;
-            autotileMidVariants = 2;
         }};
 
         cruxFloor5 = new Floor("crux-floor-5"){{
@@ -873,6 +871,7 @@ public class Blocks{
             autotile = true;
             drawEdgeOut = false;
             drawEdgeIn = false;
+            autotileMidVariants = 2;
         }};
 
         cruxFloor9 = new Floor("crux-floor-9"){{