Merge remote-tracking branch 'origin/master'

aps2019project · May 8, 2019 · ab80b5b · ab80b5b
2 parents 57869d4 + 22ad870
commit ab80b5b
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 80 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/models/Cell.java b/src/models/Cell.java
@@ -2,9 +2,8 @@
 
 public class Cell {
 
-    private Coordination coordination;
+    private Coordination coordination=new Coordination();
     private Card card;
-    private Item item;
     private boolean isThereFlag = false;
 
     public Card getCard() {
@@ -17,16 +16,6 @@ public void setCard(Card card) {
         this.card = card;
     }
 
-    public Item getItem() {
-
-        return item;
-    }
-
-    public void setItem(Item item) {
-
-        this.item = item;
-    }
-
     public boolean isThereFlag() {
 
         return isThereFlag;

diff --git a/src/models/Collectible.java b/src/models/Collectible.java
diff --git a/src/models/Deck.java b/src/models/Deck.java
@@ -8,7 +8,6 @@ public class Deck implements Serializable {
     private String deckName;
     private ArrayList<Card> cards = new ArrayList<>();
     private int maxCardNumber;
-    private Item item;
     private Hand hand = new Hand();
 
     public String getDeckName() {

diff --git a/src/models/Item.java b/src/models/Item.java
diff --git a/src/models/Shop.java b/src/models/Shop.java
diff --git a/src/models/Table.java b/src/models/Table.java
@@ -21,6 +21,7 @@ public Table() {
         for (int row = 0; row < ROWS; row++) {
             for (int column = 0; column < COLUMNS; column++) {
 
+                cells[row][column] = new Cell();
                 cells[row][column].setCoordination(row, column);
             }
         }

diff --git a/src/models/Usable.java b/src/models/Usable.java
diff --git a/testCase.txt b/testCase.txt
@@ -1,3 +1,63 @@
+create account erfan
+erfan
+enter shop
+buy total_disarm
+buy lighting_bolt
+buy all_disarm
+buy all_poison
+buy dispel
+buy sacrifice
+buy shock
+
+buy white_demon
+buy soul_eater
+
+buy iraj
+buy iraj
+buy arjang
+buy big_giant
+buy panther
+buy siavash
+buy iraj
+buy iraj
+buy iraj
+buy big_giant
+buy panther
+buy big_giant
+buy panther
+exit
+enter collection
+create deck mode1
+add erfan_total_disarm_1 to deck mode1
+add erfan_lighting_bolt_1 to deck mode1
+add erfan_all_disarm_1 to deck mode1
+add erfan_all_poison_1 to deck mode1
+add erfan_dispel_1 to deck mode1
+add erfan_sacrifice_1 to deck mode1
+add erfan_shock_1 to deck mode1
+
+add erfan_white_demon_1 to deck mode1
+add erfan_soul_eater_1 to deck mode1
+
+add erfan_iraj_1 to deck mode1
+add erfan_iraj_2 to deck mode1
+add erfan_arjang_1 to deck mode1
+add erfan_big_giant_1 to deck mode1
+add erfan_panther_1 to deck mode1
+add erfan_siavash_1 to deck mode1
+add erfan_iraj_3 to deck mode1
+add erfan_iraj_4 to deck mode1
+add erfan_iraj_5 to deck mode1
+add erfan_big_giant_2 to deck mode1
+add erfan_panther_2 to deck mode1
+add erfan_big_giant_3 to deck mode1
+add erfan_panther_3 to deck mode1
+
+select deck mode1
+exit
+enter loginmenu
+save
+logout
 create account ali
 ali
 enter shop
@@ -52,5 +112,9 @@ add ali_big_giant_2 to deck mode1
 add ali_panther_2 to deck mode1
 add ali_big_giant_3 to deck mode1
 add ali_panther_3 to deck mode1
-
-select deck mode1
+select deck mode1
+exit
+enter battle
+2
+select user erfan
+start multiplayer game 1