Fixed MoveEvent bug

8 files changed, 147 insertions, 48 deletions

@@ -6,9 +6,9 @@
 package com.fourisland.fourpuzzle.gamestate.mapview;
 
 import com.fourisland.fourpuzzle.*;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
 import java.awt.Dimension;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Vector;
 
@@ -41,19 +41,18 @@ public abstract class Map {
         }
     }
     
-    private ArrayList<LayerEvent> events = new ArrayList<LayerEvent>();
-    public ArrayList<LayerEvent> getEvents()
+    private EventList events = new EventList();
+    public EventList getEvents()
     {
         return events;
     }
     public LayerEvent getEvent(String event)
     {
-        int i=0;
-        for (i=0;i<events.size();i++)
+        for (LayerEvent ev : events)
         {
-            if (events.get(i).getLabel().equals(event))
+            if (ev.getLabel().equals(event))
             {
-                return events.get(i);
+                return ev;
             }
         }
         
@@ -13,10 +13,12 @@ import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.Layer;
 import com.fourisland.fourpuzzle.PuzzleApplication;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.EventCallTime;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
+import com.fourisland.fourpuzzle.util.Functions;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
 
 /**
  *
@@ -67,7 +69,7 @@ public class MapViewGameState implements GameState {
                 debugWalkthrough = false;
             }
 
-            if (!hero.isMoving())
+            if (!hero.isMoving() && !MoveEventThread.isHeroMoving())
             {
                 Direction toMove = null;
                 Boolean letsMove = false;
@@ -104,29 +106,22 @@ public class MapViewGameState implements GameState {
 
                 if ((Game.getKey().getKeyCode() == KeyEvent.VK_ENTER) || (Game.getKey().getKeyCode() == KeyEvent.VK_SPACE))
                 {
-                    int i=0;
-                    for (i=0;i<currentMap.getEvents().size();i++)
+                    for (LayerEvent ev : currentMap.getEvents())
                     {
-                        LayerEvent ev = currentMap.getEvents().get(i);
-
                         if (ev.getCalltime() == EventCallTime.PushKey)
                         {
-                            if ((hero.getDirection() == Direction.North) && (ev.getLocation().x == hero.getLocation().x) && (ev.getLocation().y == (hero.getLocation().y - 1)))
-                            {
-                                ev.setDirection(Direction.South);
-                                ev.getCallback().run();
-                            } else if ((hero.getDirection() == Direction.West) && (ev.getLocation().x == (hero.getLocation().x - 1)) && (ev.getLocation().y == hero.getLocation().y))
-                            {
-                                ev.setDirection(Direction.East);
-                                ev.getCallback().run();
-                            } else if ((hero.getDirection() == Direction.South) && (ev.getLocation().x == hero.getLocation().x) && (ev.getLocation().y == (hero.getLocation().y + 1)))
+                            if (ev.getLayer() == Layer.Middle)
                             {
-                                ev.setDirection(Direction.North);
-                                ev.getCallback().run();
-                            } else if ((hero.getDirection() == Direction.East) && (ev.getLocation().x == (hero.getLocation().x + 1)) && (ev.getLocation().y == hero.getLocation().y))
-                            {
-                                ev.setDirection(Direction.West);
-                                ev.getCallback().run();
+                                if (Functions.isFacing(hero, ev))
+                                {
+                                    ev.setDirection(Functions.oppositeDirection(hero.getDirection()));
+                                    ev.getCallback().activate();
+                                }
+                            } else {
+                                if (ev.getLocation().equals(hero.getLocation()))
+                                {
+                                    ev.getCallback().activate();
+                                }
                             }
                         }
                     }
@@ -145,14 +140,16 @@ public class MapViewGameState implements GameState {
             hero.processMoving();
         }
 
-        int i=0;
-        for (i=0;i<currentMap.getEvents().size();i++)
+        for (LayerEvent ev : currentMap.getEvents())
         {
-            if (!currentMap.getEvents().get(i).isMoving())
+            if (!ev.isMoving())
             {
-                currentMap.getEvents().get(i).startMoving(currentMap);
+                if (!MoveEventThread.isOtherMoving(ev))
+                {
+                    ev.startMoving(currentMap);
+                }
             } else {
-                currentMap.getEvents().get(i).processMoving();
+                ev.processMoving();
             }
         }
     }
@@ -183,10 +180,10 @@ public class MapViewGameState implements GameState {
         mv.draw(g, true);*/
         Game.getSaveFile().getHero().render(g);
 
-        ArrayList<LayerEvent> events = currentMap.getEvents();
-        for (i=0;i<events.size();i++)
+        EventList events = currentMap.getEvents();
+        for (LayerEvent event : events)
         {
-            events.get(i).render(g);
+            event.render(g);
         }
 
         for (i=0;i<currentMap.getMapData().size();i++)
@@ -22,4 +22,9 @@ public abstract class EventCall extends SpecialEvent implements Runnable {
 
     public abstract void run();
     
+    public void activate()
+    {
+        new Thread(this, "Special Event").start();
+    }
+    
 }
@@ -0,0 +1,42 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event;
+
+import java.util.Vector;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class EventList extends Vector<LayerEvent> {
+    
+    @Override
+    public boolean add(LayerEvent o)
+    {
+        if (o.getLabel().equals("Unlabelled"))
+        {
+            o.setLabel("Event" + (this.size()+1));
+        } else {
+            if (    (o.getLabel().equals("Hero")) ||
+                    (o.getLabel().equals("Unlabelled")) ||
+                    (o.getLabel().equals("")))
+            {
+                return false;
+            }
+            
+            for (Event ev : this)
+            {
+                if (ev.getLabel().equals(o.getLabel()))
+                {
+                    return false;
+                }
+            }
+        }
+        
+        return super.add(o);
+    }
+
+}
@@ -27,6 +27,7 @@ public class LayerEvent implements Event {
     {
         location = new Point(x,y);
         events = new ArrayList<PossibleEvent>();
+        label = "Unlabelled";
     }
     
     /** Create a new Event instance
@@ -204,4 +205,8 @@ public class LayerEvent implements Event {
         return getPossibleEvent().getCallback();
     }
 
-}
+    public void setLabel(String string) {
+        this.label = string;
+    }
+    
+}
\ No newline at end of file
@@ -6,10 +6,9 @@
 package com.fourisland.fourpuzzle.gamestate.mapview.event;
 
 import com.fourisland.fourpuzzle.*;
+import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -102,18 +101,18 @@ public class SpecialEvent {
      */
     public void MoveEvent(MoveEvent[] actions)
     {
-        MoveEvent(actions, Game.getHeroEvent());
+        new Thread(new MoveEventThread(Game.getHeroEvent(), actions)).start();
     }
     
     /**
      * Performs actions on an event
      * 
      * @param actions An array of MoveEvents to perform on the event
-     * @param ev The event to act upon
+     * @param label The label of the event to act upon
      */
-    public void MoveEvent(MoveEvent[] actions, Event ev)
+    public void MoveEvent(MoveEvent[] actions, String label)
     {
-        new Thread(new MoveEventThread(ev, actions)).start();
+        new Thread(new MoveEventThread(((MapViewGameState) Game.getGameState()).getCurrentMap().getEvent(label), actions)).start();
     }
     
     /**
@@ -5,9 +5,12 @@
 
 package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
 
+import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
+import java.util.List;
+import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -19,6 +22,7 @@ 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>();
     
     Event ev;
     MoveEvent[] actions;
@@ -29,22 +33,36 @@ public class MoveEventThread implements Runnable {
         this.actions = actions;
     }
 
-    public void run() {
+    public void run()
+    {
+        events.add(ev);
+        
         MoveEventThread.countMoveEventThreads++;
         moveEventWait = new CountDownLatch(countMoveEventThreads);
         
-        int i=0;
-        for (i=0;i<actions.length;i++)
+        for (MoveEvent action : actions)
         {
             try {
-                actions[i].doAction(ev);
+                action.doAction(ev);
             } catch (Exception ex) {
                 Logger.getLogger(MoveEventThread.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
         
+        events.remove(ev);
+        
         MoveEventThread.countMoveEventThreads--;
         moveEventWait.countDown();
     }
+    
+    public static boolean isHeroMoving()
+    {
+        return (events.contains(Game.getHeroEvent()));
+    }
+    
+    public static boolean isOtherMoving(LayerEvent event)
+    {
+        return (events.contains(event));
+    }
 
 }
@@ -5,6 +5,8 @@
 
 package com.fourisland.fourpuzzle.util;
 
+import com.fourisland.fourpuzzle.Direction;
+import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.PossibleEvent;
 
 /**
@@ -27,5 +29,37 @@ public class Functions {
         
         return false;
     }
+    
+    public static boolean isFacing(Event ev1, Event ev2) throws Exception
+    {
+        if ((ev1.getDirection() == Direction.North) && (ev2.getLocation().x == ev1.getLocation().x) && (ev2.getLocation().y == (ev1.getLocation().y - 1)))
+        {
+            return true;
+        } else if ((ev1.getDirection() == Direction.West) && (ev2.getLocation().x == (ev1.getLocation().x - 1)) && (ev2.getLocation().y == ev1.getLocation().y))
+        {
+            return true;
+        } else if ((ev1.getDirection() == Direction.South) && (ev2.getLocation().x == ev1.getLocation().x) && (ev2.getLocation().y == (ev1.getLocation().y + 1)))
+        {
+            return true;
+        } else if ((ev1.getDirection() == Direction.East) && (ev2.getLocation().x == (ev1.getLocation().x + 1)) && (ev2.getLocation().y == ev1.getLocation().y))
+        {
+            return true;
+        }
+        
+        return false;
+    }
+    
+    public static Direction oppositeDirection(Direction dir)
+    {
+        switch (dir)
+        {
+            case North: return Direction.South;
+            case West: return Direction.East;
+            case South: return Direction.North;
+            case East: return Direction.West;
+        }
+        
+        return null;
+    }
 
 }