Changed where AI is stored, adjusted to work with Multiplayer

git-svn-id: https://bd85.net/svn/cs3505_group@165 92bb83a3-7c8f-8a45-bc97-515c4e399668

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 9a44ff37f16629945ff18469cf4e862935903167..2d4c95c381eedff50bb6f32726d691f7643a7c70 100644 (file)
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -445,6 +445,8 @@ namespace CarFire
             */\r
         }\r
 \r
             */\r
         }\r
 \r

+        public AI AIData { get { return mAIData; } }\r
+\r

         public long CurrentFrameNumber\r
         {\r
             get { return State.FrameNumber; }\r
         public long CurrentFrameNumber\r
         {\r
             get { return State.FrameNumber; }\r


@@ -492,6 +494,7 @@ namespace CarFire
         {\r
             State.AdvanceFrame(mInputs, elapsedTime.Milliseconds);  // Apply the inputs, advance game state.\r
             State.mDisplay.Update(elapsedTime, mThisPlayerID);\r
         {\r
             State.AdvanceFrame(mInputs, elapsedTime.Milliseconds);  // Apply the inputs, advance game state.\r
             State.mDisplay.Update(elapsedTime, mThisPlayerID);\r

+            /*\r

             State.Entities.ForEach(delegate(IEntity e) \r
             {\r
                 IMonster m = e as IMonster;\r
             State.Entities.ForEach(delegate(IEntity e) \r
             {\r
                 IMonster m = e as IMonster;\r


@@ -508,7 +511,8 @@ namespace CarFire
                 }\r
                 e.Update(elapsedTime); \r
             });\r
                 }\r
                 e.Update(elapsedTime); \r
             });\r

-            //State.Entities.ForEach(delegate(IEntity e) { e.Update(elapsedTime); });\r
+             */\r
+            State.Entities.ForEach(delegate(IEntity e) { e.Update(elapsedTime); });\r

             mInputs = new NextInputs(State.NumberOfPlayers);  // Start with inputs cleared on the next frame.\r
             //mDisplay.Update(elapsedTime);\r
             return State.FrameNumber;\r
             mInputs = new NextInputs(State.NumberOfPlayers);  // Start with inputs cleared on the next frame.\r
             //mDisplay.Update(elapsedTime);\r
             return State.FrameNumber;\r

diff --git a/CarFire/CarFire/CarFire/SaberMonster2.cs b/CarFire/CarFire/CarFire/SaberMonster2.cs
index f522ab447763fc5faafd12d99f4024076c697127..33f94d7a309efeab505538d1da64abc1d72b64e2 100644 (file)
--- a/CarFire/CarFire/CarFire/SaberMonster2.cs
+++ b/CarFire/CarFire/CarFire/SaberMonster2.cs
@@ -42,7 +42,7 @@ namespace CarFire
         {\r
             mId = identifier;\r
             mMotion = new MovementManager(position);\r
         {\r
             mId = identifier;\r
             mMotion = new MovementManager(position);\r

-\r
+            \r

             // We need to keep the game reference in order to get the grid when we\r
             // need to find paths.\r
             mGame = game;\r
             // We need to keep the game reference in order to get the grid when we\r
             // need to find paths.\r
             mGame = game;\r


@@ -213,6 +213,29 @@ namespace CarFire
         /// <param name="timeSpan"></param>\r
         public void Update(TimeSpan timeSpan)\r
         {\r
         /// <param name="timeSpan"></param>\r
         public void Update(TimeSpan timeSpan)\r
         {\r

+            int closestChar = 0;\r
+            int closestCharDist = 1000;\r
+            for (int c = 0; c < mGame.State.mCharacters.Length; c++)\r
+            {\r
+                if (mGame.State.mCharacters[c] != null && mGame.AIData.spaceVisible(Coordinates, mGame.State.mCharacters[c].Coordinates))\r
+                {\r
+                    if (PathFinder.GetManhattanDistance(Coordinates, mGame.State.mCharacters[c].Coordinates) < closestCharDist)\r
+                    {\r
+                        closestCharDist = PathFinder.GetManhattanDistance(Coordinates, mGame.State.mCharacters[c].Coordinates);\r
+                        closestChar = c;\r
+                    }\r
+                }\r
+            }\r
+\r
+            if (mGame.State.mCharacters[closestChar] != null && mGame.AIData.spaceVisible(Coordinates, mGame.State.mCharacters[closestChar].Coordinates))\r
+            {\r
+                Chasing(mGame.State.mCharacters[0].Coordinates);\r
+            }\r
+            else\r
+            {\r
+                DefaultAction();\r
+            }\r
+        \r

             switch (mState)\r
             {\r
                 case AiState.Pacing:\r
             switch (mState)\r
             {\r
                 case AiState.Pacing:\r


@@ -286,7 +309,7 @@ namespace CarFire
 \r
         char mId;\r
         MovementManager mMotion;\r
 \r
         char mId;\r
         MovementManager mMotion;\r

-\r
+        AI mAI;\r

         PathFinder pathFinder;\r
         List<Point> mIdlePath = new List<Point>();      // List of waypoints that we got from the map.\r
         int mIdlePathIndex;                             // Index to the waypoint we're heading for.\r
         PathFinder pathFinder;\r
         List<Point> mIdlePath = new List<Point>();      // List of waypoints that we got from the map.\r
         int mIdlePathIndex;                             // Index to the waypoint we're heading for.\r