X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=8b9b0759e9bacb46f6756aef25afe6e3075d41c9;hp=be18be785b8d8a35c7f02dfbcbced0d8c414be74;hb=f41d1413bdee1a69450ca6c2bca9932a4c61a6d9;hpb=51e2ac05cd36fffa4fd39d592c5df91dae4752ed

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index be18be7..8b9b075 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -15,6 +15,10 @@ namespace CarFire
     public class GameState
     {
         #region Public Properties
+        private const int hitMonsterScore = 20;
+        private const int killMonsterScore = 100;
+        public int HitMonsterScore { get { return hitMonsterScore; } }
+        public int KillMonsterScore { get { return killMonsterScore; } }
 
         public long FrameNumber { get { return mFrameNumber; } }
 
@@ -24,9 +28,10 @@ namespace CarFire
 
         public Map Map;
         public List<IEntity> Entities = new List<IEntity>();
-        public Player[] mCharacters = new Player[4];
+        public List<Projectile> mProjectiles = new List<Projectile>();
+        public Player[] mCharacters;
         public Display mDisplay;
-
+        public AI AIData;
         #endregion
 
 
@@ -41,6 +46,8 @@ namespace CarFire
             mNumberOfPlayers = numPlayers;
             mFrameNumber = 0;
 
+            mCharacters = new Player[numPlayers];
+
             mIsGameOver = new bool[numPlayers];
             mIsTerminated = new bool[numPlayers];
 
@@ -222,7 +229,7 @@ namespace CarFire
                 foreach (IEntity entity in State.Entities)
                 {
                     Point coordinates = entity.Coordinates;
-                    grid[coordinates.X, coordinates.Y] = true;
+                    if (State.Map.IsCellOpen(coordinates)) grid[coordinates.X, coordinates.Y] = false;
                 }
                 return grid;
             }
@@ -232,13 +239,29 @@ namespace CarFire
 
 
         #region Public Methods
-        public bool IsCellOpen(Point point)
+
+        public IEntity GetEntityAtCoordinates(Point point)
         {
-            if (!State.Map.IsCellOpen(point)) return false;
             foreach (IEntity entity in State.Entities)
             {
-                if (entity.Coordinates == point) return false;
+                if (entity.Coordinates == point) return entity;
             }
+            return null;
+        }
+
+        public Player GetPlayerAtCoordinates(Point point)
+        {
+            foreach (Player player in State.mCharacters)
+            {
+                if (player != null && player.Coordinates == point) return player;
+            }
+            return null;
+        }
+
+        public bool IsCellOpen(Point point)
+        {
+            if (!State.Map.IsCellOpen(point)) return false;
+            if (GetEntityAtCoordinates(point) != null) return false;
             return true;
         }
 
@@ -259,7 +282,7 @@ namespace CarFire
             {
                 State.mCharacters[i].Coordinates = State.Map.GetStartingPositionForPlayer(i + 1);
             }
-            State.Entities = State.Map.GetAllEntities();
+            State.Entities = State.Map.GetAllEntities(this);
         }
         public void LoadContent(ContentManager contentManager)
         {
@@ -310,10 +333,47 @@ namespace CarFire
             State.mDisplay = new Display(this);
             State.mDisplay.LoadContent(mContentManager);
 
-            State.Map = mContentManager.Load<Map>("Maps/stable");
-            State.Map.Game = this;
-            State.Entities = State.Map.GetAllEntities();
-            Map.DefaultTile = mContentManager.Load<Texture2D>("default");
+            Texture2D mapTiles = mContentManager.Load<Texture2D>("graphics/wallAndFloorTilesNoEdgeScale");
+            Tilemap tilemap = new Tilemap(mapTiles, 10, 7);
+            tilemap.SetTile(' ', new Point(4, 5));
+            tilemap.SetTile('`', new Point(0, 1));
+            tilemap.SetTile('~', new Point(1, 1));
+            tilemap.SetTile('!', new Point(3, 1));
+            tilemap.SetTile('@', new Point(4, 1));
+            tilemap.SetTile('#', new Point(5, 1));
+            tilemap.SetTile('$', new Point(6, 1));
+            tilemap.SetTile('%', new Point(8, 1));
+            tilemap.SetTile('^', new Point(9, 1));
+            tilemap.SetTile('&', new Point(0, 2));
+            tilemap.SetTile('=', new Point(1, 2));
+            tilemap.SetTile('*', new Point(2, 2));
+            tilemap.SetTile('(', new Point(4, 2));
+            tilemap.SetTile(')', new Point(0, 3));
+            tilemap.SetTile('_', new Point(2, 3));
+            tilemap.SetTile('-', new Point(9, 3));
+            tilemap.SetTile(',', new Point(1, 4));
+            tilemap.SetTile('+', new Point(2, 4));
+            tilemap.SetTile('[', new Point(3, 4));
+            tilemap.SetTile(']', new Point(4, 4));
+            tilemap.SetTile('{', new Point(5, 4));
+            tilemap.SetTile('}', new Point(6, 4));
+            tilemap.SetTile('\\', new Point(8, 4));
+            tilemap.SetTile('|', new Point(9, 4));
+            tilemap.SetTile(';', new Point(0, 5));
+            tilemap.SetTile(':', new Point(1, 5));
+            tilemap.SetTile('\'', new Point(2, 5));
+            tilemap.SetTile('"', new Point(3, 5));
+            tilemap.SetTile('.', new Point(5, 5));
+            tilemap.SetTile('<', new Point(6, 5));
+            tilemap.SetTile('>', new Point(7, 5));
+            tilemap.SetTile('/', new Point(8, 5));
+            tilemap.SetTile('?', new Point(9, 5));
+
+            State.Map = mContentManager.Load<Map>("Maps/level1");
+            State.Map.Tilemap = tilemap;
+            State.Entities = State.Map.GetAllEntities(this);
+
+            State.AIData = new AI(this);
 
             /*
             mPlayers.Clear();
@@ -380,7 +440,7 @@ namespace CarFire
         public long Update(TimeSpan elapsedTime)
         {
             State.AdvanceFrame(mInputs, elapsedTime.Milliseconds);  // Apply the inputs, advance game state.
-            State.mDisplay.Update(elapsedTime, State, mThisPlayerID);
+            State.mDisplay.Update(elapsedTime, mThisPlayerID);
             State.Entities.ForEach(delegate(IEntity e) { e.Update(elapsedTime); });
             mInputs = new NextInputs(State.NumberOfPlayers);  // Start with inputs cleared on the next frame.
             //mDisplay.Update(elapsedTime);