9 files changed, 133 insertions, 43 deletions

@@ -20,7 +20,7 @@ public abstract class Map {
 
     public abstract void initalize();
     
-    public void initalize(Dimension size)
+    protected void initalize(Dimension size)
     {
         setSize(size);
         mapData = new Vector<HashMap<Integer,Integer>>();
@@ -31,7 +31,7 @@ public abstract class Map {
     {
         return size;
     }
-    public void setSize(Dimension size)
+    private void setSize(Dimension size)
     {
         if ((size.width < 20) || (size.height < 15))
         {
@@ -58,7 +58,7 @@ public abstract class Map {
         
         return null;
     }
-
+    
     public boolean checkForCollision(int x, int y, Direction toMove)
     {
         if ((toMove == Direction.North) && (y == 0))
@@ -75,48 +75,22 @@ public abstract class Map {
             return true;
         }
         
-        for (LayerEvent ev : events)
-        {
-            if (ev.getLayer() == Layer.Middle)
-            {
-                if ((ev.getLocation().y == (y - 1)) && (ev.getLocation().x == x) && (toMove == Direction.North))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().x == (x - 1)) && (ev.getLocation().y == y) && (toMove == Direction.West))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().y == (y + 1)) && (ev.getLocation().x == x) && (toMove == Direction.South))
-                {
-                    return true;
-                }
-                
-                if ((ev.getLocation().x == (x + 1)) && (ev.getLocation().y == y) && (toMove == Direction.East))
-                {
-                    return true;
-                }
-            }
-        }
-        
-        if ((Game.getHeroEvent().getLocation().y == (y - 1)) && (Game.getHeroEvent().getLocation().x == x) && (toMove == Direction.North))
+        if ((toMove == Direction.North) && (checkForEventCollision(x, y-1)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().x == (x - 1)) && (Game.getHeroEvent().getLocation().y == y) && (toMove == Direction.West))
+        
+        if ((toMove == Direction.West) && (checkForEventCollision(x-1, y)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().y == (y + 1)) && (Game.getHeroEvent().getLocation().x == x) && (toMove == Direction.South))
+        
+        if ((toMove == Direction.South) && (checkForEventCollision(x, y+1)))
         {
             return true;
         }
-
-        if ((Game.getHeroEvent().getLocation().x == (x + 1)) && (Game.getHeroEvent().getLocation().y == y) && (toMove == Direction.East))
+        
+        if ((toMove == Direction.East) && (checkForEventCollision(x+1, y)))
         {
             return true;
         }
@@ -156,6 +130,27 @@ public abstract class Map {
         
         return false;
     }
+    
+    private boolean checkForEventCollision(int x, int y)
+    {
+        for (LayerEvent ev : events)
+        {
+            if (ev.getLayer() == Layer.Middle)
+            {
+                if (ev.isOccupyingSpace(x, y))
+                {
+                    return true;
+                }
+            }
+        }
+
+        if (Game.getHeroEvent().isOccupyingSpace(x, y))
+        {
+            return true;
+        }
+       
+        return false;
+    }
 
     private String chipSet;
     public String getChipSet() {
@@ -159,6 +159,14 @@ public class MapViewGameState implements GameState {
 
     public void render(Graphics2D g)
     {
+        /* TODO Add code that checks to see if the map has been switched
+         * or if the hero has moved in such a way so as to move the
+         * viewpoint. If one or more of these conditions are filled, the
+         * already existing below code should run along with a snippet that
+         * saves a cache of the current viewpoint. If not, the previously
+         * mentioned cache should be displayed rather than re-rendering the
+         * map.
+         */
         ChipSet chipSet = ChipSet.getChipSet(currentMap.getChipSet());
         int i,x,y;
         for (i=0;i<currentMap.getMapData().size();i++)
@@ -32,4 +32,6 @@ public interface Event {
     public void startMoving(Direction direction);
     
     public Layer getLayer();
+    
+    public boolean isOccupyingSpace(int x, int y);
 }
@@ -12,6 +12,7 @@ import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.GameCharacter;
 import com.fourisland.fourpuzzle.gamestate.mapview.CharSet;
+import com.fourisland.fourpuzzle.util.Functions;
 
 /**
  *
@@ -65,6 +66,10 @@ public class HeroEvent implements Event {
             }
         }
         
+        /* TODO Change the specification of GameCharacter
+         * to require an EventGraphic instead of a graphic name
+         * and offset
+         */
         GameCharacter toDraw = Game.getSaveFile().getParty().getLeader();
         if (!toDraw.getGraphic().equals("blank"))
         {
@@ -147,5 +152,20 @@ public class HeroEvent implements Event {
     {
         return Layer.Middle;
     }
+    
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
 
 }
@@ -11,6 +11,7 @@ import java.awt.Point;
 import java.util.ArrayList;
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
+import com.fourisland.fourpuzzle.util.Functions;
 
 /**
  *
@@ -209,4 +210,19 @@ public class LayerEvent implements Event {
         this.label = string;
     }
     
+    public boolean isOccupyingSpace(int x, int y)
+    {
+        if (getLocation().equals(new Point(x,y)))
+        {
+            return true;
+        }
+        
+        if (Functions.isMovingTo(this, x, y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
+    
 }
\ No newline at end of file
@@ -17,6 +17,14 @@ import java.util.logging.Logger;
  * @author hatkirby
  */
 public class SpecialEvent {
+    
+    /* TODO Create a manager for SpecialEvent action threads that
+     * controls when they are executed and allows MapViewGameState
+     * to poll it to see if it is currently managing any action
+     * threads. If it is, MapViewGameState should be able to prevent
+     * certain actions from occuring (unless the action thread is
+     * ParallelProcess) such as keyboard input.
+     */
 
     /**
      * Display a message on the screen.
@@ -120,11 +128,7 @@ public class SpecialEvent {
      */
     public void MoveEventWait()
     {
-        try {
-            MoveEventThread.moveEventWait.await();
-        } catch (InterruptedException ex) {
-            Logger.getLogger(SpecialEvent.class.getName()).log(Level.SEVERE, null, ex);
-        }
+        MoveEventThread.moveAll();
     }
     
     /**
@@ -13,6 +13,7 @@ import com.fourisland.fourpuzzle.Direction;
  */
 public interface MovementType {
     
+    // TODO Rename the following method to getNextDirection
     public Direction startMoving();
     
 }
@@ -20,9 +20,10 @@ import java.util.logging.Logger;
  */
 public class MoveEventThread implements Runnable {
     
-    public static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     public static volatile int countMoveEventThreads = 0;
-    public static volatile List<Event> events = new Vector<Event>();
+    
+    static volatile List<Event> events = new Vector<Event>();
+    static volatile CountDownLatch moveEventWait = new CountDownLatch(0);
     
     Event ev;
     MoveEvent[] actions;
@@ -51,6 +52,10 @@ public class MoveEventThread implements Runnable {
         moveEventWait.countDown();
     }
     
+    /* TODO Rename the two following methods (isHeroMoving and isOtherMoving)
+     * to isHeroActive and isOtherActive respectively.
+     */
+    
     public static boolean isHeroMoving()
     {
         return (events.contains(Game.getHeroEvent()));
@@ -60,5 +65,14 @@ public class MoveEventThread implements Runnable {
     {
         return (events.contains(event));
     }
+    
+    public static void moveAll()
+    {
+        try {
+            moveEventWait.await();
+        } catch (InterruptedException ex) {
+            Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 
 }
@@ -48,6 +48,36 @@ public class Functions {
         
         return false;
     }
+
+    public static boolean isMovingTo(Event ev, int x, int y)
+    {        
+        if (ev.isMoving() == false)
+        {
+            return false;
+        }
+        
+        if ((ev.getDirection() == Direction.North) && ((ev.getLocation().y-1) == y) && (ev.getLocation().x == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.West) && (ev.getLocation().y == y) && ((ev.getLocation().x-1) == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.South) && ((ev.getLocation().y+1) == y) && (ev.getLocation().x == x))
+        {
+            return true;
+        }
+        
+        if ((ev.getDirection() == Direction.East) && (ev.getLocation().y == y) && ((ev.getLocation().x+1) == x))
+        {
+            return true;
+        }
+        
+        return false;
+    }
     
     public static Direction oppositeDirection(Direction dir)
     {