From ee1cbf5b0110bfb9df6d42832a29f1aaa3a1b76d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 15 Jul 2025 01:29:38 -0400 Subject: [PATCH] another floor --- .../environment/crux-floor-10-autotile.png | Bin 0 -> 1047 bytes .../crux-floor-6-autotile-old.aseprite | Bin 1155 -> 0 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 8 +++++++- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png delete mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile-old.aseprite diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c0d9b491f46e4cb3e4c750c22ac74d0d47e4ba GIT binary patch literal 1047 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V7}<-;uumf z=j~j_qT2>Mu5ekt^Y-`m`#PU2`Sa`J<*)n9|407|PiN?Qe|+-cjz9S~ zBSaXE_9y%6DSzId_Ie?MMxD*HIcZPoPd z(vFW57zza%EMSgeXY5G6$F)spqu9OO^VWZ{ln%lu5$24$`mj(<-t>}PdRsejvXEyG$w>4*1f z$%O8U?;<3Qs{n0IDLw9Xe1hfyp8uL}A71o)abZ!c?g5?unf8oR|Nfkt^uq6zd4qYO zVCQ=Q=k!bAjIu&E6x-JMY~^aGK=SSK(&~yU*Q?tlc3s+KYqRM5I%l4_p2808|Nih9 zmZW!m`|#>t&1&0QhlN+@9as?yq*v-4kj%U)Yf}{T{AX3{A0v6)Iv1Jrg;#kV{AKr! ztvTbO%@{L@+vTG@&@a=MI0gPWzD4AK>W&1F`kC998j>B*!ytXvy9YD>oMSKs#lW1* zTZi4>g#WTrV!QdRp!@FTd;S5p`CY@t6JW)%Ol=zrXBh)I6A(>n&xH8 zg#CZEHsR{G*Lsip`W`>@XILBZF`}p{CI87Ia|WdjV5;kX)f@Ad!-b{J#KZ&B)-fakr6k_5H(c8wr~=G^knsD-U~u=Z^)$V&1;Cun;OXk;vd$@?2>{gu)dTaf%58stmg8(dApKN|Taqrl?~ zoSXamoqNxLc!C&jh$AYnX^1$2Ad2vM37m^2iFw%G2UM6p{3t%gibG-{UUM}u%2()& zIF661)8OD^&6jIG&EB4wer!t?|Kk!*{dU1!Cp}(q`oU&nM;iH?X+y~uc^f{-$j;Pi z%hI;(&o@mJoT`*%ko2%$6A+78+)ON_>?Tk`gNQ++if!(%A?+r}KL&8;@4rAC=F zD!k7E;b1PYv7o$omnQvtT$!VJUP2$t9*I8Q-m`(abW=+Dyw0w|8#8fdSJYbk5`C*A zZwYAWTR$+}xGmXoQn$Kd9KwB(zm8O4L>~D4`3dzB`_+dWA1L=KrtUSO>mg9WTs+6r zRR@3Q1(#sU?W3e+zfF&l6;}P3b!BJ!b8AseityA9>vh4D+grD+ar1Pihlx`z(2P-4+f zBHZN~D%c?os>@IkaN4F4bry)_@P6n&*XTYmidd{|m}+s)=dxzr`B|_1pX;$oQd@YRs#HprgE4pxU`-sJHzJS`IqZ ux`s*CFhd7w?Ox?tRF8cfVq?0l0~b%;YIS+F(~FXll8!h1tNMju8=e8LMoUuw diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 14f185c521..0904a6a2a9 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -610,3 +610,4 @@ 63072=crux-floor-7|block-crux-floor-7-ui 63071=crux-floor-8|block-crux-floor-8-ui 63070=crux-floor-9|block-crux-floor-9-ui +63069=crux-floor-10|block-crux-floor-10-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b0ccdff4b3..b3c746c071 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -59,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, cruxFloor7, cruxFloor8, cruxFloor9, coloredFloor, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, cruxFloor10, coloredFloor, pebbles, tendrils, //ores @@ -869,6 +869,12 @@ public class Blocks{ drawEdgeIn = false; }}; + cruxFloor10 = new Floor("crux-floor-10"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + coloredFloor = new ColoredFloor("colored-floor"){{ autotile = true; drawEdgeOut = false;