some bugs fixed

aps2019project · May 6, 2019 · cbc79de · cbc79de
1 parent 0e0db5d
commit cbc79de
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 16 deletions.
diff --git a/jsonData/accounts/ahmad.account.json b/jsonData/accounts/ahmad.account.json
diff --git a/jsonData/accounts/hadi123.account.json b/jsonData/accounts/hadi123.account.json
diff --git a/jsonData/itemCards/usable/SuperShield.usable.item.card.json b/jsonData/itemCards/usable/SuperShield.usable.item.card.json
@@ -11,11 +11,7 @@
         "duration": 2147483647
       },
       "target": {
-        "isForAroundOwnHero": true,
-        "dimensions": {
-          "row": 1,
-          "column": 1
-        },
+        "isForDeckCards": true,
         "owner": {
           "own": true
         },

diff --git a/src/client/models/comperessedData/CompressedSpell.java b/src/client/models/comperessedData/CompressedSpell.java
@@ -36,6 +36,9 @@ public int getLastTurnUsed() {
     }
 
     public boolean isCoolDown(int turnNumber) {
+        if (lastTurnUsed == 0) {
+            return false;
+        }
         return lastTurnUsed + coolDown * 2 >= turnNumber;
     }
 }
diff --git a/src/client/view/View.java b/src/client/view/View.java
@@ -388,7 +388,7 @@ private void showMoves(AvailableActions availableActions) {
     private void showSpecialPower(AvailableActions availableActions) {
         if (availableActions.getSpecialPower() != null) {
             System.out.println("Special power is available; requires " +
-                    availableActions.getSpecialPower().getHero().getCard().getMannaPoint() + "MP\n");
+                    availableActions.getSpecialPower().getHero().getCard().getSpell().getMannaPoint() + "MP\n");
         }
     }
 

diff --git a/src/server/models/account/MatchHistory.java b/src/server/models/account/MatchHistory.java
@@ -1,14 +1,20 @@
 package server.models.account;
 
+import server.models.game.Player;
+
 import java.util.Date;
 
 public class MatchHistory {
     private String oppName;
     private boolean amIWinner;
     private Date date;
 
-    public MatchHistory(String oppName, boolean amIWinner) {
-        this.oppName = oppName;
+    public MatchHistory(Player player, boolean amIWinner) {
+        if (player.getUserName().equals("AI")) {
+            this.oppName = player.getDeck().getDeckName();
+        } else {
+            this.oppName = player.getUserName();
+        }
         this.amIWinner = amIWinner;
         this.date = new Date(System.currentTimeMillis());
     }

diff --git a/src/server/models/card/spell/Spell.java b/src/server/models/card/spell/Spell.java
@@ -70,6 +70,9 @@ public SpellAction getAction() {
     }
 
     public boolean isCoolDown(int turnNumber) {
+        if (lastTurnUsed == 0) {
+            return false;
+        }
         return lastTurnUsed + coolDown * 2 >= turnNumber;
     }
 }
diff --git a/src/server/models/game/Game.java b/src/server/models/game/Game.java
@@ -58,16 +58,17 @@ public GameMap getGameMap() {
     }
 
     public void startGame() throws ServerException {
+        applyOnStartSpells(playerOne.getDeck());
         putMinion(1, playerOne.getHero(), gameMap.getCell(2, 0));
+
         this.turnNumber = 2;
+        applyOnStartSpells(playerTwo.getDeck());
         putMinion(2, playerTwo.getHero(), gameMap.getCell(2, 8));
+
         this.turnNumber = 1;
 
         playerOne.setCurrentMP(20);
         Server.getInstance().sendGameUpdateMessage(this);
-
-        applyOnStartSpells(playerTwo.getDeck());
-        applyOnStartSpells(playerTwo.getDeck());
     }
 
     public CompressedGame toCompressedGame() {
@@ -469,7 +470,7 @@ private Troop getAndValidateHero(String cardId) throws ClientException {
 
     private Spell getAndValidateSpecialPower(Troop hero) throws ClientException {
         Spell specialPower = hero.getCard().getSpells().get(0);
-        if (specialPower == null || specialPower.getAvailabilityType().isSpecialPower()) {
+        if (specialPower == null || !specialPower.getAvailabilityType().isSpecialPower()) {
             throw new ClientException("special power is not available");
         }
 
@@ -747,7 +748,11 @@ private void setTargetData(Spell spell, Cell cardCell, Cell clickCell, Cell hero
             for (Card card : player.getDeck().getOthers()) {
                 addCardToTargetData(spell, targetData, card);
             }
+            for (Card card : player.getHand()) {
+                addCardToTargetData(spell, targetData, card);
+            }
             addCardToTargetData(spell, targetData, player.getNextCard());
+            addCardToTargetData(spell, targetData, player.getDeck().getHero());
         }
         if (spell.getTarget().getDimensions() != null) {
             Position centerPosition = getCenterPosition(spell, cardCell, clickCell, heroCell);
@@ -850,11 +855,11 @@ private int calculateLastCoordinate(int first, int dimension, int maxNumber) {
 
     void setMatchHistories(boolean resultOne, boolean resultTwo) {
         playerOne.setMatchHistory(
-                new MatchHistory(playerTwo.getUserName(), resultOne)
+                new MatchHistory(playerTwo, resultOne)
         );
 
         playerTwo.setMatchHistory(
-                new MatchHistory(playerOne.getUserName(), resultTwo)
+                new MatchHistory(playerOne, resultTwo)
         );
     }