Start leaguifying

[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 67d96e0..19ef894 100644 (file)
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -7,15 +7,14 @@ import java.util.Random;
 
 import com.codingame.gameengine.core.AbstractPlayer.TimeoutException;
 import com.codingame.gameengine.core.AbstractReferee;
 
 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.game.GodModeManager;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 public class Referee extends AbstractReferee {
 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 GameManager gameManager;

     @Inject private GodModeManager gm;
     @Inject private GodModeManager gm;

+    @Inject private LeagueManager league;

 
     @Inject private View view;
     @Inject private Model model;
 
     @Inject private View view;
     @Inject private Model model;


@@ -25,24 +24,23 @@ public class Referee extends AbstractReferee {
     @Override
     public void init() {
         gm.init();
     @Override
     public void init() {
         gm.init();

-        model.init(gameManager.getSeed());
+        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.getPlayer(0).model = model.p0;
         gameManager.getPlayer(1).model = model.p1;
 
         for (Player p: gameManager.getPlayers()) {
             p.gameInit(model.roadLength, model.initialStones,

-                       gameManager.getSeed(), gm.getSalt());
+                       model.seed, gm.getSalt());

         }
 
         view.init(model);
         gameManager.getPlayer(0).view = view.p0;
         gameManager.getPlayer(1).view = view.p1;
         }
 
         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);
     }
 
     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);
     }
 
         player.setScore(-1);
     }
 


@@ -108,7 +106,7 @@ public class Referee extends AbstractReferee {
             player.view.displayMessage(player.messageString);
         }
 
             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
          *
          * As a special case, the "cheater" (sending out negative
          * stones) handling is deferred here because we need to update


@@ -135,7 +133,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.
          * (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.