From 19345915f06ea44bafd1a585911765ab86eb8f23 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 14 Jan 2015 23:13:28 +0100 Subject: [PATCH] [FRF] Added 7 red cards. --- .../src/mage/sets/fatereforged/Arcbond.java | 133 ++++++++++++++++++ .../sets/fatereforged/BloodfireEnforcers.java | 110 +++++++++++++++ .../fatereforged/BreakThroughTheLine.java | 82 +++++++++++ .../sets/fatereforged/CollateralDamage.java | 66 +++++++++ .../mage/sets/fatereforged/DefiantOgre.java | 76 ++++++++++ .../mage/sets/fatereforged/Dragonrage.java | 85 +++++++++++ .../sets/fatereforged/FierceInvocation.java | 105 ++++++++++++++ .../sets/fatereforged/HoodedAssassin.java | 3 - .../mage/sets/magic2012/PhantasmalImage.java | 2 +- .../mage/sets/magic2014/ScourgeOfValkas.java | 11 +- .../src/mage/sets/mirrodin/LeoninElder.java | 4 - Mage/src/mage/abilities/Modes.java | 10 +- 12 files changed, 671 insertions(+), 16 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/fatereforged/Arcbond.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/BreakThroughTheLine.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/CollateralDamage.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/DefiantOgre.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/Dragonrage.java create mode 100644 Mage.Sets/src/mage/sets/fatereforged/FierceInvocation.java diff --git a/Mage.Sets/src/mage/sets/fatereforged/Arcbond.java b/Mage.Sets/src/mage/sets/fatereforged/Arcbond.java new file mode 100644 index 0000000000..fd3badac38 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/Arcbond.java @@ -0,0 +1,133 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.DelayedTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; +import mage.abilities.effects.common.DamageEverythingEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.permanent.PermanentIdPredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author LevelX2 + */ +public class Arcbond extends CardImpl { + + public Arcbond(UUID ownerId) { + super(ownerId, 91, "Arcbond", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{R}"); + this.expansionSetCode = "FRF"; + + // Choose target creature. Whenever that creature is dealt damage this turn, it deals that much damage to each other creature and each player. + this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new ArcbondDelayedTriggeredAbility(), true)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + } + + public Arcbond(final Arcbond card) { + super(card); + } + + @Override + public Arcbond copy() { + return new Arcbond(this); + } +} + +class ArcbondDelayedTriggeredAbility extends DelayedTriggeredAbility { + + public ArcbondDelayedTriggeredAbility() { + super(new ArcbondEffect(), Duration.EndOfTurn, false); + } + + public ArcbondDelayedTriggeredAbility(ArcbondDelayedTriggeredAbility ability) { + super(ability); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.DAMAGED_CREATURE && event.getTargetId().equals(this.getFirstTarget())) { + for (Effect effect : this.getEffects()) { + effect.setValue("damage", event.getAmount()); + } + return true; + } + return false; + } + + @Override + public ArcbondDelayedTriggeredAbility copy() { + return new ArcbondDelayedTriggeredAbility(this); + } + + @Override + public String getRule() { + return "Choose target creature. Whenever that creature is dealt damage this turn, " + modes.getText(); + } +} + +class ArcbondEffect extends OneShotEffect { + + public ArcbondEffect() { + super(Outcome.Benefit); + this.staticText = "it deals that much damage to each other creature and each player"; + } + + public ArcbondEffect(final ArcbondEffect effect) { + super(effect); + } + + @Override + public ArcbondEffect copy() { + return new ArcbondEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + int damage = (Integer) this.getValue("damage"); + if (damage > 0) { + FilterPermanent filter = new FilterCreaturePermanent("each other creature"); + filter.add(Predicates.not(new PermanentIdPredicate(source.getTargets().getFirstTarget()))); + return new DamageEverythingEffect(damage, filter).apply(game, source); + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java b/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java new file mode 100644 index 0000000000..83b954c320 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/BloodfireEnforcers.java @@ -0,0 +1,110 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.condition.Condition; +import mage.abilities.decorator.ConditionalContinousEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.TrampleAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterInstantOrSorceryCard; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author LevelX2 + */ +public class BloodfireEnforcers extends CardImpl { + + public BloodfireEnforcers(UUID ownerId) { + super(ownerId, 93, "Bloodfire Enforcers", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); + this.expansionSetCode = "FRF"; + this.subtype.add("Human"); + this.subtype.add("Monk"); + this.power = new MageInt(5); + this.toughness = new MageInt(2); + + // Bloodfire Enforcers has first strike and trample as long as an instant card and a sorcery card are in your graveyard. + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), + new BloodfireEnforcersCondition(), "{this} has first strike")); + ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), + new BloodfireEnforcersCondition(), "and trample as long as an instant card and a sorcery card are in your graveyard")); + this.addAbility(ability); + + } + + public BloodfireEnforcers(final BloodfireEnforcers card) { + super(card); + } + + @Override + public BloodfireEnforcers copy() { + return new BloodfireEnforcers(this); + } +} + + +class BloodfireEnforcersCondition implements Condition { + + private static final FilterInstantOrSorceryCard filter = new FilterInstantOrSorceryCard(); + + @Override + public boolean apply(Game game, Ability source) { + boolean instantFound = false; + boolean sorceryFound = false; + Player player = game.getPlayer(source.getControllerId()); + if (player != null) { + for(Card card : player.getGraveyard().getCards(game)) { + if (card.getCardType().contains(CardType.INSTANT)) { + if (sorceryFound) { + return true; + } + instantFound = true; + } else if (card.getCardType().contains(CardType.SORCERY)) { + if (instantFound) { + return true; + } + sorceryFound = true; + } + } + } + return false; + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/fatereforged/BreakThroughTheLine.java b/Mage.Sets/src/mage/sets/fatereforged/BreakThroughTheLine.java new file mode 100644 index 0000000000..6cf93fa31f --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/BreakThroughTheLine.java @@ -0,0 +1,82 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; +import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.Filter; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.PowerPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author LevelX2 + */ +public class BreakThroughTheLine extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less"); + + static { + filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, 3)); + } + + public BreakThroughTheLine(UUID ownerId) { + super(ownerId, 94, "Break Through the Line", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); + this.expansionSetCode = "FRF"; + + // {R}: Target creature with power 2 or less gains haste until end of turn and can't be blocked this turn. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Effect effect = new CantBeBlockedTargetEffect(Duration.EndOfTurn); + effect.setText("and can't be blocked this turn"); + ability.addEffect(effect); + ability.addTarget(new TargetCreaturePermanent(filter)); + this.addAbility(ability); + + } + + public BreakThroughTheLine(final BreakThroughTheLine card) { + super(card); + } + + @Override + public BreakThroughTheLine copy() { + return new BreakThroughTheLine(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/CollateralDamage.java b/Mage.Sets/src/mage/sets/fatereforged/CollateralDamage.java new file mode 100644 index 0000000000..887f323629 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/CollateralDamage.java @@ -0,0 +1,66 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.abilities.costs.common.SacrificeTargetCost; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.target.common.TargetControlledCreaturePermanent; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author LevelX2 + */ +public class CollateralDamage extends CardImpl { + + public CollateralDamage(UUID ownerId) { + super(ownerId, 95, "Collateral Damage", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{R}"); + this.expansionSetCode = "FRF"; + + // As an additional cost to cast Collateral Damge, sacrifice a creature. + this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("a creature")))); + + // Collateral Damage deals 3 damage to target creature or player. + this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); + this.getSpellAbility().addEffect(new DamageTargetEffect(3)); + } + + public CollateralDamage(final CollateralDamage card) { + super(card); + } + + @Override + public CollateralDamage copy() { + return new CollateralDamage(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/DefiantOgre.java b/Mage.Sets/src/mage/sets/fatereforged/DefiantOgre.java new file mode 100644 index 0000000000..bd66654b3a --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/DefiantOgre.java @@ -0,0 +1,76 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.counters.CounterType; +import mage.target.common.TargetArtifactPermanent; + +/** + * + * @author LevelX2 + */ +public class DefiantOgre extends CardImpl { + + public DefiantOgre(UUID ownerId) { + super(ownerId, 96, "Defiant Ogre", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{R}"); + this.expansionSetCode = "FRF"; + this.subtype.add("Ogre"); + this.subtype.add("Warrior"); + this.power = new MageInt(3); + this.toughness = new MageInt(5); + + // When Defiant Ogre enters the battlefield, choose one - + // * Put a +1/+1 counter on Defiant Ogre. + Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); + // * Destroy target artifact. + Mode mode = new Mode(); + mode.getEffects().add(new DestroyTargetEffect()); + mode.getTargets().add(new TargetArtifactPermanent()); + ability.addMode(mode); + this.addAbility(ability); + } + + public DefiantOgre(final DefiantOgre card) { + super(card); + } + + @Override + public DefiantOgre copy() { + return new DefiantOgre(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/Dragonrage.java b/Mage.Sets/src/mage/sets/fatereforged/Dragonrage.java new file mode 100644 index 0000000000..d2237daca7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/Dragonrage.java @@ -0,0 +1,85 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.Mana; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.DynamicManaEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilityAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.predicate.permanent.AttackingPredicate; + +/** + * + * @author LevelX2 + */ +public class Dragonrage extends CardImpl { + + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("attacking creature you control"); + + static { + filter.add(new AttackingPredicate()); + } + + + public Dragonrage(UUID ownerId) { + super(ownerId, 97, "Dragonrage", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); + this.expansionSetCode = "FRF"; + + // Add {R} to your mana pool for each attacking creature you control. + this.getSpellAbility().addEffect(new DynamicManaEffect(Mana.RedMana, + new PermanentsOnBattlefieldCount(filter))); + + // Until end of turn, attacking creatures you control gain "{R}: This creature gets +1/+0 until end of turn." + Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Effect effect = new GainAbilityAllEffect(abilityToGain, Duration.EndOfTurn, filter); + effect.setText("Until end of turn, attacking creatures you control gain \"{R}: This creature gets +1/+0 until end of turn.\""); + this.getSpellAbility().addEffect(effect); + + } + + public Dragonrage(final Dragonrage card) { + super(card); + } + + @Override + public Dragonrage copy() { + return new Dragonrage(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/FierceInvocation.java b/Mage.Sets/src/mage/sets/fatereforged/FierceInvocation.java new file mode 100644 index 0000000000..582de1d6d8 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/FierceInvocation.java @@ -0,0 +1,105 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.counter.AddCountersTargetEffect; +import mage.abilities.effects.keyword.ManifestEffect; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.counters.CounterType; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author LevelX2 + */ +public class FierceInvocation extends CardImpl { + + public FierceInvocation(UUID ownerId) { + super(ownerId, 98, "Fierce Invocation", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}"); + this.expansionSetCode = "FRF"; + + // Manifest the top card of your library, then put two +1/+1 counters on it. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.) + this.getSpellAbility().addEffect(new FierceInvocationEffect()); + } + + public FierceInvocation(final FierceInvocation card) { + super(card); + } + + @Override + public FierceInvocation copy() { + return new FierceInvocation(this); + } +} + +class FierceInvocationEffect extends OneShotEffect { + + public FierceInvocationEffect() { + super(Outcome.Benefit); + this.staticText = "Manifest the top card of your library, then put two +1/+1 counters on it. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.)"; + } + + public FierceInvocationEffect(final FierceInvocationEffect effect) { + super(effect); + } + + @Override + public FierceInvocationEffect copy() { + return new FierceInvocationEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + Card card = controller.getLibrary().getFromTop(game); + if (card != null) { + new ManifestEffect(1).apply(game, source); + Permanent permanent = game.getPermanent(card.getId()); + if (permanent != null) { + Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)); + effect.setTargetPointer(new FixedTarget(permanent.getId())); + return effect.apply(game, source); + } + } + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/HoodedAssassin.java b/Mage.Sets/src/mage/sets/fatereforged/HoodedAssassin.java index 97cf3cabcc..9d5a0d3559 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/HoodedAssassin.java +++ b/Mage.Sets/src/mage/sets/fatereforged/HoodedAssassin.java @@ -38,12 +38,9 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.counters.CounterType; -import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; -import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; -import mage.target.common.TargetOpponent; /** * diff --git a/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java b/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java index 09cca68bbe..576bfd7005 100644 --- a/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java +++ b/Mage.Sets/src/mage/sets/magic2012/PhantasmalImage.java @@ -98,7 +98,7 @@ class PhantasmalImageCopyEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { - Target target = new TargetPermanent(new FilterCreaturePermanent()); + Target target = new TargetPermanent(new FilterCreaturePermanent("creature (you copy from)")); target.setNotTarget(true); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { player.choose(Outcome.Copy, target, source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java b/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java index 153b7cb925..44ed72de9d 100644 --- a/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/sets/magic2014/ScourgeOfValkas.java @@ -45,7 +45,9 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.filter.predicate.permanent.ThisPermanentPredicate; import mage.target.common.TargetCreatureOrPlayer; /** @@ -54,15 +56,18 @@ import mage.target.common.TargetCreatureOrPlayer; */ public class ScourgeOfValkas extends CardImpl { - private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Scourge of Valkas or another Dragon"); + private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Dragon"); private final static FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("Dragons you control"); static { - filter.add(new SubtypePredicate("Dragon")); + filter.add(Predicates.or( + new ThisPermanentPredicate(), + new SubtypePredicate("Dragon") + )); filter2.add(new SubtypePredicate("Dragon")); } - private String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control."; + private final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control."; public ScourgeOfValkas(UUID ownerId) { super(ownerId, 151, "Scourge of Valkas", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{R}{R}{R}"); diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java index 246abbcd88..82738e1c05 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java @@ -29,17 +29,13 @@ package mage.sets.mirrodin; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; -import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; /** * diff --git a/Mage/src/mage/abilities/Modes.java b/Mage/src/mage/abilities/Modes.java index c1711cc455..0d50987f57 100644 --- a/Mage/src/mage/abilities/Modes.java +++ b/Mage/src/mage/abilities/Modes.java @@ -182,15 +182,15 @@ public class Modes extends LinkedHashMap { } StringBuilder sb = new StringBuilder(); if (this.getMinModes() == 1 && this.getMaxModes() == 3) { - sb.append("choose one or more - "); + sb.append("choose one or more "); }else if (this.getMinModes() == 1 && this.getMaxModes() == 2) { - sb.append("choose one or both - "); + sb.append("choose one or both "); } else if (this.getMinModes() == 2 && this.getMaxModes() == 2) { - sb.append("choose two - "); + sb.append("choose two "); } else { - sb.append("choose one - "); + sb.append("choose one "); } - sb.append("
"); + sb.append("—
"); for (Mode mode: this.values()) { sb.append("&bull "); sb.append(mode.getEffects().getTextStartingUpperCase(mode));