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 f82aae965a8..10413c67872 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
@@ -474,6 +474,7 @@ public class NewTableDialog extends MageDialog {
switch (options.getDeckType()) {
case "Variant Magic - Commander":
case "Variant Magic - Duel Commander":
+ case "Variant Magic - MTGO 1v1 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;
@@ -495,7 +496,9 @@ public class NewTableDialog extends MageDialog {
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")) {
+ if (!options.getDeckType().equals("Variant Magic - Commander")
+ && !options.getDeckType().equals("Variant Magic - Duel Commander")
+ && !options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander")) {
JOptionPane.showMessageDialog(MageFrame.getDesktop(), "Deck type Commander needs also a Commander game type", "Error", JOptionPane.ERROR_MESSAGE);
return false;
}
@@ -585,7 +588,7 @@ public class NewTableDialog extends MageDialog {
setGameOptions();
this.setLocation(150, 100);
}
- currentSettingVersion = 0;
+ currentSettingVersion = 0;
setGameSettingsFromPrefs(currentSettingVersion);
this.setVisible(true);
}
@@ -611,7 +614,7 @@ public class NewTableDialog extends MageDialog {
/**
* set the table settings from java prefs
*/
- int currentSettingVersion = 0;
+ int currentSettingVersion = 0;
private void setGameSettingsFromPrefs(int version) {
currentSettingVersion = version;
String versionStr = "";
@@ -721,9 +724,9 @@ public class NewTableDialog extends MageDialog {
TablePlayerPanel tpp = (TablePlayerPanel) player;
playerTypesString.append(tpp.getPlayerType());
}
- PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TABLE_PLAYER_TYPES + versionStr, playerTypesString.toString());
+ PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TABLE_PLAYER_TYPES + versionStr, playerTypesString.toString());
}
-
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnCancel;
private javax.swing.JButton btnOK;
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AmonkhetBlock.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AmonkhetBlock.java
new file mode 100644
index 00000000000..d93631ded16
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AmonkhetBlock.java
@@ -0,0 +1,44 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright notice, this list of
+* conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright notice, this list
+* of conditions and the following disclaimer in the documentation and/or other materials
+* provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.deck;
+
+import mage.cards.decks.Constructed;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class AmonkhetBlock extends Constructed {
+
+ public AmonkhetBlock() {
+ super("Constructed - Amonkhet Block");
+ setCodes.add("AKH");
+ setCodes.add("HOU");
+ }
+}
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java
index 22bfbe3028f..6c9d65cfc85 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/DuelCommander.java
@@ -34,7 +34,6 @@ package mage.deck;
public class DuelCommander extends Commander {
public DuelCommander() {
- super("Duel Commander");
banned.add("Ancestral Recall");
banned.add("Ancient Tomb");
banned.add("Back to Basics");
@@ -67,7 +66,7 @@ public class DuelCommander extends Commander {
banned.add("Mox Sapphire");
banned.add("Mystical Tutor");
banned.add("Natural Order");
- banned.add("Necrotic Oooze");
+ banned.add("Necrotic Ooze");
banned.add("Oath of Druids");
banned.add("Protean Hulk");
banned.add("Sensei's Divining Top");
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java
new file mode 100644
index 00000000000..6b0f0dab252
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/MTGO1v1Commander.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.deck;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class MTGO1v1Commander extends Commander {
+
+ public MTGO1v1Commander() {
+ super("MTGO 1v1 Commander");
+ banned.add("Ancestral Recall");
+ banned.add("Arcum Dagsson");
+ banned.add("Back to Basics");
+ banned.add("Balance");
+ banned.add("Bazaar of Baghdad");
+ banned.add("Black Lotus");
+ banned.add("Braids, Cabal Minion");
+ banned.add("Brainstorm");
+ banned.add("Channel");
+ banned.add("Derevi, Empyrial Tactician");
+ banned.add("Dig Through Time");
+ banned.add("Edric, Spymaster of Trest");
+ banned.add("Entomb");
+ banned.add("Fastbond");
+ banned.add("Food Chain");
+ banned.add("Gaea's Cradle");
+ banned.add("Gifts Ungiven");
+ banned.add("Griselbrand");
+ banned.add("Hermit Druid");
+ banned.add("Humility");
+ banned.add("Karakas");
+ banned.add("Library of Alexandria");
+ banned.add("Mana Crypt");
+ banned.add("Mana Drain");
+ banned.add("Mana Vault");
+ banned.add("Mind Twist");
+ banned.add("Mishra's Workshop");
+ banned.add("Moat");
+ banned.add("Mox Emerald");
+ banned.add("Mox Jet");
+ banned.add("Mox Pearl");
+ banned.add("Mox Ruby");
+ banned.add("Mox Sapphire");
+ banned.add("Natural Order");
+ banned.add("Necropotence");
+ banned.add("Oath of Druids");
+ banned.add("Ponder");
+ banned.add("Preordain");
+ banned.add("Protean Hulk");
+ banned.add("Rofellos, Llanowar Emissary");
+ banned.add("Sensei's Divining Top");
+ banned.add("Serra Ascendant");
+ banned.add("Sol Ring");
+ banned.add("Strip Mine");
+ banned.add("Survival of the Fittest");
+ banned.add("The Tabernacle at Pendrell Vale");
+ banned.add("Time Vault");
+ banned.add("Time Walk");
+ banned.add("Tinker");
+ banned.add("Tolarian Academy");
+ banned.add("Treachery");
+ banned.add("Treasure Cruise");
+ banned.add("Vial Smasher the Fierce");
+ banned.add("Yamgmoth's Bargain");
+ banned.add("Yisan, the Wanderer Bard");
+ banned.add("Zur the Enchanter");
+ }
+}
\ No newline at end of file
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 65a1edefa93..3e40d86ffe3 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
@@ -51,6 +51,10 @@ public class CommanderDuelMatch extends MatchImpl {
alsoHand = true; // commander going to hand allowed to go to command zone effective July 17, 2015
checkCommanderDamage = false; // since nov 16 duel commander uses no longer commander damage rule
}
+ if (options.getDeckType().equals("Variant Magic - MTGO 1v1 Commander")) {
+ startLife = 30;
+ alsoHand = true; // commander going to hand allowed to go to command zone effective July 17, 2015
+ }
CommanderDuel game = new CommanderDuel(options.getAttackOption(), options.getRange(), options.getFreeMulligans(), startLife);
game.setCheckCommanderDamage(checkCommanderDamage);
game.setStartMessage(this.createGameStartMessage());
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index 961d37b516b..b9b2129968e 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -138,13 +138,15 @@
-
+
+
+
-
+
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index f89a6b4b57e..eb180fc8d38 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -135,14 +135,15 @@
-
+
+
-
+