FIX: IT belongs in a MODEL!

[troll.git] / src / main / java / com / codingame / game / Player.java

diff --git a/src/main/java/com/codingame/game/Player.java b/src/main/java/com/codingame/game/Player.java
index cb5bb4a..79d5aeb 100644 (file)
--- a/src/main/java/com/codingame/game/Player.java
+++ b/src/main/java/com/codingame/game/Player.java
@@ -16,7 +16,6 @@ import com.codingame.gameengine.module.entities.Sprite;
 public class Player extends AbstractMultiplayerPlayer {
     Model.Player model;
     View.Player view;
 public class Player extends AbstractMultiplayerPlayer {
     Model.Player model;
     View.Player view;

-    Random random = new Random();

 
     @Override
     public int getExpectedOutputLines() {
 
     @Override
     public int getExpectedOutputLines() {


@@ -24,13 +23,10 @@ public class Player extends AbstractMultiplayerPlayer {
     }
 
     // same-typed positional parameters… a disaster waiting to happen
     }
 
     // same-typed positional parameters… a disaster waiting to happen

-    void gameInit(int roadLength, int initialStones, long seed) {
-        int nReserved = random.nextInt(5);
-        String reserved = "";
-        while (nReserved --> 0) reserved += " 0";
-        sendInputLine(String.format("%d %d %d %d%s",
+    void gameInit(int roadLength, int initialStones, long seed, long salt) {
+        sendInputLine(String.format("%d %d %d %d %d",

                                     roadLength, initialStones, seed,
                                     roadLength, initialStones, seed,

-                                    model.getMultiplier(), reserved));
+                                    model.getMultiplier(), salt));

     }
 
     void sendGameTurn() {
     }
 
     void sendGameTurn() {


@@ -65,7 +61,7 @@ public class Player extends AbstractMultiplayerPlayer {
         catch (NoSuchElementException e) { type = Action.Invalid; return; }
 
         s.useDelimiter(eol);
         catch (NoSuchElementException e) { type = Action.Invalid; return; }
 
         s.useDelimiter(eol);

-        if (s.hasNext(rest)) messageString = s.next(rest);
+        if (s.hasNext(rest)) messageString = s.next(rest).trim();

         else messageString = "";
         type = Action.Throw;
     }
         else messageString = "";
         type = Action.Throw;
     }