- Added new tiles

- Changed cave background
- Changed color of beam
- Added death (partially)
etc.

WrathOfJohn/VoidEngine/VoidEngine/Sprite.cs

@@ -98,15 +98,15 @@ public List<AnimationSet> AnimationSets
 		/// <summary>
 		/// Gets or sets the animations frame tick time.
 		/// </summary>
-		private int LastFrameTime
+		protected int LastFrameTime
 		{
 			get;
 			set;
 		}
 		/// <summary>
 		/// Gets or sets the SpriteEffects value of the sprite.
 		/// </summary>
-		private SpriteEffects flipEffect
+		protected SpriteEffects flipEffect
 		{
 			get;
 			set;

WrathOfJohn/WrathOfJohn/Enemy.cs

@@ -41,6 +41,7 @@ public Enemy(Vector2 position, float gravity, MovementType movementType, Color c
 			if (movementType == MovementType.FLY)
 			{
 				RotationCenter = new Vector2(animationSetList[0].frameSize.X / 2, animationSetList[0].frameSize.Y / 2);
+				Offset = new Vector2(-(animationSetList[0].frameSize.X / 2), -(animationSetList[0].frameSize.Y / 2));
 			}
 
 			#region Reset Gravity
@@ -69,11 +70,11 @@ public override void Update(GameTime gameTime)
 
 			if (_MovementType == MovementType.FLY)
 			{
-				Direction = new Vector2(_Player.GetPosition.X - Position.X, _Player.GetPosition.Y - Position.Y);
+				Direction = new Vector2(_Player.PositionCenter.X - 10 - Position.X, _Player.PositionCenter.Y - Position.Y);
 			}
 			else if (_MovementType == MovementType.HORIZONTAL || _MovementType == MovementType.BOUNCE)
 			{
-				Direction.X = _Player.GetPosition.X - Position.X;
+				Direction.X = _Player.PositionCenter.X - Position.X;
 			}
 
 			if (Collision.Magnitude(Direction) <= 200)
@@ -99,7 +100,10 @@ public override void Update(GameTime gameTime)
 					}
 				}
 
-				SetAnimation("CHASE");
+				if (_MovementType != MovementType.BOUNCE)
+				{
+					SetAnimation("CHASE");
+				}
 
 				Position += Direction;
 
@@ -108,6 +112,21 @@ public override void Update(GameTime gameTime)
 					Rotation += 0.05f;
 				}
 			}
+			else
+			{
+				if (_MovementType != MovementType.BOUNCE)
+				{
+					SetAnimation("IDLE");
+				}
+			}
+
+			foreach (Projectile p in _Player.ProjectileList)
+			{
+				if (playerCollisions.TouchLeftOf(p.projectileRectangle) || playerCollisions.TouchTopOf(p.projectileRectangle) || playerCollisions.TouchRightOf(p.projectileRectangle) || playerCollisions.TouchBottomOf(p.projectileRectangle))
+				{
+					DeleteMe = true;
+				}
+			}
 
 			foreach (Rectangle r in MapTiles)
 			{
@@ -123,6 +142,11 @@ public override void Update(GameTime gameTime)
 				{
 					isJumping = true;
 					Position.Y -= GravityForce * 1.03f;
+					SetAnimation("CHASE");
+				}
+				if (canFall)
+				{
+					SetAnimation("FALLING");
 				}
 			}
 
@@ -132,8 +156,32 @@ public override void Update(GameTime gameTime)
 			}
 
 			UpdateGravity();
+			LastFrameTime += gameTime.ElapsedGameTime.Milliseconds;
 
-			SetAnimation("IDLE");
+			if (LastFrameTime >= CurrentAnimation.framesPerMillisecond)
+			{
+				CurrentFrame.X++;
+
+				if (CurrentFrame.X >= CurrentAnimation.sheetSize.X)
+				{
+					CurrentFrame.Y++;
+					if (_MovementType != MovementType.BOUNCE)
+					{
+						CurrentFrame.X = 0;
+					}
+					else
+					{
+						CurrentFrame.X = CurrentAnimation.sheetSize.X;
+					}
+
+					if (CurrentFrame.Y >= CurrentAnimation.sheetSize.Y)
+					{
+						CurrentFrame.Y = 0;
+					}
+				}
+
+				LastFrameTime = 0;
+			}
 		}
 
 		protected override void UpdateGravity()

WrathOfJohn/WrathOfJohn/MenuManager.cs

@@ -53,8 +53,8 @@ protected override void LoadContent()
 			animationSpriteList.Add(new Sprite.AnimationSet("PRESSED", buttonTexture, new Point(170, 46), new Point(2, 0), new Point(340, 0), 0));
 
 			exitButton = new Button(new Vector2((myGame.WindowSize.X - 170) / 2, 366), myGame.segoeUIRegular, 1f, Color.Black, "EXIT", Color.White, animationSpriteList);
-			playButton = new Button(new Vector2((myGame.WindowSize.X - 170) / 2, 190), myGame.segoeUIRegular, 1f, Color.Black, "PLAY", Color.White, animationSpriteList);
-			optionsButton = new Button(new Vector2((myGame.WindowSize.X - 170) / 2, 275), myGame.segoeUIRegular, 1f, Color.Black, "OPTIONS", Color.White, animationSpriteList);
+			playButton = new Button(new Vector2(100, 190), myGame.segoeUIRegular, 1f, Color.Black, "PLAY", Color.White, animationSpriteList);
+			optionsButton = new Button(new Vector2((myGame.WindowSize.X - 170) - 100, 190), myGame.segoeUIRegular, 1f, Color.Black, "OPTIONS", Color.White, animationSpriteList);
 
 			base.LoadContent();
 		}
@@ -83,9 +83,10 @@ public override void Update(GameTime gameTime)
 
 		public override void Draw(GameTime gameTime)
 		{
+			GraphicsDevice.Clear(new Color(25, 25, 25));
 			spriteBatch.Begin(SpriteSortMode.BackToFront, null, SamplerState.PointWrap, null, null);
 			{
-				spriteBatch.Draw(background, new Rectangle(0, 0, (int)myGame.WindowSize.X, (int)myGame.WindowSize.Y), Color.White);
+				spriteBatch.Draw(background, new Rectangle((int)(background.Width - myGame.WindowSize.X) / 4, 0, (int)(((myGame.WindowSize.Y / myGame.WindowSize.X) / 1.25) * background.Width), (int)myGame.WindowSize.Y), Color.White);
 			}
 			spriteBatch.End();
 

WrathOfJohn/WrathOfJohn/PlatformManager.cs

@@ -21,7 +21,7 @@ public PlatformManager(Vector2 pos, Game mygame, int type, List<AnimationSet> an
 		{
 			myGame = mygame;
 			this.type = type;
-			SetAnimation("IDLE1");
+			SetAnimation("1");
 		}
 
 		public override void Update(GameTime gameTime)
@@ -95,6 +95,78 @@ public override void Draw(GameTime gameTime, SpriteBatch spriteBatch)
 			{
 				SetAnimation("16");
 			}
+			if (type == 17)
+			{
+				SetAnimation("17");
+			}
+			if (type == 18)
+			{
+				SetAnimation("18");
+			}
+			if (type == 19)
+			{
+				SetAnimation("19");
+			}
+			if (type == 20)
+			{
+				SetAnimation("20");
+			}
+			if (type == 21)
+			{
+				SetAnimation("21");
+			}
+			if (type == 22)
+			{
+				SetAnimation("22");
+			}
+			if (type == 23)
+			{
+				SetAnimation("23");
+			}
+			if (type == 24)
+			{
+				SetAnimation("24");
+			}
+			if (type == 25)
+			{
+				SetAnimation("25");
+			}
+			if (type == 26)
+			{
+				SetAnimation("26");
+			}
+			if (type == 27)
+			{
+				SetAnimation("27");
+			}
+			if (type == 28)
+			{
+				SetAnimation("28");
+			}
+			if (type == 29)
+			{
+				SetAnimation("29");
+			}
+			if (type == 30)
+			{
+				SetAnimation("30");
+			}
+			if (type == 31)
+			{
+				SetAnimation("31");
+			}
+			if (type == 32)
+			{
+				SetAnimation("32");
+			}
+			if (type == 33)
+			{
+				SetAnimation("33");
+			}
+			if (type == 34)
+			{
+				SetAnimation("34");
+			}
 			base.Draw(gameTime, spriteBatch);
 		}
 	}

WrathOfJohn/WrathOfJohn/Player.cs

@@ -57,6 +57,9 @@ public Mana(float maxMana, float manaRechargeTime, float manaInterval)
 		/// </summary>
 		public Game1 myGame;
 
+		public bool Dead = false;
+		public float Lives = 3;
+
 		#region Movement and Collision
 		/// <summary>
 		/// The player's collisions.
@@ -110,6 +113,10 @@ public float DefaultGravityForce
 			get;
 			set;
 		}
+		/// <summary>
+		/// The center of the player;
+		/// </summary>
+		public Vector2 PositionCenter;
 		#endregion
 
 		#region Projectiles
@@ -128,10 +135,10 @@ protected List<Sprite.AnimationSet> ProjectileAnimationSet
 		/// <summary>
 		/// Gets or sets the list of projectiles.
 		/// </summary>
-		protected List<Projectile> ProjectileList
+		public List<Projectile> ProjectileList
 		{
 			get;
-			set;
+			protected set;
 		}
 		/// <summary>
 		/// Gets or sets if the projectile list is created.
@@ -247,6 +254,40 @@ public override void Update(GameTime gameTime)
 			{
 				CheckCollision(playerCollisions, r);
 			}
+			if (playerCollisions.TouchLeftOf(myGame.gameManager.mapSegments[1]) || playerCollisions.TouchTopOf(myGame.gameManager.mapSegments[1]) || playerCollisions.TouchRightOf(myGame.gameManager.mapSegments[1]) || playerCollisions.TouchBottomOf(myGame.gameManager.mapSegments[1]))
+			{
+				myGame.gameManager.wonLevel = true;
+				Position = Vector2.Zero;
+			}
+			foreach (Enemy e in myGame.gameManager.cEnemyList)
+			{
+				if (playerCollisions.TouchLeftOf(e.playerCollisions) || playerCollisions.TouchTopOf(e.playerCollisions) || playerCollisions.TouchRightOf(e.playerCollisions) || playerCollisions.TouchBottomOf(e.playerCollisions))
+				{
+					Dead = true;
+					Lives -= 1;
+				}
+			}
+			foreach (Enemy e in myGame.gameManager.sEnemyList)
+			{
+				if (playerCollisions.TouchLeftOf(e.playerCollisions) || playerCollisions.TouchTopOf(e.playerCollisions) || playerCollisions.TouchRightOf(e.playerCollisions) || playerCollisions.TouchBottomOf(e.playerCollisions))
+				{
+					Dead = true;
+					Lives -= 1;
+				}
+			}
+			foreach (Enemy e in myGame.gameManager.tEnemyList)
+			{
+				if (playerCollisions.TouchLeftOf(e.playerCollisions) || playerCollisions.TouchTopOf(e.playerCollisions) || playerCollisions.TouchRightOf(e.playerCollisions) || playerCollisions.TouchBottomOf(e.playerCollisions))
+				{
+					Dead = true;
+					Lives -= 1;
+				}
+			}
+			if (Dead == true)
+			{
+				ProjectileList.RemoveRange(0, ProjectileList.Count);
+			}
+			Lives = MathHelper.Clamp(Lives, 0, 3);
 			#endregion
 
 			UpdateGravity();
@@ -349,6 +390,8 @@ public override void Update(GameTime gameTime)
 			base.Update(gameTime);
 
 			Position += Direction;
+
+			PositionCenter = new Vector2(Position.X, Position.Y + 21);
 		}
 
 		/// <summary>
@@ -412,7 +455,7 @@ public void ShootBeam(float shootFactor)
 		/// <param name="keyList">The key list to update the input method with, (for custom lists)</param>
 		protected virtual void InputMethod(List<Keys> keyList)
 		{
-			if (myGame.keyboardState.IsKeyDown(keyList[4]) && (!isJumping && !canFall))
+			if ((myGame.keyboardState.IsKeyDown(keyList[4]) || myGame.keyboardState.IsKeyDown(keyList[1])) && (!isJumping && !canFall))
 			{
 				isJumping = true;
 				Position.Y -= GravityForce * 1.5f;
@@ -447,10 +490,10 @@ protected virtual void InputMethod(List<Keys> keyList)
 			}
 			if (myGame.CheckKey(MovementKeys[5]))
 			{
-				if (CanShootProjectile && !isJumping && !canFall)
+				if (CanShootProjectile)
 				{
 					SetAnimation("SHOOT");
-					ShootBeam(3);
+					ShootBeam(5);
 				}
 			}
 		}
@@ -514,5 +557,14 @@ protected virtual void UpdateGravity()
 
 			Direction.Y = MathHelper.Clamp(Direction.Y, -GravityForce - 1f, GravityForce);
 		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="newPosition"></param>
+		public void SetPosition(Vector2 newPosition)
+		{
+			Position = newPosition;
+		}
 	}
 }

WrathOfJohn/WrathOfJohn/Projectile.cs

@@ -15,7 +15,7 @@ namespace WrathOfJohn
 {
 	public class Projectile : Sprite
 	{
-		Rectangle projectileRectangle;
+		public Rectangle projectileRectangle;
 
 		Game1 myGame;
 		Player player;