diff --git a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java index 71861445965..3ec7e279881 100644 --- a/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java +++ b/Mage.Sets/src/mage/cards/f/FaadiyahSeer.java @@ -35,7 +35,7 @@ public final class FaadiyahSeer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Draw a card and reveal it. If it isn't a land card, discard it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FaadiyahSeerEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FaadiyahSeerEffect(), new TapSourceCost())); } private FaadiyahSeer(final FaadiyahSeer card) { diff --git a/Mage.Sets/src/mage/cards/f/FabricationModule.java b/Mage.Sets/src/mage/cards/f/FabricationModule.java index 36942aa5a66..9e7987a6d8e 100644 --- a/Mage.Sets/src/mage/cards/f/FabricationModule.java +++ b/Mage.Sets/src/mage/cards/f/FabricationModule.java @@ -34,7 +34,7 @@ public final class FabricationModule extends CardImpl { this.addAbility(ability); // {4}, {T}: You get {E}. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(1), new GenericManaCost(4)); + ability = new SimpleActivatedAbility(new GetEnergyCountersControllerEffect(1), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaceOfFear.java b/Mage.Sets/src/mage/cards/f/FaceOfFear.java index ba0e571bf8c..3f43cabf82a 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfFear.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfFear.java @@ -30,7 +30,7 @@ public final class FaceOfFear extends CardImpl { this.toughness = new MageInt(4); // {2}{B}, Discard a card: Face of Fear gains fear until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost(false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Facevaulter.java b/Mage.Sets/src/mage/cards/f/Facevaulter.java index b1b3f19eeaa..6d8810122ab 100644 --- a/Mage.Sets/src/mage/cards/f/Facevaulter.java +++ b/Mage.Sets/src/mage/cards/f/Facevaulter.java @@ -33,7 +33,7 @@ public final class Facevaulter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java index dd6a1ec0f7d..2497683e23f 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java +++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java @@ -27,7 +27,7 @@ public final class FaerieConclave extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlueManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new FaerieConclaveToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new FaerieConclaveToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private FaerieConclave(final FaerieConclave card) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index 8d5afad5300..e25db8a530c 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -41,7 +41,7 @@ public final class FaerieNoble extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); // {tap}: Other Faerie creatures you control get +1/+0 until end of turn. Effect effect = new BoostControlledEffect(1, 0, Duration.EndOfTurn, filter, true); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaithHealer.java b/Mage.Sets/src/mage/cards/f/FaithHealer.java index eb2c17821ee..2820c02bf85 100644 --- a/Mage.Sets/src/mage/cards/f/FaithHealer.java +++ b/Mage.Sets/src/mage/cards/f/FaithHealer.java @@ -30,7 +30,7 @@ public final class FaithHealer extends CardImpl { this.toughness = new MageInt(1); // Sacrifice an enchantment: You gain life equal to the sacrificed enchantment's converted mana cost. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(SacrificeCostManaValue.ENCHANTMENT), + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(SacrificeCostManaValue.ENCHANTMENT), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT))); } diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java index ddfdbfe9eec..dbcdada721a 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathExterminator.java @@ -35,7 +35,7 @@ public final class FalkenrathExterminator extends CardImpl { // Whenever Falkenrath Exterminator deals combat damage to a player, put a +1/+1 counter on it. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FallenAngel.java b/Mage.Sets/src/mage/cards/f/FallenAngel.java index 70d29b4032c..5231d6dfe89 100644 --- a/Mage.Sets/src/mage/cards/f/FallenAngel.java +++ b/Mage.Sets/src/mage/cards/f/FallenAngel.java @@ -32,7 +32,7 @@ public final class FallenAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice a creature: Fallen Angel gets +2/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java index 30cad617ff5..a85a811d676 100644 --- a/Mage.Sets/src/mage/cards/f/FallenFerromancer.java +++ b/Mage.Sets/src/mage/cards/f/FallenFerromancer.java @@ -34,7 +34,7 @@ public final class FallenFerromancer extends CardImpl { this.addAbility(InfectAbility.getInstance()); // {1}{R}, {T}: Fallen Ferromancer deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java index 34ff9563da7..8e76bf9453f 100644 --- a/Mage.Sets/src/mage/cards/f/FamishedGhoul.java +++ b/Mage.Sets/src/mage/cards/f/FamishedGhoul.java @@ -29,7 +29,7 @@ public final class FamishedGhoul extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, Sacrifice Famished Ghoul: Exile up to two target cards from a single graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(0, 2, StaticFilters.FILTER_CARD_CARDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FanBearer.java b/Mage.Sets/src/mage/cards/f/FanBearer.java index b4cb3220c0b..5ad15cc9496 100644 --- a/Mage.Sets/src/mage/cards/f/FanBearer.java +++ b/Mage.Sets/src/mage/cards/f/FanBearer.java @@ -29,7 +29,7 @@ public final class FanBearer extends CardImpl { this.toughness = new MageInt(2); // {2}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java index 339ae6246ea..3ae9499a1f8 100644 --- a/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FanaticalFirebrand.java @@ -37,7 +37,7 @@ public final class FanaticalFirebrand extends CardImpl { this.addAbility(HasteAbility.getInstance()); // {T}, Sacrifice Fanatical Firebrand: It deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); @@ -51,4 +51,4 @@ public final class FanaticalFirebrand extends CardImpl { public FanaticalFirebrand copy() { return new FanaticalFirebrand(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/FangSkulkin.java b/Mage.Sets/src/mage/cards/f/FangSkulkin.java index f0a57ac7c2d..0ed4a8ead57 100644 --- a/Mage.Sets/src/mage/cards/f/FangSkulkin.java +++ b/Mage.Sets/src/mage/cards/f/FangSkulkin.java @@ -35,7 +35,7 @@ public final class FangSkulkin extends CardImpl { this.subtype.add(SubType.SCARECROW); this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(WitherAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(WitherAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filterBlackCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fatestitcher.java b/Mage.Sets/src/mage/cards/f/Fatestitcher.java index 1b3bc383b6f..b22c1a012a5 100644 --- a/Mage.Sets/src/mage/cards/f/Fatestitcher.java +++ b/Mage.Sets/src/mage/cards/f/Fatestitcher.java @@ -38,7 +38,7 @@ public final class Fatestitcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: You may tap or untap another target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Unearth {U} diff --git a/Mage.Sets/src/mage/cards/f/FathomFeeder.java b/Mage.Sets/src/mage/cards/f/FathomFeeder.java index d2ff7d47821..9c0da4c8a9e 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFeeder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFeeder.java @@ -46,7 +46,7 @@ public final class FathomFeeder extends CardImpl { // {3}{U}{B}: Draw a card. Each opponent exiles the top card of their library. Effect effect = new FathomFeederEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}{B}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}{B}")); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java index c6431fdf1ba..c024ab7bcd7 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetFirebrand.java @@ -28,7 +28,7 @@ public final class FathomFleetFirebrand extends CardImpl { this.toughness = new MageInt(2); // {1}{r}: Fathom Fleet Firebrand gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FathomFleetFirebrand(final FathomFleetFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 78da48253ae..376b486ad6e 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -40,7 +40,7 @@ public final class FearsomeTemper extends CardImpl { Effect effect = new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); ability = new SimpleStaticAbility(effect); - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); + Ability grantedAbility = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}")); grantedAbility.addTarget(new TargetCreaturePermanent()); effect = new GainAbilityAttachedEffect(grantedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"{2}{R}: Target creature can't block this creature this turn.\""); diff --git a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java index 4cfbddac838..1e891cebda1 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java +++ b/Mage.Sets/src/mage/cards/f/FeldonOfTheThirdPath.java @@ -42,7 +42,7 @@ public final class FeldonOfTheThirdPath extends CardImpl { this.toughness = new MageInt(3); // {2}{R}, {T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FeldonOfTheThirdPathEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new FeldonOfTheThirdPathEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(1, 1, new FilterCreatureCard("creature card in your graveyard"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeldonsCane.java b/Mage.Sets/src/mage/cards/f/FeldonsCane.java index 702d3e1afba..0283dc88776 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonsCane.java +++ b/Mage.Sets/src/mage/cards/f/FeldonsCane.java @@ -22,7 +22,7 @@ public final class FeldonsCane extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {tap}, Exile Feldon's Cane: Shuffle your graveyard into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleYourGraveyardIntoLibraryEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShuffleYourGraveyardIntoLibraryEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FelidarCub.java b/Mage.Sets/src/mage/cards/f/FelidarCub.java index 465cb5d471b..f7de726026e 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarCub.java +++ b/Mage.Sets/src/mage/cards/f/FelidarCub.java @@ -28,7 +28,7 @@ public final class FelidarCub extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Felidar Cub: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 729f7299394..1caeb44ff93 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -44,7 +44,7 @@ public final class FelidarUmbra extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); // {1}{W}: Attach Felidar Umbra to target creature you control. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Detriment, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FemerefArchers.java b/Mage.Sets/src/mage/cards/f/FemerefArchers.java index d9c5b4a84bc..1bbe77a4ca2 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefArchers.java +++ b/Mage.Sets/src/mage/cards/f/FemerefArchers.java @@ -36,7 +36,7 @@ public final class FemerefArchers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FemerefHealer.java b/Mage.Sets/src/mage/cards/f/FemerefHealer.java index afbeee66973..345baf036c1 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefHealer.java +++ b/Mage.Sets/src/mage/cards/f/FemerefHealer.java @@ -29,7 +29,7 @@ public final class FemerefHealer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Prevent the next 1 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FemerefKnight.java b/Mage.Sets/src/mage/cards/f/FemerefKnight.java index ecba4613c4f..cf98b2aa27f 100644 --- a/Mage.Sets/src/mage/cards/f/FemerefKnight.java +++ b/Mage.Sets/src/mage/cards/f/FemerefKnight.java @@ -32,7 +32,7 @@ public final class FemerefKnight extends CardImpl { // Flanking this.addAbility(new FlankingAbility()); // {W}: Femeref Knight gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FemerefKnight(final FemerefKnight card) { diff --git a/Mage.Sets/src/mage/cards/f/FencerClique.java b/Mage.Sets/src/mage/cards/f/FencerClique.java index 3ba7c4e1936..e48b9586c27 100644 --- a/Mage.Sets/src/mage/cards/f/FencerClique.java +++ b/Mage.Sets/src/mage/cards/f/FencerClique.java @@ -29,7 +29,7 @@ public final class FencerClique extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {U}: Put Fencer Clique on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private FencerClique(final FencerClique card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java index 028106217c3..c88d6f00c26 100644 --- a/Mage.Sets/src/mage/cards/f/FeralDeceiver.java +++ b/Mage.Sets/src/mage/cards/f/FeralDeceiver.java @@ -41,7 +41,7 @@ public final class FeralDeceiver extends CardImpl { this.toughness = new MageInt(2); // {1}: Look at the top card of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(), new GenericManaCost(1))); // {2}: Reveal the top card of your library. If it's a land card, {this} gets +2/+2 and gains trample until end of turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new FeralDeceiverEffect(), new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/f/FeralHydra.java b/Mage.Sets/src/mage/cards/f/FeralHydra.java index 88d7dea25ac..078caa21fea 100644 --- a/Mage.Sets/src/mage/cards/f/FeralHydra.java +++ b/Mage.Sets/src/mage/cards/f/FeralHydra.java @@ -35,7 +35,7 @@ public final class FeralHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // {3}: Put a +1/+1 counter on Feral Hydra. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{3}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java index c5142576208..525941b3597 100644 --- a/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java +++ b/Mage.Sets/src/mage/cards/f/FeralRidgewolf.java @@ -29,7 +29,7 @@ public final class FeralRidgewolf extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {1}{R}: Feral Ridgewolf gets +2/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FeralRidgewolf(final FeralRidgewolf card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralThallid.java b/Mage.Sets/src/mage/cards/f/FeralThallid.java index be4728d540f..0e5e59f9bee 100644 --- a/Mage.Sets/src/mage/cards/f/FeralThallid.java +++ b/Mage.Sets/src/mage/cards/f/FeralThallid.java @@ -30,7 +30,7 @@ public final class FeralThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Feral Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Feral Thallid: Regenerate Feral Thallid. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } private FeralThallid(final FeralThallid card) { diff --git a/Mage.Sets/src/mage/cards/f/Ferrovore.java b/Mage.Sets/src/mage/cards/f/Ferrovore.java index 03cc4672c9f..ef2e10cab2b 100644 --- a/Mage.Sets/src/mage/cards/f/Ferrovore.java +++ b/Mage.Sets/src/mage/cards/f/Ferrovore.java @@ -35,7 +35,7 @@ public final class Ferrovore extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Fertilid.java b/Mage.Sets/src/mage/cards/f/Fertilid.java index 49db6eec8ab..52625174ec5 100644 --- a/Mage.Sets/src/mage/cards/f/Fertilid.java +++ b/Mage.Sets/src/mage/cards/f/Fertilid.java @@ -37,7 +37,7 @@ public final class Fertilid extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/f/FerventPaincaster.java b/Mage.Sets/src/mage/cards/f/FerventPaincaster.java index f16c2397496..3b45726bf2c 100644 --- a/Mage.Sets/src/mage/cards/f/FerventPaincaster.java +++ b/Mage.Sets/src/mage/cards/f/FerventPaincaster.java @@ -32,12 +32,12 @@ public final class FerventPaincaster extends CardImpl { this.toughness = new MageInt(1); // {T}: Fervent Paincaster deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); // {T}, Exert Fervent Paincaster: It deals 1 damage to target creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new TapSourceCost()); ability2.addCost(new ExertSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/f/FetidHorror.java b/Mage.Sets/src/mage/cards/f/FetidHorror.java index 69be40113a3..9ec2f607507 100644 --- a/Mage.Sets/src/mage/cards/f/FetidHorror.java +++ b/Mage.Sets/src/mage/cards/f/FetidHorror.java @@ -28,7 +28,7 @@ public final class FetidHorror extends CardImpl { this.toughness = new MageInt(2); // {B}: Fetid Horror gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B))); } private FetidHorror(final FetidHorror card) { diff --git a/Mage.Sets/src/mage/cards/f/FetidImp.java b/Mage.Sets/src/mage/cards/f/FetidImp.java index 0a84cd56619..ae8f65eda41 100644 --- a/Mage.Sets/src/mage/cards/f/FetidImp.java +++ b/Mage.Sets/src/mage/cards/f/FetidImp.java @@ -31,7 +31,7 @@ public final class FetidImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Fetid Imp gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FetidImp(final FetidImp card) { diff --git a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java index 65e8a82fe88..8806d714282 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredConvulsions.java @@ -22,7 +22,7 @@ public final class FeveredConvulsions extends CardImpl { public FeveredConvulsions(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl<>("{2}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance(1)), new ManaCostsImpl<>("{2}{B}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FieldOfReality.java b/Mage.Sets/src/mage/cards/f/FieldOfReality.java index 07dfd40204d..d566bd8dbb4 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfReality.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfReality.java @@ -35,7 +35,7 @@ public final class FieldOfReality extends CardImpl { this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesAttachedEffect( Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.SPIRIT, "Spirits"), AttachmentType.AURA))); // {1}{U}: Return Field of Reality to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private FieldOfReality(final FieldOfReality card) { diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java index a80c738434a..0eb5368b767 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java @@ -46,7 +46,7 @@ public final class FieldOfRuin extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new FieldOfRuinEffect()); diff --git a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java index 6b3678c8c6e..32e91858a89 100644 --- a/Mage.Sets/src/mage/cards/f/FieldSurgeon.java +++ b/Mage.Sets/src/mage/cards/f/FieldSurgeon.java @@ -38,7 +38,7 @@ public final class FieldSurgeon extends CardImpl { this.toughness = new MageInt(1); // Tap an untapped creature you control: Prevent the next 1 damage that would be dealt to target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapTargetCost(new TargetControlledCreaturePermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FieryBombardment.java b/Mage.Sets/src/mage/cards/f/FieryBombardment.java index 62257b4c516..2691c9a9cd2 100644 --- a/Mage.Sets/src/mage/cards/f/FieryBombardment.java +++ b/Mage.Sets/src/mage/cards/f/FieryBombardment.java @@ -33,7 +33,7 @@ public final class FieryBombardment extends CardImpl { // Chroma - {2}, Sacrifice a creature: Fiery Bombardment deals damage to any target equal to the number of red mana symbols in the sacrificed creature's mana cost. Effect effect = new FieryBombardmentEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); ability.setAbilityWord(AbilityWord.CHROMA); diff --git a/Mage.Sets/src/mage/cards/f/FieryHellhound.java b/Mage.Sets/src/mage/cards/f/FieryHellhound.java index 67e1da2a70b..d053e151761 100644 --- a/Mage.Sets/src/mage/cards/f/FieryHellhound.java +++ b/Mage.Sets/src/mage/cards/f/FieryHellhound.java @@ -28,7 +28,7 @@ public final class FieryHellhound extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FieryHellhound(final FieryHellhound card) { diff --git a/Mage.Sets/src/mage/cards/f/FieryMantle.java b/Mage.Sets/src/mage/cards/f/FieryMantle.java index bae0acb82fd..435d04c016a 100644 --- a/Mage.Sets/src/mage/cards/f/FieryMantle.java +++ b/Mage.Sets/src/mage/cards/f/FieryMantle.java @@ -34,7 +34,7 @@ public final class FieryMantle extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FiligreeSages.java b/Mage.Sets/src/mage/cards/f/FiligreeSages.java index e70e20124c9..26208799cb3 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeSages.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeSages.java @@ -34,7 +34,7 @@ public final class FiligreeSages extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FireAnts.java b/Mage.Sets/src/mage/cards/f/FireAnts.java index 0cd7d8fdb1f..1e75e244a0c 100644 --- a/Mage.Sets/src/mage/cards/f/FireAnts.java +++ b/Mage.Sets/src/mage/cards/f/FireAnts.java @@ -37,7 +37,7 @@ public final class FireAnts extends CardImpl { this.toughness = new MageInt(1); // {tap}: Fire Ants deals 1 damage to each other creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost())); } private FireAnts(final FireAnts card) { diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index a5a419fb5ca..20f93f029d6 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -37,11 +37,11 @@ public final class FireWhip extends CardImpl { this.addAbility(ability); // Enchanted creature has "{t}: This creature deals 1 damage to any target." - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability1.addTarget(new TargetAnyTarget()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability1, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{T}: This creature deals 1 damage to any target.\""))); // Sacrifice Fire Whip: Fire Whip deals 1 damage to any target. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new SacrificeSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new DamageTargetEffect(1), new SacrificeSourceCost()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/f/FirebornKnight.java b/Mage.Sets/src/mage/cards/f/FirebornKnight.java index 9dbef06dfb3..3963b625075 100644 --- a/Mage.Sets/src/mage/cards/f/FirebornKnight.java +++ b/Mage.Sets/src/mage/cards/f/FirebornKnight.java @@ -32,7 +32,7 @@ public final class FirebornKnight extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // {R/W}{R/W}{R/W}{R/W}: Fireborn Knight gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}{R/W}{R/W}{R/W}"))); } diff --git a/Mage.Sets/src/mage/cards/f/Firebreathing.java b/Mage.Sets/src/mage/cards/f/Firebreathing.java index e6c85d29621..81749e52bf6 100644 --- a/Mage.Sets/src/mage/cards/f/Firebreathing.java +++ b/Mage.Sets/src/mage/cards/f/Firebreathing.java @@ -32,7 +32,7 @@ public final class Firebreathing extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private Firebreathing(final Firebreathing card) { diff --git a/Mage.Sets/src/mage/cards/f/Firefly.java b/Mage.Sets/src/mage/cards/f/Firefly.java index f6e4da47329..31e8794337d 100644 --- a/Mage.Sets/src/mage/cards/f/Firefly.java +++ b/Mage.Sets/src/mage/cards/f/Firefly.java @@ -28,7 +28,7 @@ public final class Firefly extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private Firefly(final Firefly card) { diff --git a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java index 4987094a5ab..6c5cb8e381b 100644 --- a/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java +++ b/Mage.Sets/src/mage/cards/f/FireforgersPuzzleknot.java @@ -30,7 +30,7 @@ public final class FireforgersPuzzleknot extends CardImpl { this.addAbility(ability); // {2}{R}, Sacrifice Fireforger's Puzzleknot: It deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "It"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FirefrightMage.java b/Mage.Sets/src/mage/cards/f/FirefrightMage.java index 288fe8181c6..8f38964995d 100644 --- a/Mage.Sets/src/mage/cards/f/FirefrightMage.java +++ b/Mage.Sets/src/mage/cards/f/FirefrightMage.java @@ -46,7 +46,7 @@ public final class FirefrightMage extends CardImpl { this.toughness = new MageInt(1); //{1}{R}, {T}, Discard a card: Target creature can't be blocked this turn except by artifact creatures and/or red creatures. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByAllTargetEffect(filter, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java index 574387f09d5..ac32b2da452 100644 --- a/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java +++ b/Mage.Sets/src/mage/cards/f/FirehoofCavalry.java @@ -34,7 +34,7 @@ public final class FirehoofCavalry extends CardImpl { // {3}{R}: Firehoof Cavalry gets +2/+0 and gains trample until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); effect.setText("{this} gets +2/+0"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{3}{R}")); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java index e8776bb3246..4a65914295b 100644 --- a/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/f/FiresOfYavimaya.java @@ -28,7 +28,7 @@ public final class FiresOfYavimaya extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Firescreamer.java b/Mage.Sets/src/mage/cards/f/Firescreamer.java index 3f7915cf74a..9220634c626 100644 --- a/Mage.Sets/src/mage/cards/f/Firescreamer.java +++ b/Mage.Sets/src/mage/cards/f/Firescreamer.java @@ -26,7 +26,7 @@ public final class Firescreamer extends CardImpl { this.toughness = new MageInt(2); // {R}: Firescreamer gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private Firescreamer(final Firescreamer card) { diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 8457630204d..421eea7ad80 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -45,7 +45,7 @@ public final class FirewakeSliver extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // All Slivers have "{1}, Sacrifice this permanent: Target Sliver creature gets +2/+2 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); + Ability gainedAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new GenericManaCost(1)); gainedAbility.addCost(new SacrificeSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(targetSliverFilter)); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java index 4e2113188fe..5395ff067aa 100644 --- a/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java +++ b/Mage.Sets/src/mage/cards/f/FiveAlarmFire.java @@ -37,7 +37,7 @@ public final class FiveAlarmFire extends CardImpl { //Whenever a creature you control deals combat damage, put a blaze counter on Five-Alarm Fire. this.addAbility(new FiveAlarmFireTriggeredAbility()); //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5, "it"), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5, "it"), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlailingManticore.java b/Mage.Sets/src/mage/cards/f/FlailingManticore.java index 17270aed090..fe1f6966534 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingManticore.java +++ b/Mage.Sets/src/mage/cards/f/FlailingManticore.java @@ -34,12 +34,12 @@ public final class FlailingManticore extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {1}: Flailing Manticore gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Manticore gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingOgre.java b/Mage.Sets/src/mage/cards/f/FlailingOgre.java index 9ce47e645bb..9dd941197b7 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingOgre.java +++ b/Mage.Sets/src/mage/cards/f/FlailingOgre.java @@ -28,12 +28,12 @@ public final class FlailingOgre extends CardImpl { this.toughness = new MageInt(3); // {1}: Flailing Ogre gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Ogre gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java index 253b89d8016..14306138179 100644 --- a/Mage.Sets/src/mage/cards/f/FlailingSoldier.java +++ b/Mage.Sets/src/mage/cards/f/FlailingSoldier.java @@ -29,12 +29,12 @@ public final class FlailingSoldier extends CardImpl { this.toughness = new MageInt(2); // {1}: Flailing Soldier gets +1/+1 until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); // {1}: Flailing Soldier gets -1/-1 until end of turn. Any player may activate this ability. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); + ability = new SimpleActivatedAbility(new BoostSourceEffect(-1, -1, Duration.EndOfTurn) , new ManaCostsImpl<>("{1}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FlameFusillade.java b/Mage.Sets/src/mage/cards/f/FlameFusillade.java index c5ceef06e4b..1581f9b7e16 100644 --- a/Mage.Sets/src/mage/cards/f/FlameFusillade.java +++ b/Mage.Sets/src/mage/cards/f/FlameFusillade.java @@ -23,7 +23,7 @@ public final class FlameFusillade extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); // Until end of turn, permanents you control gain "{tap}: This permanent deals 1 damage to any target." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "this permanent"), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new DamageTargetEffect(1, "this permanent"), new TapSourceCost()); gainedAbility.addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(new GainAbilityControlledEffect(gainedAbility, Duration.EndOfTurn).withDurationRuleAtStart(true)); } diff --git a/Mage.Sets/src/mage/cards/f/FlameSpirit.java b/Mage.Sets/src/mage/cards/f/FlameSpirit.java index 171e66e6bfd..a63b5f329c1 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FlameSpirit.java @@ -28,7 +28,7 @@ public final class FlameSpirit extends CardImpl { this.toughness = new MageInt(3); // {R}: Flame Spirit gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlameSpirit(final FlameSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java index 57077e8e98b..5a6cbb8470c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamecastWheel.java +++ b/Mage.Sets/src/mage/cards/f/FlamecastWheel.java @@ -23,7 +23,7 @@ public final class FlamecastWheel extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {5}, {T}, Sacrifice Flamecast Wheel: Flamecast Wheel deals 3 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new GenericManaCost(5)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new GenericManaCost(5)); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java index dddc07e745e..18ce75a875d 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBrawler.java @@ -27,7 +27,7 @@ public final class FlamekinBrawler extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FlamekinBrawler(final FlamekinBrawler card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java index d9abae55f51..7786068bdaa 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinSpitfire.java @@ -27,7 +27,7 @@ public final class FlamekinSpitfire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java index cf0aba6d4f5..47c9ed2393e 100644 --- a/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java +++ b/Mage.Sets/src/mage/cards/f/FlamesOfRemembrance.java @@ -38,7 +38,7 @@ public final class FlamesOfRemembrance extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid(new AddCountersSourceEffect(CounterType.LORE.createInstance()), new ExileFromGraveCost(new TargetCardInYourGraveyard()), null, true))); // Sacrifice Flames of Remembrance: Exile top X cards of your library, where X is the number of lore counters on Flames of Remembrance. Until end of turn you play cards exile this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlamesOfRemembranceExileEffect(new CountersSourceCount(CounterType.LORE)), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FlamesOfRemembranceExileEffect(new CountersSourceCount(CounterType.LORE)), new SacrificeSourceCost())); } private FlamesOfRemembrance(final FlamesOfRemembrance card) { diff --git a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java index a8bd1977db9..7ef97f22936 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -43,7 +43,7 @@ public final class FlamestickCourier extends CardImpl { // You may choose not to untap Flamestick Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{R}, {tap}: Target Goblin creature gets +2/+2 and has haste for as long as Flamestick Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Goblin creature gets +2/+2"), new ManaCostsImpl<>("{2}{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java index 233a20c5f0a..711fac81146 100644 --- a/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java +++ b/Mage.Sets/src/mage/cards/f/FlamewaveInvoker.java @@ -27,7 +27,7 @@ public final class FlamewaveInvoker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{7}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5), new ManaCostsImpl<>("{7}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Flamewright.java b/Mage.Sets/src/mage/cards/f/Flamewright.java index 122cf5d70f0..2abab014ca8 100644 --- a/Mage.Sets/src/mage/cards/f/Flamewright.java +++ b/Mage.Sets/src/mage/cards/f/Flamewright.java @@ -42,12 +42,12 @@ public final class Flamewright extends CardImpl { this.toughness = new MageInt(1); // {1}, {tap}: Create a 1/1 colorless Construct artifact creature token with defender. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new DarettiConstructToken()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {tap}, Sacrifice a creature with defender: Flamewright deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FledglingImp.java b/Mage.Sets/src/mage/cards/f/FledglingImp.java index 1ea7f7251b9..bfa3e441251 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingImp.java +++ b/Mage.Sets/src/mage/cards/f/FledglingImp.java @@ -30,7 +30,7 @@ public final class FledglingImp extends CardImpl { this.toughness = new MageInt(2); // {B}, Discard a card: Fledgling Imp gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index 40534c951c3..320f88cbf0f 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -33,7 +33,7 @@ public final class FledglingMawcor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Fledgling Mawcor deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FleetingImage.java b/Mage.Sets/src/mage/cards/f/FleetingImage.java index 09bee488b83..1f538518a26 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingImage.java +++ b/Mage.Sets/src/mage/cards/f/FleetingImage.java @@ -29,7 +29,7 @@ public final class FleetingImage extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{U}: Return Fleeting Image to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private FleetingImage(final FleetingImage card) { diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index 132a5ed34b0..8247d4cbb23 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -45,7 +45,7 @@ public final class FleshCarver extends CardImpl { // Intimidate this.addAbility(IntimidateAbility.getInstance()); // {1}{B}, Sacrifice another creature: Put two +1/+1 counters on Flesh Carver. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java index 04eeace45b3..de3bfa6a738 100644 --- a/Mage.Sets/src/mage/cards/f/FleshEaterImp.java +++ b/Mage.Sets/src/mage/cards/f/FleshEaterImp.java @@ -32,7 +32,7 @@ public final class FleshEaterImp extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); } diff --git a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java index a0ddf5b1241..2bc56e74452 100644 --- a/Mage.Sets/src/mage/cards/f/Fleshgrafter.java +++ b/Mage.Sets/src/mage/cards/f/Fleshgrafter.java @@ -29,7 +29,7 @@ public final class Fleshgrafter extends CardImpl { this.toughness = new MageInt(2); // Discard an artifact card: Fleshgrafter gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardCardCost(new FilterArtifactCard("an artifact card")))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new DiscardCardCost(new FilterArtifactCard("an artifact card")))); } private Fleshgrafter(final Fleshgrafter card) { diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 3e4a7c722c2..4b1366dd476 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -48,7 +48,7 @@ public final class Flickerform extends CardImpl { this.addAbility(ability); // {2}{W}{W}: Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlickerformEffect(), new ManaCostsImpl<>("{2}{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(new FlickerformEffect(), new ManaCostsImpl<>("{2}{W}{W}"))); } private Flickerform(final Flickerform card) { diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index de6dd0e93ba..378047d6505 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -43,7 +43,7 @@ public final class FlickeringWard extends CardImpl { this.addAbility(new SimpleStaticAbility(new ProtectionChosenColorAttachedEffect(true))); // {W}: Return Flickering Ward to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}"))); } private FlickeringWard(final FlickeringWard card) { diff --git a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java index 44e141f60b5..ec09ab7d006 100644 --- a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java @@ -28,7 +28,7 @@ public final class FlightSpellbomb extends CardImpl { public FlightSpellbomb (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Flood.java b/Mage.Sets/src/mage/cards/f/Flood.java index 5cc5e63b6fd..da0062f8b25 100644 --- a/Mage.Sets/src/mage/cards/f/Flood.java +++ b/Mage.Sets/src/mage/cards/f/Flood.java @@ -32,7 +32,7 @@ public final class Flood extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // {U}{U}: Tap target creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Floodbringer.java b/Mage.Sets/src/mage/cards/f/Floodbringer.java index 7fe222d4184..32f30356a6b 100644 --- a/Mage.Sets/src/mage/cards/f/Floodbringer.java +++ b/Mage.Sets/src/mage/cards/f/Floodbringer.java @@ -37,7 +37,7 @@ public final class Floodbringer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Tap target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); ReturnToHandChosenControlledPermanentCost cost = new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)); cost.setText("Return a land you control to its owner's hand"); ability.addCost(cost); diff --git a/Mage.Sets/src/mage/cards/f/Floodchaser.java b/Mage.Sets/src/mage/cards/f/Floodchaser.java index 4cf86bf8ed6..fab0314ba63 100644 --- a/Mage.Sets/src/mage/cards/f/Floodchaser.java +++ b/Mage.Sets/src/mage/cards/f/Floodchaser.java @@ -42,7 +42,7 @@ public final class Floodchaser extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); // {U}, Remove a +1/+1 counter from Floodchaser: Target land becomes an Island until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java index 5fac46920c3..8858c92c278 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java +++ b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java @@ -32,7 +32,7 @@ public final class FloodedShoreline extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); // {U}{U}, Return two Islands you control to their owner's hand: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java index 5cccc6ace27..cd8e44e976d 100644 --- a/Mage.Sets/src/mage/cards/f/FloodwaterDam.java +++ b/Mage.Sets/src/mage/cards/f/FloodwaterDam.java @@ -27,7 +27,7 @@ public final class FloodwaterDam extends CardImpl { // {X}{X}{1}, {tap}: Tap X target lands. Effect effect = new TapTargetEffect(); effect.setText("tap X target lands"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}{X}{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}{X}{1}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_LANDS)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 655a538d915..f63ad8a492a 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -35,7 +35,7 @@ public final class FloweringField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to any target this turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Prevent the next 1 damage that would be dealt to any target this turn.\""); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java index 7ab6d085439..74024a64fd8 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneArmor.java @@ -29,7 +29,7 @@ public final class FlowstoneArmor extends CardImpl { // You may choose not to untap Flowstone Armor during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {3}, {tap}: Target creature gets +1/-1 for as long as Flowstone Armor remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(1, -1, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +1/-1 for as long as {this} remains tapped"), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java index f5cda71dbf7..8b765a831b6 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java @@ -36,7 +36,7 @@ public final class FlowstoneBlade extends CardImpl { this.addAbility(ability); // {R}: Enchanted creature gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneBlade(final FlowstoneBlade card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java index 8cdb6f48efd..a255abb86b4 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java @@ -35,7 +35,7 @@ public final class FlowstoneEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {tap}: Enchanted creature gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.EndOfTurn), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(2, -2, Duration.EndOfTurn), new TapSourceCost())); } private FlowstoneEmbrace(final FlowstoneEmbrace card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java index 53b86d4ee1a..65ea7a65fa6 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneGiant.java @@ -26,7 +26,7 @@ public final class FlowstoneGiant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FlowstoneGiant(final FlowstoneGiant card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java index 15c2ac4aff3..72e6240f9d3 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneHellion.java @@ -31,7 +31,7 @@ public final class FlowstoneHellion extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {0}: Flowstone Hellion gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1,-1,Duration.EndOfTurn), new GenericManaCost(0))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(+1,-1,Duration.EndOfTurn), new GenericManaCost(0))); } private FlowstoneHellion(final FlowstoneHellion card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java index 07bc833de06..257b612ad38 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneOverseer.java @@ -29,7 +29,7 @@ public final class FlowstoneOverseer extends CardImpl { this.toughness = new MageInt(4); // {R}{R}: Target creature gets +1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java index ab917f42e12..f6fdecd2ce7 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneSculpture.java @@ -42,7 +42,7 @@ public final class FlowstoneSculpture extends CardImpl { this.toughness = new MageInt(4); // {2}, Discard a card: Put a +1/+1 counter on Flowstone Sculpture or Flowstone Sculpture gains flying, first strike, or trample. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FlowstoneSculptureEffect(), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new FlowstoneSculptureEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java index 08178fc821e..97b9a3ad273 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneThopter.java @@ -33,7 +33,7 @@ public final class FlowstoneThopter extends CardImpl { // {1}: Flowstone Thopter gets +1/-1 and gains flying until end of turn. Effect effect = new BoostSourceEffect(1, -1, Duration.EndOfTurn); effect.setText("{this} gets +1/-1"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}")); effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains flying until end of turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java index ac9b1245f74..30d9314ba98 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWall.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWall.java @@ -29,7 +29,7 @@ public final class FlowstoneWall extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {R}: Flowstone Wall gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FlowstoneWall(final FlowstoneWall card) { diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java index 5b28a898d01..b137bcfd399 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneWyvern.java @@ -28,7 +28,7 @@ public final class FlowstoneWyvern extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FlowstoneWyvern(final FlowstoneWyvern card) { diff --git a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java index 46090bde601..41f52833d2a 100644 --- a/Mage.Sets/src/mage/cards/f/FlyingCarpet.java +++ b/Mage.Sets/src/mage/cards/f/FlyingCarpet.java @@ -25,7 +25,7 @@ public final class FlyingCarpet extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FodderCannon.java b/Mage.Sets/src/mage/cards/f/FodderCannon.java index 5a8533a9549..2682808d214 100644 --- a/Mage.Sets/src/mage/cards/f/FodderCannon.java +++ b/Mage.Sets/src/mage/cards/f/FodderCannon.java @@ -26,7 +26,7 @@ public final class FodderCannon extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {4}, {tap}, Sacrifice a creature: Fodder Cannon deals 4 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(4), new ManaCostsImpl<>("{4}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/f/FogOfGnats.java b/Mage.Sets/src/mage/cards/f/FogOfGnats.java index 01486d56abc..4eef4564cb1 100644 --- a/Mage.Sets/src/mage/cards/f/FogOfGnats.java +++ b/Mage.Sets/src/mage/cards/f/FogOfGnats.java @@ -29,7 +29,7 @@ public final class FogOfGnats extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Regenerate Fog of Gnats. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private FogOfGnats(final FogOfGnats card) { diff --git a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java index 56647b41be2..1bc06a958d5 100644 --- a/Mage.Sets/src/mage/cards/f/FolkOfThePines.java +++ b/Mage.Sets/src/mage/cards/f/FolkOfThePines.java @@ -26,7 +26,7 @@ public final class FolkOfThePines extends CardImpl { this.toughness = new MageInt(5); // {1}{G}: Folk of the Pines gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); } private FolkOfThePines(final FolkOfThePines card) { diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index 1aaf756baa3..9d187f19bdc 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -27,7 +27,7 @@ public final class FontOfFertility extends CardImpl { // {1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java index d9f6daad87b..fcc36d55952 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFortunes.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFortunes.java @@ -23,7 +23,7 @@ public final class FontOfFortunes extends CardImpl { // {1}{U}, Sacrifice Font of Fortunes: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FontOfIre.java b/Mage.Sets/src/mage/cards/f/FontOfIre.java index 861dbfc2df3..2f349b6cd77 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfIre.java +++ b/Mage.Sets/src/mage/cards/f/FontOfIre.java @@ -23,7 +23,7 @@ public final class FontOfIre extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {3}{R}, Sacrifice Font of Ire: Font of Ire deals 5 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5, "it"), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(5, "it"), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfReturn.java b/Mage.Sets/src/mage/cards/f/FontOfReturn.java index 525b2413464..22b7715c6fd 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfReturn.java +++ b/Mage.Sets/src/mage/cards/f/FontOfReturn.java @@ -23,7 +23,7 @@ public final class FontOfReturn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); // {3}{B}, Sacrifice Font of Return: Return up to three target creature cards from your graveyard to your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(0, 3, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FontOfVigor.java b/Mage.Sets/src/mage/cards/f/FontOfVigor.java index 06c2f50d38b..628dcdce0cd 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfVigor.java +++ b/Mage.Sets/src/mage/cards/f/FontOfVigor.java @@ -23,7 +23,7 @@ public final class FontOfVigor extends CardImpl { // {2}{W}, Sacrifice Font of Vigor: You gain 7 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(7), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(7), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Foratog.java b/Mage.Sets/src/mage/cards/f/Foratog.java index 7fd724421ec..a2ece741ea3 100644 --- a/Mage.Sets/src/mage/cards/f/Foratog.java +++ b/Mage.Sets/src/mage/cards/f/Foratog.java @@ -35,7 +35,7 @@ public final class Foratog extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index 06987afcf3c..f33bf69c945 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -34,7 +34,7 @@ public final class ForbiddenLore extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Target creature gets +2/+1 until end of turn." - Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability gainAbility = new SimpleActivatedAbility(new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Target creature gets +2/+1 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java index f84513c8db7..e2b1740526d 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java @@ -32,7 +32,7 @@ public final class ForbiddingWatchtower extends CardImpl { this.addAbility(new WhiteManaAbility()); // {1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ForbiddingWatchtowerToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private ForbiddingWatchtower(final ForbiddingWatchtower card) { diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index 91dba6f9140..bc3619e5617 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -41,7 +41,7 @@ public final class ForcedWorship extends CardImpl { // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // {2}{W}: Return Forced Worship to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{W}"))); } private ForcedWorship(final ForcedWorship card) { diff --git a/Mage.Sets/src/mage/cards/f/Forcefield.java b/Mage.Sets/src/mage/cards/f/Forcefield.java index aeb110b60c2..598a204c83b 100644 --- a/Mage.Sets/src/mage/cards/f/Forcefield.java +++ b/Mage.Sets/src/mage/cards/f/Forcefield.java @@ -34,7 +34,7 @@ public final class Forcefield extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {1}: The next time an unblocked creature of your choice would deal combat damage to you this turn, prevent all but 1 of that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ForcefieldEffect(), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new ForcefieldEffect(), new GenericManaCost(1))); } private Forcefield(final Forcefield card) { diff --git a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java index dfbe808e4eb..d4f15946325 100644 --- a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java +++ b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java @@ -36,7 +36,7 @@ public final class ForcemageAdvocate extends CardImpl { // {tap}: Return target card from an opponent's graveyard to their hand. Put a +1/+1 counter on target creature. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("Return target card from an opponent's graveyard to their hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); effect.setText("Put a +1/+1 counter on target creature"); diff --git a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java index 2111f8ca71c..4fa8e818dcb 100644 --- a/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/f/ForerunnerOfSlaughter.java @@ -42,7 +42,7 @@ public final class ForerunnerOfSlaughter extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {1}: Target colorless creature gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(1)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index 17cd16d1ed6..977494bf9a4 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -36,7 +36,7 @@ public final class ForiysianTotem extends CardImpl { this.addAbility(new RedManaAbility()); // {4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new ForiysianTotemToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}"))); // As long as Foriysian Totem is a creature, it can block an additional creature each combat. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText))); diff --git a/Mage.Sets/src/mage/cards/f/Fortitude.java b/Mage.Sets/src/mage/cards/f/Fortitude.java index 92bfcf3400d..118811d2c50 100644 --- a/Mage.Sets/src/mage/cards/f/Fortitude.java +++ b/Mage.Sets/src/mage/cards/f/Fortitude.java @@ -42,7 +42,7 @@ public final class Fortitude extends CardImpl { this.addAbility(ability); // Sacrifice a Forest: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeTargetCost(filter))); // When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java index 5e3ea05f981..b9450e56374 100644 --- a/Mage.Sets/src/mage/cards/f/FoulFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FoulFamiliar.java @@ -30,7 +30,7 @@ public final class FoulFamiliar extends CardImpl { // Foul Familiar can't block. this.addAbility(new CantBlockAbility()); // {B}, Pay 1 life: Return Foul Familiar to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoundryChampion.java b/Mage.Sets/src/mage/cards/f/FoundryChampion.java index 656c824df3c..ac2e5a41684 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryChampion.java +++ b/Mage.Sets/src/mage/cards/f/FoundryChampion.java @@ -39,10 +39,10 @@ public final class FoundryChampion extends CardImpl { this.addAbility(ability); //{R}: Foundry Champion gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); //{W}: Foundry Champion gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private FoundryChampion(final FoundryChampion card) { diff --git a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java index d4dfb6bcedb..51baf589e18 100644 --- a/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java +++ b/Mage.Sets/src/mage/cards/f/FoundryOfTheConsuls.java @@ -28,7 +28,7 @@ public final class FoundryOfTheConsuls extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {5}, {T}, Sacrifice Foundry of the Consuls: Create two 1/1 colorless Thopter artifact creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterColorlessToken(), 2), + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ThopterColorlessToken(), 2), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FountainOfCho.java b/Mage.Sets/src/mage/cards/f/FountainOfCho.java index 2f1aefd4f7a..37eb0056d42 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfCho.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfCho.java @@ -30,7 +30,7 @@ public final class FountainOfCho extends CardImpl { // Fountain of Cho enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Fountain of Cho. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {T}, Remove any number of storage counters from Fountain of Cho: Add {W} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.WhiteMana(1), diff --git a/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java b/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java index b91b93422bb..7349c798b2b 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfRenewal.java @@ -26,7 +26,7 @@ public final class FountainOfRenewal extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1))); // {3}, Sacrifice Fountain of Renewal: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java index bf710d5871f..3f9d9e476de 100644 --- a/Mage.Sets/src/mage/cards/f/FountainOfYouth.java +++ b/Mage.Sets/src/mage/cards/f/FountainOfYouth.java @@ -20,7 +20,7 @@ public final class FountainOfYouth extends CardImpl { public FountainOfYouth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FoxfireOak.java b/Mage.Sets/src/mage/cards/f/FoxfireOak.java index 4aff5ec9ec3..cf6b9928998 100644 --- a/Mage.Sets/src/mage/cards/f/FoxfireOak.java +++ b/Mage.Sets/src/mage/cards/f/FoxfireOak.java @@ -27,7 +27,7 @@ public final class FoxfireOak extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(6); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/G}{R/G}{R/G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/G}{R/G}{R/G}"))); } private FoxfireOak(final FoxfireOak card) { diff --git a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java index 5b1ee4e0ac9..1895348acc8 100644 --- a/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java +++ b/Mage.Sets/src/mage/cards/f/FreeRangeChicken.java @@ -32,7 +32,7 @@ public final class FreeRangeChicken extends CardImpl { this.toughness = new MageInt(3); // {1}{G}: Roll two six-sided dice. If both results are the same, Free-Range Chicken gets +X/+X until end of turn, where X is that result. If the total of those results is equal to any other total you have rolled this turn for Free-Range Chicken, sacrifice it. (For example, if you roll two 3s, Free-Range Chicken gets +3/+3. If you roll a total of 6 for Free-Range Chicken later that turn, sacrifice it.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FreeRangeChickenEffect(), new ManaCostsImpl<>("{1}{G}")), new FreeRangeChickenWatcher()); + this.addAbility(new SimpleActivatedAbility(new FreeRangeChickenEffect(), new ManaCostsImpl<>("{1}{G}")), new FreeRangeChickenWatcher()); } private FreeRangeChicken(final FreeRangeChicken card) { diff --git a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java index 4ce9ce503ec..52acbf8a8eb 100644 --- a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java @@ -33,9 +33,9 @@ public final class FreedFromTheReal extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); this.addAbility(new EnchantAbility(auraTarget)); // {U}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new ManaCostsImpl<>("{U}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FreneticOgre.java b/Mage.Sets/src/mage/cards/f/FreneticOgre.java index 7f068199586..ac1cae4d8bd 100644 --- a/Mage.Sets/src/mage/cards/f/FreneticOgre.java +++ b/Mage.Sets/src/mage/cards/f/FreneticOgre.java @@ -29,7 +29,7 @@ public final class FreneticOgre extends CardImpl { this.toughness = new MageInt(3); // {R}, Discard a card at random: Frenetic Ogre gets +3/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java index 9dc1229a95b..b25ac0a2327 100644 --- a/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java +++ b/Mage.Sets/src/mage/cards/f/FreyaliseSupplicant.java @@ -43,7 +43,7 @@ public final class FreyaliseSupplicant extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a red or white creature: Freyalise Supplicant deals damage to any target equal to half the sacrificed creature's power, rounded down. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new HalfValue(SacrificeCostCreaturesPower.instance, false)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new HalfValue(SacrificeCostCreaturesPower.instance, false)), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java index 39ba836d832..a19bf49df6a 100644 --- a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java +++ b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java @@ -43,7 +43,7 @@ public final class FrightshroudCourier extends CardImpl { // You may choose not to untap Frightshroud Courier during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}{B}, {tap}: Target Zombie creature gets +2/+2 and has fear for as long as Frightshroud Courier remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target Zombie creature gets +2/+2"), new ManaCostsImpl<>("{2}{B}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java index 8f405dc0b9a..b62df1a3919 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineDevastator.java @@ -32,7 +32,7 @@ public final class FrontlineDevastator extends CardImpl { // Afflict 2 addAbility(new AfflictAbility(2)); // {1}{R}: Frontline Devastator gets +1/+0 until end of turn. - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private FrontlineDevastator(final FrontlineDevastator card) { diff --git a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java index 43b5ff38997..8162d94c8d6 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineMedic.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineMedic.java @@ -48,7 +48,7 @@ public final class FrontlineMedic extends CardImpl { this.addAbility(new BattalionAbility(effect)); // Sacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrontlineSage.java b/Mage.Sets/src/mage/cards/f/FrontlineSage.java index 1b04ae11b3c..6d6857a4686 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineSage.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineSage.java @@ -30,7 +30,7 @@ public final class FrontlineSage extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FrostRaptor.java b/Mage.Sets/src/mage/cards/f/FrostRaptor.java index bbce7785f3a..879e7df94cb 100644 --- a/Mage.Sets/src/mage/cards/f/FrostRaptor.java +++ b/Mage.Sets/src/mage/cards/f/FrostRaptor.java @@ -32,7 +32,7 @@ public final class FrostRaptor extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {S}{S}: Frost Raptor gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect( ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{S}{S}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java index e2e07dc0827..b109645e003 100644 --- a/Mage.Sets/src/mage/cards/f/FrostburnWeird.java +++ b/Mage.Sets/src/mage/cards/f/FrostburnWeird.java @@ -27,7 +27,7 @@ public final class FrostburnWeird extends CardImpl { this.toughness = new MageInt(4); // {U/R}: Frostburn Weird gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private FrostburnWeird(final FrostburnWeird card) { diff --git a/Mage.Sets/src/mage/cards/f/Frostling.java b/Mage.Sets/src/mage/cards/f/Frostling.java index 0127f7151ee..766f00620c4 100644 --- a/Mage.Sets/src/mage/cards/f/Frostling.java +++ b/Mage.Sets/src/mage/cards/f/Frostling.java @@ -27,7 +27,7 @@ public final class Frostling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // Sacrifice Frostling: Frostling deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Frostwielder.java b/Mage.Sets/src/mage/cards/f/Frostwielder.java index 7f0597231cc..4200494b814 100644 --- a/Mage.Sets/src/mage/cards/f/Frostwielder.java +++ b/Mage.Sets/src/mage/cards/f/Frostwielder.java @@ -33,7 +33,7 @@ public final class Frostwielder extends CardImpl { this.toughness = new MageInt(2); // {T}: Frostwielder deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Frostwielder this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/f/FrozenShade.java b/Mage.Sets/src/mage/cards/f/FrozenShade.java index cec029d35ca..8c4795236ca 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenShade.java +++ b/Mage.Sets/src/mage/cards/f/FrozenShade.java @@ -28,7 +28,7 @@ public final class FrozenShade extends CardImpl { this.toughness = new MageInt(1); // {B}: Frozen Shade gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private FrozenShade(final FrozenShade card) { diff --git a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java index 6d98b95bd59..2a563f2904b 100644 --- a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java +++ b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java @@ -46,7 +46,7 @@ public final class FruitcakeElemental extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageControllerEffect(7))); // {3}: Target player gains control of Fruitcake Elemental. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetPlayer(1, 1, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index 61ee050ef08..2ed8e3e0a5f 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -45,7 +45,7 @@ public final class FullMoonsRise extends CardImpl { this.addAbility(ability); // Sacrifice Full Moon's Rise: Regenerate all Werewolf creatures you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new FullMoonsRiseEffect(filter), new SacrificeSourceCost())); } private FullMoonsRise(final FullMoonsRise card) { diff --git a/Mage.Sets/src/mage/cards/f/FulminatorMage.java b/Mage.Sets/src/mage/cards/f/FulminatorMage.java index 9f1a121117d..aa9ffb87dec 100644 --- a/Mage.Sets/src/mage/cards/f/FulminatorMage.java +++ b/Mage.Sets/src/mage/cards/f/FulminatorMage.java @@ -29,7 +29,7 @@ public final class FulminatorMage extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Fulminator Mage: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FumeSpitter.java b/Mage.Sets/src/mage/cards/f/FumeSpitter.java index aaf8c76b2b8..6ad5e267f71 100644 --- a/Mage.Sets/src/mage/cards/f/FumeSpitter.java +++ b/Mage.Sets/src/mage/cards/f/FumeSpitter.java @@ -29,7 +29,7 @@ public final class FumeSpitter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FungalReaches.java b/Mage.Sets/src/mage/cards/f/FungalReaches.java index c042338edc6..709f0325b30 100644 --- a/Mage.Sets/src/mage/cards/f/FungalReaches.java +++ b/Mage.Sets/src/mage/cards/f/FungalReaches.java @@ -32,7 +32,7 @@ public final class FungalReaches extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Fungal Reaches. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java index 3737444ab03..0cd5d49e8b8 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceBrood.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceBrood.java @@ -28,7 +28,7 @@ public final class FurnaceBrood extends CardImpl { this.toughness = new MageInt(3); // {R}: Target creature can't be regenerated this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java index de158251d56..3fd42dad397 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceSpirit.java @@ -29,7 +29,7 @@ public final class FurnaceSpirit extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {R}: Furnace Spirit gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private FurnaceSpirit(final FurnaceSpirit card) { diff --git a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java index 64e4d23f57b..764186680b3 100644 --- a/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java +++ b/Mage.Sets/src/mage/cards/f/FurnaceWhelp.java @@ -28,7 +28,7 @@ public final class FurnaceWhelp extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); } private FurnaceWhelp(final FurnaceWhelp card) { diff --git a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java index aa717d927b1..d4035eb2a5b 100644 --- a/Mage.Sets/src/mage/cards/f/FurystokeGiant.java +++ b/Mage.Sets/src/mage/cards/f/FurystokeGiant.java @@ -33,7 +33,7 @@ public final class FurystokeGiant extends CardImpl { this.toughness = new MageInt(3); // When Furystoke Giant enters the battlefield, other creatures you control gain "{tap}: This creature deals 2 damage to any target" until end of turn. - SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + SimpleActivatedAbility FurystokeGiantAbility = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); FurystokeGiantAbility.addTarget(new TargetAnyTarget()); Effect effect = new GainAbilityAllEffect(FurystokeGiantAbility, Duration.EndOfTurn, new FilterControlledCreaturePermanent("other creatures"), true); effect.setText("other creatures you control gain \"{T}: This creature deals 2 damage to any target\" until end of turn."); diff --git a/Mage.Sets/src/mage/cards/f/Fylamarid.java b/Mage.Sets/src/mage/cards/f/Fylamarid.java index 7da338ff78f..4ccf52d8e97 100644 --- a/Mage.Sets/src/mage/cards/f/Fylamarid.java +++ b/Mage.Sets/src/mage/cards/f/Fylamarid.java @@ -45,7 +45,7 @@ public final class Fylamarid extends CardImpl { // Fylamarid can't be blocked by blue creatures. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // {U}: Target creature becomes blue until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(ObjectColor.BLUE, + Ability ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(ObjectColor.BLUE, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/Fylgja.java b/Mage.Sets/src/mage/cards/f/Fylgja.java index 9ab5a548b0e..34c8c3a144d 100644 --- a/Mage.Sets/src/mage/cards/f/Fylgja.java +++ b/Mage.Sets/src/mage/cards/f/Fylgja.java @@ -46,12 +46,12 @@ public final class Fylgja extends CardImpl { .setText("with four healing counters on it."))); // Remove a healing counter from Fylgja: Prevent the next 1 damage that would be dealt to enchanted creature this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToAttachedEffect(Duration.EndOfTurn, AttachmentType.AURA, 1, false) + this.addAbility(new SimpleActivatedAbility(new PreventDamageToAttachedEffect(Duration.EndOfTurn, AttachmentType.AURA, 1, false) .setText("Prevent the next 1 damage that would be dealt to enchanted creature this turn"), new RemoveCountersSourceCost(CounterType.HEALING.createInstance(1)))); // {2}{W}: Put a healing counter on Fylgja. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)), new ManaCostsImpl<>("{2}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBow.java b/Mage.Sets/src/mage/cards/f/FyndhornBow.java index b5c82742cfc..9552d9d703a 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBow.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBow.java @@ -25,7 +25,7 @@ public final class FyndhornBow extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {3}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java index b5630dfe2ed..d4e972beb26 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornBrownie.java @@ -29,7 +29,7 @@ public final class FyndhornBrownie extends CardImpl { this.toughness = new MageInt(1); // {2}{G}, {tap}: Untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability);