Skip to content

Commit 7d2509c

Browse files
change in total ants variable passed to graphics
1 parent 1af9561 commit 7d2509c

File tree

1 file changed

+11
-11
lines changed
  • src/main/java/ir/sharif/aichallenge/server/logic/model

1 file changed

+11
-11
lines changed

src/main/java/ir/sharif/aichallenge/server/logic/model/Game.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ public void passTurn(Map<String, List<ClientMessageInfo>> messages) {
6767
handleChatMessages(messages);
6868
handleAntsMove(messages);
6969
map.getAllCells().forEach(Cell::manageResources);
70-
/* if (isFinished()) {
71-
Colony winnerColony = gameJudge.getWinner();
72-
this.graphicLogDTO.game_config.winner = winnerColony.getId();
73-
this.graphicLogDTO.stats.winner = winnerColony.getId();
74-
Log.i("Game", "Game finished, winner colony id: " + winnerColony.getId());
75-
System.exit(0);
76-
} */
70+
/*
71+
* if (isFinished()) { Colony winnerColony = gameJudge.getWinner();
72+
* this.graphicLogDTO.game_config.winner = winnerColony.getId();
73+
* this.graphicLogDTO.stats.winner = winnerColony.getId(); Log.i("Game",
74+
* "Game finished, winner colony id: " + winnerColony.getId()); System.exit(0);
75+
* }
76+
*/
7777
generateTurnGraphicLog();
7878
currentTurn++;
7979
}
@@ -158,13 +158,13 @@ private TurnDTO addMoreToLog(TurnDTO log, int colonyID) {
158158
if (colonyID == 0) {
159159
log.team0_alive_soldiers = soldier_alive;
160160
log.team0_alive_workers = workers_alive;
161-
log.team0_total_soldiers = soldiers;
162-
log.team0_total_workers = workers;
161+
log.team0_total_soldiers = getColonies().get(0).getAllSoldierAntsGeneratedCount();
162+
log.team0_total_workers = getColonies().get(0).getAllAntsGeneratedCount() - log.team0_total_soldiers;
163163
} else {
164164
log.team1_alive_soldiers = soldier_alive;
165165
log.team1_alive_workers = workers_alive;
166-
log.team1_total_soldiers = soldiers;
167-
log.team1_total_workers = workers;
166+
log.team1_total_soldiers = getColonies().get(1).getAllSoldierAntsGeneratedCount();
167+
log.team1_total_workers = getColonies().get(1).getAllAntsGeneratedCount() - log.team1_total_soldiers;
168168
}
169169
return log;
170170
}

0 commit comments

Comments
 (0)