X-Git-Url: https://troll.desast.re/troll.git/blobdiff_plain/9656502aaa68fb88bfc0664b0d60e8ed25a9acb0..2032e4c0fbf3f7a170640aecdf41698f85dd9753:/src/main/java/com/codingame/game/Referee.java?ds=sidebyside

diff --git a/src/main/java/com/codingame/game/Referee.java b/src/main/java/com/codingame/game/Referee.java
index dfa3324..3de5140 100644
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -7,19 +7,13 @@ import java.util.Random;
 
 import com.codingame.gameengine.core.AbstractPlayer.TimeoutException;
 import com.codingame.gameengine.core.AbstractReferee;
-import com.codingame.gameengine.core.GameManager;
-import com.codingame.gameengine.core.MultiplayerGameManager;
-import com.codingame.gameengine.module.entities.GraphicEntityModule;
-import com.codingame.gameengine.module.entities.Rectangle;
-import com.codingame.gameengine.module.entities.Sprite;
-import com.codingame.gameengine.module.entities.Text;
-import com.codingame.gameengine.module.entities.Curve;
+import com.codingame.game.GodModeManager;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 public class Referee extends AbstractReferee {
-    @Inject private MultiplayerGameManager<Player> gameManager;
-    @Inject private GraphicEntityModule graphicEntityModule;
+    @Inject private GameManager gameManager;
+    @Inject private GodModeManager gm;
 
     @Inject private View view;
     @Inject private Model model;
@@ -28,24 +22,24 @@ public class Referee extends AbstractReferee {
 
     @Override
     public void init() {
-        model.init(gameManager.getSeed());
+        gm.init();
+        model.init();
         gameManager.getPlayer(0).model = model.p0;
         gameManager.getPlayer(1).model = model.p1;
 
         for (Player p: gameManager.getPlayers()) {
             p.gameInit(model.roadLength, model.initialStones,
-                       gameManager.getSeed());
+                       model.seed, gm.getSalt());
         }
 
         view.init(model);
         gameManager.getPlayer(0).view = view.p0;
         gameManager.getPlayer(1).view = view.p1;
-        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.view.disqualify(message);
         player.setScore(-1);
     }
 
@@ -71,7 +65,7 @@ public class Referee extends AbstractReferee {
          * least.
          */
         for (Player player : gameManager.getActivePlayers()) {
-            player.receiveGameTurn();
+            player.receiveGameTurn(); gm.transcend(player);
             switch (player.type) {
             case Timeout:
                 disqualify(player, "T/O", "timed out!");
@@ -111,7 +105,7 @@ public class Referee extends AbstractReferee {
             player.view.displayMessage(player.messageString);
         }
 
-        /* Update game model and view.
+        /* Update game model and view, stones' part.
          *
          * As a special case, the "cheater" (sending out negative
          * stones) handling is deferred here because we need to update
@@ -122,6 +116,7 @@ public class Referee extends AbstractReferee {
          * exhaustion).
          */
         int delta = 0;
+        gm.update(gameManager.getPlayers());
         for (Player player : gameManager.getActivePlayers()) {
             player.view.throwStones(player.stoneThrow);
             delta += player.model.getMultiplier() * player.stoneThrow;
@@ -137,7 +132,9 @@ public class Referee extends AbstractReferee {
             }
         }
 
-        /* If a player cheated, delta is unusable as is.
+        /* Update game model and view, troll part.
+         *
+         * If a player cheated, delta is unusable as is.
          * (Consider the case the player on the right sent
          * INT_MIN.  INT_MIN * (-1) = INT_MIN, so that player
          * would both glean the stones *and* push the troll away.
@@ -172,6 +169,8 @@ public class Referee extends AbstractReferee {
         boolean noStones = true;
         int delta = 0;
         for (Player player : gameManager.getActivePlayers()) {
+            if (model.haveWinner() && player.getIndex() == model.getLoser())
+                continue;
             player.stoneThrow = player.model.getStones();
             player.model.setStones(0);
             delta += player.stoneThrow * player.model.getMultiplier();