external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

When playing non-team matches, display Player name as winner in Game Recap screen

Browse Source
This commit is contained in:
Chris H
2018-04-28 23:22:23 -04:00
parent dc71046018
commit 758dbb689a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
View File

@@ -47,7 +47,12 @@ public class GameStateEvaluator {
} }
private Score getScoreForGameOver(Game game, Player aiPlayer) { private Score getScoreForGameOver(Game game, Player aiPlayer) {
return game.getOutcome().getWinningTeam() == aiPlayer.getTeam() ? new Score(Integer.MAX_VALUE) : new Score(Integer.MIN_VALUE); if (game.getOutcome().getWinningTeam() == aiPlayer.getTeam() ||
game.getOutcome().isWinner(aiPlayer.getRegisteredPlayer())) {
return new Score(Integer.MAX_VALUE);
}
return new Score(Integer.MIN_VALUE);
} }
public Score getScoreForGameState(Game game, Player aiPlayer) { public Score getScoreForGameState(Game game, Player aiPlayer) {

4
forge-game/src/main/java/forge/game/GameOutcome.java
View File

@@ -92,8 +92,8 @@ public final class GameOutcome implements Iterable<Entry<RegisteredPlayer, Playe
this.playerRating.put(p.getRegisteredPlayer(), p.getStats()); this.playerRating.put(p.getRegisteredPlayer(), p.getStats());
this.playerNames.put(p.getRegisteredPlayer(), p.getName()); this.playerNames.put(p.getRegisteredPlayer(), p.getName());
if (p.getOutcome().hasWon() && if (p.getOutcome().hasWon() && winCondition == GameEndReason.AllOpposingTeamsLost) {
(winCondition == GameEndReason.AllOpponentsLost || winCondition == GameEndReason.AllOpposingTeamsLost)) { // Only mark the WinningTeam when "Team mode" is on.
winningTeam = p.getTeam(); winningTeam = p.getTeam();
} }
} }