From 3d5363692c7516d84cefa95d786966754e231a77 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Jun 2025 21:24:56 -0400 Subject: [PATCH] wip crux floor --- .../blocks/environment/crux-floor-1-autotile.png | Bin 0 -> 2800 bytes .../sprites/blocks/environment/crux-floor-1.png | Bin 0 -> 121 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 10 +++++++++- gradle.properties | 2 +- .../src/mindustry/tools/ImageTileGenerator.java | 2 +- 6 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-1.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..d73a9a72dce29f6ee9dda94c0ba3a8c3a5c82a7c GIT binary patch literal 2800 zcmb_edpy(q7yo`|n+-Ad+prOl+k_{|-PFi+Bo$FoJv_7$?Rng0$t4V3q~dW4xlFn& zlgdO<7^0Msp$NH!#TI+^{PFwm_uudL$LDj-=khwQbI$91-sfa^d+y&Rp(X(Uz&2L` zo+y%(e-{ES+S}}ocZmcTP2BGU)U(ku03cE0ig)xQ7tR+QIL{%-r3zaBr?R^ZBmJZ1 zk{b|>=MCkixJO0wcu#@8blmt7Y(#P|+T572ofz-OE|Uw9g%TX{@trq{%bnr@0(YW}!UfLF`|GRAqn|x7F}wufD9TeihW|O~$@S*k`$bT9 zXpW=rjh6YXp`wv5q<*;;B@1~@@6jh_aB8L-{H2)^J~!E6XIdPXk0O`sU>tr+@PN_pWP;@CUm?U-zWrT0=lYRUiu186pKo#0*lN=^;+p+0XJR1Y4f-E6u z$I?Ues0J`!FbeF31$_JIQ2@XR8((q|Su-T3i2~^kn#w>afYYwEasawraAG*woCs59 zYRADd3YfAU=S#-&ES7%lR$)7sAum_O9&hSea(_i4oWQ4=6z+*Np;ja6+sChJHi>g> zZB$Nxd9PW0P#n$;%tE0Py1BoKi`u+Q+6**aOL;gNQEnmhw3(=!JiA#*@D$4EvFe#C zFn2)glG^+6SE*}4OAsFQ5wimSL>Cgzz$eR)uRJmv_`rEF5_5DwK0wzUthJ5rAJTGLnTr%y#799?Fmg?nZ+ z8FUBR1*hEV4mC$?#S1``%(C3yv9jsP4mSTD%~K+~HuEd2j)VgupHK?(r#*P6@90IJDf5y> zdJl_^P&xr26R$gR17GfyIRS4y>8h~W>3R|(}C)KcvyJ`-6OhJZ}kO4^q z{;e8VK+HWrvO`{vp?r%yFnStWiZqA=BH3xk5GKKTNsJY-y%;&Jj{)2~fcH3p@aV{o@?$UJU+uV{?AV>~t1kX`d*Rn&;h8#GR!1q_nrsv}HrvSz{txf+ z{uI`#a7`kKwsHyXnv*SuW}*`k*j04#zO}8!qC-Q`>GO+Hkj5B$cfjy&g<)*)w9ijR z-`z_lyrVGgAR!gUGr2%q*K; zrAezWq8ibN%3WHyEE)UxQj0niZWTr0m|g)a+lN;G*ZPkpM` zTGy<~+K?JFS9B9@+pRg9)f@~Z==;-$?BT+;5Tr_|G;P9Wvm z)Fn;K*(9ZN(@tOLN$g8_(Xn+KDBSl;{Gh-~)E4~iT+)#f9VoppY$pTti#2m!Wzo~QULrC&2V}k zSv^~rv#_Cda3AehBOo&QQdIk9(d_|FYeDdyTD@q2x!l=-S2AB)nQbpPyA~IJ%X*aM z;9TN^^V@xT+Vs+j21CB)Rnyu}gX_bVX>k*z*e$usc1`8_A$k}03QZC*jPDJLWuZgW zYmk@rRrAf6ROkFd$pCGSo`k z^?Ae3m-~s^WkHuP#VUiUBkF^`jPmb+TH9Lq4E#JTZDBS|gVz=P@zf_5K}6%Ji~coJ z+G!J;e1U@7{Oy(WfJ4km>=Lh+W$ivl_B@b6)5!E?BC!eErLt~WH zd~*6jj-Kr=??w3M^pG;%*_biwC)4mR50-Zs##G*_;5;O{sw2YH5VLoRICw34j2hxL zxixs=oZ_bz#a3bjm0o?^G3NNrb8f9``E`SprCdLJUzk4AD>iCixtU-3yZ*YH&DPva zrnjK+HhNg;a@`OR=3fI0o#}P!(VmtGOYRKqi`;cDI5z59c75VKFZgK9rX)kyxK5yG zgj4DdSJ%(hR`z@lLHtvbN5}U&8sE#wrH_S;$V ziSVyMVlX~9a&e|p^LnY~H8LakwQi6j(4u#wu%TG|WK#wTh3+bAo_x@21j% zru*OXK0KrFlaEYcuHK!2+Yb`g1l?x$LR(}S#Q9rxEa&0IPb}Mp#XxsK0tH;MZIK}r b^Mo>vx8_3$^S)NJkz=xWA0wJ@1A?s5~vCZI85S+N@EgaJLVJx67_WTb6Mw< G&;$S%nIF#p literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 8034be5937..c503a0a1e8 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -600,3 +600,4 @@ 63082=stone-vent|block-stone-vent-ui 63081=basalt-vent|block-basalt-vent-ui 63080=tile-logic-display|block-tile-logic-display-ui +63079=crux-floor-1|block-crux-floor-1-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4491580f73..f764a59394 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, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, pebbles, tendrils, //ores @@ -808,6 +809,13 @@ public class Blocks{ darkMetal = new StaticWall("dark-metal"); + cruxFloor1 = new Floor("crux-floor-1"){{ + autotile = true; + emitLight = true; + lightRadius = 30f; + lightColor = Team.crux.color.cpy().a(0.3f); + }}; + Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6) .each(b -> b.asFloor().wall = darkMetal); diff --git a/gradle.properties b/gradle.properties index ce43e41c4b..a8e0be2bf0 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=79c4cf021d +archash=9b55a5d628 diff --git a/tools/src/mindustry/tools/ImageTileGenerator.java b/tools/src/mindustry/tools/ImageTileGenerator.java index bc5c01138d..4f9b1e98d8 100644 --- a/tools/src/mindustry/tools/ImageTileGenerator.java +++ b/tools/src/mindustry/tools/ImageTileGenerator.java @@ -56,7 +56,7 @@ public class ImageTileGenerator{ for(int i = 0; i < 47; i++){ int cx = i % 12, cy = i / 12; Pixmap cropped = out.crop(cx * cellSize, cy * cellSize, cellSize, cellSize); - outputDir.child(name + "-" + i).writePng(cropped); + outputDir.child(name + "-" + i + ".png").writePng(cropped); cropped.dispose(); }