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 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U~%$vaSW-L z^LCDPnXsdP>->@v9tr&S8b9)#cp?!bGyA|T1_`qSrVih(-6Ne&Mgh!^>E%qNJl~)9pcIoztg3 zuI!OT6;gsO6Xs8_s^6#>#p7?(d9<;Ju`d zB_b|klUfeLrAtx03MmXxo1%IYVi;~sit1JfVOaWPi-_Y41~2bS)g}SPh?5zLP2$e= z3t#Wb+ZZu}_tC?Df~&7qUfbHXd$;`N@AIV(W|iKPoiFoLXW^-X{tfG1?>cMm{kh=3 z#wNc!hn>f#TJiH%G2fUPXT|h#;nco_?-g;%H>4frzX=k|;9VWUQhWTP#KFxBZ7SLB z3v5;1at82jGnhbmX0B@G9r`Q`>udcnPIcHwomU~T7 z&gZ%I{QIl*TjKTX&G*u!oNNS3s(;_D;#TuG!QQaC{QBPiC!ARt*pw$sn*X9(!G|G3 zgDLZ8XRTlh7Xz=$0#*Bs(vCYA0t#7feG;B6*uujg>K5Qtr{pT|DEoopqIy>wJ4-FS z`pFySGjwj(zaNpW$nE{JL+-%#@Ai!c1S@Wo-(Z;Zr=>m7@8Ib=XSNO6_7786I9J?C z-@)+fiMkDMx%|Cv;#v)gKRNTA{VMK+&tN!q%D+N-+xEXIPAmqYb%#!0*!w0~{+&L{ z*{S+RkFMvxnH@3zuwqO-Qv|=C)4nHGQagATi2aOu?fKBC;ntJv^|PCIGh|JT&-%M^ z2iJnKpG*6V*~}TYDBXWmQM-dUd-#AsK4t#Ls){ch8vEnzj>U2INHIQ@pVqHAy=k$l!_UK?48O)XOySU|pHp*Y zr{oh`rc?6z^2P7js(KqfEkEgg?rlQ8V8FkUpC@YN4gig^_qS7#ebHj{1 zmijY1_|88HR@hbJ!Pd|zm;uU9z|>H}AR*cK?1Ps}KzB_BOG6`v7mvSj)2t`X+6-S@ z0zld6ikkc^#sqby?uVXkpwz+MP%jw4x4!NA?yXOl56FL9#Gzo`?7tmYv@m$O`njxg HN@xNA9^>)9 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/ui/sectors/sector-craters.png b/core/assets-raw/sprites/ui/sectors/sector-craters.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf2b01fb327c72fae1f1a9d1d942b8b3fc322b8 GIT binary patch literal 1292 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 Ezh{UT)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()); } }