colonist now cancel animation when no target is found and still anima…

…te when mining a node afterwards
Permafrost-Game · Mar 15, 2020 · d053547 · d053547
1 parent 0c14e48
commit d053547
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/TeamProject/GlobalWarmingGame/Interactions/Interactables/Colonist.cs b/TeamProject/GlobalWarmingGame/Interactions/Interactables/Colonist.cs
@@ -64,6 +64,7 @@ public bool InCombat
                 if (value == false)
                 {
                     TextureGroupIndex = 0;
+                    IsAttacking = false;
                 }
 
             }
@@ -212,10 +213,11 @@ public override void Update(GameTime gameTime)
 
             if (delta.Equals(Vector2.Zero))
             {
-                if (!IsAttacking)
+                if (!IsAttacking && instructions.Count==0)
                 {
-                    //TextureGroupIndex = 0;
-                    //isAnimated = false;
+                    TextureGroupIndex = 0;
+
+
                 }
             }
             else if (Math.Abs(delta.X) >= Math.Abs(delta.Y))
@@ -244,8 +246,12 @@ public override void Update(GameTime gameTime)
             }
             else
             {
-                combatModeOn = false;
-
+                if (combatModeOn)
+                {
+                    IsAttacking = false;
+                    combatModeOn = false;
+                }
+
             }
             if (combatModeOn)
             {
@@ -437,6 +443,7 @@ private void ColonistAttack(GameTime gameTime)
                     this.InCombat = false;
                     this.IsAttacking = false;
 
+
                 }
             }