github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Added table info about range set in a multiplayer game (fixes #3878).

Browse source
This commit is contained in:
LevelX2 2017-08-24 18:57:23 +02:00
parent 04afe73f28
commit 4aca2506d8
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Common/src/main/java/mage/view/TableView.java
View file

@ -24,8 +24,7 @@
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
*/
package mage.view;
import java.io.Serializable;
@ -33,7 +32,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import mage.constants.SkillLevel;
import mage.constants.TableState;
import mage.game.Game;
@ -47,6 +45,7 @@ import mage.game.tournament.TournamentPlayer;
* @author BetaSteward_at_googlemail.com
*/
public class TableView implements Serializable {
private static final long serialVersionUID = 1L;
private UUID tableId;
@ -77,9 +76,9 @@ public class TableView implements Serializable {
}
this.controllerName = table.getControllerName();
this.tableState = table.getState();
if (table.getState() == TableState.WAITING ||
table.getState() == TableState.READY_TO_START ||
table.getState() == TableState.STARTING) {
if (table.getState() == TableState.WAITING
|| table.getState() == TableState.READY_TO_START
|| table.getState() == TableState.STARTING) {
this.createTime = table.getCreateTime();
} else {
if (table.isTournament()) {
@ -94,7 +93,7 @@ public class TableView implements Serializable {
}
if (!table.isTournament()) {
// MATCH
if (table.getState()==TableState.WAITING || table.getState()==TableState.READY_TO_START) {
if (table.getState() == TableState.WAITING || table.getState() == TableState.READY_TO_START) {
tableStateText = table.getState().toString() + " (" + table.getMatch().getPlayers().size() + '/' + table.getSeats().length + ')';
} else {
tableStateText = table.getState().toString();
@ -131,6 +130,9 @@ public class TableView implements Serializable {
addInfo.append("Wins:").append(table.getMatch().getWinsNeeded());
addInfo.append(sbScore.toString());
}
if (table.getNumberOfSeats() > 3) {
addInfo.append(" Rng: ").append(table.getMatch().getOptions().getRange().toString());
}
this.additionalInfo = addInfo.toString();
this.skillLevel = table.getMatch().getOptions().getSkillLevel();
this.quitRatio = Integer.toString(table.getMatch().getOptions().getQuitRatio());