Engine: Added ShakeScreen() special action

Also implemented F12 to return to the title screen and added a move frequency variable to events that decides how often they move.

7 files changed, 143 insertions, 5 deletions

@@ -218,4 +218,15 @@ public abstract class AbstractEvent implements Event {
     {
         return moveSpeed;
     }
+    
+    private MoveFrequency freq;
+    public void setFrequency(MoveFrequency freq)
+    {
+        this.freq = freq;
+    }
+    
+    public MoveFrequency getFrequency()
+    {
+        return freq;
+    }
 }
@@ -51,4 +51,7 @@ public interface Event {
     
     public void setMoveSpeed(MoveSpeed moveSpeed);
     public MoveSpeed getMoveSpeed();
+    
+    public void setFrequency(MoveFrequency freq);
+    public MoveFrequency getFrequency();
 }
@@ -25,6 +25,7 @@ public class HeroEvent extends AbstractEvent implements Event {
     {
         setLocation(new Point());
         setMoveSpeed(MoveSpeed.Faster);
+        setFrequency(MoveFrequency.EIGHT);
     }
     
     public String getLabel()
@@ -12,6 +12,7 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraphic;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.MoveableEventGraphic;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.precondition.Precondition;
+import com.fourisland.fourpuzzle.util.PauseTimer;
 
 /**
  *
@@ -97,15 +98,21 @@ public class LayerEvent extends AbstractEvent implements Event {
         }
     }
     
+    PauseTimer pt = new PauseTimer(0);
     public void startMoving()
     {
-        Direction toMove = getPossibleEvent().getMovement().nextMovement(new ImmutableEvent(this));
-        
-        if (toMove != null)
+        if (pt.isElapsed())
         {
-            if (getPossibleEvent().getGraphic() instanceof MoveableEventGraphic)
+            pt.setTimer(getFrequency().getFrequency()-1);
+            
+            Direction toMove = getPossibleEvent().getMovement().nextMovement(new ImmutableEvent(this));
+        
+            if (toMove != null)
             {
-                startMoving(toMove);
+                if (getPossibleEvent().getGraphic() instanceof MoveableEventGraphic)
+                {
+                    startMoving(toMove);
+                }
             }
         }
     }
@@ -169,4 +176,16 @@ public class LayerEvent extends AbstractEvent implements Event {
         return getPossibleEvent().getMoveSpeed();
     }
     
+    @Override
+    public void setFrequency(MoveFrequency freq)
+    {
+        getPossibleEvent().setFrequency(freq);
+    }
+    
+    @Override
+    public MoveFrequency getFrequency()
+    {
+        return getPossibleEvent().getFrequency();
+    }
+    
 }
\ No newline at end of file
@@ -0,0 +1,34 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event;
+
+/**
+ *
+ * @author hatkirby
+ */
+public enum MoveFrequency {
+    
+    EIGHT(1),
+    SEVEN(2),
+    SIX(3),
+    FIVE(4),
+    FOUR(5),
+    THREE(6),
+    TWO(7),
+    ONE(8);
+    
+    private int freq;
+    private MoveFrequency(int freq)
+    {
+        this.freq = freq;
+    }
+    
+    public int getFrequency()
+    {
+        return freq;
+    }
+
+}
@@ -25,6 +25,7 @@ public class PossibleEvent {
     private AnimationType animation;
     private MovementType movement;
     private MoveSpeed moveSpeed;
+    private MoveFrequency freq;
     private EventCallTime calltime;
     private EventCall callback;
     
@@ -44,6 +45,7 @@ public class PossibleEvent {
         private AnimationType animation = AnimationType.CommonWithoutStepping;
         private MovementType movement = new StayStillMovementType();
         private MoveSpeed moveSpeed = MoveSpeed.Normal;
+        private MoveFrequency freq = MoveFrequency.EIGHT;
         private EventCallTime calltime = EventCallTime.PushKey;
         private EventCall callback = EventCall.getEmptyEventCall();
         
@@ -77,6 +79,12 @@ public class PossibleEvent {
             return this;
         }
         
+        public Builder freq(MoveFrequency freq)
+        {
+            this.freq = freq;
+            return this;
+        }
+        
         public Builder calltime(EventCallTime calltime)
         {
             this.calltime = calltime;
@@ -102,6 +110,7 @@ public class PossibleEvent {
         animation = builder.animation;
         movement = builder.movement;
         moveSpeed = builder.moveSpeed;
+        freq = builder.freq;
         calltime = builder.calltime;
         callback = builder.callback;
     }
@@ -114,6 +123,7 @@ public class PossibleEvent {
                 .animation(animation)
                 .movement(movement)
                 .speed(moveSpeed)
+                .freq(freq)
                 .calltime(calltime)
                 .callback(callback)
                 .build();
@@ -154,6 +164,16 @@ public class PossibleEvent {
     {
         return moveSpeed;
     }
+    
+    void setFrequency(MoveFrequency freq)
+    {
+        this.freq = freq;
+    }
+    
+    public MoveFrequency getFrequency()
+    {
+        return freq;
+    }
 
     private boolean moving = false;
     void setMoving(boolean moving)
@@ -16,6 +16,8 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventTh
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.FixedViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.MovingViewpoint;
+import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.ShakingViewpoint;
+import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.ShakingViewpoint.ShakeSpeed;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint;
 import com.fourisland.fourpuzzle.transition.InTransition;
 import com.fourisland.fourpuzzle.transition.OutTransition;
@@ -366,4 +368,52 @@ public class SpecialEvent {
         throw new InterruptedException();
     }
     
+    /**
+     * Shake the screen like an earthquake
+     * 
+     * @param speed How fast the screen should shake
+     * @param length The amount of time (in milliseconds) the shaking should
+     * last
+     * @param block If true, the game will wait for the shaking to complete
+     * before executing any more commands
+     * @throws java.lang.InterruptedException
+     */
+    public void ShakeScreen(ShakeSpeed speed, int length, final boolean block) throws InterruptedException
+    {
+        Viewpoint viewpoint = mapView.getViewpoint();
+        final CountDownLatch blocker;
+        
+        if (block)
+        {
+            blocker = new CountDownLatch(1);
+        } else {
+            blocker = null;
+        }
+            
+        mapView.setViewpoint(new ShakingViewpoint(viewpoint.getX(), viewpoint.getY(), speed, length, new Runnable() {
+            public void run()
+            {
+                if (block)
+                {
+                    blocker.countDown();
+                } else {
+                    ResetViewpoint();
+                }
+            }
+        }));
+        
+        if (block)
+        {
+            try
+            {
+                blocker.await();
+            } catch (InterruptedException ex)
+            {
+                throw ex;
+            } finally {
+                ResetViewpoint();
+            }
+        }
+    }
+    
 }