Implemented all AnimationTypes

2 files changed, 73 insertions, 10 deletions

@@ -10,10 +10,54 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event;
  * @author hatkirby
  */
 public enum AnimationType {
-    CommonWithoutStepping,
-    CommonWithStepping,
-    WithoutStepping,
-    FixedGraphic,
-    TurnLeft,
-    TurnRight
+    /**
+     * The default AnimationType, it allows the Event to turn and to animate
+     * while it walks, but it only animates while it moves.
+     */
+    CommonWithoutStepping(true, true, false),
+    /**
+     * An AnimationType which allows the Event to turn and to animate. It will
+     * animate at all times, even while stationary.
+     */
+    CommonWithStepping(true, true, true),
+    /**
+     * An AnimationType that allows the Event to turn, but not to animate.
+     */
+    WithoutStepping(true, false, false),
+    /**
+     * An AnimationType that does not allow the Event to turn or animate.
+     */
+    FixedGraphic(false, false, false);
+    
+    private boolean canTurn;
+    private boolean canStep;
+    private boolean alwaysStepping;
+    private AnimationType(boolean canTurn, boolean canStep, boolean alwaysStepping)
+    {
+        this.canTurn = canTurn;
+        this.canStep = canStep;
+
+        if (!canStep)
+        {
+            this.alwaysStepping = false;
+        } else {
+            this.alwaysStepping = alwaysStepping;
+        }
+    }
+    
+    public boolean canTurn()
+    {
+        return canTurn;
+    }
+    
+    public boolean canStep()
+    {
+        return canStep;
+    }
+    
+    public boolean isAlwaysStepping()
+    {
+        return alwaysStepping;
+    }
+
 }
@@ -13,7 +13,6 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraph
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.EventGraphic;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.movement.MovementType;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.movement.StayStillMovementType;
-import com.fourisland.fourpuzzle.util.Functions;
 import java.awt.image.BufferedImage;
 
 /**
@@ -52,7 +51,24 @@ public class PossibleEvent {
         return graphic.getImage();
     }
 
+    private boolean aSLC = false;
     public EventGraphic getGraphic() {
+        if (animation.isAlwaysStepping())
+        {
+            if (aSLC)
+            {
+                aSLC = false;
+                
+                if (animationStep == 0)
+                {
+                    setAnimationStep(2);
+                } else {
+                    setAnimationStep(animationStep-1);
+                }
+            } else {
+                aSLC = true;
+            }
+        }
         return graphic;
     }
 
@@ -90,7 +106,7 @@ public class PossibleEvent {
 
     public void setDirection(Direction direction)
     {
-        if (Functions.canTurn(this))
+        if (animation.canTurn())
         {
             this.direction = direction;
             graphic.setDirection(direction);
@@ -102,8 +118,11 @@ public class PossibleEvent {
     }
 
     public void setAnimationStep(int animationStep) {
-        this.animationStep = animationStep;
-        graphic.setAnimationStep(animationStep);
+        if (animation.canStep())
+        {
+            this.animationStep = animationStep;
+            graphic.setAnimationStep(animationStep);
+        }
     }
     
     public void addPrecondition(Precondition precondition)