External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 22:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added cubes for Sealed and Daft Tournaments. Added a simple Swiss like tournament format.

Browse source
This commit is contained in:
LevelX2 2014-01-10 19:58:55 +01:00
parent e3d543fa76
commit e490d6af61
44 changed files with 3119 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Common/src/mage/interfaces/ServerState.java
View file

@ -44,14 +44,16 @@ public class ServerState implements Serializable {
private List<TournamentTypeView> tournamentTypes;
private String[] playerTypes;
private String[] deckTypes;
private String[] draftCubes;
private boolean testMode;
private MageVersion version;
public ServerState(List<GameTypeView> gameTypes, List<TournamentTypeView> tournamentTypes, String[] playerTypes, String[] deckTypes, boolean testMode, MageVersion version) {
public ServerState(List<GameTypeView> gameTypes, List<TournamentTypeView> tournamentTypes, String[] playerTypes, String[] deckTypes, String[] draftCubes, boolean testMode, MageVersion version) {
this.gameTypes = gameTypes;
this.tournamentTypes = tournamentTypes;
this.playerTypes = playerTypes;
this.deckTypes = deckTypes;
this.draftCubes = draftCubes;
this.testMode = testMode;
this.version = version;
}
@ -72,6 +74,10 @@ public class ServerState implements Serializable {
return deckTypes;
}
public String[] getDraftCubes() {
return draftCubes;
}
public boolean isTestMode() {
return testMode;
}

6
Mage.Common/src/mage/remote/SessionImpl.java
View file

@ -339,6 +339,12 @@ public class SessionImpl implements Session {
return serverState.getDeckTypes();
}
@Override
public String[] getDraftCubes() {
return serverState.getDraftCubes();
}
@Override
public List<TournamentTypeView> getTournamentTypes() {
return serverState.getTournamentTypes();

2
Mage.Common/src/mage/remote/interfaces/GameTypes.java
View file

@ -43,5 +43,7 @@ public interface GameTypes {
String[] getDeckTypes();
String[] getDraftCubes();
List<TournamentTypeView> getTournamentTypes();
}

10
Mage.Common/src/mage/view/DraftView.java
View file

@ -46,8 +46,14 @@ public class DraftView implements Serializable {
private int cardNum;
public DraftView(Draft draft) {
for (ExpansionSet set: draft.getSets()) {
sets.add(set.getName());
if (draft.getDraftCube() != null) {
for (int i = 0; i < draft.getNumberBoosters(); i++) {
sets.add(draft.getDraftCube().getName());
}
} else {
for (ExpansionSet set: draft.getSets()) {
sets.add(set.getName());
}
}
this.boosterNum = draft.getBoosterNum();
this.cardNum = draft.getCardNum();

5
Mage.Common/src/mage/view/MatchView.java
View file

@ -86,7 +86,10 @@ public class MatchView implements Serializable {
this.matchId = table.getTournament().getId();
this.matchName = table.getName();
this.gameType = table.getGameType();
this.deckType = new StringBuilder(table.getDeckType()).append(" ").append(table.getTournament().getSetsFormatedShort()).toString();
if (table.getTournament().getOptions().getNumberRounds() > 0) {
this.gameType = new StringBuilder(this.gameType).append(" ").append(table.getTournament().getOptions().getNumberRounds()).append(" Rounds").toString();
}
this.deckType = new StringBuilder(table.getDeckType()).append(" ").append(table.getTournament().getBoosterInfo()).toString();
StringBuilder sb1 = new StringBuilder();
for (TournamentPlayer tPlayer : table.getTournament().getPlayers()) {

5
Mage.Common/src/mage/view/TableView.java
View file

@ -109,6 +109,9 @@ public class TableView implements Serializable {
} else {
this.wins = table.getTournament().getOptions().getMatchOptions().getWinsNeeded();
if (table.getTournament().getOptions().getNumberRounds() > 0) {
this.gameType = new StringBuilder(this.gameType).append(" ").append(table.getTournament().getOptions().getNumberRounds()).append(" Rounds").toString();
}
this.freeMulligans = table.getTournament().getOptions().getMatchOptions().getFreeMulligans();
StringBuilder sb1 = new StringBuilder();
for (TournamentPlayer tp: table.getTournament().getPlayers()) {
@ -129,7 +132,7 @@ public class TableView implements Serializable {
default:
}
this.additionalInfo = sb.toString();
this.deckType = new StringBuilder(table.getDeckType()).append(" ").append(table.getTournament().getSetsFormatedShort()).toString();
this.deckType = new StringBuilder(table.getDeckType()).append(" ").append(table.getTournament().getBoosterInfo()).toString();
}
}

14
Mage.Common/src/mage/view/TournamentTypeView.java
View file

@ -44,6 +44,9 @@ public class TournamentTypeView implements Serializable {
private int numBoosters;
private boolean draft;
private boolean limited;
private boolean cubeBooster;
private boolean elimination;
public TournamentTypeView(TournamentType tournamentType) {
this.name = tournamentType.getName();
@ -52,6 +55,8 @@ public class TournamentTypeView implements Serializable {
this.numBoosters = tournamentType.getNumBoosters();
this.draft = tournamentType.isDraft();
this.limited = tournamentType.isLimited();
this.cubeBooster = tournamentType.isCubeBooster();
this.elimination = tournamentType.isElimination();
}
@Override
@ -82,4 +87,13 @@ public class TournamentTypeView implements Serializable {
public boolean isLimited() {
return limited;
}
public boolean isCubeBooster() {
return cubeBooster;
}
public boolean isElimination() {
return elimination;
}
}