X-Git-Url: https://troll.desast.re/troll.git/blobdiff_plain/69db5112920d309f4b10c10fd4d71793a7e1c4dc..f1557b1498b1a64d32a0e7e40dbe8899468ffc2d:/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 b907739..e741cd1 100644
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -78,7 +78,7 @@ public class Referee extends AbstractReferee {
                 try { player.model.consumeStones(player.stoneThrow); }
                 catch (Model.Player.ThrewMoreStonesThanHad e) {
                     if (model.random.nextInt(10) > 0) {
-                        gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " tried to throw more stones than they had.  I'll let it slide for this time.  (But not let them throw that much!)"));
+                        player.view.threwMoreStonesThanHad();
                         player.stoneThrow = player.model.consumeMaxStones();
                     }
                     else {
@@ -88,7 +88,7 @@ public class Referee extends AbstractReferee {
                 }
                 catch (Model.Player.FailedToThrowStonesAndShouldHave e) {
                     if (model.random.nextInt(10) > 0) {
-                        gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " tried not throwing any stones.  Fixing that for them because I'm in a good mood today."));
+                        player.view.failedToThrowStonesAndShouldHave();
                         player.stoneThrow = player.model.consumeMinStones();
                     }
                     else {
@@ -116,7 +116,7 @@ public class Referee extends AbstractReferee {
         boolean exhausted = false;
         if (! disqual) {
             for (Player player : gameManager.getActivePlayers()) {
-                gameManager.addToGameSummary(String.format("%s throws %d stone%s at the troll.", player.getNicknameToken(), player.stoneThrow, player.stoneThrow == 1 ? "" : "s"));
+                player.view.throwStones(player.stoneThrow);
                 delta += player.model.getMultiplier() * player.stoneThrow;
 
                 if (player.stoneThrow < 0) {
@@ -144,18 +144,17 @@ public class Referee extends AbstractReferee {
             else if (cheat1) delta =  1;
 
             if (delta > 0) {
-                gameManager.addToGameSummary("Troll walks right.");
                 model.trollPosition++;
+                view.moveTroll(View.Dir.RIGHT);
             }
             else if (delta < 0) {
-                gameManager.addToGameSummary("Troll walks left.");
                 model.trollPosition--;
+                view.moveTroll(View.Dir.LEFT);
             }
             else {
-                gameManager.addToGameSummary("Troll stands still.");
+                view.moveTroll(View.Dir.STILL);
                 // XXX animate
             }
-            view.moveTroll();
 
             for (Player player : gameManager.getActivePlayers()) {
                 player.model.adjustScore(model.trollPosition);
@@ -163,7 +162,6 @@ public class Referee extends AbstractReferee {
 
             if (model.haveWinner()) {
                 int loser = model.getLoser();
-                gameManager.addToGameSummary(GameManager.formatErrorMessage("Troll destroys " + gameManager.getPlayer(loser).getNicknameToken()) + ".");
                 gameManager.getPlayer(loser).view.destroy();
                 victory = true;
             }
@@ -183,20 +181,20 @@ public class Referee extends AbstractReferee {
         int s1 = p1.getScore();
 
         if (s0 > s1) {
-            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p0.getNicknameToken() + " wins."));
+            p0.view.victory();
             p1.view.markLoser();
         }
         else if (s0 < s1) {
-            gameManager.addToGameSummary(GameManager.formatSuccessMessage(p1.getNicknameToken() + " wins."));
+            p1.view.victory();
             p0.view.markLoser();
         }
         else if (s0 < 0) {
-            gameManager.addToGameSummary(GameManager.formatErrorMessage("Everybody loses!"));
+            view.doubleDefeat();
             p0.view.markLoser();
             p1.view.markLoser();
         }
         else {
-            gameManager.addToGameSummary("Draw.");
+            view.draw();
         }
     }
 }