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 503f59e6b6..a99ef8bec2 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java @@ -637,6 +637,7 @@ public class NewTableDialog extends MageDialog { case "Variant Magic - Commander": case "Variant Magic - Duel Commander": case "Variant Magic - MTGO 1v1 Commander": + case "Variant Magic - Centurion 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); @@ -683,6 +684,7 @@ public class NewTableDialog extends MageDialog { 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 - Centurion 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); diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 5d01790591..a6e001d385 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -812,7 +812,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|^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|^MTGO 1v1 Commander|^Duel Brawl|^Brawl", TablesTableModel.COLUMN_DECK_TYPE)); } if (btnFormatTinyLeader.isSelected()) { formatFilterList.add(RowFilter.regexFilter("^Tiny", TablesTableModel.COLUMN_DECK_TYPE)); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CenturionCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CenturionCommander.java new file mode 100644 index 0000000000..2e8352cc44 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CenturionCommander.java @@ -0,0 +1,86 @@ + +package mage.deck; + +/** + * + * @author andreacosta + */ +public class CenturionCommander extends Commander { + + public CenturionCommander() { + super("Centurion Commander"); + banned.add("Ancestral Recall"); + banned.add("Ancient Tomb"); + banned.add("Back to Basic"); + banned.add("Balance"); + banned.add("Bazaar of Baghdad"); + banned.add("Black Lotus"); + banned.add("Cataclysm"); + banned.add("Channel"); + banned.add("Chaos Orb"); + banned.add("Chrome Mox"); + banned.add("Demonic Tutor"); + banned.add("Dig Through Time"); + banned.add("Emrakul, the Aeons Torn"); + banned.add("Emrakul, the Promised End"); + banned.add("Entomb"); + banned.add("Erayo, Soratami Ascendant"); + banned.add("Falling Star"); + banned.add("Fastbond"); + banned.add("Food Chain"); + banned.add("Gaea’s Cradle"); + banned.add("Gifts Ungiven"); + banned.add("Grim Monolith"); + banned.add("Grindstone"); + banned.add("Hermit Druid"); + banned.add("High Tide"); + banned.add("Humility"); + banned.add("Imperial Seal"); + banned.add("Karakas"); + banned.add("Library of Alexandria"); + banned.add("Mana Crypt"); + banned.add("Mana Drain"); + banned.add("Mana Vault"); + banned.add("Mishra’s Workshop"); + banned.add("Mind Twist"); + banned.add("Mox Diamond"); + banned.add("Mox Emerald"); + banned.add("Mox Jet"); + banned.add("Mox Pearl"); + banned.add("Mox Ruby"); + banned.add("Mox Sapphire"); + banned.add("Mystical Tutor"); + banned.add("Natural Order"); + banned.add("Necropotence"); + banned.add("Oath of Druids"); + banned.add("Protean Hulk"); + banned.add("Sensei’s Diving Top"); + banned.add("Serra Ascendant"); + banned.add("Sharazad"); + banned.add("Survival of the Fittest"); + banned.add("Sol Ring"); + banned.add("Strip Mine"); + banned.add("The Tabernacle at Pendrell Vale"); + banned.add("Time Vault"); + banned.add("Time Walk"); + banned.add("Tinker"); + banned.add("Tolarian Academy"); + banned.add("Treasure Cruise"); + banned.add("Vampiric Tutor"); + banned.add("Vanishing"); + banned.add("Winter Orb"); + banned.add("Yawgmoth’s Bargain"); + + bannedCommander.add("Baral, Chief of Compliance"); + bannedCommander.add("Derevi, Empyrial Tactician"); + bannedCommander.add("Edgar Markov"); + bannedCommander.add("Kess, Dissident Mage"); + bannedCommander.add("Rofellos, Llanowar Emissary"); + + bannedCommander.add("Rowan Kenrith"); + bannedCommander.add("Tymna the Weaver"); + bannedCommander.add("Will Kenrith"); + bannedCommander.add("Vial Smasher The Fierce"); + } + +} diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelMatch.java b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelMatch.java index f03473c6e2..a6008061ec 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelMatch.java +++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelMatch.java @@ -22,7 +22,7 @@ public class CommanderDuelMatch extends MatchImpl { startLife = 20; // Starting with the Commander 2016 update (on November 11th, 2016), Duel Commander will be played with 20 life points instead of 30. checkCommanderDamage = false; // since nov 16 duel commander uses no longer commander damage rule } - if (options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander")) { + if (options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander") || options.getDeckType().equals("Variant Magic - Centurion Commander")) { startLife = 30; } Mulligan mulligan = options.getMulliganType().getMulligan(options.getFreeMulligans()); diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index 625a01d39d..098bbe7c3d 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -169,6 +169,7 @@ + diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index 2584861224..111ef0e394 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -163,6 +163,7 @@ +