Add View.placeShipRandomly

src/battleship/model/Game.java

@@ -73,8 +73,8 @@ public class Game {
     }
 
     public Player Play(View view){
-        //view.setShips(players[0]);
+        view.setShips(players[0]);
-        //view.setShips(players[1]);
+        view.setShips(players[1]);
         while(getWinner() == null) {
             System.out.println(view);
             Pair<Integer,Integer> move  = currentPlayer.chooseMove();

src/battleship/view/Terminal.java

@@ -3,6 +3,7 @@ package battleship.view;
 import battleship.model.Direction;
 import battleship.model.Game;
 import battleship.model.Ship;
+import battleship.model.player.Human;
 import battleship.model.player.Player;
 import battleship.utils.Pair;
 
@@ -21,37 +22,46 @@ public class Terminal extends View {
         System.out.println("Joueur " + player.getId() + ", placez vos navires");
         int x, y;
         String dir;
-        for(int i : ships) {
+        if(player instanceof Human) {
-            boolean valid = false;
+            for(int i : ships) {
-            Ship ship = new Ship(new Pair<>(-1, -1), i, Direction.DEFAULT);
+                boolean valid = false;
-            while (!player.setShips(ship)) {
+                Ship ship = new Ship(new Pair<>(-1, -1), i, Direction.DEFAULT);
-                if (valid) {
+                while (!player.setShips(ship)) {
-                    System.out.println("Erreur");
+                    if (valid) {
-                }
+                        System.out.println("Erreur");
-                valid = true;
+                    }
-                System.out.println("Placement du bateau de longueur " + ship.getSize());
+                    valid = true;
-                System.out.println("Veuillez indiquer la coordonée x de votre bateau");
+                    System.out.println("Placement du bateau de longueur " + ship.getSize());
-                x = scanner.nextInt();
+                    System.out.println("Veuillez indiquer la coordonée x de votre bateau");
-                System.out.println("Veuillez indiquer la coordonée y de votre bateau");
+                    x = scanner.nextInt();
-                y = scanner.nextInt();
+                    System.out.println("Veuillez indiquer la coordonée y de votre bateau");
-                ship.setCoords(new Pair<>(x, y));
+                    y = scanner.nextInt();
-                boolean validDirection = false;
+                    ship.setCoords(new Pair<>(x, y));
-                while (!validDirection) {
+                    boolean validDirection = false;
-                    System.out.println("Veuillez indiquer la direction de placement de votre bateau (d droite, h haut, b bas, g gauche)");
+                    while (!validDirection) {
-                    dir = scanner.next().toUpperCase();
+                        System.out.println("Veuillez indiquer la direction de placement de votre bateau (d droite, h haut, b bas, g gauche)");
-                    for (Direction direction : Direction.values()) {
+                        dir = scanner.next().toUpperCase();
-                        if (direction.getKeyword() != null && direction.getKeyword().equals(dir)) {
+                        for (Direction direction : Direction.values()) {
-                            ship.setDirection(direction);
+                            if (direction.getKeyword() != null && direction.getKeyword().equals(dir)) {
-                            System.out.println(direction);
+                                ship.setDirection(direction);
-                            validDirection = true;
+                                System.out.println(direction);
-                            break;
+                                validDirection = true;
+                                break;
+                            }
                         }
                     }
                 }
             }
+        } else {
+            // Random
+            placeShipRandomly(player);
         }
+
+
     }
 
+
+
     @Override
     public void displayBoard() {
         System.out.println(toString());

src/battleship/view/View.java

@@ -1,10 +1,14 @@
 package battleship.view;
 
+import battleship.model.Direction;
 import battleship.model.Game;
+import battleship.model.Ship;
 import battleship.model.player.Player;
+import battleship.utils.Pair;
 import battleship.utils.Triplet;
 
 import java.util.ArrayList;
+import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class View {
@@ -21,6 +25,16 @@ public abstract class View {
 
     public abstract void displayBoard();
 
+    protected void placeShipRandomly(Player player) {
+        Random rand = new Random();
+        for(int i : ships) {
+            Ship ship = null;
+            while(ship == null || !player.setShips(ship)) {
+                ship = new Ship(new Pair<>(rand.nextInt(10), rand.nextInt(10)), i, Direction.values()[rand.nextInt(Direction.values().length)]);
+            }
+        }
+    }
+
     @Override
     public String toString() {
         ArrayList<Triplet<Integer,Integer,Boolean>> moves = game.currentPlayer.getMoves();