Merge pull request #6 from david-simoes-93/david/betaTesting

Beta testing - last fixes

Author: david-simoes-93

Assets/Resources/Prefabs/UI_Sniper.prefab

@@ -40,8 +40,8 @@ RectTransform:
   - {fileID: 2660599062746226202}
   - {fileID: 5427215832826055333}
   - {fileID: 4769254305147996424}
-  - {fileID: 6588651019230867595}
   - {fileID: 4719344330296782526}
+  - {fileID: 6588651019230867595}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -163,7 +163,7 @@ RectTransform:
   - {fileID: 2989869001936946805}
   - {fileID: 2855354270773238251}
   m_Father: {fileID: 8737853539303070747}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2197,7 +2197,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8737853539303070747}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6722127539520228989
 GameObject:

Assets/Src/Entity/Monsters/FreyjaScript.cs

@@ -19,7 +19,7 @@ internal class FreyjaScript : MonoBehaviour, IConfigurableMonster
 
     private readonly System.Random random_ = new System.Random();
 
-    private const float kAggroRange = 15;
+    private const float kAggroRange = 20;
     private const float kSpawnPointRadius = 1;
     private const float kMoveIfFurtherAwayThan = 3;
 

Assets/Src/Entity/Monsters/ThorScript.cs

@@ -103,17 +103,18 @@ void FixedUpdate()
             }
         }
 
-        // AoE
-        if (closestEntity != null)
+        if (!parent_.IsDead && !parent_.IsStunned && parent_.LeashedBy == null && closestEntity != null)
+        {
+            // AoE
             ProcessSlam();
 
+            // chain lightning
+            ProcessChainLightning(closestEntity);
+        }
+
         // spawn adds that wont move
         ProcessMagnet();
 
-        // chain lightning
-        if (closestEntity != null)
-            ProcessChainLightning(closestEntity);
-
         // cloud slowly rotating around the room
         ProcessCloud(closestEntity);
     }