From 2fb026166ac1e72fd79a89fa2514b705be5a6771 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 30 Apr 2014 17:17:29 +0200 Subject: [PATCH] Added Fury of the Horde and Conflagrate. --- .../mage/sets/coldsnap/FuryOfTheHorde.java | 205 ++++++++++++++++++ .../src/mage/sets/timespiral/Conflagrate.java | 77 +++++++ .../src/mage/sets/weatherlight/Firestorm.java | 1 - .../mage/sets/zendikar/SphinxOfJwarIsle.java | 38 +++- 4 files changed, 310 insertions(+), 11 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/Conflagrate.java diff --git a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java new file mode 100644 index 00000000000..6296d39c825 --- /dev/null +++ b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java @@ -0,0 +1,205 @@ +/* + * 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.coldsnap; + +import java.util.Set; +import java.util.UUID; +import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.costs.AlternativeCostSourceAbility; +import mage.abilities.costs.common.ExileFromHandCost; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TurnPhase; +import mage.filter.FilterCard; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.game.turn.TurnMod; +import mage.target.common.TargetCardInHand; +import mage.watchers.Watcher; +import mage.watchers.common.AttackedThisTurnWatcher; + +/** + * + * @author LevelX2 + */ +public class FuryOfTheHorde extends CardImpl { + + private static final FilterCard filter = new FilterCard("two red cards"); + + static { + filter.add(new ColorPredicate(ObjectColor.RED)); + } + + public FuryOfTheHorde(UUID ownerId) { + super(ownerId, 81, "Fury of the Horde", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); + this.expansionSetCode = "CSP"; + + this.color.setRed(true); + + // You may exile two red cards from your hand rather than pay Fury of the Horde's mana cost. + this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(2, filter)))); + + // Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase. + this.getSpellAbility().addEffect(new FuryOfTheHordeUntapEffect()); + this.getSpellAbility().addEffect(new FuryOfTheHordeAddPhasesEffect()); + this.addWatcher(new AttackedThisTurnWatcher()); + + } + + public FuryOfTheHorde(final FuryOfTheHorde card) { + super(card); + } + + @Override + public FuryOfTheHorde copy() { + return new FuryOfTheHorde(this); + } +} + + +class FuryOfTheHordeUntapEffect extends OneShotEffect { + + public FuryOfTheHordeUntapEffect() { + super(Outcome.Benefit); + staticText = " Untap all creatures that attacked this turn"; + } + + public FuryOfTheHordeUntapEffect(final FuryOfTheHordeUntapEffect effect) { + super(effect); + } + + @Override + public FuryOfTheHordeUntapEffect copy() { + return new FuryOfTheHordeUntapEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Watcher watcher = game.getState().getWatchers().get("AttackedThisTurn"); + if (watcher != null && watcher instanceof AttackedThisTurnWatcher) { + Set attackedThisTurn = ((AttackedThisTurnWatcher)watcher).getAttackedThisTurnCreatures(); + for (UUID uuid : attackedThisTurn) { + Permanent permanent = game.getPermanent(uuid); + if (permanent != null && permanent.getCardType().contains(CardType.CREATURE)) { + permanent.untap(game); + } + } + return true; + } + return false; + } + +} + +class FuryOfTheHordeAddPhasesEffect extends OneShotEffect { + + public FuryOfTheHordeAddPhasesEffect() { + super(Outcome.Benefit); + staticText = "After this main phase, there is an additional combat phase followed by an additional main phase"; + } + + public FuryOfTheHordeAddPhasesEffect(final FuryOfTheHordeAddPhasesEffect effect) { + super(effect); + } + + @Override + public FuryOfTheHordeAddPhasesEffect copy() { + return new FuryOfTheHordeAddPhasesEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + // 15.07.2006 If it's somehow not a main phase when Fury of the Horde resolves, all it does is untap all creatures that attacked that turn. No new phases are created. + if (game.getTurn().getPhaseType().equals(TurnPhase.PRECOMBAT_MAIN) + || game.getTurn().getPhaseType().equals(TurnPhase.POSTCOMBAT_MAIN) ) { + // we can't add two turn modes at once, will add additional post combat on delayed trigger resolution + TurnMod combat = new TurnMod(source.getControllerId(), TurnPhase.COMBAT, TurnPhase.POSTCOMBAT_MAIN, false); + game.getState().getTurnMods().add(combat); + DelayedAddMainPhaseAbility delayedTriggeredAbility = new DelayedAddMainPhaseAbility(); + delayedTriggeredAbility.setSourceId(source.getSourceId()); + delayedTriggeredAbility.setControllerId(source.getControllerId()); + delayedTriggeredAbility.setConnectedTurnMod(combat.getId()); + game.addDelayedTriggeredAbility(delayedTriggeredAbility); + return true; + } + return false; + } + +} + +class DelayedAddMainPhaseAbility extends DelayedTriggeredAbility { + + private UUID connectedTurnMod; + private boolean enabled; + + public DelayedAddMainPhaseAbility() { + super(null, Duration.EndOfTurn); + this.usesStack = false; // don't show this to the user + } + + public DelayedAddMainPhaseAbility(DelayedAddMainPhaseAbility ability) { + super(ability); + this.connectedTurnMod = ability.connectedTurnMod; + this.enabled = ability.enabled; + } + + @Override + public DelayedAddMainPhaseAbility copy() { + return new DelayedAddMainPhaseAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.PHASE_CHANGED && this.connectedTurnMod.equals(event.getSourceId())) { + enabled = true; + } + if (event.getType() == GameEvent.EventType.COMBAT_PHASE_PRE && enabled) { + // add additional post combat main phase after that - after phase == null because add it after this combat + game.getState().getTurnMods().add(new TurnMod(getControllerId(), TurnPhase.POSTCOMBAT_MAIN, null, false)); + enabled = false; + } + return false; + } + + public void setConnectedTurnMod(UUID connectedTurnMod) { + this.connectedTurnMod = connectedTurnMod; + } + + @Override + public String getRule() { + return "add additional post combat main phase"; + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java b/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java new file mode 100644 index 00000000000..4de1378ffe8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/Conflagrate.java @@ -0,0 +1,77 @@ +/* + * 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.timespiral; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.costs.common.DiscardXTargetCost; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.ManacostVariableValue; +import mage.abilities.effects.common.DamageMultiEffect; +import mage.abilities.keyword.FlashbackAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.filter.FilterCard; +import mage.target.common.TargetCreatureOrPlayerAmount; + +/** + * + * @author LevelX2 + */ +public class Conflagrate extends CardImpl { + + public Conflagrate(UUID ownerId) { + super(ownerId, 151, "Conflagrate", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{X}{R}"); + this.expansionSetCode = "TSP"; + + this.color.setRed(true); + + // Conflagrate deals X damage divided as you choose among any number of target creatures and/or players. + DynamicValue xValue = new ManacostVariableValue(); + this.getSpellAbility().addEffect(new DamageMultiEffect(xValue)); + this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(xValue)); + + // Flashback-{R}{R}, Discard X cards. + Ability ability = new FlashbackAbility(new ManaCostsImpl("{R}{R}"), TimingRule.SORCERY); + ability.addCost(new DiscardXTargetCost(new FilterCard("cards"))); + this.addAbility(ability); + + } + + public Conflagrate(final Conflagrate card) { + super(card); + } + + @Override + public Conflagrate copy() { + return new Conflagrate(this); + } +} diff --git a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java index a70915ea4f0..8fbc8b1328f 100644 --- a/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java +++ b/Mage.Sets/src/mage/sets/weatherlight/Firestorm.java @@ -27,7 +27,6 @@ */ package mage.sets.weatherlight; -import java.util.List; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.DiscardXTargetCost; diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java index 66af883f3b1..37e39189584 100644 --- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java +++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java @@ -28,9 +28,13 @@ package mage.sets.zendikar; import java.util.UUID; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -39,10 +43,6 @@ 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.game.Game; import mage.players.Player; @@ -61,12 +61,11 @@ public class SphinxOfJwarIsle extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - // Flying, shroud this.addAbility(FlyingAbility.getInstance()); this.addAbility(ShroudAbility.getInstance()); + // TODO: this should be a static ability + this.addAbility(new SphinxOfJwarIsleLookAbility()); - // You may look at the top card of your library. (You may do this at any time.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SphinxOfJwarIsleEffect(), new GenericManaCost(0))); } public SphinxOfJwarIsle(final SphinxOfJwarIsle card) { @@ -79,10 +78,28 @@ public class SphinxOfJwarIsle extends CardImpl { } } +class SphinxOfJwarIsleLookAbility extends ActivatedAbilityImpl { + + public SphinxOfJwarIsleLookAbility() { + super(Zone.BATTLEFIELD, new SphinxOfJwarIsleEffect(), new GenericManaCost(0)); + this.usesStack = false; + } + + public SphinxOfJwarIsleLookAbility(SphinxOfJwarIsleLookAbility ability) { + super(ability); + } + + @Override + public SphinxOfJwarIsleLookAbility copy() { + return new SphinxOfJwarIsleLookAbility(this); + } + +} + class SphinxOfJwarIsleEffect extends OneShotEffect { public SphinxOfJwarIsleEffect() { - super(Outcome.AIDontUseIt); // AI can't use the information anyway and seems to do it again and again + super(Outcome.Neutral); this.staticText = "You may look at the top card of your library"; } @@ -104,7 +121,8 @@ class SphinxOfJwarIsleEffect extends OneShotEffect { Card card = player.getLibrary().getFromTop(game); if (card != null) { - Cards cards = new CardsImpl(card); + Cards cards = new CardsImpl(Zone.PICK); + cards.add(card); player.lookAtCards("Sphinx of Jwar Isle", cards, game); } else { return false;