Add cop controller and spawner and add support for them getting hit b…

…y the door
mcgrue · Apr 1, 2012 · 30f00d6 · 30f00d6
1 parent c2b7a88
commit 30f00d6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/DemonDoor/DemonDoor/CivvieController.cs b/DemonDoor/DemonDoor/CivvieController.cs
@@ -15,7 +15,7 @@ class CivvieController : IDrawableThing, ICollidable, IBrainyThing
         CivvieSprite myCorpse = null;
         Vector2 screen;
 
-        private Body _fsBody;
+        internal Body _fsBody;
         private Shape _fsShape;
         private Fixture _fsFixture;
         private World _world;
@@ -173,7 +173,7 @@ public void ProcessBehavior(GameTime time)
             }
         }
 
-        private void Die()
+        internal void Die()
         {
             this.behaviorState = BehaviorState.Dead;
             myCorpse.SetAnimationState(CivvieSprite.AnimationState.Dead);

diff --git a/DemonDoor/DemonDoor/DemonDoor.csproj b/DemonDoor/DemonDoor/DemonDoor.csproj
@@ -118,6 +118,8 @@
     <Compile Include="Coords.cs" />
     <Compile Include="CivvieController.cs" />
     <Compile Include="CopSprite.cs" />
+    <Compile Include="CopController.cs" />
+    <Compile Include="CopSpawner.cs" />
     <Compile Include="DoorSprite.cs" />
     <Compile Include="DemonController.cs" />
     <Compile Include="GameOverScreen.cs" />

diff --git a/DemonDoor/DemonDoor/DoorController.cs b/DemonDoor/DemonDoor/DoorController.cs
@@ -47,8 +47,7 @@ private bool PhysicsCollided(Fixture f1, Fixture f2, Contact contact)
                 other = f1;
             }
 
-            if (other.UserData is CivvieController && !_alreadyShot.Contains(other)) {
-                CivvieController c = other.UserData as CivvieController;
+            if ((other.UserData is CivvieController || other.UserData is CopController) && !_alreadyShot.Contains(other)) {
                 //Console.WriteLine("collided with corpse {0}, kickin' it", c);
 
                 other.Body.ApplyLinearImpulse(Impulse);

diff --git a/DemonDoor/DemonDoor/Game1.cs b/DemonDoor/DemonDoor/Game1.cs
@@ -20,7 +20,7 @@ public class Game1 : VERGEGame {
 
         public McGrenderStack mcg;
 
-        public Texture2D im_civvie, im_title, im_door, im_stage, im_skybox, im_demon, im_gameover;
+        public Texture2D im_civvie, im_title, im_door, im_stage, im_skybox, im_demon, im_gameover, im_cop;
         public Texture2D[] im_clouds;
         public SpriteFont ft_hud24;
 
@@ -82,6 +82,7 @@ internal void LoadLevel(string level)
             im_skybox = Content.Load<Texture2D>( "art/skybox" );
             im_demon = Content.Load<Texture2D>( "art/demon" );
             im_gameover = Content.Load<Texture2D>("art/gameover");
+            im_cop = Content.Load<Texture2D>("art/police_01");
 
             _engine = new AudioEngine("Content/music.xgs");
             _sb = new SoundBank(_engine, "Content/Sound Bank.xsb");

diff --git a/DemonDoor/DemonDoor/Level1Screen.cs b/DemonDoor/DemonDoor/Level1Screen.cs
@@ -54,6 +54,9 @@ internal override void Load()
             SpriteBasis civSpriteBasis = new SpriteBasis(16, 16, 7, 7);
             civSpriteBasis.image = game1.im_civvie;
 
+            SpriteBasis copSpriteBasis = new SpriteBasis(16, 16, 10, 10);
+            copSpriteBasis.image = game1.im_cop;
+
             mcg = new McGrenderStack();
             Game1.game.setMcGrender(mcg);
 
@@ -119,6 +122,10 @@ internal override void Load()
             Vector2 spawnerR = Coords.Screen2Physics(new Vector2 { X = 325, Y = 218 });
             var civvieSpawner = new CivvieSpawner(_world, l, spawnerR, TimeSpan.FromSeconds(1), civSpriteBasis, 1000);
             l.AddNode(new McgNode(civvieSpawner, l, 80, 20));
+
+            //spawn cops
+            var copSpawner = new CopSpawner(_world, l, spawnerR, TimeSpan.FromSeconds(1), copSpriteBasis, 1000);
+            l.AddNode(new McgNode(copSpawner, l, 80, 20));
         }
 
         Vector2 _aimPoint = Vector2.UnitX;