Large diffs are not rendered by default.

@@ -10,9 +10,12 @@ namespace ThreeThingGame131115
{
public class Player
{
public bool ready = false;
public int score;
Vector2 weaponPosition;
public float health;
public Animation hatAnimation;
public Vector2 hatPos;
public Animation activeAnimation;
Animation playerRunning;
Animation playerBody;
@@ -32,7 +35,7 @@ public class Player
Vector2 armAngleVector;
float armAngle;
float windowWidth, windowHeight;
PlayerIndex playerNumber;
public PlayerIndex playerNumber;
bool flipped;
float playerSpeed;
GamePadState gamePadState;
@@ -57,9 +60,11 @@ public enum MoveState
State currentState = State.OnGround;
MoveState currentMoveState = MoveState.Standing;
public void Initialize(Texture2D healthtexture,Animation playerBody, Animation playerRunning, Animation playerWalking, Animation playerCrouch, Animation playerJump, Animation playerHead, Animation playerArm, Vector2 position, float windowWidth, float windowHeight, Vector2 gravity,
float playerSpeed, Vector2 jumpSpeed, PlayerIndex playerNumber, int score )
float playerSpeed, Vector2 jumpSpeed, PlayerIndex playerNumber, int score,Texture2D hatTex, Vector2 hatPos )
{
this.hatAnimation =new Animation();
this.healthtexture = healthtexture;
this.hatPos = hatPos;
State currentState = State.OnGround;
MoveState currentMoveState = MoveState.Standing;
active = true;
@@ -101,6 +106,8 @@ public enum MoveState
jumpList.Add(9);
jumpList.Add(0);
activeAnimation = playerBody;
hatAnimation.LoadTexture(hatTex);
hatAnimation.Initialize(1, 1, new Vector2(0, 0), 0, Color.White);

}
public void GetInputRight()
@@ -476,6 +483,7 @@ public void Update(GameTime gameTime)
playerCrouch.Update(gameTime);
playerRunning.Update(gameTime);
activeAnimation.Update(gameTime);

if (flipped)
{
playerArm.origin = new Vector2(playerArm.frameWidth, 0);
@@ -517,6 +525,18 @@ public void Update(GameTime gameTime)
Matrix.CreateScale(playerHead.scale) *
Matrix.CreateTranslation(new Vector3(playerHead.position, 0.0f));
Matrix.CreateTranslation(new Vector3(playerHead.position, 0.0f));

hatAnimation.position = headPosition - new Vector2((playerHead.frameWidth / 2), playerHead.frameHeight / 2) * 2 + hatPos;




hatAnimation.Update(gameTime);

hatAnimation.origin = new Vector2(0, 0);



if(health <=0)
{
PlayerDeath();
@@ -545,6 +565,7 @@ public void Draw(SpriteBatch sb)
{
if (active)
{

float healthPercentage = health / 100; ;
float visibleWidth = (float)healthtexture.Width * healthPercentage;

@@ -565,6 +586,7 @@ public void Draw(SpriteBatch sb)
{
activeWeapon.Draw(sb);
}
hatAnimation.Draw(sb);
}
}

@@ -36,6 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Animation.cs" />
<Compile Include="Button.cs" />
<Compile Include="Pickup.cs" />
<Compile Include="Platform.cs" />
<Compile Include="Projectile.cs" />
@@ -57,9 +58,36 @@
<Content Include="Content\BackGround1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\batmanhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\beret.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\boater.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Bullet.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\chefhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\christmashat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\dmed.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\elfhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\exitButton.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\fez.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Good.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -69,12 +97,42 @@
<Content Include="Content\healthbar.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\pilgrimmhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\piratehat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\platform.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\playButton.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\playerFourWin.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\playerOneWin.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\playerThreeWin.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\playerTwoWin.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\ricehat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\russianhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Scoreboard.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\stetson.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\Stick.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -96,6 +154,12 @@
<Content Include="Content\StickWalking.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\vikinghat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\wizardhat.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Icon.ico" />
</ItemGroup>
<ItemGroup>