X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=a2693671890f8bf1cf3a75150dd9921b14f273bc;hb=d861be5538dfe866f867a6e237311ba6b743e863;hp=c2a7aafadf8e0f58cea4b86fa33b07205e3101e9;hpb=fc34f843ea42a3496a7ff5dd04853695ba628e8b;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index c2a7aaf..a269367 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; } }
 
@@ -27,7 +31,7 @@ namespace CarFire
         public List<Projectile> mProjectiles = new List<Projectile>();
         public Player[] mCharacters;
         public Display mDisplay;
-
+        public AI AIData;
         #endregion
 
 
@@ -331,44 +335,46 @@ namespace CarFire
 
             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));
+            tilemap.SetTile(' ', new Point(4, 5), TileFlags.Default);
+            tilemap.SetTile('`', new Point(0, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('~', new Point(1, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('!', new Point(3, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('@', new Point(4, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('#', new Point(5, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('$', new Point(6, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('%', new Point(8, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('^', new Point(9, 1), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('&', new Point(0, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('=', new Point(1, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('*', new Point(2, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('(', new Point(4, 2), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile(')', new Point(0, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('_', new Point(2, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile('-', new Point(9, 3), TileFlags.Closed | TileFlags.Wall);
+            tilemap.SetTile(',', new Point(1, 4), TileFlags.Default);
+            tilemap.SetTile('+', new Point(2, 4), TileFlags.Default);
+            tilemap.SetTile('[', new Point(3, 4), TileFlags.Default);
+            tilemap.SetTile(']', new Point(4, 4), TileFlags.Default);
+            tilemap.SetTile('{', new Point(5, 4), TileFlags.Default);
+            tilemap.SetTile('}', new Point(6, 4), TileFlags.Default);
+            tilemap.SetTile('\\', new Point(8, 4), TileFlags.Default);
+            tilemap.SetTile('|', new Point(9, 4), TileFlags.Default);
+            tilemap.SetTile(';', new Point(0, 5), TileFlags.Default);
+            tilemap.SetTile(':', new Point(1, 5), TileFlags.Default);
+            tilemap.SetTile('\'', new Point(2, 5), TileFlags.Default);
+            tilemap.SetTile('"', new Point(3, 5), TileFlags.Default);
+            tilemap.SetTile('.', new Point(5, 5), TileFlags.Default);
+            tilemap.SetTile('<', new Point(6, 5), TileFlags.Default);
+            tilemap.SetTile('>', new Point(7, 5), TileFlags.Default);
+            tilemap.SetTile('/', new Point(8, 5), TileFlags.Default);
+            tilemap.SetTile('?', new Point(9, 5), TileFlags.Default);
 
             State.Map = mContentManager.Load<Map>("Maps/level1");
             State.Map.Tilemap = tilemap;
             State.Entities = State.Map.GetAllEntities(this);
 
+            State.AIData = new AI(this);
+
             /*
             mPlayers.Clear();
             for (int i = 0; i < PlayerIdentifiers.Length; i++)