Cleanup and meta updates

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

diff --git a/src/main/java/com/codingame/game/Referee.java b/src/main/java/com/codingame/game/Referee.java
index e6c941f..979e283 100644 (file)
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -30,22 +30,24 @@ public class Referee extends AbstractReferee {
         gameManager.getPlayer(0).model = model.p0;
         gameManager.getPlayer(1).model = model.p1;
 
         gameManager.getPlayer(0).model = model.p0;
         gameManager.getPlayer(1).model = model.p1;
 

-        for (Player p : gameManager.getPlayers()) {
-            p.sendInputLine(String.format("%d %d", model.roadLength, model.initialStones));
+        for (Player p: gameManager.getPlayers()) {
+            p.sendInputLine(String.format("%d %d",
+                                          model.roadLength,
+                                          model.initialStones));

         }
 
         view.init(model);
         }
 
         view.init(model);

-

         gameManager.getPlayer(0).view = view.p0;
         gameManager.getPlayer(1).view = view.p1;
         gameManager.getPlayer(0).view = view.p0;
         gameManager.getPlayer(1).view = view.p1;

-
-        gameManager.setFrameDuration(2000); // XXX
+        gameManager.setFrameDuration(2000);

     }
 
     @Override
     public void gameTurn(int turn) {
         // System.err.println("Starting turn " + turn);
 
     }
 
     @Override
     public void gameTurn(int turn) {
         // System.err.println("Starting turn " + turn);
 

+        view.startTurn();
+

         boolean disqual = false;
         boolean victory = false;
         boolean exhausted = false;
         boolean disqual = false;
         boolean victory = false;
         boolean exhausted = false;


@@ -54,10 +56,10 @@ public class Referee extends AbstractReferee {
         for (Player player : gameManager.getActivePlayers()) {
             Model.Player p = player.model;
             {
         for (Player player : gameManager.getActivePlayers()) {
             Model.Player p = player.model;
             {

-                int trollDistance = p.getTrollDistance();
-                int stones = p.getStones();
-                int oppStones = p.getOppStones();
-                player.sendInputLine(String.format("%d %d %d", trollDistance, stones, oppStones));
+                player.sendInputLine(String.format("%d %d %d",
+                                                   p.getTrollDistance(),
+                                                   p.getStones(),
+                                                   p.getOppStones()));

             }
             player.execute();
         }
             }
             player.execute();
         }


@@ -135,8 +137,8 @@ public class Referee extends AbstractReferee {
             }
 
             if (model.haveWinner()) {
             }
 
             if (model.haveWinner()) {

-                int winner = model.getWinner();
-                gameManager.addToGameSummary(GameManager.formatErrorMessage("Troll destroys " + gameManager.getPlayer(winner).getNicknameToken()));
+                int loser = model.getLoser();
+                gameManager.addToGameSummary(GameManager.formatErrorMessage("Troll destroys " + gameManager.getPlayer(loser).getNicknameToken()) + ".");

                 victory = true;
             }
             else if (model.exhausted()) exhausted = true;
                 victory = true;
             }
             else if (model.exhausted()) exhausted = true;


@@ -155,11 +157,11 @@ public class Referee extends AbstractReferee {
         int s1 = p1.getScore();
 
         if (s0 > s1) {
         int s1 = p1.getScore();
 
         if (s0 > s1) {

-            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p0.getNicknameToken() + " wins"));
+            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p0.getNicknameToken() + " wins."));

             p1.view.destroy();
         }
         else if (s0 < s1) {
             p1.view.destroy();
         }
         else if (s0 < s1) {

-            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p1.getNicknameToken() + " wins"));
+            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p1.getNicknameToken() + " wins."));

             p0.view.destroy();
         }
         else if (s0 < 0) {
             p0.view.destroy();
         }
         else if (s0 < 0) {