From a2f30899139162c65873f03598d83062d626fcdb Mon Sep 17 00:00:00 2001 From: Dilnu Date: Sun, 18 Sep 2016 09:47:58 -0400 Subject: [PATCH 1/2] Remove files about to be renamed to allow for merge. --- .../src/mage/sets/kaladesh/AetherHub.java | 71 ---------- .../sets/kaladesh/AetherfluxReservoir.java | 99 -------------- .../mage/sets/kaladesh/AetherstormRoc.java | 102 --------------- .../mage/sets/kaladesh/AetherworksMarvel.java | 121 ------------------ .../src/mage/sets/magic2011/AetherAdept.java | 69 ---------- .../mage/sets/urzasdestiny/AetherSting.java | 104 --------------- .../src/mage/sets/zendikar/AetherFigment.java | 80 ------------ .../abilities/enters/AEtherFigmentTest.java | 37 ------ 8 files changed, 683 deletions(-) delete mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherHub.java delete mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java delete mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java delete mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java delete mode 100644 Mage.Sets/src/mage/sets/magic2011/AetherAdept.java delete mode 100644 Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java delete mode 100644 Mage.Sets/src/mage/sets/zendikar/AetherFigment.java delete mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java b/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java deleted file mode 100644 index f0cb7968b6..0000000000 --- a/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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.kaladesh; - -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.costs.common.PayEnergyCost; -import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; -import mage.abilities.mana.AnyColorManaAbility; -import mage.abilities.mana.ColorlessManaAbility; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; - -/** - * - * @author emerald000 - */ -public class AetherHub extends CardImpl { - - public AetherHub(UUID ownerId) { - super(ownerId, 242, "Aether Hub", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); - this.expansionSetCode = "KLD"; - - // When Aether Hub enters the battlefield, you get {E}. - this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(1))); - - // {T}: Add {C} to your mana pool. - this.addAbility(new ColorlessManaAbility()); - - // {T}, Pay {E}: Add one mana of any color to your mana pool. - Ability ability = new AnyColorManaAbility(); - ability.addCost(new PayEnergyCost(1)); - this.addAbility(ability); - } - - public AetherHub(final AetherHub card) { - super(card); - } - - @Override - public AetherHub copy() { - return new AetherHub(this); - } -} diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java b/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java deleted file mode 100644 index 6c00b0278c..0000000000 --- a/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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.kaladesh; - -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.costs.common.PayLifeCost; -import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.GainLifeEffect; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.Zone; -import mage.game.Game; -import mage.target.common.TargetCreatureOrPlayer; -import mage.watchers.common.CastSpellLastTurnWatcher; - -/** - * - * @author emerald000 - */ -public class AetherfluxReservoir extends CardImpl { - - public AetherfluxReservoir(UUID ownerId) { - super(ownerId, 192, "Aetherflux Reservoir", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); - this.expansionSetCode = "KLD"; - - // Whenever you cast a spell, you gain 1 life for each spell you've cast this turn. - this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(new AetherfluxReservoirDynamicValue()), false)); - - // Pay 50 life: Aetherflux Reservoir deals 50 damage to target creature or player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(50), new PayLifeCost(50)); - ability.addTarget(new TargetCreatureOrPlayer()); - this.addAbility(ability); - } - - public AetherfluxReservoir(final AetherfluxReservoir card) { - super(card); - } - - @Override - public AetherfluxReservoir copy() { - return new AetherfluxReservoir(this); - } -} - -class AetherfluxReservoirDynamicValue implements DynamicValue { - - @Override - public int calculate(Game game, Ability sourceAbility, Effect effect) { - CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get(CastSpellLastTurnWatcher.class.getName()); - return watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(sourceAbility.getControllerId()); - } - - @Override - public AetherfluxReservoirDynamicValue copy() { - return new AetherfluxReservoirDynamicValue(); - } - - @Override - public String toString() { - return "1"; - } - - @Override - public String getMessage() { - return "spell you've cast this turn"; - } - -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java b/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java deleted file mode 100644 index e4b3108de4..0000000000 --- a/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * 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.kaladesh; - -import java.util.UUID; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; -import mage.abilities.costs.common.PayEnergyCost; -import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.TapTargetEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; -import mage.abilities.keyword.FlyingAbility; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.counters.CounterType; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.ControllerIdPredicate; -import mage.game.Game; -import mage.target.common.TargetCreaturePermanent; - -/** - * - * @author LevelX2 - */ -public class AetherstormRoc extends CardImpl { - - private final UUID originalId; - - public AetherstormRoc(UUID ownerId) { - super(ownerId, 3, "Aetherstorm Roc", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.expansionSetCode = "KLD"; - this.subtype.add("Bird"); - this.power = new MageInt(3); - this.toughness = new MageInt(3); - - // Flying - this.addAbility(FlyingAbility.getInstance()); - // Whenever Aetherstorm Roc or another creature enters the battlefield under your control, you get {E}. - this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GetEnergyCountersControllerEffect(1), new FilterCreaturePermanent("{this} or another creature"))); - - // Whenever Aetherstorm Roc attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls. - DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(2)); - doIfCostPaidEffect.addEffect(new TapTargetEffect()); - Ability ability = new AttacksTriggeredAbility(doIfCostPaidEffect, false, - "Whenever {this} attacks you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls."); - ability.addTarget(new TargetCreaturePermanent(0, 1, new FilterCreaturePermanent("creature defending player controls"), false)); - originalId = ability.getOriginalId(); - this.addAbility(ability); - - } - - public AetherstormRoc(final AetherstormRoc card) { - super(card); - this.originalId = card.originalId; - } - - @Override - public void adjustTargets(Ability ability, Game game) { - if (ability.getOriginalId().equals(originalId)) { - ability.getTargets().clear(); - FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); - UUID defenderId = game.getCombat().getDefenderId(ability.getSourceId()); - filter.add(new ControllerIdPredicate(defenderId)); - TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false); - ability.addTarget(target); - } - } - - @Override - public AetherstormRoc copy() { - return new AetherstormRoc(this); - } -} diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java b/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java deleted file mode 100644 index e666710b57..0000000000 --- a/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * 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.kaladesh; - -import java.util.Set; -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.common.PayEnergyCost; -import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.Cards; -import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; -import mage.filter.common.FilterControlledPermanent; -import mage.filter.common.FilterNonlandCard; -import mage.game.Game; -import mage.players.Player; -import mage.target.TargetCard; -import mage.target.common.TargetCardInLibrary; - -/** - * - * @author emerald000 - */ -public class AetherworksMarvel extends CardImpl { - - public AetherworksMarvel(UUID ownerId) { - super(ownerId, 193, "Aetherworks Marvel", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{4}"); - this.expansionSetCode = "KLD"; - this.supertype.add("Legendary"); - - // Whenever a permanent you control is put into a graveyard, you get {E}. - this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new GetEnergyCountersControllerEffect(1), false, new FilterControlledPermanent("a permanent you control"), false)); - - // {T}, Pay {E}{E}{E}{E}{E}{E}: Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AetherworksMarvelEffect(), new TapSourceCost()); - ability.addCost(new PayEnergyCost(6)); - this.addAbility(ability); - } - - public AetherworksMarvel(final AetherworksMarvel card) { - super(card); - } - - @Override - public AetherworksMarvel copy() { - return new AetherworksMarvel(this); - } -} - -class AetherworksMarvelEffect extends OneShotEffect { - - AetherworksMarvelEffect() { - super(Outcome.PlayForFree); - this.staticText = "Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order"; - } - - AetherworksMarvelEffect(final AetherworksMarvelEffect effect) { - super(effect); - } - - @Override - public AetherworksMarvelEffect copy() { - return new AetherworksMarvelEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - Player controller = game.getPlayer(source.getControllerId()); - if (controller != null) { - Set cardsSet = controller.getLibrary().getTopCards(game, 6); - Cards cards = new CardsImpl(); - for (Card card : cardsSet) { - cards.add(card); - } - TargetCard target = new TargetCardInLibrary(0, 1, new FilterNonlandCard("card to cast without paying its mana cost")); - if (controller.choose(Outcome.PlayForFree, cards, target, game)) { - Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); - if (card != null && controller.cast(card.getSpellAbility(), game, true)) { - cards.remove(card); - } - } - controller.putCardsOnBottomOfLibrary(cards, game, source, false); - return true; - } - return false; - } -} diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java deleted file mode 100644 index 7c9e206f81..0000000000 --- a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.magic2011; - -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.ReturnToHandTargetEffect; -import mage.cards.CardImpl; -import mage.target.common.TargetCreaturePermanent; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class AetherAdept extends CardImpl { - - public AetherAdept(UUID ownerId) { - super(ownerId, 41, "AEther Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); - this.expansionSetCode = "M11"; - this.subtype.add("Human"); - this.subtype.add("Wizard"); - - this.power = new MageInt(2); - this.toughness = new MageInt(2); - - // When AEther Adept enters the battlefield, return target creature to its owner's hand. - Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); - ability.addTarget(new TargetCreaturePermanent()); - this.addAbility(ability); - } - - public AetherAdept(final AetherAdept card) { - super(card); - } - - @Override - public AetherAdept copy() { - return new AetherAdept(this); - } -} diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java deleted file mode 100644 index 98b093c721..0000000000 --- a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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.urzasdestiny; - -import java.util.UUID; -import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.DamageTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.constants.Zone; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; -import mage.target.targetpointer.FixedTarget; - -/** - * - * @author Backfir3 - */ -public class AetherSting extends CardImpl { - - public AetherSting(UUID ownerId) { - super(ownerId, 76, "AEther Sting", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); - this.expansionSetCode = "UDS"; - - - // Whenever an opponent casts a creature spell, AEther Sting deals 1 damage to that player. - this.addAbility(new AetherStingTriggeredAbility()); - } - - public AetherSting(final AetherSting card) { - super(card); - } - - @Override - public AetherSting copy() { - return new AetherSting(this); - } -} - -class AetherStingTriggeredAbility extends TriggeredAbilityImpl { - - public AetherStingTriggeredAbility() { - super(Zone.BATTLEFIELD, new DamageTargetEffect(1), false); - } - - public AetherStingTriggeredAbility(final AetherStingTriggeredAbility ability) { - super(ability); - } - - @Override - public AetherStingTriggeredAbility copy() { - return new AetherStingTriggeredAbility(this); - } - - @Override - public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == EventType.SPELL_CAST; - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - if (game.getOpponents(controllerId).contains(event.getPlayerId())) { - Card card = game.getCard(event.getSourceId()); - if (card != null && card.getCardType().contains(CardType.CREATURE)) { - this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId())); - return true; - } - } - return false; - } - - @Override - public String getRule() { - return "Whenever an opponent casts a creature spell, {this} deals 1 damage to that player."; - } -} diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java deleted file mode 100644 index d5b4caaa4a..0000000000 --- a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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.zendikar; - -import java.util.UUID; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.condition.common.KickedCondition; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.abilities.keyword.CantBeBlockedSourceAbility; -import mage.abilities.keyword.KickerAbility; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; -import mage.counters.CounterType; - -/** - * @author nantuko, BetaSteward_at_googlemail.com - */ -public class AetherFigment extends CardImpl { - - public AetherFigment(UUID ownerId) { - super(ownerId, 40, "AEther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.expansionSetCode = "ZEN"; - this.subtype.add("Illusion"); - - this.power = new MageInt(1); - this.toughness = new MageInt(1); - - // AEther Figment can't be blocked. - this.addAbility(new CantBeBlockedSourceAbility()); - - // Kicker {3} - this.addAbility(new KickerAbility("{3}")); - - // If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it - Ability ability = new EntersBattlefieldAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), - KickedCondition.getInstance(), - "If {this} was kicked, it enters the battlefield with two +1/+1 counters on it", - ""); - this.addAbility(ability); - } - - public AetherFigment(final AetherFigment card) { - super(card); - } - - @Override - public AetherFigment copy() { - return new AetherFigment(this); - } - -} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java deleted file mode 100644 index cebf7db41d..0000000000 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.mage.test.cards.abilities.enters; - -import mage.constants.PhaseStep; -import mage.constants.Zone; -import org.junit.Test; -import org.mage.test.serverside.base.CardTestPlayerBase; - -/** - * - * @author noxx - */ -public class AEtherFigmentTest extends CardTestPlayerBase { - - /* - AEther Figment {1}{U} - Creature - Illusion - 1/1 - Kicker {3} (You may pay an additional as you cast this spell.) - AEther Figment can't be blocked. - If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it. - */ - @Test - public void testEnteringWithCounters() { - addCard(Zone.BATTLEFIELD, playerA, "Island", 5); - addCard(Zone.HAND, playerA, "AEther Figment"); - - castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); - - setStopAt(1, PhaseStep.BEGIN_COMBAT); - execute(); - - assertLife(playerA, 20); - assertLife(playerB, 20); - assertPermanentCount(playerA, "AEther Figment", 1); - assertPowerToughness(playerA, "AEther Figment", 3, 3); - } -} From 6ddbf5b5607c602adeea843e307057ac062e1805 Mon Sep 17 00:00:00 2001 From: Dilnu Date: Sun, 18 Sep 2016 10:50:41 -0400 Subject: [PATCH 2/2] Revert "Remove files about to be renamed to allow for merge." This reverts commit a2f30899139162c65873f03598d83062d626fcdb. --- .../src/mage/sets/kaladesh/AetherHub.java | 71 ++++++++++ .../sets/kaladesh/AetherfluxReservoir.java | 99 ++++++++++++++ .../mage/sets/kaladesh/AetherstormRoc.java | 102 +++++++++++++++ .../mage/sets/kaladesh/AetherworksMarvel.java | 121 ++++++++++++++++++ .../src/mage/sets/magic2011/AetherAdept.java | 69 ++++++++++ .../mage/sets/urzasdestiny/AetherSting.java | 104 +++++++++++++++ .../src/mage/sets/zendikar/AetherFigment.java | 80 ++++++++++++ .../abilities/enters/AEtherFigmentTest.java | 37 ++++++ 8 files changed, 683 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherHub.java create mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java create mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java create mode 100644 Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java create mode 100644 Mage.Sets/src/mage/sets/magic2011/AetherAdept.java create mode 100644 Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java create mode 100644 Mage.Sets/src/mage/sets/zendikar/AetherFigment.java create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java b/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java new file mode 100644 index 0000000000..f0cb7968b6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/kaladesh/AetherHub.java @@ -0,0 +1,71 @@ +/* + * 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.kaladesh; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.costs.common.PayEnergyCost; +import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; +import mage.abilities.mana.AnyColorManaAbility; +import mage.abilities.mana.ColorlessManaAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author emerald000 + */ +public class AetherHub extends CardImpl { + + public AetherHub(UUID ownerId) { + super(ownerId, 242, "Aether Hub", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); + this.expansionSetCode = "KLD"; + + // When Aether Hub enters the battlefield, you get {E}. + this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(1))); + + // {T}: Add {C} to your mana pool. + this.addAbility(new ColorlessManaAbility()); + + // {T}, Pay {E}: Add one mana of any color to your mana pool. + Ability ability = new AnyColorManaAbility(); + ability.addCost(new PayEnergyCost(1)); + this.addAbility(ability); + } + + public AetherHub(final AetherHub card) { + super(card); + } + + @Override + public AetherHub copy() { + return new AetherHub(this); + } +} diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java b/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java new file mode 100644 index 0000000000..6c00b0278c --- /dev/null +++ b/Mage.Sets/src/mage/sets/kaladesh/AetherfluxReservoir.java @@ -0,0 +1,99 @@ +/* + * 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.kaladesh; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SpellCastControllerTriggeredAbility; +import mage.abilities.costs.common.PayLifeCost; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.GainLifeEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.target.common.TargetCreatureOrPlayer; +import mage.watchers.common.CastSpellLastTurnWatcher; + +/** + * + * @author emerald000 + */ +public class AetherfluxReservoir extends CardImpl { + + public AetherfluxReservoir(UUID ownerId) { + super(ownerId, 192, "Aetherflux Reservoir", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); + this.expansionSetCode = "KLD"; + + // Whenever you cast a spell, you gain 1 life for each spell you've cast this turn. + this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(new AetherfluxReservoirDynamicValue()), false)); + + // Pay 50 life: Aetherflux Reservoir deals 50 damage to target creature or player. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(50), new PayLifeCost(50)); + ability.addTarget(new TargetCreatureOrPlayer()); + this.addAbility(ability); + } + + public AetherfluxReservoir(final AetherfluxReservoir card) { + super(card); + } + + @Override + public AetherfluxReservoir copy() { + return new AetherfluxReservoir(this); + } +} + +class AetherfluxReservoirDynamicValue implements DynamicValue { + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get(CastSpellLastTurnWatcher.class.getName()); + return watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(sourceAbility.getControllerId()); + } + + @Override + public AetherfluxReservoirDynamicValue copy() { + return new AetherfluxReservoirDynamicValue(); + } + + @Override + public String toString() { + return "1"; + } + + @Override + public String getMessage() { + return "spell you've cast this turn"; + } + +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java b/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java new file mode 100644 index 0000000000..e4b3108de4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/kaladesh/AetherstormRoc.java @@ -0,0 +1,102 @@ +/* + * 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.kaladesh; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.AttacksTriggeredAbility; +import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; +import mage.abilities.costs.common.PayEnergyCost; +import mage.abilities.effects.common.DoIfCostPaid; +import mage.abilities.effects.common.TapTargetEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.counters.CounterType; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; +import mage.game.Game; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author LevelX2 + */ +public class AetherstormRoc extends CardImpl { + + private final UUID originalId; + + public AetherstormRoc(UUID ownerId) { + super(ownerId, 3, "Aetherstorm Roc", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); + this.expansionSetCode = "KLD"; + this.subtype.add("Bird"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + // Whenever Aetherstorm Roc or another creature enters the battlefield under your control, you get {E}. + this.addAbility(new EntersBattlefieldControlledTriggeredAbility(new GetEnergyCountersControllerEffect(1), new FilterCreaturePermanent("{this} or another creature"))); + + // Whenever Aetherstorm Roc attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls. + DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(2)); + doIfCostPaidEffect.addEffect(new TapTargetEffect()); + Ability ability = new AttacksTriggeredAbility(doIfCostPaidEffect, false, + "Whenever {this} attacks you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls."); + ability.addTarget(new TargetCreaturePermanent(0, 1, new FilterCreaturePermanent("creature defending player controls"), false)); + originalId = ability.getOriginalId(); + this.addAbility(ability); + + } + + public AetherstormRoc(final AetherstormRoc card) { + super(card); + this.originalId = card.originalId; + } + + @Override + public void adjustTargets(Ability ability, Game game) { + if (ability.getOriginalId().equals(originalId)) { + ability.getTargets().clear(); + FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); + UUID defenderId = game.getCombat().getDefenderId(ability.getSourceId()); + filter.add(new ControllerIdPredicate(defenderId)); + TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false); + ability.addTarget(target); + } + } + + @Override + public AetherstormRoc copy() { + return new AetherstormRoc(this); + } +} diff --git a/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java b/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java new file mode 100644 index 0000000000..e666710b57 --- /dev/null +++ b/Mage.Sets/src/mage/sets/kaladesh/AetherworksMarvel.java @@ -0,0 +1,121 @@ +/* + * 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.kaladesh; + +import java.util.Set; +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.PayEnergyCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.Cards; +import mage.cards.CardsImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.common.FilterNonlandCard; +import mage.game.Game; +import mage.players.Player; +import mage.target.TargetCard; +import mage.target.common.TargetCardInLibrary; + +/** + * + * @author emerald000 + */ +public class AetherworksMarvel extends CardImpl { + + public AetherworksMarvel(UUID ownerId) { + super(ownerId, 193, "Aetherworks Marvel", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{4}"); + this.expansionSetCode = "KLD"; + this.supertype.add("Legendary"); + + // Whenever a permanent you control is put into a graveyard, you get {E}. + this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new GetEnergyCountersControllerEffect(1), false, new FilterControlledPermanent("a permanent you control"), false)); + + // {T}, Pay {E}{E}{E}{E}{E}{E}: Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AetherworksMarvelEffect(), new TapSourceCost()); + ability.addCost(new PayEnergyCost(6)); + this.addAbility(ability); + } + + public AetherworksMarvel(final AetherworksMarvel card) { + super(card); + } + + @Override + public AetherworksMarvel copy() { + return new AetherworksMarvel(this); + } +} + +class AetherworksMarvelEffect extends OneShotEffect { + + AetherworksMarvelEffect() { + super(Outcome.PlayForFree); + this.staticText = "Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order"; + } + + AetherworksMarvelEffect(final AetherworksMarvelEffect effect) { + super(effect); + } + + @Override + public AetherworksMarvelEffect copy() { + return new AetherworksMarvelEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Set cardsSet = controller.getLibrary().getTopCards(game, 6); + Cards cards = new CardsImpl(); + for (Card card : cardsSet) { + cards.add(card); + } + TargetCard target = new TargetCardInLibrary(0, 1, new FilterNonlandCard("card to cast without paying its mana cost")); + if (controller.choose(Outcome.PlayForFree, cards, target, game)) { + Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); + if (card != null && controller.cast(card.getSpellAbility(), game, true)) { + cards.remove(card); + } + } + controller.putCardsOnBottomOfLibrary(cards, game, source, false); + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java new file mode 100644 index 0000000000..7c9e206f81 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magic2011/AetherAdept.java @@ -0,0 +1,69 @@ +/* + * 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.magic2011; + +import java.util.UUID; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.ReturnToHandTargetEffect; +import mage.cards.CardImpl; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class AetherAdept extends CardImpl { + + public AetherAdept(UUID ownerId) { + super(ownerId, 41, "AEther Adept", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); + this.expansionSetCode = "M11"; + this.subtype.add("Human"); + this.subtype.add("Wizard"); + + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // When AEther Adept enters the battlefield, return target creature to its owner's hand. + Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect()); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public AetherAdept(final AetherAdept card) { + super(card); + } + + @Override + public AetherAdept copy() { + return new AetherAdept(this); + } +} diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java new file mode 100644 index 0000000000..98b093c721 --- /dev/null +++ b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java @@ -0,0 +1,104 @@ +/* + * 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.urzasdestiny; + +import java.util.UUID; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author Backfir3 + */ +public class AetherSting extends CardImpl { + + public AetherSting(UUID ownerId) { + super(ownerId, 76, "AEther Sting", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); + this.expansionSetCode = "UDS"; + + + // Whenever an opponent casts a creature spell, AEther Sting deals 1 damage to that player. + this.addAbility(new AetherStingTriggeredAbility()); + } + + public AetherSting(final AetherSting card) { + super(card); + } + + @Override + public AetherSting copy() { + return new AetherSting(this); + } +} + +class AetherStingTriggeredAbility extends TriggeredAbilityImpl { + + public AetherStingTriggeredAbility() { + super(Zone.BATTLEFIELD, new DamageTargetEffect(1), false); + } + + public AetherStingTriggeredAbility(final AetherStingTriggeredAbility ability) { + super(ability); + } + + @Override + public AetherStingTriggeredAbility copy() { + return new AetherStingTriggeredAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == EventType.SPELL_CAST; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (game.getOpponents(controllerId).contains(event.getPlayerId())) { + Card card = game.getCard(event.getSourceId()); + if (card != null && card.getCardType().contains(CardType.CREATURE)) { + this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId())); + return true; + } + } + return false; + } + + @Override + public String getRule() { + return "Whenever an opponent casts a creature spell, {this} deals 1 damage to that player."; + } +} diff --git a/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java new file mode 100644 index 0000000000..d5b4caaa4a --- /dev/null +++ b/Mage.Sets/src/mage/sets/zendikar/AetherFigment.java @@ -0,0 +1,80 @@ +/* + * 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.zendikar; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAbility; +import mage.abilities.condition.common.KickedCondition; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.CantBeBlockedSourceAbility; +import mage.abilities.keyword.KickerAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.counters.CounterType; + +/** + * @author nantuko, BetaSteward_at_googlemail.com + */ +public class AetherFigment extends CardImpl { + + public AetherFigment(UUID ownerId) { + super(ownerId, 40, "AEther Figment", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); + this.expansionSetCode = "ZEN"; + this.subtype.add("Illusion"); + + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // AEther Figment can't be blocked. + this.addAbility(new CantBeBlockedSourceAbility()); + + // Kicker {3} + this.addAbility(new KickerAbility("{3}")); + + // If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it + Ability ability = new EntersBattlefieldAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), + KickedCondition.getInstance(), + "If {this} was kicked, it enters the battlefield with two +1/+1 counters on it", + ""); + this.addAbility(ability); + } + + public AetherFigment(final AetherFigment card) { + super(card); + } + + @Override + public AetherFigment copy() { + return new AetherFigment(this); + } + +} diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java new file mode 100644 index 0000000000..cebf7db41d --- /dev/null +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/AEtherFigmentTest.java @@ -0,0 +1,37 @@ +package org.mage.test.cards.abilities.enters; + +import mage.constants.PhaseStep; +import mage.constants.Zone; +import org.junit.Test; +import org.mage.test.serverside.base.CardTestPlayerBase; + +/** + * + * @author noxx + */ +public class AEtherFigmentTest extends CardTestPlayerBase { + + /* + AEther Figment {1}{U} + Creature - Illusion + 1/1 + Kicker {3} (You may pay an additional as you cast this spell.) + AEther Figment can't be blocked. + If AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it. + */ + @Test + public void testEnteringWithCounters() { + addCard(Zone.BATTLEFIELD, playerA, "Island", 5); + addCard(Zone.HAND, playerA, "AEther Figment"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "AEther Figment"); + + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertLife(playerA, 20); + assertLife(playerB, 20); + assertPermanentCount(playerA, "AEther Figment", 1); + assertPowerToughness(playerA, "AEther Figment", 3, 3); + } +}