From e28b548a03d616a870665e31fbe597b44efba04b Mon Sep 17 00:00:00 2001
From: cindyle1 <cindylee4675@gmail.com>
Date: Mon, 11 Sep 2023 11:35:12 +1000
Subject: [PATCH] Changed stun effect animation to suit the game more.

---
 .../images/projectiles/oldstun_effect.atlas   |  41 ++++++++++++++++++
 .../images/projectiles/oldstun_effect.png     | Bin 0 -> 1146 bytes
 .../images/projectiles/stun_effect.atlas      |  32 +++++++-------
 .../assets/images/projectiles/stun_effect.png | Bin 1146 -> 647 bytes
 .../components/tasks/StunTowerCombatTask.java |   3 +-
 .../destructors/ProjectileDestructors.java    |   1 +
 6 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 source/core/assets/images/projectiles/oldstun_effect.atlas
 create mode 100644 source/core/assets/images/projectiles/oldstun_effect.png

diff --git a/source/core/assets/images/projectiles/oldstun_effect.atlas b/source/core/assets/images/projectiles/oldstun_effect.atlas
new file mode 100644
index 000000000..a50132d0b
--- /dev/null
+++ b/source/core/assets/images/projectiles/oldstun_effect.atlas
@@ -0,0 +1,41 @@
+
+stun_effect.png
+size: 256, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 86, 3
+  size: 41, 27
+  orig: 41, 27
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 129, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 44, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 86, 3
+  size: 41, 27
+  orig: 41, 27
+  offset: 0, 0
+  index: -1
\ No newline at end of file
diff --git a/source/core/assets/images/projectiles/oldstun_effect.png b/source/core/assets/images/projectiles/oldstun_effect.png
new file mode 100644
index 0000000000000000000000000000000000000000..238eac60d99c88d68091d07bfcbeeafbfad971f7
GIT binary patch
literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq00961001Be1^@s6{i&wp000C*Nkl<ZcwX(C
z&1w`u6ouzq{7q27wIFU>xDbR0;@*XVE_AP3!FTZ4ViIBqS@;4%<aX-ToIYLET{Bem
z^x*m6(9=Itb*AsVRo$JLtX4t@A%qY@2qA<JLI@#*5JCvCImb_LjcN(7r=|H@DtxY{
zB=#H*Xij+i>CxT6e%I;Iliu+);68G~<8vNc_$!6Il&Ce<$Hk|^)y0>?)z$ZhtKT0E
z1|D)cd2xGIuc9&>&=PrJU4DIF%WKr-w~z6-T5$g*%6W8ua}NUUiwkB-{yA!6ZF<pP
zd_L^f|NMO1oiCH^JEqvO!ZA_!*~A`z!3!D$IVc`;_NHH0*MFZ~BY1obu<s!Dwvk6$
zZ!t)XVg2CMNJ(*ZK5zV29|YWo$&21S*}3xmyYn_8^ooN)ZNH)sm<S<|yq-+RRAFI(
zc^frIc;fY)dmO|1NL`I^F{Ol`r>0kLFKAHAQ(~X^{#JvQXn+MMC>BIQG3d5De|JA7
zO(&<H2-SjL=rMY-<<*ZzvwF;7?Q`*S;Y_K8S3GAXo4s+M853T;uvhonV$c!|;NXs^
zHwgIaL{U`_e!@#qSYXlLOdeBM+qvR*A1p2=IJT-+Zx40$_Fnd(sSEG%@s@#Q+x<AP
zU^u`SFy0=5x=vIotXB7c2_J*~-rrz$n#rSs9#3B0>6Sb&u@Be4d&6SlzDwKp<9s0C
zfvu%yu>&|kLSP5M_8E0oPl2iLoq2@w)QO893m<)?W>(i6S1X%hUQ&au3qPmWb3Bki
zH^miZRt&b!c)Oy+V~bfIArIZMWB~H@+@A<r``(7m*Q=YD+vg+2ePYj{#LQk+?{Wah
zd7L{TL;r)KC_P8?{+^bE`Qa;oR8B0-x7ZL&Ko0cWm)B$DJlbnaNS<M9gKc}?z5e%n
z0B|qKX8_Lnyf4PL$iPX40psm4&>_G)2;it+^O7~;W3cbnbC~@T9@$@Qj}El&1yDRl
zq9;~uuiSph590e%&njXb0JeRqO|bwt0Z=qs#)87vJP4R-KeS?BDD;TmPe^(6ZKm2D
z9rjoH5D?e>J+2mBv0vBNp8->aZ%P%v27o;Rf*b>O`g)xN9Bf+-z6g{a2&x5t8;`ba
zFhe!;=z!Oa{|snKd2Znq`iy>Xph=0(b0;SFo%^fSVoNB<U7}ecaIpQgCrR(#uW@m0
z>v7CyZI3Ce?M=T3G?!OzFKE)!z#9}ie<nZwbN|>%Yyl)eOa>1$1|DZD{-F)4_9d&g
z1)B6|voFuUsM;QLSo^s_phT^_dV41Q80bF-lfh)k;KJ>AADFvW<o&ha_DejXkCbYA
z%z=I3V8q3gDy;QvTHmX+*WD`V=fJ{)W{GzG{-8?$TXF&M@nfpZrXKM<In9Op_I{^|
zYwp?9J?S5U2+@dK!Q`~d*_6FZNeEF07tff45JCtcgb+dqA%w{B4@hDN%KbKkQUCw|
M07*qoM6N<$g87*=EdT%j

literal 0
HcmV?d00001

diff --git a/source/core/assets/images/projectiles/stun_effect.atlas b/source/core/assets/images/projectiles/stun_effect.atlas
index a50132d0b..6aa98a315 100644
--- a/source/core/assets/images/projectiles/stun_effect.atlas
+++ b/source/core/assets/images/projectiles/stun_effect.atlas
@@ -1,41 +1,41 @@
 
 stun_effect.png
-size: 256, 32
+size: 128, 32
 format: RGBA8888
 filter: Nearest, Nearest
 repeat: none
 projectile
   rotate: false
-  xy: 86, 3
-  size: 41, 27
-  orig: 41, 27
+  xy: 2, 2
+  size: 21, 19
+  orig: 21, 19
   offset: 0, 0
   index: -1
 projectile
   rotate: false
-  xy: 2, 2
-  size: 40, 28
-  orig: 40, 28
+  xy: 48, 2
+  size: 20, 19
+  orig: 20, 19
   offset: 0, 0
   index: -1
 projectile
   rotate: false
-  xy: 129, 2
-  size: 40, 28
-  orig: 40, 28
+  xy: 25, 2
+  size: 21, 19
+  orig: 21, 19
   offset: 0, 0
   index: -1
 projectile
   rotate: false
-  xy: 44, 2
-  size: 40, 28
-  orig: 40, 28
+  xy: 70, 2
+  size: 17, 19
+  orig: 17, 19
   offset: 0, 0
   index: -1
 default
   rotate: false
-  xy: 86, 3
-  size: 41, 27
-  orig: 41, 27
+  xy: 2, 2
+  size: 21, 19
+  orig: 21, 19
   offset: 0, 0
   index: -1
\ No newline at end of file
diff --git a/source/core/assets/images/projectiles/stun_effect.png b/source/core/assets/images/projectiles/stun_effect.png
index 238eac60d99c88d68091d07bfcbeeafbfad971f7..cd862a426dacca1e19493657acfc4568deb9a355 100644
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz0006`Nkl<ZcwX(9
zzfQw25QjS>kl0w*Knw_80l|b=Sa<|BBqR_U60g7m@LtS_E>&NlMGBnbbAIuk#Ay;z
zTlYz)w60@U{w~QSnau=25Cox_)x(ZAgv>FrU-lgN*tRWvT^xC1EbMv4p6_2#a$on2
z<n{XjZ3_zhxz=ZDXyNC#CytEo>*K-2n6YoFu{q{<<$p*T6ubU7G~$b&OBE&&%HJkW
z0+hdeI;U+xvA932#OUAqf|4l~k7^Dz-}3D&k0dZhy_V17?WiTe#0h}%i_a?+Moih>
zI|)#(maWF;^}r<PGtZ<bnbq~(5guqW`%D2ZILgNuA_;u*?E`|7ApHcOqhDY1Ye)NE
zTc|zuEWrJ`MiagS&>{v&f+qQ9p4<{()galI1TmsiA1ExNqou~+1=rX7S_1HQI|;f7
z;{GA|+(uhn6LcDXtAK@f1wZeW5&FGB62X12uxyK%8iN)as(t4y;Au1c+faS0YCk9+
zkACi-B)r(P_>SO#5&-vYi`cQXpkN`$ZM4O^gEqJySNkB^k)M14Ncbet=fN%kBPM`-
zD`+QyeHMrj#r<sA_V@g50X>rY7J+8$fiD3}QxahGO#qCn<P&PKN4gDE{YEGP5nmEu
zA}C=U3PJ7{Dgd*R&+x*J@gT^N8yQ`|B%t8C1C$?oD~NLO;SW~(S;;5Vq9^ny*ayqO
zcL7FNq<jV?W8k}h>_D+95w`qgPzYPvro!y~HytM_jO0XK2MZ(N$QSW~AP9mW2!bF8
hf*=TjAP9nx0>4B(SuQrR2N(bV002ovPDHLkV1mRdBqjg=

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq00961001Be1^@s6{i&wp000C*Nkl<ZcwX(C
z&1w`u6ouzq{7q27wIFU>xDbR0;@*XVE_AP3!FTZ4ViIBqS@;4%<aX-ToIYLET{Bem
z^x*m6(9=Itb*AsVRo$JLtX4t@A%qY@2qA<JLI@#*5JCvCImb_LjcN(7r=|H@DtxY{
zB=#H*Xij+i>CxT6e%I;Iliu+);68G~<8vNc_$!6Il&Ce<$Hk|^)y0>?)z$ZhtKT0E
z1|D)cd2xGIuc9&>&=PrJU4DIF%WKr-w~z6-T5$g*%6W8ua}NUUiwkB-{yA!6ZF<pP
zd_L^f|NMO1oiCH^JEqvO!ZA_!*~A`z!3!D$IVc`;_NHH0*MFZ~BY1obu<s!Dwvk6$
zZ!t)XVg2CMNJ(*ZK5zV29|YWo$&21S*}3xmyYn_8^ooN)ZNH)sm<S<|yq-+RRAFI(
zc^frIc;fY)dmO|1NL`I^F{Ol`r>0kLFKAHAQ(~X^{#JvQXn+MMC>BIQG3d5De|JA7
zO(&<H2-SjL=rMY-<<*ZzvwF;7?Q`*S;Y_K8S3GAXo4s+M853T;uvhonV$c!|;NXs^
zHwgIaL{U`_e!@#qSYXlLOdeBM+qvR*A1p2=IJT-+Zx40$_Fnd(sSEG%@s@#Q+x<AP
zU^u`SFy0=5x=vIotXB7c2_J*~-rrz$n#rSs9#3B0>6Sb&u@Be4d&6SlzDwKp<9s0C
zfvu%yu>&|kLSP5M_8E0oPl2iLoq2@w)QO893m<)?W>(i6S1X%hUQ&au3qPmWb3Bki
zH^miZRt&b!c)Oy+V~bfIArIZMWB~H@+@A<r``(7m*Q=YD+vg+2ePYj{#LQk+?{Wah
zd7L{TL;r)KC_P8?{+^bE`Qa;oR8B0-x7ZL&Ko0cWm)B$DJlbnaNS<M9gKc}?z5e%n
z0B|qKX8_Lnyf4PL$iPX40psm4&>_G)2;it+^O7~;W3cbnbC~@T9@$@Qj}El&1yDRl
zq9;~uuiSph590e%&njXb0JeRqO|bwt0Z=qs#)87vJP4R-KeS?BDD;TmPe^(6ZKm2D
z9rjoH5D?e>J+2mBv0vBNp8->aZ%P%v27o;Rf*b>O`g)xN9Bf+-z6g{a2&x5t8;`ba
zFhe!;=z!Oa{|snKd2Znq`iy>Xph=0(b0;SFo%^fSVoNB<U7}ecaIpQgCrR(#uW@m0
z>v7CyZI3Ce?M=T3G?!OzFKE)!z#9}ie<nZwbN|>%Yyl)eOa>1$1|DZD{-F)4_9d&g
z1)B6|voFuUsM;QLSo^s_phT^_dV41Q80bF-lfh)k;KJ>AADFvW<o&ha_DejXkCbYA
z%z=I3V8q3gDy;QvTHmX+*WD`V=fJ{)W{GzG{-8?$TXF&M@nfpZrXKM<In9Op_I{^|
zYwp?9J?S5U2+@dK!Q`~d*_6FZNeEF07tff45JCtcgb+dqA%w{B4@hDN%KbKkQUCw|
M07*qoM6N<$g87*=EdT%j

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java
index 64351bdb2..2340ac3e6 100644
--- a/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java
+++ b/source/core/src/main/com/csse3200/game/components/tasks/StunTowerCombatTask.java
@@ -98,8 +98,9 @@ public void updateTowerState() {
                     owner.getEntity().getEvents().trigger(ATTACK);
                     Entity newProjectile = ProjectileFactory.createEffectProjectile(PhysicsLayer.NPC, new Vector2(100,
                             owner.getEntity().getPosition().y), new Vector2(2,2), ProjectileEffects.STUN, false);
+                    newProjectile.setScale(-0.4f, -0.4f);
                     newProjectile.setPosition((float) (owner.getEntity().getPosition().x + 0.25),
-                            (float) (owner.getEntity().getPosition().y + 0.25));
+                            (float) (owner.getEntity().getPosition().y + 0.85));
                     ServiceLocator.getEntityService().register(newProjectile);
                 }
             }
diff --git a/source/core/src/main/com/csse3200/game/entities/destructors/ProjectileDestructors.java b/source/core/src/main/com/csse3200/game/entities/destructors/ProjectileDestructors.java
index 2fbd01930..1df39162d 100644
--- a/source/core/src/main/com/csse3200/game/entities/destructors/ProjectileDestructors.java
+++ b/source/core/src/main/com/csse3200/game/entities/destructors/ProjectileDestructors.java
@@ -15,6 +15,7 @@ public class ProjectileDestructors {
    */
   public static Entity destroyProjectile(Entity projectile) {
     projectile.dispose();
+    projectile.getEvents().trigger("");
     return projectile;
   }
   /**