Skip to content
Snippets Groups Projects
Commit 997e54f8 authored by Trandinh Thien's avatar Trandinh Thien
Browse files

Fixed attack animation direction

parent 27ae4fd9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 19 deletions
src/Blaze-Brigade/Blaze_Brigade/Archer.cs
+ 9
− 0
View file @ 997e54f8
......@@ -360,6 +360,15 @@ namespace Model
return screenBounds;
}
/**
Sets the current frame unit should be on
* @param frame the current frame number
*/
public void setCurrentFrame(int frame)
{
currentFrame = frame;
}
/**
animate sprite walking the direction specified
* @param direction The direction the unit is moving in
......
src/Blaze-Brigade/Blaze_Brigade/Game.cs
+ 8
− 4
View file @ 997e54f8
......@@ -313,6 +313,7 @@ namespace Controller
if (GameState.beforeMove) // if unit has yet to move, display the overall move and attack range of unit
{
// Highlight movable nodes in blue
Debug.WriteLine(GameState.moveableNodes.Count());
foreach (Node move in GameState.moveableNodes)
{
spriteBatch.Draw(moveableNode, move.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
......@@ -320,14 +321,16 @@ namespace Controller
// Highlight attackable nodes in red
LinkedList<Node> attackableNodes = GameFunction.getAttackableNodes(graph, unit);
//Debug.WriteLine(attackableNodes.Count());
foreach (Node attack in attackableNodes)
{
if (!GameState.moveableNodes.Contains(attack))
if ((!GameState.moveableNodes.Contains(attack))&&(attack.unitOnNode!=unit)&&(!attack.isObstacle))
{
spriteBatch.Draw(attackableNode, attack.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
}
}
}
else // else if unit has already moved, only display the attack range
{
......@@ -366,7 +369,6 @@ namespace Controller
int critRate = DamageCalculations.getCritRate(unit, attackedUnit);
// get enemy counter attack stats
attackType = findAttackType(attackedUnit);
Debug.WriteLine(attackType);
int damageDealt2 = DamageCalculations.getDamageDealt(attackedUnit, unit, attackType);
int hitCount2 = DamageCalculations.getHitCount(attackedUnit, unit);
int hitRate2 = DamageCalculations.getHitRate(attackedUnit, unit);
......@@ -475,9 +477,10 @@ namespace Controller
}
#endregion
#region Game Over
if (GameState.gameOver)
{
Debug.WriteLine("game over");
Vector2 gameOverLocation = new Vector2(-370, -300);
spriteBatch.DrawString(largestFont,"Game Over", new Vector2(350, 200), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f); //draws Game Over Text
spriteBatch.Draw(gameOver, Vector2.Zero, null, Color.White, 0, gameOverLocation, 1f, SpriteEffects.None, 0f);
......@@ -509,6 +512,7 @@ namespace Controller
}
#endregion
}
#endregion
spriteBatch.Draw(backGround, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 1);
......
src/Blaze-Brigade/Blaze_Brigade/GameFunction.cs
+ 2
− 2
View file @ 997e54f8
......@@ -232,8 +232,8 @@ namespace Controller
{
for (int y = 0; y < graph.Height; y++)
{
if (isNodeAttackable(unit.getClass(), moveableNode.getPositionX(),
moveableNode.getPositionY(), graph.getNode(x, y)))
if ((isNodeAttackable(unit.getClass(), moveableNode.getPositionX(),
moveableNode.getPositionY(), graph.getNode(x, y)))&&(!attackableNodes.Contains(graph.getNode(x, y)))) //make sure attackable nodes is only added once each to list
{
// if node is attackable, add it to list of attackable nodes
attackableNodes.AddLast(graph.getNode(x, y));
......
src/Blaze-Brigade/Blaze_Brigade/Mage.cs
+ 9
− 0
View file @ 997e54f8
......@@ -360,6 +360,15 @@ namespace Model
return screenBounds;
}
/**
Sets the current frame unit should be on
* @param frame the current frame number
*/
public void setCurrentFrame(int frame)
{
currentFrame = frame;
}
/**
animate sprite walking the direction specified
* @param direction The direction the unit is moving in
......
src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+ 29
− 11
View file @ 997e54f8
......@@ -200,13 +200,13 @@ namespace Controller
GameState.isAnimating = false;
}
private static void attackAnimation(int direction, Unit unit)
private static void attackAnimation(Direction direction, Unit unit)
{
GameState.isAnimating = true;
float originalLocationX = unit.PixelCoordinates.X;
float originalLocationY = unit.PixelCoordinates.Y;
#region Attack Right
if (direction == 0) //attack right
if (direction == Direction.Right) //attack right
{
for (float i = originalLocationX; i <= originalLocationX + 8; i++)
{
......@@ -224,7 +224,7 @@ namespace Controller
}
#endregion
#region Attack Left
else if (direction == 1) //attack left
else if (direction == Direction.Left) //attack left
{
for (float i = originalLocationX; i >= originalLocationX - 8; i--)
{
......@@ -242,7 +242,7 @@ namespace Controller
}
#endregion
#region Attack Down
else if (direction == 2) //attack down
else if (direction == Direction.Down) //attack down
{
for (float i = originalLocationY; i <= originalLocationY + 8; i++)
{
......@@ -260,7 +260,7 @@ namespace Controller
}
#endregion
#region Attack Up
else if (direction == 3) //attack up
else if (direction == Direction.Up) //attack up
{
for (float i = originalLocationY; i >= originalLocationY - 8; i--)
{
......@@ -390,28 +390,46 @@ namespace Controller
int counterAttackDirection = 0;
//Gets attack anaimation direction
#region Attack animation Direction
if (unit.Position.Item1 < unit2.Position.Item1)
Direction attackDir = Direction.Up;
Direction counterAttackDir = Direction.Up;
if (unit.Position.Item1 < unit2.Position.Item1) //attack right
{
attackDirection = 0;
counterAttackDirection = 1;
attackDir = Direction.Right;
counterAttackDir = Direction.Left;
unit.setCurrentFrame(7);
unit2.setCurrentFrame(4);
}
else if (unit.Position.Item1 > unit2.Position.Item1)
else if (unit.Position.Item1 > unit2.Position.Item1) //attack left
{
attackDirection = 1;
counterAttackDirection = 0;
attackDir = Direction.Left;
counterAttackDir = Direction.Right;
unit.setCurrentFrame(4);
unit2.setCurrentFrame(7);
}
else if (unit.Position.Item2 < unit2.Position.Item2)
else if (unit.Position.Item2 < unit2.Position.Item2) //attack down
{
attackDirection = 2;
counterAttackDirection = 3;
attackDir = Direction.Down;
counterAttackDir = Direction.Up;
unit.setCurrentFrame(1);
unit2.setCurrentFrame(10);
}
else if (unit.Position.Item2 > unit2.Position.Item2)
else if (unit.Position.Item2 > unit2.Position.Item2) //attack up
{
attackDirection = 3;
counterAttackDirection = 2;
attackDir = Direction.Up;
counterAttackDir = Direction.Down;
unit.setCurrentFrame(10);
unit2.setCurrentFrame(1);
}
#endregion
attackAnimation(attackDirection, unit);
attackAnimation(attackDir, unit);
bool attackType = false;
......@@ -424,7 +442,7 @@ namespace Controller
if (unit2.Alive && (GameFunction.isEnemyUnitInRange(graph, unit2, unit))) //if unit 2 is still alive, perform a counter attack
{
Thread.Sleep(750);
attackAnimation(counterAttackDirection, unit2);
attackAnimation(counterAttackDir, unit2);
attackType = findAttackType(unit2); //gets attack type
int damageTaken = DamageCalculations.finalDamage(unit2, unit, attackType); //damage dealt
unit.Hp = unit.Hp - damageTaken; //update hp
......
src/Blaze-Brigade/Blaze_Brigade/Unit.cs
+ 6
− 0
View file @ 997e54f8
......@@ -153,6 +153,12 @@ namespace Model
*/
Rectangle getCurrentFrame();
/**
Sets the current frame unit should be on
* @param frame the current frame number
*/
void setCurrentFrame(int frame);
/**
returns array of equipable weapons
*/
......
src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
+ 12
− 2
View file @ 997e54f8
......@@ -34,6 +34,7 @@ namespace Model
Sets and returns a unit's Defense
*/
public int Def { get; set; }
/**
Sets and returns a unit's Resistance
*/
......@@ -380,6 +381,15 @@ namespace Model
return screenBounds;
}
/**
Sets the current frame unit should be on
* @param frame the current frame number
*/
public void setCurrentFrame(int frame)
{
currentFrame = frame;
}
/**
animate sprite walking the direction specified
* @param direction The direction the unit is moving in
......@@ -434,7 +444,7 @@ namespace Model
{
if ((currentFrame < 6) || (currentFrame > 8)) // if unit isnt already going right, set the sprite to default facing right
{
currentFrame = 7;//increment walk cycle
currentFrame = 7;
}
else
{
......@@ -444,7 +454,7 @@ namespace Model
}
else
{
currentFrame++;
currentFrame++; //increment walk cycle
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment