Added LoopUntilCollisionMoveEvent

LoopUntilCollisionMoveEvent repeats an array of MoveEvents until the event in question collides with something. This is done by comparing the location of the event before and after the actions. It is a replacement for the deprecated CycleUpDownMovementType and CycleLeftRightMovementType.

2 files changed, 41 insertions, 8 deletions

@@ -15,11 +15,4 @@ public interface MovementType {
     
     public Direction nextMovement();
     
-}
-    
-/*
-    CycleUpDown
-    CycleLeftRight
-    StepTowardHero
-    StepAwayFromHero
-*/
\ No newline at end of file
+}
\ No newline at end of file
@@ -0,0 +1,40 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
+
+import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
+import java.awt.Point;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class LoopUntilCollisionMoveEvent implements MoveEvent {
+    
+    private Point loc;
+    private MoveEvent[] moves;
+    
+    public LoopUntilCollisionMoveEvent(MoveEvent[] moves)
+    {
+        this.moves = moves;
+    }
+
+    public void doAction(Event ev)
+    {
+        loc = new Point();
+        
+        while ((loc == null) || (!loc.equals(ev.getLocation())))
+        {
+            loc.setLocation(ev.getLocation());
+            
+            for (MoveEvent move : moves)
+            {
+                move.doAction(ev);
+            }
+        }
+    }
+
+}