From 388a8ae720817243ca08fbe873fe2b8251ee6885 Mon Sep 17 00:00:00 2001
From: laurids <miucat17@gmail.com>
Date: Sun, 11 Jul 2021 13:56:18 +0200
Subject: [PATCH] Artillery Effect Fix

---
 Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab |  4 ++--
 Assets/GWConquest/Scenes/GalaxyMap.unity          | 15 ++++++++++-----
 Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs    | 13 ++++++++-----
 Assets/GWConquest/Scripts/Unit.cs                 |  6 +++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab b/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab
index f1da4b4..84fd400 100644
--- a/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab
+++ b/Assets/GWConquest/Prefabs/UI/BattleArmyGui.prefab
@@ -610,8 +610,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -90, y: -90}
-  m_SizeDelta: {x: 200, y: 200}
+  m_AnchoredPosition: {x: -60, y: -60}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2200581606992659820
 CanvasRenderer:
diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity
index 1165528..dde1754 100644
--- a/Assets/GWConquest/Scenes/GalaxyMap.unity
+++ b/Assets/GWConquest/Scenes/GalaxyMap.unity
@@ -28073,7 +28073,7 @@ MonoBehaviour:
   MoveToFlankCooldown: 15
   MoveToReserveCooldown: 15
   UnitDeathCooldown: 60
-  ArtilleryCooldown: 1
+  ArtilleryCooldown: 20
   MovementStartingCooldown: 10
   MovementFinishedCooldown: 10
   DefaultStorageCapacity: 10000
@@ -50981,8 +50981,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -8.91626}
-  m_SizeDelta: {x: -20, y: 40}
+  m_AnchoredPosition: {x: 0, y: 6}
+  m_SizeDelta: {x: -29.999992, y: 33.233643}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &824125517
 CanvasRenderer:
@@ -52579,7 +52579,7 @@ PrefabInstance:
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -7.09
+      value: -7.090027
       objectReference: {fileID: 0}
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
@@ -79171,6 +79171,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: TitlePanel
       objectReference: {fileID: 0}
+    - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
       propertyPath: m_Pivot.x
@@ -114827,7 +114832,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 200, y: -52.83618}
+  m_AnchoredPosition: {x: 200, y: -33}
   m_SizeDelta: {x: -400, y: 27.159664}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1829904045
diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
index 6559000..65cb81a 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
@@ -209,11 +209,13 @@ namespace GWConquest {
 
         }
 
-        public void PlayHitAnim()
+        public void PlayHitAnim(UnitDamageAnimEvent evnt)
         {
             if(IsAnimatorIdle)
             {
-                if(Unit.Class.UnitType == UnitType.Infantry)
+                bool explode = (evnt.Attacker != null && evnt.Attacker.GetComponent<Unit>().Class.UnitType == UnitType.Artillery)
+                    || Unit.Class.UnitType != UnitType.Infantry;
+                if(!explode)
                 {
                     GetComponent<Animator>().SetTrigger("Hit");
                     SoundEffects.Instance.PlayEffect("Hit");
@@ -233,10 +235,11 @@ namespace GWConquest {
             SoundEffects.Instance.PlayEffect("Death");
         }
 
-        public void PlayDeathAnim()
+        public void PlayDeathAnim(UnitDamageAnimEvent evnt)
         {
-            bool explosion = Unit.Class.UnitType != UnitType.Infantry;
-            StartCoroutine(DeathAnimCoroutine(explosion));
+            bool explode = (evnt.Attacker != null && evnt.Attacker.GetComponent<Unit>().Class.UnitType == UnitType.Artillery)
+                    || Unit.Class.UnitType != UnitType.Infantry;
+            StartCoroutine(DeathAnimCoroutine(explode));
         }
 
         public void PlayAttackingAnim()
diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs
index aabec55..8e0fd22 100644
--- a/Assets/GWConquest/Scripts/Unit.cs
+++ b/Assets/GWConquest/Scripts/Unit.cs
@@ -263,7 +263,7 @@ namespace GWConquest
             {
                 if(evnt.IsDead)
                 {
-                    CurrentIcon.PlayDeathAnim();
+                    CurrentIcon.PlayDeathAnim(evnt);
                 }
                 else if(evnt.IsDemoralized && !DemoralizedAnimPlayed)
                 {
@@ -275,7 +275,7 @@ namespace GWConquest
                     CurrentIcon.PlayGlancingHitAnim();
                 }
                 else {
-                    CurrentIcon.PlayHitAnim();
+                    CurrentIcon.PlayHitAnim(evnt);
                 }
                 
 
@@ -286,7 +286,7 @@ namespace GWConquest
 
                     if(attacker.Class.UnitType == UnitType.Artillery)
                     {
-                        SoundEffects.Instance.PlayEffect("Artillery");
+                        SoundEffects.Instance.PlayEffect("ArtilleryShot");
                     }
                     else {
                         WeaponType weaponType = (WeaponType) evnt.WeaponType;