Restore cheat throw visuals

[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 0c87bbf..6e291be 100644 (file)
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -40,6 +40,12 @@ public class Referee extends AbstractReferee {
         gameManager.setFrameDuration(2000);
     }
 
+    private void disqualify(Player player, String popup, String message) {
+        player.deactivate(player.getNicknameToken() + " " + popup);
+        gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " " + message));
+        player.setScore(-1);
+    }
+
     @Override
     public void gameTurn(int turn) {
         // System.err.println("Starting turn " + turn);
@@ -61,40 +67,32 @@ public class Referee extends AbstractReferee {
             player.receiveGameTurn();
             switch (player.type) {
             case Timeout:
-                gameManager.addToGameSummary(player.getNicknameToken() + " timed out!");
-                player.deactivate(player.getNicknameToken() + " T/O");
-                player.setScore(-1);
+                disqualify(player, "T/O", "timed out!");
                 disqual = true;
                 break;
             case Invalid:
-                player.deactivate(player.getNicknameToken() + " INVALID");
-                gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " provided an ill-formed action"));
-                player.setScore(-1);
+                disqualify(player, "INVALID", "provided an ill-formed action");
                 disqual = true;
                 break;
             case Throw:
                 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 {
-                        gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " tried to throw more stones than they had.  They went into debt trying to provide.  The economy tanked, recession and famine ensued; even the troll wouldn't have wanted to bash them anymore.  But that's no victory."));
-                        player.deactivate(player.getNicknameToken() + " ILLEGAL");
-                        player.setScore(-1);
+                        disqualify(player, "ILLEGAL", "tried to throw more stones than they had.  They went into debt trying to provide.  The economy tanked, recession and famine ensued; even the troll wouldn't have wanted to bash them anymore.  But that's no victory.");
                         disqual = true;
                     }
                 }
                 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 {
-                        gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + "tried not throwing any stones.  They were then eaten by a grue."));
-                        player.deactivate(player.getNicknameToken() + " ILLEGAL");
-                        player.setScore(-1);
+                        disqualify(player, "ILLEGAL", "tried not throwing any stones.  They were then eaten by a grue.");
                         disqual = true;
                     }
                 }
@@ -118,16 +116,14 @@ 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) {
-                    player.deactivate(player.getNicknameToken() + " CHEAT");
-                    gameManager.addToGameSummary(GameManager.formatErrorMessage(player.getNicknameToken() + " cheated.  Banning account."));
-                    player.setScore(-1);
+                    disqualify(player, "CHEAT", "cheated.  Banning account.");
                     disqual = true;
                 }
-                else if (player.stoneThrow > 0) {
+                if (player.stoneThrow != 0) {
                     player.view.animateStones(player.stoneThrow);
                     player.view.updateStoneCounter();
                 }
@@ -148,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);
@@ -167,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;
             }
@@ -187,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();
         }
     }
 }