Spawn the enemies on all maps

timotei · Sep 17, 2011 · f607d62 · f607d62
1 parent b039df5
commit f607d62
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/egp_story/Enemy.cs b/egp_story/Enemy.cs
@@ -93,5 +93,16 @@ private bool IsNewPositionOK( LevelMap levelMap, Rectangle rectangle )
 					!levelMap.ThePlayer.BoundingBox.Intersects( rectangle ) &&
 					CheckHitAndRemove( levelMap, rectangle, false ) == null );
 		}
+
+		public static Enemy CreateBugEnemy( Game game )
+		{
+			return new Enemy( game, CardinalDirection.SOUTH, null,
+				new[] { 
+					new AnimatedSprite( Assets.BugWalkNorth, 2, 5 ),
+					new AnimatedSprite( Assets.BugWalkSouth, 2, 5 ),
+					new AnimatedSprite( Assets.BugWalkEast, 2, 5 )},
+					null
+				);
+		}
 	}
 }
diff --git a/egp_story/Levels/Calipuirr.cs b/egp_story/Levels/Calipuirr.cs
@@ -20,7 +20,10 @@ public Calipuirr( Game game )
 			: base( game )
 		{
 			Player player = Player.CreateNewHarapAlb( game );
-			LevelMap = new LevelMap( player, null, Assets.CalipuirrBackground, Assets.CalipuirrBackgroundMask );
+			Enemy bugEnemy = Enemy.CreateBugEnemy( game );
+
+			LevelMap = new LevelMap( player, bugEnemy,
+				Assets.CalipuirrBackground, Assets.CalipuirrBackgroundMask );
 		}
 	}
 }
diff --git a/egp_story/Levels/EllyuteionLake.cs b/egp_story/Levels/EllyuteionLake.cs
@@ -21,7 +21,10 @@ public EllyuteionLake( Game game )
 			: base( game )
 		{
 			Player player = Player.CreateNewHarapAlb( game );
-			LevelMap = new LevelMap( player, null, Assets.EllyuteionLakeBackground, Assets.EllyuteionLakeBackgroundMask );
+			Enemy bugEnemy = Enemy.CreateBugEnemy( game );
+
+			LevelMap = new LevelMap( player, bugEnemy,
+				Assets.EllyuteionLakeBackground, Assets.EllyuteionLakeBackgroundMask );
 		}
 	}
 }
diff --git a/egp_story/Levels/MirrosHills.cs b/egp_story/Levels/MirrosHills.cs
@@ -20,7 +20,10 @@ public MirrosHills( Game game )
 			: base( game )
 		{
 			Player player = Player.CreateNewHarapAlb( game );
-			LevelMap = new LevelMap( player, null, Assets.MirrosHillsBackground, Assets.MirrosHillsBackgroundMask );
+			Enemy bugEnemy = Enemy.CreateBugEnemy( game );
+
+			LevelMap = new LevelMap( player, bugEnemy,
+				Assets.MirrosHillsBackground, Assets.MirrosHillsBackgroundMask );
 		}
 	}
 }
diff --git a/egp_story/Levels/Pandorashys.cs b/egp_story/Levels/Pandorashys.cs
@@ -20,7 +20,10 @@ public Pandorashys( Game game )
 			: base( game )
 		{
 			Player player = Player.CreateNewHarapAlb( game );
-			LevelMap = new LevelMap( player, null, Assets.PandorashysBackground, Assets.PandorashysBackgroundMask );
+			Enemy bugEnemy = Enemy.CreateBugEnemy( game );
+
+			LevelMap = new LevelMap( player, bugEnemy,
+				Assets.PandorashysBackground, Assets.PandorashysBackgroundMask );
 		}
 	}
 }
diff --git a/egp_story/Levels/ViridesPuirr.cs b/egp_story/Levels/ViridesPuirr.cs
@@ -21,16 +21,10 @@ public ViridesPuirr( Game game )
 			: base( game )
 		{
 			Player player = Player.CreateNewHarapAlb( game );
+			Enemy bugEnemy = Enemy.CreateBugEnemy( game );
 
-			Enemy bugEnemy = new Enemy( game, CardinalDirection.SOUTH, null,
-				new[] { 
-					new AnimatedSprite( Assets.BugWalkNorth, 2, 5 ),
-					new AnimatedSprite( Assets.BugWalkSouth, 2, 5 ),
-					new AnimatedSprite( Assets.BugWalkEast, 2, 5 )},
-					null
-				);
-
-			LevelMap = new LevelMap( player, bugEnemy, Assets.ViridesPuirrBackground, Assets.ViridesPuirrBackgroundMask );
+			LevelMap = new LevelMap( player, bugEnemy,
+				Assets.ViridesPuirrBackground, Assets.ViridesPuirrBackgroundMask );
 		}
 	}
 }