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

Merge pull request #6211 from michaelrfarcasin/feature/freeform-unlimited-commander

Browse source 
Add Freeform Unlimited Commander game type
This commit is contained in:
Oleg Agafonov 2020-01-22 06:57:43 +01:00 • committed by GitHub
commit 9ba249c543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 421 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -650,6 +650,12 @@ public class NewTableDialog extends MageDialog {
return false;
}
break;
case "Variant Magic - Freeform Unlimited Commander":
if (!options.getGameType().startsWith("Freeform Unlimited Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform+ Commander needs also a Freeform Unlimited Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
break;
case "Variant Magic - Brawl":
case "Variant Magic - Duel Brawl":
if (!options.getGameType().startsWith("Brawl")) {
@ -698,6 +704,12 @@ public class NewTableDialog extends MageDialog {
return false;
}
break;
case "Freeform Unlimited Commander":
if (!options.getDeckType().equals("Variant Magic - Freeform Unlimited Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Freeform Unlimited Commander needs also a Freeform Unlimited Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
break;
case "Brawl Two Player Duel":
case "Brawl Free For All":
if (!options.getDeckType().equals("Variant Magic - Brawl")

2
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -818,7 +818,7 @@ public class TablesPanel extends javax.swing.JPanel {
formatFilterList.add(RowFilter.regexFilter("^Constructed - Premodern", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatCommander.isSelected()) {
formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander|^Centurion Commander|^Penny Dreadful Commander|^Freeform Commander|^MTGO 1v1 Commander|^Duel Brawl|^Brawl", TablesTableModel.COLUMN_DECK_TYPE));
formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander|^Centurion Commander|^Penny Dreadful Commander|^Freeform Commander|^Freeform Unlimited Commander|^MTGO 1v1 Commander|^Duel Brawl|^Brawl", TablesTableModel.COLUMN_DECK_TYPE));
}
if (btnFormatTinyLeader.isSelected()) {
formatFilterList.add(RowFilter.regexFilter("^Tiny", TablesTableModel.COLUMN_DECK_TYPE));