diff --git a/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java b/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java new file mode 100644 index 00000000000..0820dc8d0be --- /dev/null +++ b/Mage.Sets/src/mage/sets/darkascension/ThaliaGuardianOfThraben.java @@ -0,0 +1,114 @@ +/* + * 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.sets.darkascension; + +import java.util.UUID; +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.SpellAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.CostModificationEffectImpl; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.game.Game; +import mage.util.CardUtil; + +/** + * + * @author BetaSteward + */ +public class ThaliaGuardianOfThraben extends CardImpl { + + public ThaliaGuardianOfThraben(UUID ownerId) { + super(ownerId, 24, "Thalia, Guardian of Thraben", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}"); + this.expansionSetCode = "DKA"; + this.supertype.add("Legendary"); + this.subtype.add("Human"); + this.subtype.add("Soldier"); + + this.color.setWhite(true); + this.power = new MageInt(2); + this.toughness = new MageInt(1); + + this.addAbility(FirstStrikeAbility.getInstance()); + + // Noncreature spells cost {1} more to cast. + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ThaliaGuardianOfThrabenCostReductionEffect())); + + } + + public ThaliaGuardianOfThraben(final ThaliaGuardianOfThraben card) { + super(card); + } + + @Override + public ThaliaGuardianOfThraben copy() { + return new ThaliaGuardianOfThraben(this); + } +} + +class ThaliaGuardianOfThrabenCostReductionEffect extends CostModificationEffectImpl { + + ThaliaGuardianOfThrabenCostReductionEffect ( ) { + super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Benefit); + staticText = "Noncreature spells cost {1} more to cast"; + } + + ThaliaGuardianOfThrabenCostReductionEffect(ThaliaGuardianOfThrabenCostReductionEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source, Ability abilityToModify) { + SpellAbility spellAbility = (SpellAbility) abilityToModify; + spellAbility.getManaCostsToPay().add(new GenericManaCost(1)); + return true; + } + + @Override + public boolean applies(Ability abilityToModify, Ability source, Game game) { + if (abilityToModify instanceof SpellAbility) { + Card card = game.getCard(abilityToModify.getSourceId()); + if (card != null && !card.getCardType().contains(CardType.CREATURE)) { + return true; + } + } + return false; + } + + @Override + public ThaliaGuardianOfThrabenCostReductionEffect copy() { + return new ThaliaGuardianOfThrabenCostReductionEffect(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java new file mode 100644 index 00000000000..ff7005d3dd2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/darkascension/WardenOfTheWall.java @@ -0,0 +1,87 @@ +/* + * 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.sets.darkascension; + +import java.util.UUID; +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.MageInt; +import mage.abilities.common.EntersBattlefieldTappedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.common.NotMyTurnCondition; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.mana.ColorlessManaAbility; +import mage.cards.CardImpl; +import mage.game.permanent.token.Token; + +/** + * + * @author BetaSteward + */ +public class WardenOfTheWall extends CardImpl { + + public WardenOfTheWall(UUID ownerId) { + super(ownerId, 153, "Warden of the Wall", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); + this.expansionSetCode = "DKA"; + + // Warden of the Wall enters the battlefield tapped. + this.addAbility(new EntersBattlefieldTappedAbility()); + + // {tap}: Add {1} to your mana pool. + this.addAbility(new ColorlessManaAbility()); + + // As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying. + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BecomesCreatureSourceEffect(new GargoyleToken(), "", Constants.Duration.WhileOnBattlefield), NotMyTurnCondition.getInstance(), "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying"))); + } + + public WardenOfTheWall(final WardenOfTheWall card) { + super(card); + } + + @Override + public WardenOfTheWall copy() { + return new WardenOfTheWall(this); + } +} + +class GargoyleToken extends Token { + + public GargoyleToken() { + super("", "2/3 Gargoyle artifact creature with flying"); + cardType.add(CardType.CREATURE); + cardType.add(CardType.ARTIFACT); + subtype.add("Gargoyle"); + power = new MageInt(2); + toughness = new MageInt(3); + addAbility(FlyingAbility.getInstance()); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/TestThaliaGuardianOfThraben.java b/Mage.Tests/src/test/java/org/mage/test/cards/TestThaliaGuardianOfThraben.java new file mode 100644 index 00000000000..312da3da01f --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/TestThaliaGuardianOfThraben.java @@ -0,0 +1,49 @@ +package org.mage.test.cards; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.PhaseStep; +import mage.filter.Filter; +import org.junit.Ignore; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * also tests cost reduction effects + * + * @author BetaSteward + */ +public class TestThaliaGuardianOfThraben extends CardTestPlayerBase { + + @Test + public void testCard() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain"); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + + castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + assertGraveyardCount(playerA, 0); + } + + @Test + public void testCard1() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Thalia, Guardian of Thraben"); + addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2); + addCard(Constants.Zone.HAND, playerA, "Lightning Bolt"); + + castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB); + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 17); + assertGraveyardCount(playerA, 1); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/TestWardenOfTheWall.java b/Mage.Tests/src/test/java/org/mage/test/cards/TestWardenOfTheWall.java new file mode 100644 index 00000000000..68eaa4d86ca --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/TestWardenOfTheWall.java @@ -0,0 +1,42 @@ +package org.mage.test.cards; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.PhaseStep; +import mage.filter.Filter; +import org.junit.Ignore; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author BetaSteward + */ +public class TestWardenOfTheWall extends CardTestPlayerBase { + + @Test + public void testCard() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Warden of the Wall"); + + setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + assertPowerToughness(playerA, "Warden of the Wall", 0, 0, Filter.ComparisonScope.All); + } + + @Test + public void testCard1() { + addCard(Constants.Zone.BATTLEFIELD, playerA, "Warden of the Wall"); + + setStopAt(2, Constants.PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + assertPowerToughness(playerA, "Warden of the Wall", 2, 3, Filter.ComparisonScope.All); + assertType("Warden of the Wall", CardType.CREATURE, "Gargoyle"); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 89404d8a7ae..6fd89526536 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -14,6 +14,7 @@ import org.mage.test.serverside.base.MageTestPlayerBase; import java.util.List; import java.util.UUID; +import mage.Constants.CardType; import mage.Constants.PhaseStep; import mage.counters.Counter; import mage.counters.CounterType; @@ -319,6 +320,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents(player.getId())) { if (permanent.getName().equals(cardName)) { found = permanent; + break; } } @@ -381,6 +383,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents()) { if (permanent.getName().equals(cardName)) { found = permanent; + break; } } @@ -390,6 +393,29 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement } /** + * Assert whether a permanent is a specified type or not + * + * @param cardName Name of the permanent that should be checked. + * @param type A type to test for + * @param subType a subtype to test for + */ + public void assertType(String cardName, CardType type, String subType) throws AssertionError { + Permanent found = null; + for (Permanent permanent : currentGame.getBattlefield().getAllActivePermanents()) { + if (permanent.getName().equals(cardName)) { + found = permanent; + break; + } + } + + Assert.assertNotNull("There is no such permanent on the battlefield, cardName=" + cardName, found); + + Assert.assertTrue("(Battlefield) card type not found (" + cardName + ":" + type + ")", found.getCardType().contains(type)); + + Assert.assertTrue("(Battlefield) card sub-type not equal (" + cardName + ":" + subType + ")", found.getSubtype().contains(subType)); + } + + /** * Assert whether a permanent is tapped or not * * @param cardName Name of the permanent that should be checked. diff --git a/Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java b/Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java index 124eb57c79b..71f922aa9f9 100644 --- a/Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java +++ b/Mage/src/mage/abilities/condition/common/NotMyTurnCondition.java @@ -27,6 +27,7 @@ */ package mage.abilities.condition.common; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.game.Game; @@ -40,6 +41,9 @@ public class NotMyTurnCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - return !game.getActivePlayerId().equals(source.getControllerId()); + UUID activePlayerId = game.getActivePlayerId(); + if (activePlayerId != null) + return !activePlayerId.equals(source.getControllerId()); + return false; } }