diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 3436a9b62c0a18383b1f6607cde61259ca9457f8..927f721e67c48be1b960898c80b5bdb125161b47 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -183,14 +183,18 @@ namespace Controller
// draws units for player 1
for (int i = 0; i < player1.getNumOfUnits(); i++)
{
-
Unit unit = player1.getUnits().ElementAt(i); //gets unit at i
- spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f); //redraws char sprite
+ spriteBatch.Draw(unit.getSpriteImage(), unit.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f); // redraws char sprite
- #region When Unit is selected
+ }
+ #endregion
+
+ #region When Unit is selected
//if unit is currently clicked on
- if (unit.getClickedOn())
+ if (GameState.isPlayableUnitSelected())
{
+ Unit unit = GameState.getSelectedUnit();
+
#region Highlight nodes
//Highlight movable nodes in blue
LinkedList<Node> moveableNodes = GameFunction.getMovableNodes(graph, unit);
@@ -229,9 +233,7 @@ namespace Controller
Vector2 statLocation = new Vector2(180, 533); //starting location for first stat
Vector2 increment = new Vector2(0, 11.5f); //increment downwards for each stat
Vector2 infoLocation = new Vector2(20, 513);
-
-
-
+
for (int k=0; k<7; k++) //for 6 stats - str, int, skill, speed, def, res
{
spriteBatch.DrawString(font, unit.getStats(k).ToString(), statLocation, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
@@ -240,19 +242,12 @@ namespace Controller
spriteBatch.DrawString(largeFont, unit.getHp().ToString(), new Vector2(255, 515), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.6f); //draws each stat
spriteBatch.Draw(unit.getCharInfo(), infoLocation, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charInfoBackground texture
-
-
+
#endregion
}
#endregion
-
-
-
- }
- #endregion
-
#region Player 2 Units
// draws units for player 2
for (int i = 0; i < player2.getNumOfUnits(); i++)
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index 30bd8f7d3c70b89cb7edc5a80db3b8d854bd4712..9b39a3302fe3ef67d3cab15033483aac68212613 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -44,6 +44,12 @@ namespace Controller
// if player clicks after unit is already selected ...
if (GameState.isPlayableUnitSelected())
{
+ // TODO: determine if player has clicked on a menu button
+ //if (mouseClickCoordinates == GameState.getSelectedUnit())
+ //{
+
+ //}
+
// if user clicks on a valid end node, move to it
Node startNode = graph.getNode(GameState.getSelectedUnit().getPosition());
Node endNode = graph.getNode(mouseClickCoordinates);
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
index 1f2437ad9badc95cde58dacf0a97efe035135c88..c60e13e3e9c19202430e7a1dc043cf9b3477888f 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Unit.cs
@@ -36,8 +36,6 @@ namespace Model
void setPosition(int x, int y); // sets the current position (by node) of the unit
void setEquippedWeapon(Weapon w); // sets the unit's currently equipped weapon
void setMoved(bool a); // on start of players turn, set all units to unmoved (F)
- void setClickedOn(bool a); // sets unit if it has been clicked on or not
- bool getClickedOn(); // returns if the unit has been clicked on
void setMenuOpen(bool a); // Sets if the dropdown menu should be opened
bool getMenuOpen(); // returns if the dropdown menu should be open
}
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
index 65b6f410b80f6bdabc9d59f7201997397c8c30eb..b05ceb575c86740161bc66f12b82da7cccdd5191 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Warrior.cs
@@ -201,21 +201,13 @@ namespace Model
{
this.moved = a;
}
- //set if unit has been clicked on
- public void setClickedOn(bool a)
- {
- clickedOn = a;
- }
- // return if unit has been clicked on
- public Boolean getClickedOn()
- {
- return clickedOn;
- }
+
// set if menu should be open
public void setMenuOpen(bool a)
{
menuOpen = a;
}
+
// return if menu has been open
public Boolean getMenuOpen()
{