From 3096397fd3215164cd7cc3d16762f4c19f054ea5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 8 Apr 2025 01:23:58 -0400 Subject: [PATCH] WIP sector icons --- .gitignore | 3 +++ .../ui/sectors/sector-biomassFacility.png | Bin 0 -> 1160 bytes .../sprites/ui/sectors/sector-craters.png | Bin 0 -> 1292 bytes .../sprites/ui/sectors/sector-frozenForest.png | Bin 0 -> 1379 bytes .../sprites/ui/sectors/sector-groundZero.png | Bin 0 -> 1324 bytes .../sprites/ui/sectors/sector-ruinousShores.png | Bin 0 -> 1131 bytes core/src/mindustry/type/SectorPreset.java | 3 ++- 7 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/ui/sectors/sector-biomassFacility.png create mode 100644 core/assets-raw/sprites/ui/sectors/sector-craters.png create mode 100644 core/assets-raw/sprites/ui/sectors/sector-frozenForest.png create mode 100644 core/assets-raw/sprites/ui/sectors/sector-groundZero.png create mode 100644 core/assets-raw/sprites/ui/sectors/sector-ruinousShores.png diff --git a/.gitignore b/.gitignore index 4ebcbb7233..5e3b7987ef 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,6 @@ android/libs/ # ignored due to frequent branch conflicts. core/assets/logicids.dat + +# project files for the sectors +core/assets-raw/sprites/ui/sectors/*.json \ No newline at end of file diff --git a/core/assets-raw/sprites/ui/sectors/sector-biomassFacility.png b/core/assets-raw/sprites/ui/sectors/sector-biomassFacility.png new file mode 100644 index 0000000000000000000000000000000000000000..998605309c0a018c39bc489d45b24f0622b4a12e GIT binary patch literal 1160 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 F1OU~fNQ(df literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/ui/sectors/sector-frozenForest.png b/core/assets-raw/sprites/ui/sectors/sector-frozenForest.png new file mode 100644 index 0000000000000000000000000000000000000000..c1480b6729725ba7e26e9a13ede01923bb1e69b1 GIT binary patch literal 1379 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_SnwLD!MLn;{G&NVE$Y9P?| zeW~|Mwe}ODmkzLMWL`E92?!|U(&Ac?ajA$?Yuy3G3=Pf0XOgD`#^u;Y-nv__`u9GM zaiP)1Ex+u4-`wP**Wz>5^_%HT0WJeek%S_R15W}PPA+7a?98av&g8?#Izt9i;&@2I z@ALL@n|#YJy#0Pa@pshJnh)>o_LyX+^OpSHn_y(%?LIG^rR4Ws=D8eM zd;Oo+)>)rr+9Kz=RdHL}`NjY3wbB{#IVJYVWyv$f2^rMHhOB2?qnhyJ*NS+SD9-~Q zat(HJUzpbL@OEOE^a@qR!`qLR$T|G>*&tr><3(lHq;Iio9EJiD5B2YnJG3@=o{$Td zy94*|nJE$;WfZF_GQF-^#Y&pz?y@mb##nbQ;<`5&t5{EE75mvg~H^@Zl2 zmbCfNx8CPH@Ox?ar^W4l^zHU_><;bi%f2#P_))u0@(M@RChx~@G+&51E`Fff81}=7 z@ymxv4#qVL8Foc@FOc0Az)-tJWdldNMg#9Hp@>#}kpq1iuNBWZGV*NPr*@%%NkX`G zQ#X@^KqM2_1D6m^jRs{w)ddXaTqZX#F?6UfvN8y|Hm&<#-*C^-n;}-fsQO37q#6N6 z3A<^3&OFv*IDEY5*T%Hp{+mlJkR1?3_S9u@4ZY71(`Q1ojZ%kphjma|FjU6gdY)6^R&#k4}93T#V#mM zh(XrwS7nvF3@^?Z*Tj}VxXU9LN}fyZ<8@_PV153> zTMKQ5U7vaGPdj_?@0VZR#n0F0=WkkDdq(cx>h1cQ)>^I8TVwgPQ#xggu*>mHr(0`j+=Fd&~SCyKEBv#~pY-fB&Yn zKONfil|DUx&;0K_tHOB)j|&ggA26M05pv;-U&Nsx>?xpG)2Y(nqu{vZgX$~>qYW&A zho^TiooEnp;f-I!rNHbdU|Hkn&ocGHvwyMMo}S*md;QHY*%SY!3w-05aDihX+uE|g zzxt|s7?>nn-hNZ^zR=3>$f6_ct;^H}(u_wE1*-4Y^Tu*2Fv~2wsPe*(LGppI)g+c! zE(PY8rS20KL^HZE=pHO|JaPQ}``s}U7n>dws$F!fYm3U83bq%%Om8owO;(5(`SnBa zLN`lT;#sAGFE@Qqzs_(`bpu~!3Fovpp2{*oiBP8X1#VLl-d^2sbaz9BP({1ZES6~f z_I3Bz+$J)J9@7w-Q*B#QEXSbBxT|&xOZfD5=hypl%Dd;x<#1}9a7$P7kkAyCxKi=6 zELGkGx9;T#Ra}d<5q+b2Fv@zf$Aj4C>(Uvo3C+3v|AmmktJ{AKPIxt4`rD_)xN6<1 z<&C$5-rT*PA*AqnWu43#RmZn=ZW9?|-7i-)gmFgI%iC7070Q_JnVk_Q5ER`K_HnP5 zfMU(XD8Vh;CEh-&o~+>YW6@5PHCr@RKdPRn5cFfwUbPP~h1ZU{PgjWgk+e~xWUa^g zM~l4#3~M$*B6{CC4WpTwVS#zP~d&)6d1jl7WGN!PC{x JWt~$(695d8Wo-Ze literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/ui/sectors/sector-groundZero.png b/core/assets-raw/sprites/ui/sectors/sector-groundZero.png new file mode 100644 index 0000000000000000000000000000000000000000..66fa502e75dff12a36a738d6b9a1014ebc06608a GIT binary patch literal 1324 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_SnK6|=2hEy=Vo#R_{+kmGv z@%^SVj#jq*RR^Bg%#~YmTIcS}6bWxL-OubQatFSzeN^Jc^kLr#p{1{M8h`$NUUaiY zMbdBfeCLh4|Bs&!zF}9*X*uIgyq)R^;XDoZ_FAt3{}qi>YMuu-*(SCH79VowT-PGu za{8v7>W@Qz1*-JEYBUxznymXAKK(%M=ULr0+TIT~eH7HLS?%>;-OGumcWZk+SoKgc z`}b*^e z)MAVY6g=#&;KdLc@Z^JVhR^|#%}zf!RX7#6A~pZ8bg?{hT_aJ)Zc9U zm9~=~zAv~MeE55~L*@z|d;YB0^Ec))+i*{RDBm0x-?w}60e3~?KSq15%sdgtdZ+E| zhu0rM-XA`FK*Z{B{$cOCcU}8pcwWjrTEBh!yIXbp_m^KasM@%q+-(E5Bgez+9QMB+ z44MpHKRQnc9pG#bt5aIV62P>eZGMLaV-LfNhw6(w85A3)e-NIiVjzAX`bVdR&+M&as=dVHd;RpQW4=%r^bBko9J?X`gRUtKh=C zT0p5qUywzh*q@k*Qu!iPG=_PGcW%{*u`>pIxH&`E%Y2>DqE)O*TA+?bCNXWEF5f>{GGo zdMm@Dj1_UOe0B&r$nc2o-6yk-Mc{$r;%i@d%9%JGY`FMp<-w&4OeQ5$tfC6F8yI-* zSN-1$N`UF-xpk8yoLWAp$}(y=$_5^q{x+OJRYN)GM^QDO17}~S*uE!zOq!1KIv$>0 zyqdvlgL>AFq7q3D&XVoPM>osNZ+lbApdI|l{ZEPFiQf|wLcNN$qd1qa>|1eib%o{( zp&tv(manR2oWd}BTFt6_wm>GIsN&3B(jJ@}UYuO~v&=yCzykC3bUzpqnh z5xTL!w0x?1lg7aqljm!{c}S?vX#O@QbUx=2mSjo8_^<6wng=D^&X%4CJ~+i;`ozyN k-y$qjFC>1E`Oo~PXT`<4A1_{FU|?YIboFyt=akR{0Gn}DIRF3v literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/ui/sectors/sector-ruinousShores.png b/core/assets-raw/sprites/ui/sectors/sector-ruinousShores.png new file mode 100644 index 0000000000000000000000000000000000000000..75f932b979b91b39306e427055d052ab4b90e4ea GIT binary patch literal 1131 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_Snj67W&Ln;{G&OMteZ79NK zzp`DyAx}?XdQ7qC1g;>DJk5hAR9lxcvRt?tzI{QEhy&x?t$Y6eKJk6W97|7w99@fM z(djA=7B9%`n|u9&0?P#pB2oLfY=dW)pTEC;?slk+z3sZPlD%`*x3^z@@m|plb(ok=G%WpdWD>`&Pr}ZE0u6?iPt>2eTu`^aD9*?zF)6q%NvFy1XXkGY zjsqP+pM+}#&rF>E!p(t!ZOWASFWfe`)G4_-Fi3x#Fu$U%%4W^P`4%>F_;gru4+QUH zy?*+q7lZc4Y4*=M6Zlv*H0?bh&Zv{_|H+l%^o`jyf(L58X~eS_^zS_-&gio_{b$!c zfhV>h8p{ypZFMl?)&sqlHt?er>C_Uo*bW`-_I~X-hH1Jd&8fIPoYK( zPmWJsAH=9&zpQ2|2gA?8r`q2u8*V*ypT7LWbH)kr?2$|kb+$9u8~*Gv;AQyvHBpS= z)9WKD3{S3~e#S5%-h4Kb!#@4!>kL~|8J_%3QjE`LcG#yM_Gzmch^raz4dPz=v{i-S z$?r+d`<}5i)WjE^ygr9v!h3JOpR=s^AL#BctBgLW8=qXx@Z@)p)4n#4flHsP)(3He z_Pqlcu=MF_X@*a=A1ACA0a26mJ>8%Dexw;+JNdvQh5O0jwoH~+> zpOQ~p{~J`$$pP}`uWw96ZXmCkZjqd#%mni7#=8!uIVQ*l@AJxGSGHeQFe`3 zpBtq*^v*XOY*l#jJ|5(bI_XbW#Th=`p1A%u!-V_OYD$?M>Z(6YWpb#S{Ymv@$DgvN ztMi3!2(3MBZ!?GQxc&Zpt^b}+-0AS|<+HzK>>0XDPySC{|1R7?TTtQu{+hez8NbOf zeu_UGeqW_vy`aMXwKcr9tZ#Igo_s%j{YLVGI37 zn^|Fh-m??e0~k)MpS=_8oY!fcHFrVr5vdh_7Ze5APqbMZ{_Kj>j-S+bV*PC0Pgl)3 zTdHno#ZT%Jt7kct{Pb-ZyF$~h4PU-~5_MoHO?dnAs!Rh%(&WSEXL~9L9#NS-{oZm0 zr4Cm=`R4vc7lGzGa%%r8&T_lD*qnXh6tK2A;&titv};}oxy_Nczg8JlYwnolxb~^l z;td)43cnt>?cdj-bC0LX>O|mrZL8H~%!_%;w!B{1dG+?eKsMV`rB_ZZ`^<2!`TgIY z)d`;)1@t*jY(MzKB_LDs#P-8)JR&qTPi#N>#V6rgFZYw#$#ohg(^Z~4S3JEkAv^NK kdG~F}55q1^m_L2LwoZ(CjhmdKI;Vst0B498)c^nh literal 0 HcmV?d00001 diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index fee095e66a..786c58829c 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -1,5 +1,6 @@ package mindustry.type; +import arc.*; import arc.func.*; import mindustry.ctype.*; import mindustry.game.*; @@ -63,7 +64,7 @@ public class SectorPreset extends UnlockableContent{ @Override public void loadIcon(){ if(Icon.terrain != null){ - uiIcon = fullIcon = Icon.terrain.getRegion(); + uiIcon = fullIcon = Core.atlas.find("sector-" + name, Icon.terrain.getRegion()); } }