diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java index 3dc25efc64f..cd967a0a355 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Vintage.java @@ -20,6 +20,7 @@ public class Vintage extends Constructed { // All attractions & sticker cards are banned. (to add if/when implemented) // this also includes the mtgo replacement "Name Sticker" Goblin. banned.add("\"Name Sticker\" Goblin"); + banned.add("Gleemox"); restricted.add("Ancestral Recall"); restricted.add("Balance"); diff --git a/Mage.Sets/src/mage/cards/g/Gleemox.java b/Mage.Sets/src/mage/cards/g/Gleemox.java new file mode 100644 index 00000000000..4572a20157d --- /dev/null +++ b/Mage.Sets/src/mage/cards/g/Gleemox.java @@ -0,0 +1,33 @@ + + +package mage.cards.g; + +import java.util.UUID; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.common.InfoEffect; +import mage.abilities.mana.AnyColorManaAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; + +/** + * @author Tuomas-Matti Soikkeli + */ + +public final class Gleemox extends CardImpl { + + public Gleemox(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); + this.addAbility(new AnyColorManaAbility()); + this.addAbility(new SimpleStaticAbility(new InfoEffect("This card is banned."))); + } + + private Gleemox(final Gleemox card) { + super(card); + } + + @Override + public Gleemox copy() { + return new Gleemox(this); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/MagicOnlinePromos.java b/Mage.Sets/src/mage/sets/MagicOnlinePromos.java index a9be1013abe..af804dcd0a3 100644 --- a/Mage.Sets/src/mage/sets/MagicOnlinePromos.java +++ b/Mage.Sets/src/mage/sets/MagicOnlinePromos.java @@ -1064,6 +1064,7 @@ public class MagicOnlinePromos extends ExpansionSet { cards.add(new SetCardInfo("Gladehart Cavalry", 59661, Rarity.RARE, mage.cards.g.GladehartCavalry.class)); cards.add(new SetCardInfo("Glasspool Mimic", 83872, Rarity.RARE, mage.cards.g.GlasspoolMimic.class)); cards.add(new SetCardInfo("Gleancrawler", 32017, Rarity.RARE, mage.cards.g.Gleancrawler.class)); + cards.add(new SetCardInfo("Gleemox", 26584, Rarity.RARE, mage.cards.g.Gleemox.class)); cards.add(new SetCardInfo("Glimpse of Tomorrow", 91287, Rarity.RARE, mage.cards.g.GlimpseOfTomorrow.class)); cards.add(new SetCardInfo("Glimpse the Unthinkable", 102297, Rarity.RARE, mage.cards.g.GlimpseTheUnthinkable.class)); cards.add(new SetCardInfo("Glint Raker", 105660, Rarity.RARE, mage.cards.g.GlintRaker.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java index b1cb8bcf99f..1c6975051af 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java @@ -4,7 +4,9 @@ import mage.cards.decks.DeckValidator; import mage.deck.Commander; import mage.deck.Limited; import mage.deck.Modern; +import mage.deck.Legacy; import mage.deck.Standard; +import mage.deck.Vintage; import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.MageTestPlayerBase; @@ -18,6 +20,22 @@ import static org.mage.test.serverside.deck.DeckValidationUtil.testDeckValid; */ public class DeckValidatorTest extends MageTestPlayerBase { + @Test + public void testGleemoxBannedInLegacy() { + DeckTester deckTester = new DeckTester(new Legacy()); + deckTester.addMaindeck("Gleemox", 1); + deckTester.addMaindeck("Island", 59); + deckTester.validate("Gleemox is banned.", false); + } + + @Test + public void testGleemoxBannedInVintage() { + DeckTester deckTester = new DeckTester(new Vintage()); + deckTester.addMaindeck("Gleemox", 1); + deckTester.addMaindeck("Island", 59); + deckTester.validate("Gleemox is banned.", false); + } + @Test public void testStandardDeckCardsAmountValid() { DeckTester deckTester = new DeckTester(new Standard()); diff --git a/Mage/src/main/java/mage/cards/decks/Constructed.java b/Mage/src/main/java/mage/cards/decks/Constructed.java index 588eb807f8c..8f7ea73ef01 100644 --- a/Mage/src/main/java/mage/cards/decks/Constructed.java +++ b/Mage/src/main/java/mage/cards/decks/Constructed.java @@ -193,6 +193,9 @@ public class Constructed extends DeckValidator { banned.add("Vorthos, Steward of Myth"); banned.add("Water Gun Balloon Game"); banned.add("Well Done"); + + // Gleemox is banned + banned.add("Gleemox"); } public List getSetCodes() {