github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-13 01:09:53 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Changed tournament result genration and disconnect time formatting.

Browse source
This commit is contained in:
LevelX2 2014-04-01 00:07:49 +02:00
parent 455cca0795
commit cb018dd0f0
2 changed files with 21 additions and 12 deletions
Mage.Server/src/main/java/mage/server
User.java
Mage/src/mage/game/tournament
TournamentImpl.java

15
Mage.Server/src/main/java/mage/server/User.java
View file

@ -137,9 +137,18 @@ public class User {
public String getDisconnectDuration() {
long secondsDisconnected = SystemUtil.getDateDiff(lastActivity, new Date(), TimeUnit.SECONDS);
int minutes = (int) secondsDisconnected / 60;
int seconds = (int) secondsDisconnected % 60;
return new StringBuilder(Integer.toString(minutes)).append(":").append(seconds > 9 ? seconds: "0" + Integer.toString(seconds)).toString();
long secondsLeft = 0;
String sign = "";
if (secondsDisconnected > (3 * 60)) {
sign="-";
secondsLeft = secondsDisconnected - (3 *60);
} else {
secondsLeft = (3 * 60) - secondsDisconnected;
}
int minutes = (int) secondsLeft / 60;
int seconds = (int) secondsLeft % 60;
return new StringBuilder(sign).append(Integer.toString(minutes)).append(":").append(seconds > 9 ? seconds: "0" + Integer.toString(seconds)).toString();
}
public Date getConnectionTime() {

18
Mage/src/mage/game/tournament/TournamentImpl.java
View file

@ -200,11 +200,10 @@ public abstract class TournamentImpl implements Tournament {
}
protected void playRound(Round round) {
for (TournamentPairing pair: round.getPairs()) {
playMatch(pair);
}
updateResults(); // show points from byes
while (!round.isRoundOver()) {
try {
//TODO: improve this
@ -255,8 +254,8 @@ public abstract class TournamentImpl implements Tournament {
}
}
// Add round result
tp1.setResults(addRoundResult(pair, tp1, tp2));
tp2.setResults(addRoundResult(pair, tp2, tp1));
tp1.setResults(addRoundResult(round.getRoundNumber(), pair, tp1, tp2));
tp2.setResults(addRoundResult(round.getRoundNumber(), pair, tp2, tp1));
// Add points
if (mp2.hasQuit() || mp1.getWins() > mp2.getWins()) {
@ -270,22 +269,23 @@ public abstract class TournamentImpl implements Tournament {
}
}
for (TournamentPlayer tp : round.getPlayerByes()) {
tp.setResults(new StringBuilder(tp.getResults()).append("(Round Bye) ").toString());
tp.setResults(new StringBuilder(tp.getResults()).append("R").append(round.getRoundNumber()).append(" ").append("Bye ").toString());
tp.setPoints(tp.getPoints() + 3);
}
}
}
private static String addRoundResult(TournamentPairing pair, TournamentPlayer TournamentPlayer, TournamentPlayer opponentPlayer) {
StringBuilder playerResult = new StringBuilder(TournamentPlayer.getResults());
playerResult.append(getMatchResultString(TournamentPlayer, opponentPlayer, pair.getMatch()));
private static String addRoundResult(int round, TournamentPairing pair, TournamentPlayer tournamentPlayer, TournamentPlayer opponentPlayer) {
StringBuilder playerResult = new StringBuilder(tournamentPlayer.getResults());
playerResult.append("R").append(round).append(" ");
playerResult.append(getMatchResultString(tournamentPlayer, opponentPlayer, pair.getMatch()));
return playerResult.toString();
}
private static String getMatchResultString(TournamentPlayer p1, TournamentPlayer p2, Match match) {
MatchPlayer mp1 = match.getPlayer(p1.getPlayer().getId());
MatchPlayer mp2 = match.getPlayer(p2.getPlayer().getId());
StringBuilder matchResult = new StringBuilder(p1.getResults());
StringBuilder matchResult = new StringBuilder();
matchResult.append(p2.getPlayer().getName());
matchResult.append(" (").append(mp1.getWins());
if (mp1.hasQuit()) {