github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 19:25:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5756 from mooretc2/freeform-commander-fix

Browse source 
Freeform commander fix
This commit is contained in:
Oleg Agafonov 2019-04-28 20:23:23 +02:00 committed by GitHub
commit cb59442103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
View file

@ -637,13 +637,18 @@ public class NewTableDialog extends MageDialog {
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": 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;
} }
break; break;
case "Variant Magic - Freeform Commander":
if (!options.getGameType().startsWith("Freeform Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Commander needs also a Freeform Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
break;
case "Variant Magic - Brawl": case "Variant Magic - Brawl":
case "Variant Magic - Duel Brawl": case "Variant Magic - Duel Brawl":
if (!options.getGameType().startsWith("Brawl")) { if (!options.getGameType().startsWith("Brawl")) {
@ -678,6 +683,12 @@ public class NewTableDialog extends MageDialog {
return false; return false;
} }
break; break;
case "Freeform Commander Free For All":
if (!options.getDeckType().equals("Variant Magic - Freeform Commander")){
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Commander needs also a Freeform Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
break;
case "Brawl Two Player Duel": case "Brawl Two Player Duel":
case "Brawl Free For All": case "Brawl Free For All":
if (!options.getDeckType().equals("Variant Magic - Brawl") if (!options.getDeckType().equals("Variant Magic - Brawl")