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

moved logic decisions outside of DrawUI

parent 7ce36fbf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/Blaze-Brigade/Blaze_Brigade/Game.cs
+ 29
− 7
View file @ 808126c3
...@@ -348,16 +348,28 @@ namespace Controller ...@@ -348,16 +348,28 @@ namespace Controller
if (!GameState.isAnimating) if (!GameState.isAnimating)
{ {
drawUI.drawHighlightNodes(spriteBatch, graph, moveableNode, attackableNode); drawUI.drawHighlightNodes(spriteBatch, graph, moveableNode, attackableNode);
drawUI.drawDropDownMenu(spriteBatch); if (GameState.dropDownMenuOpen) // if dropDowMenu should be opened, draw dropDownMenu
drawUI.drawInventoryMenu(spriteBatch, font); {
drawUI.drawDropDownMenu(spriteBatch);
}
if (GameState.inventoryOpen)
{
drawUI.drawInventoryMenu(spriteBatch, font);
}
} }
} }
#endregion #endregion
// redraws unit at game over to be darker // redraws unit at game over to be darker
drawUI.drawUnitsAtGameOver(spriteBatch, player1, player2); if (GameState.gameOver)
{
drawUI.drawUnitsAtGameOver(spriteBatch, player1, player2);
}
// draws end turn button // draws end turn button
drawUI.drawEndTurnButton(spriteBatch, endTurnButton); if (GameState.endTurnButton)
{
drawUI.drawEndTurnButton(spriteBatch, endTurnButton);
}
break; break;
} }
spriteBatch.End(); // end spriteBatch spriteBatch.End(); // end spriteBatch
...@@ -371,8 +383,12 @@ namespace Controller ...@@ -371,8 +383,12 @@ namespace Controller
if (GameState.playableUnitSelected) if (GameState.playableUnitSelected)
{ {
//draw attack confirm menu //draw attack confirm menu
drawUI.drawAttackConfirm(spriteBatch, font, largeFont, largestFont, player1, graph); if (GameState.attackConfirmOpen && !GameState.isAnimating)
{
drawUI.drawAttackConfirm(spriteBatch, font, largeFont, largestFont, player1, graph);
}
//draw char info screen menu //draw char info screen menu
drawUI.drawInfoScreen(spriteBatch, player1, font, largeFont); drawUI.drawInfoScreen(spriteBatch, player1, font, largeFont);
Unit unit = GameState.selectedUnit; Unit unit = GameState.selectedUnit;
...@@ -525,9 +541,15 @@ namespace Controller ...@@ -525,9 +541,15 @@ namespace Controller
} }
} }
//draw game over menu //draw game over menu
drawUI.drawGameOverMenu(spriteBatch, gameOver, backGround, largestFont); if (GameState.gameOver)
{
drawUI.drawGameOverMenu(spriteBatch, gameOver, backGround, largestFont);
}
//draw turn transition //draw turn transition
drawUI.drawTurnTransition(spriteBatch, player1Transition, player2Transition, player1); if (GameState.transitionTurn)
{
drawUI.drawTurnTransition(spriteBatch, player1Transition, player2Transition, player1);
}
spriteBatch.End(); spriteBatch.End();
#endregion #endregion
......
src/Blaze-Brigade/Blaze_Brigade/drawUI.cs
+ 50
− 62
View file @ 808126c3
...@@ -42,79 +42,71 @@ namespace View ...@@ -42,79 +42,71 @@ namespace View
{ {
Unit unit = GameState.selectedUnit; Unit unit = GameState.selectedUnit;
if (GameState.beforeMove && !GameState.attackSelect) // if unit has yet to move, display the overall move and attack range of unit if (GameState.beforeMove && !GameState.attackSelect) // if unit has yet to move, display the overall move and attack range of unit
{ {
// Highlight movable nodes in blue // Highlight movable nodes in blue
foreach (Node move in GameState.moveableNodes) foreach (Node move in GameState.moveableNodes)
{ {
spriteBatch.Draw(moveableNode, move.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f); spriteBatch.Draw(moveableNode, move.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
} }
// Highlight attackable nodes in red // Highlight attackable nodes in red
LinkedList<Node> attackableNodes = GameFunction.getAttackableNodes(graph, unit); LinkedList<Node> attackableNodes = GameFunction.getAttackableNodes(graph, unit);
foreach (Node attack in attackableNodes) foreach (Node attack in attackableNodes)
{ {
if ((!GameState.moveableNodes.Contains(attack)) && (attack.unitOnNode != unit) && (!attack.isObstacle)) 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); 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 else // else if unit has already moved, only display the attack range
{ {
LinkedList<Node> attackableNodes = GameFunction.getAttackRangeAfterMoving(graph, unit); LinkedList<Node> attackableNodes = GameFunction.getAttackRangeAfterMoving(graph, unit);
foreach (Node attack in attackableNodes) foreach (Node attack in attackableNodes)
{ {
spriteBatch.Draw(attackableNode, attack.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f); spriteBatch.Draw(attackableNode, attack.getPosition(), null, Color.White * 0.2f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
} }
} }
} }
public static void drawDropDownMenu(SpriteBatch spriteBatch) public static void drawDropDownMenu(SpriteBatch spriteBatch)
{ {
Unit unit = GameState.selectedUnit; Unit unit = GameState.selectedUnit;
unit.setButtonCoordinates(unit.PixelCoordinates);
unit.setButtonCoordinates(unit.PixelCoordinates); Button[] unitButtons = unit.getButtons();
for (int i = 0; i < 4; i++)
Button[] unitButtons = unit.getButtons(); {
for (int i = 0; i < 4; i++) if (unitButtons[i].Active)
{ {
if (unitButtons[i].Active) spriteBatch.Draw(unitButtons[i].getImage(), unitButtons[i].getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f);
{
spriteBatch.Draw(unitButtons[i].getImage(), unitButtons[i].getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f);
}
} }
}
} }
public static void drawInventoryMenu(SpriteBatch spriteBatch, SpriteFont font) public static void drawInventoryMenu(SpriteBatch spriteBatch, SpriteFont font)
{ {
Unit unit = GameState.selectedUnit; Unit unit = GameState.selectedUnit;
if (GameState.inventoryOpen) unit.setButtonCoordinates(unit.PixelCoordinates); //update button positions
{
unit.setButtonCoordinates(unit.PixelCoordinates); //update button positions
Button[] unitButtons = unit.getButtons(); //for each inventory button Button[] unitButtons = unit.getButtons(); //for each inventory button
for (int i = 5; i < 9; i++) for (int i = 5; i < 9; i++)
{
if (unitButtons[i].Active) //if inventory menu buttons are active
{ {
if (unitButtons[i].Active) //if inventory menu buttons are active if (unitButtons[i].hasItem) //if current menu button actually has an item stored in it
{ {
if (unitButtons[i].hasItem) //if current menu button actually has an item stored in it spriteBatch.DrawString(font, unitButtons[i].weapon.name.ToString(), unitButtons[i].getPixelCoordinates() + (new Vector2(15, 5)), Color.Black, 0,
{ Vector2.Zero, 1f, SpriteEffects.None, 0f); //draws item stored in unitButtons[i]
spriteBatch.DrawString(font, unitButtons[i].weapon.name.ToString(), unitButtons[i].getPixelCoordinates() + (new Vector2(15, 5)), Color.Black, 0, spriteBatch.Draw(unitButtons[i].getImage(), unitButtons[i].getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.1f);
Vector2.Zero, 1f, SpriteEffects.None, 0f); //draws item stored in unitButtons[i]
spriteBatch.Draw(unitButtons[i].getImage(), unitButtons[i].getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.1f);
}
} }
} }
} }
} }
public static void drawUnitsAtGameOver(SpriteBatch spriteBatch, Player player1, Player player2) public static void drawUnitsAtGameOver(SpriteBatch spriteBatch, Player player1, Player player2)
{ {
if (GameState.gameOver)
{
// draws faded units // draws faded units
#region Player 1 Units #region Player 1 Units
...@@ -142,15 +134,14 @@ namespace View ...@@ -142,15 +134,14 @@ namespace View
} }
} }
#endregion #endregion
}
} }
public static void drawEndTurnButton(SpriteBatch spriteBatch, Texture2D endTurnButton) public static void drawEndTurnButton(SpriteBatch spriteBatch, Texture2D endTurnButton)
{ {
if (GameState.endTurnButton)
{
spriteBatch.Draw(endTurnButton, GameState.endTurnButtonLocation, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0); spriteBatch.Draw(endTurnButton, GameState.endTurnButtonLocation, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0);
}
} }
private static bool findAttackType(Unit unit1) private static bool findAttackType(Unit unit1)
...@@ -167,8 +158,7 @@ namespace View ...@@ -167,8 +158,7 @@ namespace View
public static void drawAttackConfirm(SpriteBatch spriteBatch, SpriteFont font, SpriteFont largeFont, SpriteFont largestFont, Player player1, Graph graph) public static void drawAttackConfirm(SpriteBatch spriteBatch, SpriteFont font, SpriteFont largeFont, SpriteFont largestFont, Player player1, Graph graph)
{ {
if (GameState.attackConfirmOpen && !GameState.isAnimating)
{
Unit unit = GameState.selectedUnit; Unit unit = GameState.selectedUnit;
Unit attackedUnit = GameState.unitToAttack; Unit attackedUnit = GameState.unitToAttack;
Button confirmButton = unit.getButtonType(ButtonType.AttackConfirm); Button confirmButton = unit.getButtonType(ButtonType.AttackConfirm);
...@@ -233,7 +223,7 @@ namespace View ...@@ -233,7 +223,7 @@ namespace View
} }
} }
spriteBatch.Draw(confirmButton.getImage(), confirmButton.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f); spriteBatch.Draw(confirmButton.getImage(), confirmButton.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
}
} }
public static void drawInfoScreen(SpriteBatch spriteBatch, Player player1, SpriteFont font, SpriteFont largeFont) public static void drawInfoScreen(SpriteBatch spriteBatch, Player player1, SpriteFont font, SpriteFont largeFont)
...@@ -293,20 +283,18 @@ namespace View ...@@ -293,20 +283,18 @@ namespace View
public static void drawGameOverMenu(SpriteBatch spriteBatch, Texture2D gameOver, Texture2D backGround, SpriteFont largestFont) public static void drawGameOverMenu(SpriteBatch spriteBatch, Texture2D gameOver, Texture2D backGround, SpriteFont largestFont)
{ {
if (GameState.gameOver)
{
Vector2 gameOverLocation = new Vector2(-370, -300); 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.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); spriteBatch.Draw(gameOver, Vector2.Zero, null, Color.White, 0, gameOverLocation, 1f, SpriteEffects.None, 0f);
spriteBatch.Draw(backGround, Vector2.Zero, null, Color.Black * 0.5f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f); spriteBatch.Draw(backGround, Vector2.Zero, null, Color.Black * 0.5f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
}
} }
public static void drawTurnTransition(SpriteBatch spriteBatch, Texture2D player1Transition, Texture2D player2Transition, Player player1) public static void drawTurnTransition(SpriteBatch spriteBatch, Texture2D player1Transition, Texture2D player2Transition, Player player1)
{ {
if (GameState.transitionTurn)
{
if (GameState.currentPlayer == player1) if (GameState.currentPlayer == player1)
{ {
spriteBatch.Draw(player1Transition, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw turn transition spriteBatch.Draw(player1Transition, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw turn transition
...@@ -316,6 +304,6 @@ namespace View ...@@ -316,6 +304,6 @@ namespace View
spriteBatch.Draw(player2Transition, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw turn transition spriteBatch.Draw(player2Transition, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw turn transition
} }
} }
}
} }
} }
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