From f8b9e3d40812311995b874e79c424d7eb0d0d86e Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 29 Mar 2019 18:30:17 +0400 Subject: [PATCH] Added more game mode and deck type combinations for commander; --- .../main/java/mage/client/dialog/NewTableDialog.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java index c94559d6ca8..f433f0c0cb5 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -631,10 +631,14 @@ public class NewTableDialog extends MageDialog { * @return */ private boolean checkMatchOptions(MatchOptions options) { + + // deck => game switch (options.getDeckType()) { case "Variant Magic - Commander": case "Variant Magic - Duel Commander": case "Variant Magic - MTGO 1v1 Commander": + case "Variant Magic - Freeform Commander": + case "Variant Magic - Penny Dreadful Commander": if (!options.getGameType().startsWith("Commander")) { JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE); return false; @@ -660,12 +664,16 @@ public class NewTableDialog extends MageDialog { } break; } + + // game => deck switch (options.getGameType()) { case "Commander Two Player Duel": case "Commander Free For All": if (!options.getDeckType().equals("Variant Magic - 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); return false; }