From f53bc0a2683f65b91d54ade6c57b5082e414e657 Mon Sep 17 00:00:00 2001
From: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
Date: Fri, 1 Nov 2024 22:19:51 +0300
Subject: [PATCH] Improved sprites for all modded Status Effects

---
 res/sprites/statuses/hacked.png          | Bin 407 -> 309 bytes
 res/sprites/statuses/injected.png        | Bin 309 -> 238 bytes
 res/sprites/statuses/tokicite-slowed.png | Bin 340 -> 238 bytes
 src/fos/content/FOSStatuses.java         |  14 +++++++++-----
 src/fos/type/FOSStatusEffect.java        |  17 +++++++++++++++++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/res/sprites/statuses/hacked.png b/res/sprites/statuses/hacked.png
index 5acaf421f0246a681b35e74fdd94696abcd90705..2ef148c918a09e54f77b73e842de678ac118ba4f 100644
GIT binary patch
delta 270
zcmV+p0rCEq1GNH>Fn<8=Nkl<ZScUDC(H4Us3`5KQ|DV~*I0w6?4H4ZQ?2}CFjj3T~
zPhD93Q`w$&CHw$tEo8lR0epEN+AldUH$!iRz<$5%00Q``oR9=C_GT{4_hbjMrsJ9!
zm7D@J+sKU>-h1!!`t(P*0*`8W1Z=(;xFjG0u-QL6qk#P!qksFEuw?<GVblnT*>)61
z@$zdXcG6MIyaf}xtOs;}wXhN;#V~`TF=V2~Iuf%K!))dVUjAOee1k08%)vtoSQVkb
zO92SB3vNcFplW^wZU!8PVzkrtxxO5LCsy&tqgHxc?t)MPegQWFAK_i_r~abe`f}V9
UqD2XW00000Ne4wvM6N<$f|ZMW`Tzg`

delta 368
zcmV-$0gwK*0+$1jFn<A2Nkl<ZScT1&%MpVx3`AvS(i{a)LW-gU7eI44BqwEr&}RiE
z6P>^Y-g+&`G`cC4<@wfQy{}D=O(Ox>oHc$>RE6tR$+_1&6A{s4+jj5Ecgg}HYb`j3
zC!(|k9)QQ?$}~_5;&)&NJh%k)zBcVp=EUhFv;fxjWKO^WDu4FsvFQ1d1E>hTjzn;j
zssPDy%MA&C&GYUacHj!!bFTNbK>{lEZOtvq^Q{{e+y|nTtKm^zND*)+^x%3Qt$R<H
zcES~a^z=*=BEsAPZ_o8db(x{HFTa0qpqg;Jau1$4v2y^0M=Q7Hqxd>7V&%y59H)-s
zY~>mrH6Xq=1!;H*B%vtWYd{?C@00~W`@Qw^X?4Sc07Qfp89a)#3bHJ|0w)5h;EL@?
zOcC6Jje-*qwX;X<2sn|*fyxOs3ceGN!Lxck8;Ae+J0MZGt@s!4zlaYZ2tJ&Mafyon
O0000<MNUMnLSTaEnW=>U

diff --git a/res/sprites/statuses/injected.png b/res/sprites/statuses/injected.png
index 04dd2aaaf624948cca68323b3417e183dac33d39..2ded8a425f5bfcdc011f8089f6614755ed2ba393 100644
GIT binary patch
delta 197
zcmV;$06PD*0`38jF@LB@L_t(oh3%F*4!|G`L!tM-bGmdY`NyOk@Q4)rq&lW!9DS_G
z9TE|lgL5vk)*Lr;Sw<*xNnrq_c^Cj~9tPmdIH+v^J0MaaL_(whkPvAAR3J|e{Idt7
zFjdT?JJr-mhVRQVkB|!h0b#8stOweQ2qjn%we<kf+y!8LTRzR)lM8onw9r)^rciRd
z5Rr`tuTG_OAOIRfrVG-)Qm7&-i5|5ZA0c%Eh7o)#jb(o&00000NkvXXu0mjflNn9R

delta 269
zcmV+o0rLLt0kr~<F@Nt#L_t(oh3%KY6@oAjL>HbmM*);zQI<dfH0MDt;sJLyGwTLD
zxJMwFpUp6Y!JakGm%ANU%W@se%*G={z4|)9$-8))rslx&y2|6cF{ut@#8JrrmEtl$
zwYUu6iFr`n0D3^AOjrq#&Vee3G(eRh|2goRIe^Uci5Qv_c7K3{V4NR46K+8TL<{f*
zu$@rY%5=ih8qtkjwbyvt0v2MwV#c7}+$BNOH3wRI8;LW%pgIt(7>Tf^q_;qUP~He=
zIP{~EIr*AlbBB&sAyn}ufC7;brvMm;tT+u2L7-v-O^RL?LWy)a`&$s|_v8VIeuzJ%
TB5!#B0000<MFvhpu0mjfNAP$A

diff --git a/res/sprites/statuses/tokicite-slowed.png b/res/sprites/statuses/tokicite-slowed.png
index 2116af53fe8bc82fbc81f46900932c3e07f2435b..1c25c2804917c28363e79547ba504393da452e0c 100644
GIT binary patch
delta 198
zcmV;%06G8E0`38jFn<83Nkl<ZScUD?%MySf2nA5-|Npr*HKQX57l9rlYt5tLt&~+?
zul+3R{LK^cD8Pzf0kg+C1*jL!Kr{euK@@?GckKZSA_RaS8UPVdHljO$Yy^7+T7>qP
zN8^SI)e|q&%+usHChpWT3pjxI3cPy)21J(#h>qj56S%v|6hFYIkHP^`6TiO+e-CiY
z{O;q55L2fdiqIw~6th|c65nvnONi)y$13+a0EHN20TMmJN&o-=07*qoM6N<$f=cL9
Ag#Z8m

delta 301
zcmV+|0n+~N0n`GJFn<9KNkl<ZScScp-4%i`421*71=xdm9Kj`cb_qvd9`|qreL@2?
z$-S-VedEwHUz<M|q(ay0?d`o^*T;bFHP!$`iU89A7>EmMU|s7n%_1Ule?1AjpGL$v
zvStIJ0hoBP5Xj!e99X8g`b0-X5GMfbxCg`zpyZH+u-01;DSu_iK+pha(xMPMfZAGa
zfjHejF9;KWfj|?~TQ`W<an*(!R7+{<gKe#S)DND)Kbw=*Hv|YohITo?d`P4Klpr#$
z-37>!70NCEULK_bL`mE&1X?=Jx&s`OyemMd%tL^dMugZxH&6qC+Q1=TAegmg>qRCc
z<J@ZVZtrLQ874e=GbS89tq{?GgQj0C1TtMe0xo})CELO)00000NkvXXu0mjfWtxBH

diff --git a/src/fos/content/FOSStatuses.java b/src/fos/content/FOSStatuses.java
index a37e80e9..236d4b5d 100644
--- a/src/fos/content/FOSStatuses.java
+++ b/src/fos/content/FOSStatuses.java
@@ -4,8 +4,8 @@
 import arc.graphics.g2d.*;
 import arc.util.Time;
 import fos.graphics.FOSPal;
+import fos.type.*;
 import fos.world.draw.FOSStats;
-import fos.type.HackedEffect;
 import mindustry.entities.Effect;
 import mindustry.gen.Unit;
 import mindustry.type.StatusEffect;
@@ -22,7 +22,10 @@ public static void load() {
             color = FOSPal.hackedBack;
         }};
 
-        injected = new StatusEffect("injected"){
+        injected = new FOSStatusEffect("injected"){
+            {
+                color = FOSPal.hackedBack;
+            }
             @Override
             public void setStats() {
                 super.setStats();
@@ -38,14 +41,15 @@ public void draw(Unit unit) {
                 Draw.reset();
             }
         };
-        tokiciteSlowed = new StatusEffect("tokicite-slowed"){{
+        tokiciteSlowed = new FOSStatusEffect("tokicite-slowed"){{
             speedMultiplier = 0.25f;
             effect = FOSFx.tokiciteDrop;
+            color = Color.valueOf("d16792");
         }};
-        buildBoost = new StatusEffect("build-boost"){{
+        buildBoost = new FOSStatusEffect("build-boost"){{
             buildSpeedMultiplier = 1.25f;
         }};
-        dissolving = new StatusEffect("dissolving"){{
+        dissolving = new FOSStatusEffect("dissolving"){{
             healthMultiplier = 0.8f;
             damage = 1.5f;
             color = Color.valueOf("b3db81");
diff --git a/src/fos/type/FOSStatusEffect.java b/src/fos/type/FOSStatusEffect.java
index 0bdce6c1..d1657929 100644
--- a/src/fos/type/FOSStatusEffect.java
+++ b/src/fos/type/FOSStatusEffect.java
@@ -1,10 +1,13 @@
 package fos.type;
 
+import arc.Core;
+import arc.graphics.*;
 import arc.math.Mathf;
 import arc.util.*;
 import fos.gen.DamageAbsorbc;
 import mindustry.content.Fx;
 import mindustry.gen.Unit;
+import mindustry.graphics.*;
 import mindustry.type.StatusEffect;
 
 public class FOSStatusEffect extends StatusEffect {
@@ -29,4 +32,18 @@ public void update(Unit unit, float time) {
             effect.at(unit.x + Tmp.v1.x, unit.y + Tmp.v1.y, 0, color, parentizeEffect ? unit : null);
         }
     }
+
+    @Override
+    public void createIcons(MultiPacker packer) {
+        //color image
+        Pixmap base = Core.atlas.getPixmap(uiIcon).crop();
+        Pixmap tint = base;
+        base.each((x, y) -> tint.setRaw(x, y, Color.muli(tint.getRaw(x, y), color.rgba())));
+
+        //outline the image
+        Pixmap container = new Pixmap(tint.width + 6, tint.height + 6);
+        container.draw(base, 3, 3, true);
+        base = container.outline(Pal.gray, 3);
+        packer.add(MultiPacker.PageType.ui, name, base);
+    }
 }