Merge pull request #29 from AP2020Fall/Fatemeh

Phase 1;
AP2020Fall · Dec 17, 2020 · d0e120d · d0e120d
2 parents 9a75860 + 47ade0a
commit d0e120d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/plato/controller/DotsAndBoxesController.java b/src/plato/controller/DotsAndBoxesController.java
@@ -4,6 +4,7 @@
 import plato.model.Player;
 import plato.view.DotsAndBoxesView;
 
+import java.util.ArrayList;
 import java.util.Scanner;
 
 
@@ -13,8 +14,9 @@ public class DotsAndBoxesController extends DotsAndBoxes {
     static final int RIGHT = 0;
     static final int BOTTOM = 1;
     public static int numberofplayedgame=0;
+    public static int turn;
     boolean[][] box;
-    int turn;
+
     boolean[][] rightline;
     boolean[][] bottomline;
 
@@ -123,7 +125,11 @@ public void saveInformation(){
     public void availableLines(){
 
     }
-    public void players(Player player1, Player player2){
+    ArrayList<Player> players = new ArrayList<>();
+    public ArrayList<Player> players(Player player1, Player player2){
+        players.add(player1);
+        players.add(player2);
+        return players;
 
     }
     public void timeToDrawLine(){

diff --git a/src/plato/view/DotsAndBoxesView.java b/src/plato/view/DotsAndBoxesView.java
@@ -9,16 +9,16 @@ public class DotsAndBoxesView extends GameView {
 
 
     public void showWhoseTurn(Player player1, Player player2){
+        if(DotsAndBoxesController.turn == 1 )
+            System.out.println("It's" + player1 + "Turn");
+        if (DotsAndBoxesController.turn == 2)
+            System.out.println("It's" + player2 + "Turn");
 
     }
     public void showTable(){
 
     }
-    //Dots
-    public void showAvailableLines(){
 
-
-    }
     //Line
     public void showDrawnLines(){
 

diff --git a/src/plato/view/GameView.java b/src/plato/view/GameView.java
@@ -50,7 +50,7 @@ public void showPlayedCount(Game game) {
 
     }
 
-    public String showPoints(Game game) {
-        return null;
+    public void showPoints(Game game) {
+
     }
 }