3 files changed, 63 insertions, 14 deletions

@@ -5,6 +5,8 @@
 
 package com.fourisland.fourpuzzle;
 
+import java.awt.Point;
+
 /**
  *
  * @author hatkirby
@@ -26,6 +28,14 @@ public enum Direction {
         {
             return Direction.East;
         }
+        
+        public Point to(Point original)
+        {
+            Point temp = new Point(original);
+            temp.translate(0, -1);
+            
+            return temp;
+        }
     },
     East
     {
@@ -43,6 +53,14 @@ public enum Direction {
         {
             return Direction.South;
         }
+        
+        public Point to(Point original)
+        {
+            Point temp = new Point(original);
+            temp.translate(1, 0);
+            
+            return temp;
+        }
     },
     South
     {
@@ -60,6 +78,14 @@ public enum Direction {
         {
             return Direction.West;
         }
+        
+        public Point to(Point original)
+        {
+            Point temp = new Point(original);
+            temp.translate(0, 1);
+            
+            return temp;
+        }
     },
     West
     {
@@ -77,6 +103,14 @@ public enum Direction {
         {
             return Direction.North;
         }
+        
+        public Point to(Point original)
+        {
+            Point temp = new Point(original);
+            temp.translate(-1, 0);
+            
+            return temp;
+        }
     };
     
     /**
@@ -99,4 +133,14 @@ public enum Direction {
      * @return A Direction representing the wanted direction
      */
     public abstract Direction right();
+    
+    /**
+     * Returns a point one unit in the specified direction away from the
+     * specified point
+     * 
+     * @param original The point to move away from
+     * @return A Point representing a space one unit away from the original
+     */
+    public abstract Point to(Point original);
+    
 }
@@ -9,6 +9,8 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
 import com.fourisland.fourpuzzle.util.Functions;
 import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *
@@ -79,20 +81,7 @@ public abstract class AbstractEvent implements Event {
             {
                 setAnimationStep(1);
                 setMoving(false);
-                
-                if (getDirection() == Direction.North)
-                {
-                    setLocation(getLocation().x,getLocation().y-1);
-                } else if (getDirection() == Direction.West)
-                {
-                    setLocation(getLocation().x-1,getLocation().y);
-                } else if (getDirection() == Direction.South)
-                {
-                    setLocation(getLocation().x,getLocation().y+1);
-                } else if (getDirection() == Direction.East)
-                {
-                    setLocation(getLocation().x+1,getLocation().y);
-                }
+                setLocation(getDirection().to(getLocation()));
             }
         }
     }
@@ -112,6 +101,20 @@ public abstract class AbstractEvent implements Event {
         return false;
     }
     
+    public List<Direction> getLegalMoves()
+    {
+        List<Direction> temp = new ArrayList<Direction>();
+        for (Direction d : Direction.values())
+        {
+            if (!getParentMap().checkForCollision(this, d))
+            {
+                temp.add(d);
+            }
+        }
+        
+        return temp;
+    }
+    
     private Map parentMap = null;
     public Map getParentMap()
     {
@@ -10,6 +10,7 @@ import com.fourisland.fourpuzzle.Layer;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
 import java.awt.Graphics;
 import java.awt.Point;
+import java.util.List;
 
 /**
  *
@@ -40,6 +41,7 @@ public interface Event {
     public Layer getLayer();
     
     public boolean isOccupyingSpace(int x, int y);
+    public List<Direction> getLegalMoves();
     
     public void setAnimationStep(int animStep);
     public int getAnimationStep();