From f9b6e3c0a622cdac340cd590a5000be2537969cf Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Jul 2025 19:07:31 -0400 Subject: [PATCH] More tile progress --- .../environment/crux-floor-1-flat-autotile.png | Bin 0 -> 1521 bytes .../blocks/environment/crux-floor-3-autotile.png | Bin 0 -> 1094 bytes .../blocks/environment/crux-floor-4-autotile.png | Bin 0 -> 1147 bytes .../sprites/blocks/environment/pipes.png | Bin 0 -> 296 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 9 ++++++++- tools/src/mindustry/tools/Generators.java | 5 +++-- 7 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/pipes.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..a5bbed72ead6be4eefa69de8b8f2b53518185a61 GIT binary patch literal 1521 zcmZuxdo6>HoB?mzp-z2EQW^ZnlYz4xBa{pNamx~eGZDgpqY z;zp(TfHrM=D8RwFn{a**G>|wSS4W_381o4Lw_a&&M&*$SVTRUx%27OW;HgiTA9wY zBE|j&yxb4P%`1trg1TsBv4C2!`$qD)x;Oj#Gx%E~6>(DGh?h*}nag_Ur3(o~)6Q$( zxu_dKx0}+Y?d$UzBOc-o%{^uyC#SV(@*x>cP^uQK+GDN6|MN+8{Ikoou!@cb+b^SX zfn_N6+;TaJiDun*dmVOGJ|>TnQdnIS9Ll7+ShuOHNyUBAz9g%33X}S*^ej9eyJ!JV z&u`4~lPqVki}>E337Ywa8ZzFoSsOcxH%r+><3}aI{>%fR{ls>yY4J^p&2w!5evb|J z^p=80#_m-!LBZ!=J`pFYK<mg5JDN>SAmb2w>KXWsa{WgyEMu}dBly}ZNSCEdH0ObmQ9nnZR(JVB>& z{?4NCl!o{47M^)V3jt9@NZx0>lfV{c`^#a`3=(H+NG1<;Ujlf)X zoJ1P1f@5^%OFt;kjgTcGFE5DBZThM0@)emwV!m52A9rb7(5jeI3c`2A=^A&yXtS#N z0i>pw>LEm|1%OA#;l{s{ds=BXdSMH~LsXvKPW*qjL+qQ1 zS!__46jN^qIa^02E`ql#y0@SYwEnilwa zZwVT;1)&GnrdQ8B9J9HqSLm-*pv|dWlUJ2NF2>Q@Cq* zuToSumVV8U+!Gx+?_G#ZUteI)=mQ-;KRAI37hrB==1KwTqf)NbniQD4WSb7cNe1#` ze{|}+w<$iS)#>4_a;F1j+^?NER})m5pLnWAW&52xntfUaxxRKp^VyW0-wT-b+?C21 zeeR2b(sLe`N+KzsoiN%IDfdgc({X(GDyDVM1pKbtJjSBq`c&KH1w|tnV>7Vrrg<0^ z*x(v9*nf8h9!E_QoRYZq1{rhGtRVW7RTqyKe@WI6gfU9^!;nrtj4@{s7MEs7cn}Ro z{|&YajxrrH@rvzO(AFo5!^edH*#==N@rqPW9Rs_NG(H1z+ZVnAss_3J^Bgsq%Z%5X zP8QK!KLr{U2(6NSQiutZ7#&w?)=1%ZTR%NSTGZDKe!S^`AXj_v9-M$OQvU#4dj)n1 zCLtLk%rT&nXpaJ1 zSQT9g;- hIG~yTwN&tpm^5|~0`A3^w1YhyaC7#g)Hw!c`~%-*xrqP( literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..5a30bd7107e32977c4c9d7b64ae8f3aeead44a22 GIT binary patch literal 1094 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U}5ldaSW-L z^LEbeKp967*PB~EJPAnX?&p_% zzSmlR-?H61ckcH0cW2FgnRxEqzjxn$uGz5f-=E-Lmmht7d-?d$`HlDI?O*>h;OwfO zMjvi}c4xk@n&XGnzZ8Zl5ytrA_otp?T$g`t^7nmze(a7?yl-D0@n>f6GkaSbzBqs0 z(zpMn|G25_z*iS`bIT>50n5+q-?2+(kDRs8mKXJ%^H~Tnm2E|$CCbU4Z{{arhR?()(pDc4eKB4b2+S5dhq&3 zH}i!>KrhsVGF$^m$ICXDb{9Na|MPup_J{kT4Y!o8I0t-IZhdfDvFO+MVwf^0IJ14Nvsek+bvIsDp7vMR^$k7SxsGOyE5Ud`Dz$LN1WaeCH@?C<-JoR?!P`d~a+c6ZpH?$xIczTT+p*bTJVlfmnQX_rM@ zivq9X>3`3E{9xpf=dg{TG^PaQz=p8=@lZU#ukgs76BuKP_D;YUd%%8xzd`=N|DqbZ idvp8c56pq#|4cE)p4MGzIl91tfx*+&&t;ucLK6VpSO>cR 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 new file mode 100644 index 0000000000000000000000000000000000000000..26d4509d07d8305c2cc435a6ff022076ce192ce2 GIT binary patch literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U@`S{aSW-L z^LDOd(QN}B*I3`a37%!26mPA&oqPV?H-V3OGw&?CYa)4dV(uiSpNtRp#>({XQg4|`4$=d_3X4pUDY$*jCOxcC+N!->oR2hT`}VtW7U<7)w2%-*(>=5A29XO zbISdYrMD)^UMhrX@?{&QFROeav#TzB@AxUgki5ZY@ezj8?26gbqN*=`Z_#1jA^PB6 z<(bwtny3!;w{cK4%q+UiK^99NvVITK=4QOxx}lZeFq8{o412lY1FTeeX8cU778w z7|xi$&gQ`fLw=hX7p<>foGkiZaq5A%1^Z*`i)A0=PIf(g*RuQX&$ut4Iake3GDgj< z$gcl)@9Wwdi}Z5^E>`(eG2d`(=5YSoaY5lwguT=i#!1f29gV-HwY=ls;Ih{~e(icU zBi0qotFL`$;Z<_^6}P~#CEz}@Nr#7>>;(meLR#E5AQq{WZ@}n`JADGsx8UjG253?#*8h^wUj_1#70R_TKe{yd65Y+JRmgZs*J)b z<~~6U&kI$@{>RK0Oi);VUjI@{m9IQAk6UKb)?W;40t@6grv-2bJybovYj=Ikgz$CX zw4P~ks>ABvXX}>KT~dp12@?z{6VW3wy?u?YHLNKlQWHey-ma_JBokvKQqKFbeuM zF!pq&G0AbiZ?N)QVt?S=0(*uMW@Z(3W|j7T49y?Er5Gq5aJceY?*;z@hJ3XH3`{mN j8=NL^l+OFQ?7z6cZBAo`-@B`Tr3r(ltDnm{r-UW|JF^!{ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/pipes.png b/core/assets-raw/sprites/blocks/environment/pipes.png new file mode 100644 index 0000000000000000000000000000000000000000..25962a405b4537e81cc4b093d49f49e579e19492 GIT binary patch literal 296 zcmV+@0oVSCP)Px#;z>k7R9J=Wm&*;qAPk00l{v^L?X^qf+L>}?iCmLW!XoL(6^d~1gBDfdKO(R{ z8T`P3Qq%N0q-XXR0RUk1{5Ay4FF|SvJck=3&7|-8-fBeMF51? zaMrdi&J=+ZB7|A>p3D)jssnU@{|2xWp(+41ATEms)$wvpH5D<0*^vOHj#mq!cm-65 zbIvr^!RiGP!<@Y-eDgFEb;E64R2>h6? b.asFloor().wall = darkMetal); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index a7c46b41e6..4c5a847e6d 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -89,8 +89,9 @@ public class Generators{ if(!iconPath.exists()){ //save the bottom right region as the "main" sprite for previews Pixmap out = new Pixmap(basePath); - Pixmap cropped = out.crop(96, 96, 32, 32); + Pixmap cropped = out.crop(32, 32, 32, 32); iconPath.writePng(cropped); + iconPath.parent().parent().parent().child("editor").child("editor-" + block.name + ".png").writePng(cropped); out.dispose(); gens.put(block, cropped); } @@ -830,7 +831,7 @@ public class Generators{ generate("edges", () -> { content.blocks().each(b -> b instanceof Floor && !(b instanceof OverlayFloor) && !b.isAir(), floor -> { - if(has(floor.name + "-edge") || floor.blendGroup != floor){ + if(has(floor.name + "-edge") || floor.blendGroup != floor || (!floor.drawEdgeOut)){ return; }