diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs index 200b2252540ff915ce628c861a1ec4c6ff6a35a7..320ba1a54d556f75699327994084953e9eab8043 100644 --- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs +++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs @@ -258,6 +258,7 @@ namespace Controller if (GameState.playableUnitSelected) { Unit unit = GameState.selectedUnit; + Unit attackedUnit = GameState.unitToAttack; if (!GameState.isAnimating) { #region Highlight nodes @@ -309,10 +310,13 @@ namespace Controller { if (GameState.currentPlayer == player1) { - spriteBatch.Draw(unit.getCharAttackInfo(), Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground texture - }else + spriteBatch.Draw(unit.getCharAttackInfo(), Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground texture for current character + spriteBatch.Draw(attackedUnit.getCharAttackInfo(), attackInfoLocation2, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground for unit being attacked + } + else { - spriteBatch.Draw(unit.getCharAttackInfo(), attackInfoLocation2, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground texture + spriteBatch.Draw(unit.getCharAttackInfo(), attackInfoLocation2, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground texture for current character + spriteBatch.Draw(attackedUnit.getCharAttackInfo(), Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.7f); //draw charAttackInfoBackground for unit being attacked } spriteBatch.Draw(confirmButton.getImage(), confirmButton.getPixelCoordinates(), null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f); } @@ -376,7 +380,7 @@ namespace Controller Button moveButton = new Button(ButtonType.Move, unitPosition, Content.Load<Texture2D>("move")); Button itemButton = new Button(ButtonType.Items, unitPosition, Content.Load<Texture2D>("items")); ; Button waitButton = new Button(ButtonType.Wait, unitPosition, Content.Load<Texture2D>("wait")); ; - Button attackConfirmButton = new Button(ButtonType.AttackConfirm, unitPosition, Content.Load<Texture2D>("attack")); + Button attackConfirmButton = new Button(ButtonType.AttackConfirm, new Vector2(425, 250), Content.Load<Texture2D>("attack")); if (player == 1) { diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs index ec686e97f7ce65b76ebaaea81306a70147458d53..3373bce4ba0d611b4e7afb82dbdafd1a36419e69 100644 --- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs +++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs @@ -219,7 +219,7 @@ namespace Controller Thread.Sleep(10); } - for (float i = unit.PixelCoordinates.Y; i > originalLocationY; i++) + for (float i = unit.PixelCoordinates.Y; i > originalLocationY; i--) { unit.PixelCoordinates = new Vector2(unit.PixelCoordinates.X, unit.PixelCoordinates.Y - 1); Game.Instance.Tick();