5 files changed, 53 insertions, 6 deletions

@@ -134,7 +134,7 @@ public class MapViewGameState implements GameState {
                             {
                                 if (Functions.isFacing(hero, ev))
                                 {
-                                    ev.setDirection(hero.getDirection().oppositeDirection());
+                                    ev.setDirection(hero.getDirection().opposite());
                                     ev.getCallback().activate(ev.getCalltime());
                                 }
                             } else {
@@ -78,7 +78,7 @@ public abstract class AbstractEvent implements Event {
             } else if (moveTimer == 0)
             {
                 setAnimationStep(1);
-                moving = false;
+                setMoving(false);
                 
                 if (getDirection() == Direction.North)
                 {
@@ -46,10 +46,44 @@ public enum AnimationType {
     /**
      * An AnimationType that does not allow the Event to turn or animate.
      */
-    FixedGraphic(false, false);
+    FixedGraphic(false, false),
+    /**
+     * An AnimationType that is identical to CommonWithoutStepping except that
+     * it causes the Event in question to continually rotate counterclockwise.
+     */
+    TurnLeft(true, true)
+    {
+        Interval in = Interval.createTickInterval(2);
+        
+        @Override
+        public void tick(PossibleEvent pe)
+        {
+            if (in.isElapsed())
+            {
+                pe.setDirection(pe.getDirection().left());
+            }
+        }
+    },
+    /**
+     * An AnimationType that is identical to CommonWithoutStepping except that
+     * it causes the Event in question to continually rotate clockwise.
+     */
+    TurnRight(true, true)
+    {
+        Interval in = Interval.createTickInterval(2);
+        
+        @Override
+        public void tick(PossibleEvent pe)
+        {
+            if (in.isElapsed())
+            {
+                pe.setDirection(pe.getDirection().right());
+            }
+        }
+    };
     
-    private boolean canTurn;
-    private boolean canStep;
+    private final boolean canTurn;
+    private final boolean canStep;
     private AnimationType(boolean canTurn, boolean canStep)
     {
         this.canTurn = canTurn;
@@ -132,4 +132,11 @@ public class LayerEvent extends AbstractEvent implements Event {
         return getPossibleEvent().getAnimationStep();
     }
     
+    @Override
+    public void setMoving(boolean moving)
+    {
+        super.setMoving(moving);
+        getPossibleEvent().setMoving(moving);
+    }
+    
 }
\ No newline at end of file
@@ -119,6 +119,12 @@ public class PossibleEvent {
         return movement;
     }
 
+    private boolean moving = false;
+    void setMoving(boolean moving)
+    {
+        this.moving = moving;
+    }
+    
     Direction getDirection()
     {
         return direction;
@@ -126,7 +132,7 @@ public class PossibleEvent {
 
     void setDirection(Direction direction)
     {
-        if (animation.canTurn())
+        if (animation.canTurn() && !moving)
         {
             this.direction = direction;
             graphic.setDirection(direction);