Added more game mode and deck type combinations for commander;

This commit is contained in:
Oleg Agafonov 2019-03-29 18:30:17 +04:00
parent ff640a942e
commit f8b9e3d408

View file

@ -631,10 +631,14 @@ public class NewTableDialog extends MageDialog {
* @return * @return
*/ */
private boolean checkMatchOptions(MatchOptions options) { private boolean checkMatchOptions(MatchOptions options) {
// deck => game
switch (options.getDeckType()) { switch (options.getDeckType()) {
case "Variant Magic - Commander": case "Variant Magic - Commander":
case "Variant Magic - Duel Commander": case "Variant Magic - Duel Commander":
case "Variant Magic - MTGO 1v1 Commander": case "Variant Magic - MTGO 1v1 Commander":
case "Variant Magic - Freeform Commander":
case "Variant Magic - Penny Dreadful Commander":
if (!options.getGameType().startsWith("Commander")) { if (!options.getGameType().startsWith("Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false; return false;
@ -660,12 +664,16 @@ public class NewTableDialog extends MageDialog {
} }
break; break;
} }
// game => deck
switch (options.getGameType()) { switch (options.getGameType()) {
case "Commander Two Player Duel": case "Commander Two Player Duel":
case "Commander Free For All": case "Commander Free For All":
if (!options.getDeckType().equals("Variant Magic - Commander") if (!options.getDeckType().equals("Variant Magic - Commander")
&& !options.getDeckType().equals("Variant Magic - Duel Commander") && !options.getDeckType().equals("Variant Magic - Duel Commander")
&& !options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander")) { && !options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander")
&& !options.getDeckType().equals("Variant Magic - Freeform Commander")
&& !options.getDeckType().equals("Variant Magic - Penny Dreadful Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false; return false;
} }