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,6 +22,7 @@ public class Terminal extends View {
         System.out.println("Joueur " + player.getId() + ", placez vos navires");
         int x, y;
         String dir;
+        if(player instanceof Human) {
             for(int i : ships) {
                 boolean valid = false;
                 Ship ship = new Ship(new Pair<>(-1, -1), i, Direction.DEFAULT);
@@ -50,8 +52,16 @@ public class Terminal extends View {
                     }
                 }
             }
+        } 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();