diff --git a/Mage.Sets/src/mage/cards/s/SaberclawGolem.java b/Mage.Sets/src/mage/cards/s/SaberclawGolem.java index d27398d8d6c..c5982af9bb2 100644 --- a/Mage.Sets/src/mage/cards/s/SaberclawGolem.java +++ b/Mage.Sets/src/mage/cards/s/SaberclawGolem.java @@ -26,7 +26,7 @@ public final class SaberclawGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(4); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private SaberclawGolem(final SaberclawGolem card) { diff --git a/Mage.Sets/src/mage/cards/s/SacellumArchers.java b/Mage.Sets/src/mage/cards/s/SacellumArchers.java index 2d85929bf90..3c015049e37 100644 --- a/Mage.Sets/src/mage/cards/s/SacellumArchers.java +++ b/Mage.Sets/src/mage/cards/s/SacellumArchers.java @@ -30,7 +30,7 @@ public final class SacellumArchers extends CardImpl { this.toughness = new MageInt(3); // {R}{W}, {tap}: Sacellum Archers deals 2 damage to target attacking or blocking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAttackingOrBlockingCreature()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SacredArmory.java b/Mage.Sets/src/mage/cards/s/SacredArmory.java index 692c292b8ed..37b643d80b2 100644 --- a/Mage.Sets/src/mage/cards/s/SacredArmory.java +++ b/Mage.Sets/src/mage/cards/s/SacredArmory.java @@ -23,7 +23,7 @@ public final class SacredArmory extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}: Target creature gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SacredMesa.java b/Mage.Sets/src/mage/cards/s/SacredMesa.java index 55b6e17be93..42319096dda 100644 --- a/Mage.Sets/src/mage/cards/s/SacredMesa.java +++ b/Mage.Sets/src/mage/cards/s/SacredMesa.java @@ -34,7 +34,7 @@ public final class SacredMesa extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new SacrificeTargetCost(filter)))); // {1}{W}: Create a 1/1 white Pegasus creature token with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{1}{W}"))); } private SacredMesa(final SacredMesa card) { diff --git a/Mage.Sets/src/mage/cards/s/Safeguard.java b/Mage.Sets/src/mage/cards/s/Safeguard.java index b08325625f1..cbdb2583cc0 100644 --- a/Mage.Sets/src/mage/cards/s/Safeguard.java +++ b/Mage.Sets/src/mage/cards/s/Safeguard.java @@ -26,7 +26,7 @@ public final class Safeguard extends CardImpl { // {2}{W}: Prevent all combat damage that would be dealt by target creature this turn. Effect effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt by target creature this turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SafeholdSentry.java b/Mage.Sets/src/mage/cards/s/SafeholdSentry.java index 8a90858a9e2..f835e37246b 100644 --- a/Mage.Sets/src/mage/cards/s/SafeholdSentry.java +++ b/Mage.Sets/src/mage/cards/s/SafeholdSentry.java @@ -31,7 +31,7 @@ public final class SafeholdSentry extends CardImpl { this.toughness = new MageInt(2); // {2}{W}, {untap}: Safehold Sentry gets +0/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{W}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SageOfLatNam.java b/Mage.Sets/src/mage/cards/s/SageOfLatNam.java index b99151a59a0..0bcaef31a57 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfLatNam.java +++ b/Mage.Sets/src/mage/cards/s/SageOfLatNam.java @@ -31,7 +31,7 @@ public final class SageOfLatNam extends CardImpl { this.toughness = new MageInt(2); // {T}, Sacrifice an artifact: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java b/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java index 4f3865daba4..67524f8a8c0 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java +++ b/Mage.Sets/src/mage/cards/s/SageOfTheMaze.java @@ -55,7 +55,7 @@ public final class SageOfTheMaze extends CardImpl { this.addAbility(ability); // Tap an untapped Gate you control: Untap Sage of the Maze. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter))); + ability = new SimpleActivatedAbility(new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(1, filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Sailmonger.java b/Mage.Sets/src/mage/cards/s/Sailmonger.java index 2e4fb79d3a9..217742aae00 100644 --- a/Mage.Sets/src/mage/cards/s/Sailmonger.java +++ b/Mage.Sets/src/mage/cards/s/Sailmonger.java @@ -31,7 +31,7 @@ public final class Sailmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Target creature gains flying until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java b/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java index 3c404c3c7c7..47ce7173ac6 100644 --- a/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java +++ b/Mage.Sets/src/mage/cards/s/SakuraTribeElder.java @@ -29,7 +29,7 @@ public final class SakuraTribeElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(target, true, true), new SacrificeSourceCost())); } private SakuraTribeElder(final SakuraTribeElder card) { diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java b/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java index cfe562fdf61..2501e86e2be 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadQuartermasters.java @@ -36,7 +36,7 @@ public final class SaltRoadQuartermasters extends CardImpl { "with two +1/+1 counters on it")); // {2}{G}, Remove a +1/+1 counter from Salt Road Quartermasters: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java b/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java index 48649c20c4d..a845006301c 100644 --- a/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java +++ b/Mage.Sets/src/mage/cards/s/SaltcrustedSteppe.java @@ -31,7 +31,7 @@ public final class SaltcrustedSteppe extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Put a storage counter on Saltcrusted Steppe. - 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); // {1}, Remove X storage counters from Saltcrusted Steppe: Add X mana in any combination of {G} and/or {W}. diff --git a/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java b/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java index ed7936881e9..ff061c7c2bc 100644 --- a/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java +++ b/Mage.Sets/src/mage/cards/s/SaltfieldRecluse.java @@ -31,7 +31,7 @@ public final class SaltfieldRecluse extends CardImpl { this.toughness = new MageInt(2); // {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,0, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2,0, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SalvagingStation.java b/Mage.Sets/src/mage/cards/s/SalvagingStation.java index f2adc872eca..51d4283cc6e 100644 --- a/Mage.Sets/src/mage/cards/s/SalvagingStation.java +++ b/Mage.Sets/src/mage/cards/s/SalvagingStation.java @@ -36,7 +36,7 @@ public final class SalvagingStation extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {tap}: Return target noncreature artifact card with converted mana cost 1 or less from your graveyard to the battlefield. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new TapSourceCost()); secondAbility.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(secondAbility); // Whenever a creature dies, you may untap Salvaging Station. diff --git a/Mage.Sets/src/mage/cards/s/SamiteArcher.java b/Mage.Sets/src/mage/cards/s/SamiteArcher.java index 2863af6572a..5ffaba8aa95 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteArcher.java +++ b/Mage.Sets/src/mage/cards/s/SamiteArcher.java @@ -32,12 +32,12 @@ public final class SamiteArcher extends CardImpl { this.toughness = new MageInt(1); // {T}: 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), + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {T}: Samite Archer 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.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java index d5d382f01cb..1e0a80ef316 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java @@ -41,7 +41,7 @@ public final class SamiteBlessing extends CardImpl { this.addAbility(ability); // Enchanted creature has "{tap}: The next time a source of your choice would deal damage to target creature this turn, prevent that damage." - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); diff --git a/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java b/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java index b1ce188a82d..a97785a1f0c 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java +++ b/Mage.Sets/src/mage/cards/s/SamiteCenserBearer.java @@ -34,7 +34,7 @@ public final class SamiteCenserBearer extends CardImpl { this.toughness = new MageInt(1); // {W}, Sacrifice Samite Censer-Bearer: Prevent the next 1 damage that would be dealt to each creature you control this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteCenserBearerEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new SamiteCenserBearerEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteElder.java b/Mage.Sets/src/mage/cards/s/SamiteElder.java index bc291e0b931..6f3448c584d 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteElder.java +++ b/Mage.Sets/src/mage/cards/s/SamiteElder.java @@ -37,7 +37,7 @@ public final class SamiteElder extends CardImpl { this.toughness = new MageInt(2); // {T}: Creatures you control gain protection from the colors of target permanent you control until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamiteElderEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SamiteElderEffect(), new TapSourceCost()); ability.addTarget(new TargetControlledPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SamiteHealer.java b/Mage.Sets/src/mage/cards/s/SamiteHealer.java index b9aed60cbae..86a49ce4708 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteHealer.java +++ b/Mage.Sets/src/mage/cards/s/SamiteHealer.java @@ -28,7 +28,7 @@ public final class SamiteHealer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - 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/s/SamitePilgrim.java b/Mage.Sets/src/mage/cards/s/SamitePilgrim.java index 312cd820cda..d67d815d796 100644 --- a/Mage.Sets/src/mage/cards/s/SamitePilgrim.java +++ b/Mage.Sets/src/mage/cards/s/SamitePilgrim.java @@ -30,7 +30,7 @@ public final class SamitePilgrim extends CardImpl { this.toughness = new MageInt(1); // Domain - {T}: Prevent the next X damage that would be dealt to target creature this turn, where X is the number of basic land types among lands you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SamitePilgrimPreventDamageToTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SamitePilgrimPreventDamageToTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java b/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java index ed20c56e6e3..0cb699b8fee 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SamiteSanctuary.java @@ -24,7 +24,7 @@ public final class SamiteSanctuary extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // {2}: Prevent the next 1 damage that would be dealt to target creature this turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,1), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java index 589997d2a19..f3439375be3 100644 --- a/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java +++ b/Mage.Sets/src/mage/cards/s/SamutVoiceOfDissent.java @@ -64,7 +64,7 @@ public final class SamutVoiceOfDissent extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter))); //W, Tap: Untap another target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent(filter2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java index 375b48c52ef..943fa3147df 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumCustodian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumCustodian.java @@ -29,7 +29,7 @@ public final class SanctumCustodian extends CardImpl { this.toughness = new MageInt(2); // {tap}: Prevent the next 2 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java index ce1f970b295..4a58c3e06e0 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SanctumGuardian.java @@ -29,7 +29,7 @@ public final class SanctumGuardian extends CardImpl { this.toughness = new MageInt(4); // Sacrifice Sanctum Guardian: The next time a source of your choice would deal damage to any target this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToTargetEffect(Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java b/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java index a81369dedb1..e12069ab73c 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfShatteredHeights.java @@ -44,7 +44,7 @@ public final class SanctumOfShatteredHeights extends CardImpl { this.subtype.add(SubType.SHRINE); // {1}, Discard a land card or Shrine card: Sanctum of Shattered Heights deals X damage to target creature or planeswalker, where X is the number of Shrines you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(xValue) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(xValue) .setText("Sanctum of Shattered Heights deals X damage to target creature or planeswalker, where X is the number of Shrines you control"), new ManaCostsImpl<>("{1}")) .addHint(new ValueHint("Shrines you control", xValue)); diff --git a/Mage.Sets/src/mage/cards/s/SandSquid.java b/Mage.Sets/src/mage/cards/s/SandSquid.java index c7f7392e445..9b8b59eda9f 100644 --- a/Mage.Sets/src/mage/cards/s/SandSquid.java +++ b/Mage.Sets/src/mage/cards/s/SandSquid.java @@ -35,7 +35,7 @@ public final class SandSquid extends CardImpl { // You may choose not to untap Sand Squid during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {tap}: Tap target creature. That creature doesn't untap during its controller's untap step for as long as Sand Squid remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DontUntapAsLongAsSourceTappedEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java index eebbfcedee6..0a3fed6c243 100644 --- a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java +++ b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java @@ -24,7 +24,7 @@ public final class SandsOfDelirium extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {X}, {tap}: Target player puts the top X cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(GetXValue.instance), new VariableManaCost(VariableCostType.NORMAL)); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(GetXValue.instance), new VariableManaCost(VariableCostType.NORMAL)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sandsower.java b/Mage.Sets/src/mage/cards/s/Sandsower.java index b3eae1e704b..6f66eef7c64 100644 --- a/Mage.Sets/src/mage/cards/s/Sandsower.java +++ b/Mage.Sets/src/mage/cards/s/Sandsower.java @@ -37,7 +37,7 @@ public final class Sandsower extends CardImpl { this.toughness = new MageInt(3); // Tap three untapped creatures you control: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java b/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java index 0f9977c23ae..5a1d37ec985 100644 --- a/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java +++ b/Mage.Sets/src/mage/cards/s/SandstoneWarrior.java @@ -29,7 +29,7 @@ public final class SandstoneWarrior extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {R}: Sandstone Warrior gets +1/+0 until end of turn. - 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 SandstoneWarrior(final SandstoneWarrior card) { diff --git a/Mage.Sets/src/mage/cards/s/SandstormEidolon.java b/Mage.Sets/src/mage/cards/s/SandstormEidolon.java index 00c4b36671a..7e61246eb1d 100644 --- a/Mage.Sets/src/mage/cards/s/SandstormEidolon.java +++ b/Mage.Sets/src/mage/cards/s/SandstormEidolon.java @@ -29,7 +29,7 @@ public final class SandstormEidolon extends CardImpl { this.toughness = new MageInt(2); // {R}, Sacrifice Sandstorm Eidolon: Target creature can't block this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CantBlockTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanguineGuard.java b/Mage.Sets/src/mage/cards/s/SanguineGuard.java index d0eb456cd02..d8c7bace50e 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineGuard.java +++ b/Mage.Sets/src/mage/cards/s/SanguineGuard.java @@ -29,7 +29,7 @@ public final class SanguineGuard extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FirstStrikeAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SanguineGuard(final SanguineGuard card) { diff --git a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java index 63532b89b1d..dd55104910b 100644 --- a/Mage.Sets/src/mage/cards/s/SanguinePraetor.java +++ b/Mage.Sets/src/mage/cards/s/SanguinePraetor.java @@ -35,7 +35,7 @@ public final class SanguinePraetor extends CardImpl { this.toughness = new MageInt(5); // {B}, Sacrifice a creature: Destroy each creature with the same converted mana cost as the sacrificed creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SanguinePraetorEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new SanguinePraetorEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java b/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java index e3953752f50..f5ed528c55c 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanBreaker.java @@ -29,7 +29,7 @@ public final class SaprazzanBreaker extends CardImpl { this.toughness = new MageInt(3); // {U}: Put the top card of your library into your graveyard. If that card is a land card, Saprazzan Breaker can't be blocked this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprazzanBreakerEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new SaprazzanBreakerEffect(), new ManaCostsImpl<>("{U}"))); } private SaprazzanBreaker(final SaprazzanBreaker card) { diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanCove.java b/Mage.Sets/src/mage/cards/s/SaprazzanCove.java index 111cb356495..2553b3dd9ff 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanCove.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanCove.java @@ -30,7 +30,7 @@ public final class SaprazzanCove extends CardImpl { // Saprazzan Cove enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Saprazzan Cove. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {tap}, Remove any number of storage counters from Saprazzan Cove: Add {U} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.BlueMana(1), diff --git a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java index 1fac1bbcabf..2487504c569 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java @@ -38,7 +38,7 @@ public final class SaprolingBurst extends CardImpl { this.addAbility(new FadingAbility(7, this)); // Remove a fade counter from Saproling Burst: create a green Saproling creature token. It has "This creature's power and toughness are each equal to the number of fade counters on Saproling Burst." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SaprolingBurstCreateTokenEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new SaprolingBurstCreateTokenEffect(), new RemoveCountersSourceCost(CounterType.FADE.createInstance()))); // When Saproling Burst leaves the battlefield, destroy all tokens created with Saproling Burst. They can't be regenerated. this.addAbility(new SaprolingBurstLeavesBattlefieldTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java index 967aa8f6d77..c35f4f7ebc9 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingCluster.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingCluster.java @@ -24,7 +24,7 @@ public final class SaprolingCluster extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {1}, Discard a card: Create a 1/1 green Saproling creature token. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()) , new GenericManaCost(1)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()) , new GenericManaCost(1)); ability.addCost(new DiscardCardCost()); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); diff --git a/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java b/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java index 5a26130a84f..63bb964c2e0 100644 --- a/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java +++ b/Mage.Sets/src/mage/cards/s/SarcomiteMyr.java @@ -30,8 +30,8 @@ public final class SarcomiteMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java index aef44943fbb..bbdfb56eef5 100644 --- a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java +++ b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVII.java @@ -35,7 +35,7 @@ public final class SarpadianEmpiresVolVII extends CardImpl { // As Sarpadian Empires, Vol. VII enters the battlefield, choose white Citizen, blue Camarid, black Thrull, red Goblin, or green Saproling. this.addAbility(new AsEntersBattlefieldAbility(new SarpadianEmpiresChooseTokenEffect())); // {3}, {T}: Create a 1/1 creature token of the chosen color and type. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new SarpadianEmpiresCreateSelectedTokenEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java index fa0f4be0b4f..8699e75a72d 100644 --- a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java @@ -51,7 +51,7 @@ public final class SasayaOrochiAscendant extends CardImpl { // Reveal your hand: If you have seven or more land cards in your hand, flip Sasaya, Orochi Ascendant. Effect effect = new SasayaOrochiAscendantFlipEffect(); effect.setOutcome(Outcome.AIDontUseIt); // repetition issues need to be fixed for the AI to use this effectively - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new RevealHandSourceControllerCost())); + this.addAbility(new SimpleActivatedAbility(effect, new RevealHandSourceControllerCost())); } private SasayaOrochiAscendant(final SasayaOrochiAscendant card) { diff --git a/Mage.Sets/src/mage/cards/s/SatyrPiper.java b/Mage.Sets/src/mage/cards/s/SatyrPiper.java index e421e0b51cf..319d0aece14 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrPiper.java +++ b/Mage.Sets/src/mage/cards/s/SatyrPiper.java @@ -30,7 +30,7 @@ public final class SatyrPiper extends CardImpl { this.toughness = new MageInt(1); // {3}{G}: Target creature must be blocked this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new MustBeBlockedByAtLeastOneTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SavaenElves.java b/Mage.Sets/src/mage/cards/s/SavaenElves.java index 1f493bb6a45..68900662f13 100644 --- a/Mage.Sets/src/mage/cards/s/SavaenElves.java +++ b/Mage.Sets/src/mage/cards/s/SavaenElves.java @@ -43,7 +43,7 @@ public final class SavaenElves extends CardImpl { // {G}{G}, {tap}: Destroy target Aura attached to a land. Effect effect = new DestroyTargetEffect(); effect.setText("Destroy target Aura attached to a land"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{G}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SavageGorilla.java b/Mage.Sets/src/mage/cards/s/SavageGorilla.java index ab6bce013e5..1e577042c3c 100644 --- a/Mage.Sets/src/mage/cards/s/SavageGorilla.java +++ b/Mage.Sets/src/mage/cards/s/SavageGorilla.java @@ -30,7 +30,7 @@ public final class SavageGorilla extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java b/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java index e96da01726e..543c04bd434 100644 --- a/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java +++ b/Mage.Sets/src/mage/cards/s/SavageKnuckleblade.java @@ -35,10 +35,10 @@ public final class SavageKnuckleblade extends CardImpl { this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); // {2}{U}: Return Savage Knuckleblade to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}"))); // {R}: Savage Knuckleblade gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SavageThallid.java b/Mage.Sets/src/mage/cards/s/SavageThallid.java index 79951df43cb..4f247ed69e9 100644 --- a/Mage.Sets/src/mage/cards/s/SavageThallid.java +++ b/Mage.Sets/src/mage/cards/s/SavageThallid.java @@ -45,9 +45,9 @@ public final class SavageThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on Savage Thallid. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Remove three spore counters from Savage Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); // Sacrifice a Saproling: Regenerate target Fungus. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new RegenerateTargetEffect(), new SacrificeTargetCost(filter2)); ability.addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/s/SawbackManticore.java b/Mage.Sets/src/mage/cards/s/SawbackManticore.java index 31c955a984f..bfb221d90ec 100644 --- a/Mage.Sets/src/mage/cards/s/SawbackManticore.java +++ b/Mage.Sets/src/mage/cards/s/SawbackManticore.java @@ -34,7 +34,7 @@ public final class SawbackManticore extends CardImpl { this.toughness = new MageInt(4); // {4}: Sawback Manticore gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(4))); // {1}: Sawback Manticore deals 2 damage to target attacking or blocking creature. Activate this ability only if Sawback Manticore is attacking or blocking and only once each turn. Ability ability = new LimitedTimesPerTurnActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/s/SawtoothThresher.java b/Mage.Sets/src/mage/cards/s/SawtoothThresher.java index ff2c56f6f63..2b642885436 100644 --- a/Mage.Sets/src/mage/cards/s/SawtoothThresher.java +++ b/Mage.Sets/src/mage/cards/s/SawtoothThresher.java @@ -31,7 +31,7 @@ public final class SawtoothThresher extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove two +1/+1 counters from Sawtooth Thresher: Sawtooth Thresher gets +4/+4 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(4, 4, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2)))); } private SawtoothThresher(final SawtoothThresher card) { diff --git a/Mage.Sets/src/mage/cards/s/ScaldingDevil.java b/Mage.Sets/src/mage/cards/s/ScaldingDevil.java index d1ec30eaf35..5729e8f5513 100644 --- a/Mage.Sets/src/mage/cards/s/ScaldingDevil.java +++ b/Mage.Sets/src/mage/cards/s/ScaldingDevil.java @@ -28,7 +28,7 @@ public final class ScaldingDevil extends CardImpl { this.toughness = new MageInt(1); // {2}{R}: Scalding Devil deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Scaldkin.java b/Mage.Sets/src/mage/cards/s/Scaldkin.java index c774f73f01d..48a4c91e631 100644 --- a/Mage.Sets/src/mage/cards/s/Scaldkin.java +++ b/Mage.Sets/src/mage/cards/s/Scaldkin.java @@ -32,7 +32,7 @@ public final class Scaldkin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{R}, Sacrifice Scaldkin: Scaldkin deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java b/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java index 0f86dcbee7b..510b9157c3d 100644 --- a/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java +++ b/Mage.Sets/src/mage/cards/s/ScaleOfChissGoria.java @@ -28,7 +28,7 @@ public final class ScaleOfChissGoria extends CardImpl { // Affinity for artifacts this.addAbility(new AffinityForArtifactsAbility()); // {tap}: Target creature gets +0/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java index 7e76a0b4e6e..a1954cf71ed 100644 --- a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java @@ -36,7 +36,7 @@ public final class ScarabOfTheUnseen extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {T}, Sacrifice Scarab of the Unseen: Return all Auras attached to target permanent you own to their owners’ hands. Draw a card at the beginning of the next turn’s upkeep. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScarabOfTheUnseenEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScarabOfTheUnseenEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); diff --git a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java index 5d2916daa3b..6d5f345830f 100644 --- a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java +++ b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java @@ -36,7 +36,7 @@ public final class ScarbladeElite extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Scarecrone.java b/Mage.Sets/src/mage/cards/s/Scarecrone.java index 96be5665410..bec813c4ea0 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrone.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrone.java @@ -39,12 +39,12 @@ public final class Scarecrone extends CardImpl { this.toughness = new MageInt(2); // {1}, Sacrifice a Scarecrow: Draw a card. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability firstAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); firstAbility.addCost(new SacrificeTargetCost(filterScarecrow)); this.addAbility(firstAbility); // {4}, {T}: Return target artifact creature card from your graveyard to the battlefield. - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(4)); + Ability secondAbility = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new GenericManaCost(4)); secondAbility.addCost(new TapSourceCost()); secondAbility.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(secondAbility); diff --git a/Mage.Sets/src/mage/cards/s/Scarecrow.java b/Mage.Sets/src/mage/cards/s/Scarecrow.java index 64671dbb32e..efbf684284a 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrow.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrow.java @@ -35,7 +35,7 @@ public final class Scarecrow extends CardImpl { this.toughness = new MageInt(2); // {6}, {T}: Prevent all damage that would be dealt to you this turn by attacking creatures without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScarecrowEffect(), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new ScarecrowEffect(), new GenericManaCost(6)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScattershotArcher.java b/Mage.Sets/src/mage/cards/s/ScattershotArcher.java index 25c4f93f510..47b70bb743f 100644 --- a/Mage.Sets/src/mage/cards/s/ScattershotArcher.java +++ b/Mage.Sets/src/mage/cards/s/ScattershotArcher.java @@ -36,7 +36,7 @@ public final class ScattershotArcher extends CardImpl { this.toughness = new MageInt(2); // {tap}: Scattershot Archer deals 1 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost())); } private ScattershotArcher(final ScattershotArcher card) { diff --git a/Mage.Sets/src/mage/cards/s/ScavengerFolk.java b/Mage.Sets/src/mage/cards/s/ScavengerFolk.java index 7898d7f558d..ebcefa766d1 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengerFolk.java +++ b/Mage.Sets/src/mage/cards/s/ScavengerFolk.java @@ -30,7 +30,7 @@ public final class ScavengerFolk extends CardImpl { this.toughness = new MageInt(1); // {G}, {T}, Sacrifice Scavenger Folk: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java index d09225cc010..203265cc073 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java +++ b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java @@ -34,7 +34,7 @@ public final class ScavengingGhoul extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersSourceEffect(CounterType.CORPSE.createInstance(), CreaturesDiedThisTurnCount.instance, true), false).addHint(CreaturesDiedThisTurnHint.instance)); // Remove a corpse counter from Scavenging Ghoul: Regenerate Scavenging Ghoul. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.CORPSE.createInstance()))); } diff --git a/Mage.Sets/src/mage/cards/s/ScavengingOoze.java b/Mage.Sets/src/mage/cards/s/ScavengingOoze.java index 1aa6f37e7ab..1a2d1772ee1 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengingOoze.java +++ b/Mage.Sets/src/mage/cards/s/ScavengingOoze.java @@ -34,7 +34,7 @@ public final class ScavengingOoze extends CardImpl { this.toughness = new MageInt(2); // {G}: Exile target card from a graveyard. If it was a creature card, put a +1/+1 counter on Scavenging Ooze and you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScavengingOozeEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new ScavengingOozeEffect(), new ManaCostsImpl<>("{G}")); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java b/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java index b5131cbe4bf..7dfcdb9a595 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfDominance.java @@ -23,7 +23,7 @@ public final class ScepterOfDominance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{W}{W}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java b/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java index 821d119473a..e28cb424043 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfEmpires.java @@ -24,7 +24,7 @@ public final class ScepterOfEmpires extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // {tap}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScepterOfEmpiresEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScepterOfEmpiresEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java b/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java index d9e23e97242..0eef02c7901 100644 --- a/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java +++ b/Mage.Sets/src/mage/cards/s/ScepterOfInsight.java @@ -22,7 +22,7 @@ public final class ScepterOfInsight extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}{U}{U}"); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java b/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java index 43e93d72c24..dc0d5c68025 100644 --- a/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java +++ b/Mage.Sets/src/mage/cards/s/ScholarOfAthreos.java @@ -27,7 +27,7 @@ public final class ScholarOfAthreos extends CardImpl { this.toughness = new MageInt(4); // {2}{B}: Each opponent loses 1 life. You gain life equal to the life lost this way. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsYouGainLifeLostEffect(1), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new LoseLifeOpponentsYouGainLifeLostEffect(1), new ManaCostsImpl<>("{2}{B}"))); } private ScholarOfAthreos(final ScholarOfAthreos card) { diff --git a/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java b/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java index 5c44c99b842..66c4b89a8d6 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfGlaciers.java @@ -27,7 +27,7 @@ public final class ScionOfGlaciers extends CardImpl { this.toughness = new MageInt(5); // {U}: Scion of Glaciers gets +1/-1 until end of turn - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private ScionOfGlaciers(final ScionOfGlaciers card) { diff --git a/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java b/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java index b30d7b0e329..589574564e7 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java +++ b/Mage.Sets/src/mage/cards/s/ScorchedRusalka.java @@ -30,7 +30,7 @@ public final class ScorchedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java index 44aece15c4b..01d93aa8264 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfKherRidges.java @@ -43,11 +43,11 @@ public final class ScourgeOfKherRidges extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Scourge of Kher Ridges deals 2 damage to each creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(2, filter), new ManaCostsImpl<>("{1}{R}")); this.addAbility(ability); // {5}{R}: Scourge of Kher Ridges deals 6 damage to each other creature with flying. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(6, filter2), new ManaCostsImpl<>("{5}{R}")); + Ability ability2 = new SimpleActivatedAbility(new DamageAllEffect(6, filter2), new ManaCostsImpl<>("{5}{R}")); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java b/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java index 1c7bd561386..8ae71f20f7f 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfSkolaVale.java @@ -45,7 +45,7 @@ public final class ScourgeOfSkolaVale extends CardImpl { effect.setText("with two +1/+1 counters on it"); this.addAbility(new EntersBattlefieldAbility(effect)); // {T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScourgeOfSkolaValeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScourgeOfSkolaValeEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java index 16e547b24dd..ebbfc6a1120 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java @@ -41,7 +41,7 @@ public final class ScourgeOfTheNobilis extends CardImpl { // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn." SimpleStaticAbility redAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); redAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA), + new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R/W}")), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.RED), "and has \"{R/W}: This creature gets +1/+0 until end of turn.\"")); this.addAbility(redAbility); diff --git a/Mage.Sets/src/mage/cards/s/Scrapbasket.java b/Mage.Sets/src/mage/cards/s/Scrapbasket.java index 79840d6a946..e13663aad2f 100644 --- a/Mage.Sets/src/mage/cards/s/Scrapbasket.java +++ b/Mage.Sets/src/mage/cards/s/Scrapbasket.java @@ -32,7 +32,7 @@ public final class Scrapbasket extends CardImpl { this.toughness = new MageInt(2); // {1}: Scrapbasket becomes all colors until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesAllColorsEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesAllColorsEffect(), new ManaCostsImpl<>("{1}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java b/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java index d1743d9d7c3..7afdce340f3 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/s/ScreamsOfTheDamned.java @@ -24,7 +24,7 @@ public final class ScreamsOfTheDamned extends CardImpl { // {1}{B}, Exile a card from your graveyard: Screams of the Damned deals 1 damage to each creature and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java b/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java index 08d6cdbd62c..033c62fa1aa 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingGriffin.java @@ -32,7 +32,7 @@ public final class ScreechingGriffin extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {R}: Target creature can't block Screeching Griffin this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new CantBeBlockedByTargetSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java b/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java index e9c748d52c8..e489ca16ce0 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingHarpy.java @@ -27,7 +27,7 @@ public final class ScreechingHarpy extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private ScreechingHarpy(final ScreechingHarpy card) { diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java index 2c6f5f63abb..ee9a57eea4c 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java @@ -32,7 +32,7 @@ public final class ScreechingSliver extends CardImpl { this.toughness = new MageInt(1); // All Slivers have "{T}: Target player puts the top card of their library into their graveyard." - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(1), new TapSourceCost()); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new MillCardsTargetEffect(1), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/s/ScribNibblers.java b/Mage.Sets/src/mage/cards/s/ScribNibblers.java index 35cdf6b7de9..e1ba03d4386 100644 --- a/Mage.Sets/src/mage/cards/s/ScribNibblers.java +++ b/Mage.Sets/src/mage/cards/s/ScribNibblers.java @@ -33,7 +33,7 @@ public final class ScribNibblers extends CardImpl { this.toughness = new MageInt(1); // {tap}: Exile the top card of target player's library. If it's a land card, you gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ScribNibblersEffect(), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java b/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java index 141f3f00dc9..b9c195b3560 100644 --- a/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java +++ b/Mage.Sets/src/mage/cards/s/ScribeOfTheMindful.java @@ -44,7 +44,7 @@ public final class ScribeOfTheMindful extends CardImpl { // {1}, {T}, Sacrifice Scribe of the Mindful: Return target instant or sorcery card from your graveyard to your hand. Effect effect = new ReturnToHandTargetEffect(); effect.setText("Return target instant or sorcery card from your graveyard to your hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(effect, new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java index 2bd0e129827..3f198f3d572 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java @@ -32,7 +32,7 @@ public final class ScrollOfAvacyn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Scroll of Avacyn: Draw a card. If you control an Angel, you gain 5 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new GainLifeEffect(5), new PermanentsOnTheBattlefieldCondition(filter), "If you control an Angel, you gain 5 life")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java index 1c9404b91d8..657c7610105 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java @@ -33,7 +33,7 @@ public final class ScrollOfGriselbrand extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Scroll of Griselbrand: Target opponent discards a card. If you control a Demon, that player loses 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DiscardTargetEffect(1), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new ConditionalOneShotEffect(new LoseLifeTargetEffect(3), new PermanentsOnTheBattlefieldCondition(filter), "If you control a Demon, that player loses 3 life")); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/s/ScrollRack.java b/Mage.Sets/src/mage/cards/s/ScrollRack.java index 560ab770d14..cb54b43f881 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollRack.java +++ b/Mage.Sets/src/mage/cards/s/ScrollRack.java @@ -30,7 +30,7 @@ public final class ScrollRack extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {1}, {tap}: Exile any number of cards from your hand face down. Put that many cards from the top of your library into your hand. Then look at the exiled cards and put them on top of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScrollRackEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ScrollRackEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScryingGlass.java b/Mage.Sets/src/mage/cards/s/ScryingGlass.java index f01ec33449a..edd9daa8369 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingGlass.java +++ b/Mage.Sets/src/mage/cards/s/ScryingGlass.java @@ -28,7 +28,7 @@ public final class ScryingGlass extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Choose a number greater than 0 and a color. Target opponent reveals their hand. If that opponent reveals exactly the chosen number of cards of the chosen color, you draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingGlassEffect(), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new ScryingGlassEffect(), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ScryingSheets.java b/Mage.Sets/src/mage/cards/s/ScryingSheets.java index 3dca234ec98..65be778723a 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingSheets.java +++ b/Mage.Sets/src/mage/cards/s/ScryingSheets.java @@ -34,7 +34,7 @@ public final class ScryingSheets extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{S}, {T}: Look at the top card of your library. If that card is snow, you may reveal it and put it into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryingSheetsEffect(), new ManaCostsImpl<>("{1}{S}")); + Ability ability = new SimpleActivatedAbility(new ScryingSheetsEffect(), new ManaCostsImpl<>("{1}{S}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Scuttlemutt.java b/Mage.Sets/src/mage/cards/s/Scuttlemutt.java index 91274cced62..675da8772a2 100644 --- a/Mage.Sets/src/mage/cards/s/Scuttlemutt.java +++ b/Mage.Sets/src/mage/cards/s/Scuttlemutt.java @@ -32,7 +32,7 @@ public final class Scuttlemutt extends CardImpl { this.addAbility(new AnyColorManaAbility()); // {T}: Target creature becomes the color or colors of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java b/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java index 6f3251c4f2c..964e61a4603 100644 --- a/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java +++ b/Mage.Sets/src/mage/cards/s/ScuttlingDeath.java @@ -28,7 +28,7 @@ public final class ScuttlingDeath extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); this.addAbility(new SoulshiftAbility(4)); diff --git a/Mage.Sets/src/mage/cards/s/SeaSnidd.java b/Mage.Sets/src/mage/cards/s/SeaSnidd.java index 1976a3b811e..0247590333b 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSnidd.java +++ b/Mage.Sets/src/mage/cards/s/SeaSnidd.java @@ -28,7 +28,7 @@ public final class SeaSnidd extends CardImpl { this.toughness = new MageInt(3); // {T}: Target land becomes the basic land type of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeaSpirit.java b/Mage.Sets/src/mage/cards/s/SeaSpirit.java index b6e4afb8386..f9f16faf873 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SeaSpirit.java @@ -28,7 +28,7 @@ public final class SeaSpirit extends CardImpl { this.toughness = new MageInt(3); // {U}: Sea Spirit gets +1/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(+1, +0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Seahunter.java b/Mage.Sets/src/mage/cards/s/Seahunter.java index bebacdf3fd6..cd60794b087 100644 --- a/Mage.Sets/src/mage/cards/s/Seahunter.java +++ b/Mage.Sets/src/mage/cards/s/Seahunter.java @@ -37,7 +37,7 @@ public final class Seahunter extends CardImpl { this.toughness = new MageInt(2); // {3}, {T}: Search your library for a Merfolk permanent card and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfCleansing.java b/Mage.Sets/src/mage/cards/s/SealOfCleansing.java index 2b8c29eaa2a..04fe7e145a2 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfCleansing.java +++ b/Mage.Sets/src/mage/cards/s/SealOfCleansing.java @@ -24,7 +24,7 @@ public final class SealOfCleansing extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfDoom.java b/Mage.Sets/src/mage/cards/s/SealOfDoom.java index aa520bbe9fc..64ca2f487eb 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfDoom.java +++ b/Mage.Sets/src/mage/cards/s/SealOfDoom.java @@ -20,7 +20,7 @@ public final class SealOfDoom extends CardImpl { public SealOfDoom(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(true), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfFire.java b/Mage.Sets/src/mage/cards/s/SealOfFire.java index 448448a5fe4..62571660d12 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfFire.java +++ b/Mage.Sets/src/mage/cards/s/SealOfFire.java @@ -23,7 +23,7 @@ public final class SealOfFire extends CardImpl { // Sacrifice Seal of Fire: Seal of Fire deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java b/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java index 99a2bbc60b5..9849e8c085a 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java +++ b/Mage.Sets/src/mage/cards/s/SealOfPrimordium.java @@ -24,7 +24,7 @@ public final class SealOfPrimordium extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // Sacrifice Seal of Primordium: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfRemoval.java b/Mage.Sets/src/mage/cards/s/SealOfRemoval.java index c820b5334a8..f0718182240 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfRemoval.java +++ b/Mage.Sets/src/mage/cards/s/SealOfRemoval.java @@ -24,7 +24,7 @@ public final class SealOfRemoval extends CardImpl { // Sacrifice Seal of Removal: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SealOfStrength.java b/Mage.Sets/src/mage/cards/s/SealOfStrength.java index 1fcd59feeda..084ba309469 100644 --- a/Mage.Sets/src/mage/cards/s/SealOfStrength.java +++ b/Mage.Sets/src/mage/cards/s/SealOfStrength.java @@ -24,7 +24,7 @@ public final class SealOfStrength extends CardImpl { // Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java b/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java index a54553c6895..eab742a77d3 100644 --- a/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java +++ b/Mage.Sets/src/mage/cards/s/SearingSpearAskari.java @@ -33,7 +33,7 @@ public final class SearingSpearAskari extends CardImpl { this.addAbility(new FlankingAbility()); // {1}{R}: Searing Spear Askari gains menace until end of turn. (It can't be blocked except by two or more creatures.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(new MenaceAbility(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private SearingSpearAskari(final SearingSpearAskari card) { diff --git a/Mage.Sets/src/mage/cards/s/SeasideHaven.java b/Mage.Sets/src/mage/cards/s/SeasideHaven.java index bb6584bc2a2..80796ec0f46 100644 --- a/Mage.Sets/src/mage/cards/s/SeasideHaven.java +++ b/Mage.Sets/src/mage/cards/s/SeasideHaven.java @@ -35,7 +35,7 @@ public final class SeasideHaven extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}{U}, {tap}, Sacrifice a Bird: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SeasonedTactician.java b/Mage.Sets/src/mage/cards/s/SeasonedTactician.java index 3d83c670ab1..909dff399bb 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonedTactician.java +++ b/Mage.Sets/src/mage/cards/s/SeasonedTactician.java @@ -30,7 +30,7 @@ public final class SeasonedTactician extends CardImpl { this.toughness = new MageInt(3); // {3}, Exile the top four cards of your library: The next time a source of your choice would deal damage to you this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new PreventNextDamageFromChosenSourceToYouEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new ExileFromTopOfLibraryCost(4)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SecondWind.java b/Mage.Sets/src/mage/cards/s/SecondWind.java index b84b803d843..de0c52e2e89 100644 --- a/Mage.Sets/src/mage/cards/s/SecondWind.java +++ b/Mage.Sets/src/mage/cards/s/SecondWind.java @@ -34,10 +34,10 @@ public final class SecondWind extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // {tap}: Tap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new TapEnchantedEffect(), new TapSourceCost())); // {tap}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapAttachedEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new UntapAttachedEffect(), new TapSourceCost())); } private SecondWind(final SecondWind card) { diff --git a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java index 995adfd3f2c..057027b2910 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java @@ -48,7 +48,7 @@ public final class SecurityBlockade extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KnightToken()))); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost()); + ability = new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA, Duration.WhileOnBattlefield, rule))); } diff --git a/Mage.Sets/src/mage/cards/s/SedgeSliver.java b/Mage.Sets/src/mage/cards/s/SedgeSliver.java index 81336897609..e9fab11d510 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeSliver.java +++ b/Mage.Sets/src/mage/cards/s/SedgeSliver.java @@ -43,7 +43,7 @@ public final class SedgeSliver extends CardImpl { new GainAbilityAllEffect(boost, Duration.WhileOnBattlefield, filter, "All Sliver creatures have \"This creature gets +1/+1 as long as you control a Swamp.\""))); // All Slivers have "{B}: Regenerate this permanent." - Ability regenerate = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability regenerate = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); this.addAbility(new SimpleStaticAbility( new GainAbilityAllEffect(regenerate, Duration.WhileOnBattlefield, filterSlivers, "All Slivers have \"{B}: Regenerate this permanent.\""))); diff --git a/Mage.Sets/src/mage/cards/s/SedgeTroll.java b/Mage.Sets/src/mage/cards/s/SedgeTroll.java index 2ee30c17062..5a447725502 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeTroll.java +++ b/Mage.Sets/src/mage/cards/s/SedgeTroll.java @@ -36,7 +36,7 @@ public final class SedgeTroll extends CardImpl { // Sedge Troll gets +1/+1 as long as you control a Swamp. this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {B}: Regenerate Sedge Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SedgeTroll(final SedgeTroll card) { diff --git a/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java b/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java index 5f007d31469..5a54d2de897 100644 --- a/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java +++ b/Mage.Sets/src/mage/cards/s/SeedcradleWitch.java @@ -30,7 +30,7 @@ public final class SeedcradleWitch extends CardImpl { this.toughness = new MageInt(1); // {2}{G}{W}: Target creature gets +3/+3 until end of turn. Untap that creature. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{W}")); ability.addEffect(new UntapTargetEffect().setText("untap that creature")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java b/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java index 40dbbfd60bb..8a9753c7304 100644 --- a/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java +++ b/Mage.Sets/src/mage/cards/s/SeekerOfSkybreak.java @@ -26,7 +26,7 @@ public final class SeekerOfSkybreak extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new UntapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java index 5a3d2cd6158..d05dc33d427 100644 --- a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java +++ b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java @@ -31,7 +31,7 @@ public final class SeerOfTheLastTomorrow extends CardImpl { this.toughness = new MageInt(4); // {U}, {T}, Discard a card: Target player puts the top three cards of their library into their graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(3), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/SeersLantern.java b/Mage.Sets/src/mage/cards/s/SeersLantern.java index ea6aab14b50..93209e0567c 100644 --- a/Mage.Sets/src/mage/cards/s/SeersLantern.java +++ b/Mage.Sets/src/mage/cards/s/SeersLantern.java @@ -26,7 +26,7 @@ public final class SeersLantern extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {2}, {T}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeismicMage.java b/Mage.Sets/src/mage/cards/s/SeismicMage.java index af2165ad319..65360614059 100644 --- a/Mage.Sets/src/mage/cards/s/SeismicMage.java +++ b/Mage.Sets/src/mage/cards/s/SeismicMage.java @@ -30,7 +30,7 @@ public final class SeismicMage extends CardImpl { this.toughness = new MageInt(1); // {2}{R}, {tap}, Discard a card: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java index 268cc82d5cf..5c099a1c47e 100644 --- a/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java +++ b/Mage.Sets/src/mage/cards/s/SeleniaDarkAngel.java @@ -34,7 +34,7 @@ public final class SeleniaDarkAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Pay 2 life: Return Selenia, Dark Angel to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new PayLifeCost(2))); } private SeleniaDarkAngel(final SeleniaDarkAngel card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java b/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java index 8746ef2e954..eecfdcc6ece 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaCluestone.java @@ -32,7 +32,7 @@ public final class SelesnyaCluestone extends CardImpl { this.addAbility(new WhiteManaAbility()); // {G}{W}, {T}, Sacrifice Selesnya Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{W}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java index d3c25cb4dec..228442bf655 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaEvangel.java @@ -40,7 +40,7 @@ public final class SelesnyaEvangel extends CardImpl { this.toughness = new MageInt(2); // {1}, {tap}, Tap an untapped creature you control: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java index 86910a3dfc6..1e7e2cc454a 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaGuildmage.java @@ -32,9 +32,9 @@ public final class SelesnyaGuildmage extends CardImpl { this.toughness = new MageInt(2); // {3}{G}: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{3}{G}"))); // {3}{W}: Creatures you control get +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{3}{W}"))); } private SelesnyaGuildmage(final SelesnyaGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java index 7c445afd27c..d1923d26d1b 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java @@ -29,7 +29,7 @@ public final class SelesnyaKeyrune extends CardImpl { this.addAbility(new WhiteManaAbility()); // {G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SelesnyaKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{W}"))); } private SelesnyaKeyrune(final SelesnyaKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java b/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java index a70865edc78..bf770d66ac2 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaSentry.java @@ -27,7 +27,7 @@ public final class SelesnyaSentry extends CardImpl { this.toughness = new MageInt(2); // {5}{G}: Regenerate Selesnya Sentry. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); } private SelesnyaSentry(final SelesnyaSentry card) { diff --git a/Mage.Sets/src/mage/cards/s/SelflessCathar.java b/Mage.Sets/src/mage/cards/s/SelflessCathar.java index 28d5794da24..f66bdb5f59e 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessCathar.java +++ b/Mage.Sets/src/mage/cards/s/SelflessCathar.java @@ -29,7 +29,7 @@ public final class SelflessCathar extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, Sacrifice Selfless Cathar: Creatures you control get +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SelflessSpirit.java b/Mage.Sets/src/mage/cards/s/SelflessSpirit.java index 98a3f3d5ba7..ecb8c25bd62 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SelflessSpirit.java @@ -33,7 +33,7 @@ public final class SelflessSpirit extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Selfless Spirit: Creatures you control gain indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, + this.addAbility(new SimpleActivatedAbility(new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES), new SacrificeSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SenateGuildmage.java b/Mage.Sets/src/mage/cards/s/SenateGuildmage.java index 23ea9afcc25..0b6a8224a34 100644 --- a/Mage.Sets/src/mage/cards/s/SenateGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SenateGuildmage.java @@ -28,12 +28,12 @@ public final class SenateGuildmage extends CardImpl { this.toughness = new MageInt(2); // {W}, {T}: You gain 2 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(2), new ManaCostsImpl<>("{W}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {U}, {T}: Draw a card, then discard a card. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); + Ability ability2 = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java index 62080c300c9..2578082ec8b 100644 --- a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java +++ b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java @@ -43,7 +43,7 @@ public final class SengirNosferatu extends CardImpl { // {1}{B}, Exile Sengir Nosferatu: Create a 1/2 black Bat creature token with flying. It has "{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control." Effect effect = new CreateTokenEffect(new SengirNosferatuBatToken(), 1); effect.setText("Create a 1/2 black Bat creature token with flying. It has \"{1}{B}, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java b/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java index 5d4c1a47d3b..da61df5554b 100644 --- a/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java +++ b/Mage.Sets/src/mage/cards/s/SenseisDiviningTop.java @@ -26,9 +26,9 @@ public final class SenseisDiviningTop extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {1}: Look at the top three cards of your library, then put them back in any order. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LookLibraryControllerEffect(3), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new LookLibraryControllerEffect(3), new GenericManaCost(1))); // {T}: Draw a card, then put Sensei's Divining Top on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addEffect(new SenseisDiviningTopEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SentinelTotem.java b/Mage.Sets/src/mage/cards/s/SentinelTotem.java index 3e40211ac27..1d7477075b2 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelTotem.java +++ b/Mage.Sets/src/mage/cards/s/SentinelTotem.java @@ -27,7 +27,7 @@ public final class SentinelTotem extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(1))); // {T}, Exile Sentinel Totem: Exile all cards from all graveyards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileGraveyardAllPlayersEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileGraveyardAllPlayersEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java b/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java index 5c1ae95bb22..cb40ad7d525 100644 --- a/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/s/SentryOfTheUnderworld.java @@ -35,7 +35,7 @@ public final class SentryOfTheUnderworld extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {W}{B}, Pay 3 life: Regenerate Sentry of the Underworld. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{W}{B}")); ability.addCost(new PayLifeCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SequesteredStash.java b/Mage.Sets/src/mage/cards/s/SequesteredStash.java index bcf70ccd1ad..415144e2163 100644 --- a/Mage.Sets/src/mage/cards/s/SequesteredStash.java +++ b/Mage.Sets/src/mage/cards/s/SequesteredStash.java @@ -33,7 +33,7 @@ public final class SequesteredStash extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4},{T}, Sacrifice Sequestered Stash: Put the top five cards of your library into your graveyard. Then you may put an artifact card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsControllerEffect(5), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new MillCardsControllerEffect(5), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addEffect(new SequesteredStashEffect()); diff --git a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java index 2243db64a33..32afdb747a2 100644 --- a/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SerendibSorcerer.java @@ -37,7 +37,7 @@ public final class SerendibSorcerer extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature other than Serendib Sorcerer becomes 0/2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java index b142e9ae6e8..6327d4d1e34 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentGenerator.java +++ b/Mage.Sets/src/mage/cards/s/SerpentGenerator.java @@ -26,7 +26,7 @@ public final class SerpentGenerator extends CardImpl { // {4}, {tap}: Create a 1/1 colorless Snake artifact creature token. It has "Whenever this creature deals damage to a player, that player gets a poison counter." Effect effect = new CreateTokenEffect(new SerpentGeneratorSnakeToken()); effect.setText("Create a 1/1 colorless Snake artifact creature token. It has \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerpentSkin.java b/Mage.Sets/src/mage/cards/s/SerpentSkin.java index ccc9576ba20..e54961b0e6a 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentSkin.java +++ b/Mage.Sets/src/mage/cards/s/SerpentSkin.java @@ -38,7 +38,7 @@ public final class SerpentSkin extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {G}: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA),new ColoredManaCost(ColoredManaSymbol.G))); } private SerpentSkin(final SerpentSkin card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentineKavu.java b/Mage.Sets/src/mage/cards/s/SerpentineKavu.java index e5634701732..5bdff84cdce 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineKavu.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineKavu.java @@ -27,7 +27,7 @@ public final class SerpentineKavu extends CardImpl { this.toughness = new MageInt(4); // {R}: Serpentine Kavu gains haste until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private SerpentineKavu(final SerpentineKavu card) { diff --git a/Mage.Sets/src/mage/cards/s/SerraAdvocate.java b/Mage.Sets/src/mage/cards/s/SerraAdvocate.java index a3318feb51a..fedb8c4d002 100644 --- a/Mage.Sets/src/mage/cards/s/SerraAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SerraAdvocate.java @@ -33,7 +33,7 @@ public final class SerraAdvocate extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {tap}: Target attacking or blocking creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java b/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java index 2b670c9dfb3..e497b1396a2 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java +++ b/Mage.Sets/src/mage/cards/s/SerrasLiturgy.java @@ -46,7 +46,7 @@ public final class SerrasLiturgy extends CardImpl { // {W}, Sacrifice Serra's Liturgy: Destroy up to X target artifacts and/or enchantments, where X is the number of verse counters on Serra's Liturgy. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target artifacts and/or enchantments, where X is the number of verse counters on {this}."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, filter, false)); ability.setTargetAdjuster(new TargetsCountAdjuster(new CountersSourceCount(CounterType.VERSE))); diff --git a/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java b/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java index e639c36cc4b..18eaa33830a 100644 --- a/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java +++ b/Mage.Sets/src/mage/cards/s/SerratedBiskelion.java @@ -30,7 +30,7 @@ public final class SerratedBiskelion extends CardImpl { this.toughness = new MageInt(2); // {tap}: Put a -1/-1 counter on Serrated Biskelion and a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.M1M1.createInstance(), true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(), true), new TapSourceCost()); ability.addEffect(new AddCountersTargetEffect(CounterType.M1M1.createInstance()).setText("and a -1/-1 counter on target creature")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java b/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java index 52e171b52fa..d85624b03d8 100644 --- a/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java +++ b/Mage.Sets/src/mage/cards/s/ServantOfTymaret.java @@ -31,7 +31,7 @@ public final class ServantOfTymaret extends CardImpl { this.addAbility(new InspiredAbility(new LoseLifeOpponentsYouGainLifeLostEffect(1))); // {2}{B}: Regenerate Servant of Tymaret. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{B}"))); } private ServantOfTymaret(final ServantOfTymaret card) { diff --git a/Mage.Sets/src/mage/cards/s/SetessanTactics.java b/Mage.Sets/src/mage/cards/s/SetessanTactics.java index b5aa64fb14e..9a2ab8bb6f9 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanTactics.java +++ b/Mage.Sets/src/mage/cards/s/SetessanTactics.java @@ -41,7 +41,7 @@ public final class SetessanTactics extends CardImpl { Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn); effect.setText("Until end of turn, any number of target creatures each get +1/+1"); this.getSpellAbility().addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FightTargetSourceEffect(), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new FightTargetSourceEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn, "and gain \"{T}: This creature fights another target creature.\"")); diff --git a/Mage.Sets/src/mage/cards/s/Sewerdreg.java b/Mage.Sets/src/mage/cards/s/Sewerdreg.java index d298c82d44f..3abdff276f2 100644 --- a/Mage.Sets/src/mage/cards/s/Sewerdreg.java +++ b/Mage.Sets/src/mage/cards/s/Sewerdreg.java @@ -31,7 +31,7 @@ public final class Sewerdreg extends CardImpl { this.addAbility(new SwampwalkAbility()); // Sacrifice Sewerdreg: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Shackles.java b/Mage.Sets/src/mage/cards/s/Shackles.java index 2b4fbe28204..3c6ba3badeb 100644 --- a/Mage.Sets/src/mage/cards/s/Shackles.java +++ b/Mage.Sets/src/mage/cards/s/Shackles.java @@ -40,7 +40,7 @@ public final class Shackles extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {W}: Return Shackles to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{W}"))); } private Shackles(final Shackles card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java b/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java index d823258d40c..fcc8e06488a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java +++ b/Mage.Sets/src/mage/cards/s/ShadeOfTrokair.java @@ -29,7 +29,7 @@ public final class ShadeOfTrokair extends CardImpl { this.toughness = new MageInt(2); // {W}: Shade of Trokair gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); // Suspend 3-{W} this.addAbility(new SuspendAbility(3, new ManaCostsImpl<>("{W}"), this)); diff --git a/Mage.Sets/src/mage/cards/s/ShadesForm.java b/Mage.Sets/src/mage/cards/s/ShadesForm.java index 757151b7c9e..0eec7937406 100644 --- a/Mage.Sets/src/mage/cards/s/ShadesForm.java +++ b/Mage.Sets/src/mage/cards/s/ShadesForm.java @@ -34,7 +34,7 @@ public final class ShadesForm extends CardImpl { this.addAbility(ability); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), + Ability gainedAbility = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java index 1a1b1bb6ba7..af5c2d262a4 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShadowGuildmage.java @@ -31,13 +31,13 @@ public final class ShadowGuildmage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}: Put target creature you control on top of its owner's library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // {R}, {tap}: Shadow Guildmage deals 1 damage to any target and 1 damage to you. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addEffect(new DamageControllerEffect(1).setText("and 1 damage to you")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/ShadowLance.java b/Mage.Sets/src/mage/cards/s/ShadowLance.java index b2eb4b89745..b08d8ea46d7 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowLance.java +++ b/Mage.Sets/src/mage/cards/s/ShadowLance.java @@ -34,7 +34,7 @@ public final class ShadowLance extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private ShadowLance(final ShadowLance card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java index 9b0284512ed..c109ffff51c 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java @@ -46,7 +46,7 @@ public final class ShadowbornApostle extends CardImpl { this.getSpellAbility().addEffect(new InfoEffect("A deck can have any number of cards named Shadowborn Apostle.")); // {B}, Sacrifice six creatures named Shadowborn Apostle: Search your library for a Demon creature and put it onto the battlefield. Then shuffle your library. Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(6, filterApostle)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java index 4f69a01c9e5..7b56565fa1f 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanEnKor.java +++ b/Mage.Sets/src/mage/cards/s/ShamanEnKor.java @@ -51,7 +51,7 @@ public final class ShamanEnKor extends CardImpl { this.addAbility(ability); // {1}{W}: The next time a source of your choice would deal damage to target creature this turn, that damage is dealt to Shaman en-Kor instead. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShamanEnKorRedirectFromTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + ability = new SimpleActivatedAbility(new ShamanEnKorRedirectFromTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java b/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java index 2d2d4b3cf7e..c19df03f171 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java +++ b/Mage.Sets/src/mage/cards/s/ShamanOfTheGreatHunt.java @@ -58,7 +58,7 @@ public final class ShamanOfTheGreatHunt extends CardImpl { // Ferocious — {2}{G/U}{G/U}: Draw a card for each creature you control with power 4 or greater. DynamicValue amount = new PermanentsOnBattlefieldCount(filter); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(amount), new ManaCostsImpl<>("{2}{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(amount), new ManaCostsImpl<>("{2}{G/U}{G/U}")); ability.setAbilityWord(AbilityWord.FEROCIOUS); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShamblingShell.java b/Mage.Sets/src/mage/cards/s/ShamblingShell.java index e4cd15dd441..066a7a60247 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingShell.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingShell.java @@ -31,7 +31,7 @@ public final class ShamblingShell extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Shambling Shell: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Dredge 3 diff --git a/Mage.Sets/src/mage/cards/s/ShamblingStrider.java b/Mage.Sets/src/mage/cards/s/ShamblingStrider.java index a6ca632c317..f0750d6d000 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingStrider.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingStrider.java @@ -26,7 +26,7 @@ public final class ShamblingStrider extends CardImpl { this.toughness = new MageInt(5); // {R}{G}: Shambling Strider gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{G}"))); } private ShamblingStrider(final ShamblingStrider card) { diff --git a/Mage.Sets/src/mage/cards/s/ShamblingVent.java b/Mage.Sets/src/mage/cards/s/ShamblingVent.java index 6eacb4f3819..c3f3169ca69 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingVent.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingVent.java @@ -35,7 +35,7 @@ public final class ShamblingVent extends CardImpl { this.addAbility(new BlackManaAbility()); // {1}{W}{B}: Shambling Vent becomes a 2/3 white and black Elemental creature with lifelink until end of turn. It's still a land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( new ShamblingVentToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java b/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java index 5251200ccbf..edd9bd613dc 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/ShaperGuildmage.java @@ -32,13 +32,13 @@ public final class ShaperGuildmage extends CardImpl { this.toughness = new MageInt(1); // {W}, {tap}: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}, {tap}: Target creature gets +1/+0 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -52,4 +52,4 @@ public final class ShaperGuildmage extends CardImpl { public ShaperGuildmage copy() { return new ShaperGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ShapersOfNature.java b/Mage.Sets/src/mage/cards/s/ShapersOfNature.java index 3deaabc1347..4a0953eb937 100644 --- a/Mage.Sets/src/mage/cards/s/ShapersOfNature.java +++ b/Mage.Sets/src/mage/cards/s/ShapersOfNature.java @@ -33,12 +33,12 @@ public final class ShapersOfNature extends CardImpl { this.toughness = new MageInt(3); // {3}{G}: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}{U}, Remove a +1/+1 counter from a creature you control: Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(), CounterType.P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShardPhoenix.java b/Mage.Sets/src/mage/cards/s/ShardPhoenix.java index fbb686f32b3..8fe4588d762 100644 --- a/Mage.Sets/src/mage/cards/s/ShardPhoenix.java +++ b/Mage.Sets/src/mage/cards/s/ShardPhoenix.java @@ -43,7 +43,7 @@ public final class ShardPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice Shard Phoenix: Shard Phoenix deals 2 damage to each creature without flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(2, "it", filter), new SacrificeSourceCost())); // {R}{R}{R}: Return Shard Phoenix from your graveyard to your hand. Activate this ability only during your upkeep. this.addAbility(new ConditionalActivatedAbility(Zone.GRAVEYARD, diff --git a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java index 3796730b7b8..e53f17c4538 100644 --- a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java @@ -36,15 +36,15 @@ public final class ShattergangBrothers extends CardImpl { this.toughness = new MageInt(3); // {2}{B}, Sacrifice a creature: Each other player sacrifices a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_CREATURE), new ManaCostsImpl<>("{2}{B}")); + Ability ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_CREATURE), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); // {2}{R}, Sacrifice an artifact: Each other player sacrifices an artifact. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)); this.addAbility(ability); // {2}{G}, Sacrifice an enchantment: Each other player sacrifices an enchantment. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ENCHANTMENT), new ManaCostsImpl<>("{2}{G}")); + ability = new SimpleActivatedAbility(new ShattergangBrothersEffect(StaticFilters.FILTER_PERMANENT_ENCHANTMENT), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java index db831872fff..5e2c8581c43 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java +++ b/Mage.Sets/src/mage/cards/s/ShaukuEndbringer.java @@ -44,7 +44,7 @@ public final class ShaukuEndbringer extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(3))); // {T}: Exile target creature and put a +1/+1 counter on Shauku. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).concatBy("and")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShaukusMinion.java b/Mage.Sets/src/mage/cards/s/ShaukusMinion.java index 339402edac1..e5bf360d0ca 100644 --- a/Mage.Sets/src/mage/cards/s/ShaukusMinion.java +++ b/Mage.Sets/src/mage/cards/s/ShaukusMinion.java @@ -39,7 +39,7 @@ public final class ShaukusMinion extends CardImpl { this.toughness = new MageInt(2); // {B}{R}, {tap}: Shauku's Minion deals 2 damage to target white creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java b/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java index de11c3eda17..e80594fd3ff 100644 --- a/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java +++ b/Mage.Sets/src/mage/cards/s/ShelkinBrownie.java @@ -29,7 +29,7 @@ public final class ShelkinBrownie extends CardImpl { this.toughness = new MageInt(1); // {T}: Target creature loses all "bands with other" abilities until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(new BandsWithOtherAbility(), Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new LoseAbilityTargetEffect(new BandsWithOtherAbility(), Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShellSkulkin.java b/Mage.Sets/src/mage/cards/s/ShellSkulkin.java index aa6eb9073d9..216337992b3 100644 --- a/Mage.Sets/src/mage/cards/s/ShellSkulkin.java +++ b/Mage.Sets/src/mage/cards/s/ShellSkulkin.java @@ -35,7 +35,7 @@ public final class ShellSkulkin extends CardImpl { this.subtype.add(SubType.SCARECROW); this.power = new MageInt(3); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java index 2e6b7ee70d1..3a4c88df3cb 100644 --- a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java @@ -37,7 +37,7 @@ public final class ShepherdOfRot extends CardImpl { this.toughness = new MageInt(1); // {tap}: Each player loses 1 life for each Zombie on the battlefield. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(new PermanentsOnBattlefieldCount(filter), rule), new TapSourceCost())); } private ShepherdOfRot(final ShepherdOfRot card) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldDancer.java b/Mage.Sets/src/mage/cards/s/ShieldDancer.java index 603355b1f98..ccb9256909c 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldDancer.java +++ b/Mage.Sets/src/mage/cards/s/ShieldDancer.java @@ -35,7 +35,7 @@ public final class ShieldDancer extends CardImpl { this.toughness = new MageInt(3); // {2}{W}: The next time target attacking creature would deal combat damage to Shield Dancer this turn, that creature deals that damage to itself instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShieldDancerRedirectionEffect(), new ManaCostsImpl<>("{2}{W}")); + Ability ability = new SimpleActivatedAbility(new ShieldDancerRedirectionEffect(), new ManaCostsImpl<>("{2}{W}")); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldMate.java b/Mage.Sets/src/mage/cards/s/ShieldMate.java index 656c7087649..d89fda3e217 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldMate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldMate.java @@ -30,7 +30,7 @@ public final class ShieldMate extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Shield Mate: Target creature gets +0/+4 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 4, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 4, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java index 7d4885155c2..e52fc7f07db 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheAges.java @@ -21,7 +21,7 @@ public final class ShieldOfTheAges extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}: Prevent the next 1 damage that would be dealt to you this turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new PreventDamageToControllerEffect(Duration.EndOfTurn, 1), new GenericManaCost(2))); } private ShieldOfTheAges(final ShieldOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java b/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java index 43546ff001d..9ea613ba63a 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java +++ b/Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java @@ -38,7 +38,7 @@ public final class ShieldedAetherThief extends CardImpl { this.addAbility(new BlocksSourceTriggeredAbility(new GetEnergyCountersControllerEffect(1), false)); // {T}, Pay {E}{E}{E}: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new TapSourceCost()); ability.addCost(new PayEnergyCost(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java index 7816b5e1222..5292792f6ef 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java @@ -40,7 +40,7 @@ public final class ShieldmageAdvocate extends CardImpl { // {tap}: Return target card from an opponent's graveyard to their hand. Prevent all damage that would be dealt to any target this turn by a source of your choice. 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 ShieldmageAdvocateEffect(); effect.setTargetPointer(new SecondTargetPointer()); diff --git a/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java b/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java index 191a30f90fd..2dcf1f9f60c 100644 --- a/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java +++ b/Mage.Sets/src/mage/cards/s/ShimianNightStalker.java @@ -41,7 +41,7 @@ public final class ShimianNightStalker extends CardImpl { this.toughness = new MageInt(4); // {B}, {T}: All damage that would be dealt to you this turn by target attacking creature is dealt to Shimian Night Stalker instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShimianNightStalkerRedirectDamageEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new ShimianNightStalkerRedirectDamageEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java index b9880e5ac36..9ad228f44b0 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java +++ b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java @@ -39,7 +39,7 @@ public final class ShimmeringWings extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {U}: Return Shimmering Wings to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.U))); + this.addAbility(new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new ColoredManaCost(ColoredManaSymbol.U))); } private ShimmeringWings(final ShimmeringWings card) { diff --git a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java index 6cc2369eeac..9081fb808d2 100644 --- a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java @@ -31,7 +31,7 @@ public final class ShinkaTheBloodsoakedKeep extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new RedManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java b/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java index 5259ce0f1ea..51a93423f2b 100644 --- a/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java +++ b/Mage.Sets/src/mage/cards/s/ShipwreckMoray.java @@ -32,7 +32,7 @@ public final class ShipwreckMoray extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(4))); // Pay {E}: Shipwreck Moray gets +2/-2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, -2, Duration.EndOfTurn), new PayEnergyCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, -2, Duration.EndOfTurn), new PayEnergyCost(1))); } private ShipwreckMoray(final ShipwreckMoray card) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanDragon.java b/Mage.Sets/src/mage/cards/s/ShivanDragon.java index 1881f91dc66..9aa2489b510 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShivanDragon.java @@ -24,7 +24,7 @@ public final class ShivanDragon extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); 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 ShivanDragon(final ShivanDragon card) { diff --git a/Mage.Sets/src/mage/cards/s/ShivanGorge.java b/Mage.Sets/src/mage/cards/s/ShivanGorge.java index b9a97e376b7..ed8e15b1d80 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanGorge.java +++ b/Mage.Sets/src/mage/cards/s/ShivanGorge.java @@ -28,7 +28,7 @@ public final class ShivanGorge extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}{R}, {tap}: Shivan Gorge deals 1 damage to each opponent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); + Ability ability = new SimpleActivatedAbility(new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShivanHarvest.java b/Mage.Sets/src/mage/cards/s/ShivanHarvest.java index 9fddff068bf..5dd3c7cbf2d 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanHarvest.java +++ b/Mage.Sets/src/mage/cards/s/ShivanHarvest.java @@ -25,7 +25,7 @@ public final class ShivanHarvest extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}"); // {1}{R}, Sacrifice a creature: Destroy target nonbasic land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetNonBasicLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java index 971c7296f41..c0a858dfb49 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanHellkite.java +++ b/Mage.Sets/src/mage/cards/s/ShivanHellkite.java @@ -28,7 +28,7 @@ public final class ShivanHellkite extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java index 649c01dc229..5d46b7b1eaa 100644 --- a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java @@ -47,7 +47,7 @@ public final class ShivsEmbrace extends CardImpl { ability.addEffect(effect); 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 ManaCostsImpl<>("{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java index a525af9edbb..b83ffcc7b96 100644 --- a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java @@ -31,7 +31,7 @@ public final class ShizoDeathsStorehouse extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},null); this.supertype.add(SuperType.LEGENDARY); this.addAbility(new BlackManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShockTroops.java b/Mage.Sets/src/mage/cards/s/ShockTroops.java index 760156f6675..10af9754436 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTroops.java +++ b/Mage.Sets/src/mage/cards/s/ShockTroops.java @@ -29,7 +29,7 @@ public final class ShockTroops extends CardImpl { this.toughness = new MageInt(2); // Sacrifice Shock Troops: Shock Troops deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2, "it"), new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShoreKeeper.java b/Mage.Sets/src/mage/cards/s/ShoreKeeper.java index 4d4646498e7..795c11e9ddd 100644 --- a/Mage.Sets/src/mage/cards/s/ShoreKeeper.java +++ b/Mage.Sets/src/mage/cards/s/ShoreKeeper.java @@ -29,7 +29,7 @@ public final class ShoreKeeper extends CardImpl { this.toughness = new MageInt(3); // {7}{u}, {t}, Sacrifice Shore Keeper: Draw three cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{7}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(3), new ManaCostsImpl<>("{7}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java index f7021556b76..ef12f9ae351 100644 --- a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java +++ b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java @@ -38,10 +38,10 @@ public final class ShorecrasherElemental extends CardImpl { this.toughness = new MageInt(3); // {U}: Exile Shorecrasher Elemental, then return it to the battlefield face down under its owner's control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new ShorecrasherElementalEffect(), new ManaCostsImpl<>("{U}"))); // {1}: Shorecrasher Elemental gets +1/-1 or -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalBoostEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new ShorecrasherElementalBoostEffect(), new ManaCostsImpl<>("{1}"))); // Megamorph {4}{U} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"), true)); diff --git a/Mage.Sets/src/mage/cards/s/ShrillHowler.java b/Mage.Sets/src/mage/cards/s/ShrillHowler.java index ac54bf8be79..40e9b05ce39 100644 --- a/Mage.Sets/src/mage/cards/s/ShrillHowler.java +++ b/Mage.Sets/src/mage/cards/s/ShrillHowler.java @@ -35,7 +35,7 @@ public final class ShrillHowler extends CardImpl { // {5}{G}: Transform Shrill Howler. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java index 08a5794d4d6..91cc8771309 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfBurningRage.java @@ -44,7 +44,7 @@ public final class ShrineOfBurningRage extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{3}, {T}, Sacrifice Shrine of Burning Rage: It deals damage equal to the number of charge counters on it to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.CHARGE)) .setText("it deals damage equal to the number of charge counters on it to any target"), new GenericManaCost(3)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java b/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java index 5bc70db335f..65fbcef11ab 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfLimitlessPower.java @@ -44,7 +44,7 @@ public final class ShrineOfLimitlessPower extends CardImpl { new SpellCastControllerTriggeredAbility(null, filter, false))); //{4}, {T}, Sacrifice Shrine of Limitless Power: Target player discards a card for each charge counter on Shrine of Limitless Power. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DiscardTargetEffect(new CountersSourceCount(CounterType.CHARGE)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java b/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java index 4579aa3b935..703c5549457 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java +++ b/Mage.Sets/src/mage/cards/s/ShrineOfPiercingVision.java @@ -51,7 +51,7 @@ public final class ShrineOfPiercingVision extends CardImpl { // {tap}, Sacrifice Shrine of Piercing Vision: Look at the top X cards of your library, where X is the number of charge counters on Shrine of Piercing Vision. // Put one of those cards into your hand and the rest on the bottom of your library in any order. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShrineOfPiercingVisionEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShrineOfPiercingVisionEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java index 2b9b9f16e53..e7833cad077 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java @@ -39,7 +39,7 @@ public final class SiegeGangCommander extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 3), false)); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index cb503d95772..20da964fa73 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -52,7 +52,7 @@ public final class SigardaHeronsGrace extends CardImpl { this.addAbility(ability); // {2}, Exile a card from your graveyard: Create a 1/1 white Human Soldier creature token. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HumanSoldierToken()), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new CreateTokenEffect(new HumanSoldierToken()), new GenericManaCost(2)); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SigardianPriest.java b/Mage.Sets/src/mage/cards/s/SigardianPriest.java index 3b46a1ffcf4..16ebf8d4d88 100644 --- a/Mage.Sets/src/mage/cards/s/SigardianPriest.java +++ b/Mage.Sets/src/mage/cards/s/SigardianPriest.java @@ -37,7 +37,7 @@ public final class SigardianPriest extends CardImpl { this.toughness = new MageInt(2); // {1}, {T}: Tap target non-Human creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(1, 1, filter, false)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java b/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java index a6605087293..ce5b8e69ca7 100644 --- a/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java +++ b/Mage.Sets/src/mage/cards/s/SightedCasteSorcerer.java @@ -30,7 +30,7 @@ public final class SightedCasteSorcerer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new ExaltedAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private SightedCasteSorcerer(final SightedCasteSorcerer card) { diff --git a/Mage.Sets/src/mage/cards/s/SigilTracer.java b/Mage.Sets/src/mage/cards/s/SigilTracer.java index eefb0b7c410..3d1ca28e199 100644 --- a/Mage.Sets/src/mage/cards/s/SigilTracer.java +++ b/Mage.Sets/src/mage/cards/s/SigilTracer.java @@ -40,7 +40,7 @@ public final class SigilTracer extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, Tap two untapped Wizards you control: Copy target instant or sorcery spell. You may choose new targets for the copy. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CopyTargetStackObjectEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SigiledStarfish.java b/Mage.Sets/src/mage/cards/s/SigiledStarfish.java index 59fa53bf7fb..44816acf9e6 100644 --- a/Mage.Sets/src/mage/cards/s/SigiledStarfish.java +++ b/Mage.Sets/src/mage/cards/s/SigiledStarfish.java @@ -26,7 +26,7 @@ public final class SigiledStarfish extends CardImpl { this.toughness = new MageInt(3); // {T}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new TapSourceCost())); } private SigiledStarfish(final SigiledStarfish card) { diff --git a/Mage.Sets/src/mage/cards/s/SilentAttendant.java b/Mage.Sets/src/mage/cards/s/SilentAttendant.java index cfa52178409..d971b76a8ce 100644 --- a/Mage.Sets/src/mage/cards/s/SilentAttendant.java +++ b/Mage.Sets/src/mage/cards/s/SilentAttendant.java @@ -26,7 +26,7 @@ public final class SilentAttendant extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost())); } private SilentAttendant(final SilentAttendant card) { @@ -37,4 +37,4 @@ public final class SilentAttendant extends CardImpl { public SilentAttendant copy() { return new SilentAttendant(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java b/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java index 076305a3528..691f93bd737 100644 --- a/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java +++ b/Mage.Sets/src/mage/cards/s/SilkbindFaerie.java @@ -34,7 +34,7 @@ public final class SilkbindFaerie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}{WU}, {untap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{1}{W/U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{1}{W/U}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilkwingScout.java b/Mage.Sets/src/mage/cards/s/SilkwingScout.java index 99651042e0a..0f39d99573e 100644 --- a/Mage.Sets/src/mage/cards/s/SilkwingScout.java +++ b/Mage.Sets/src/mage/cards/s/SilkwingScout.java @@ -35,7 +35,7 @@ public final class SilkwingScout extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}, Sacrifice Silkwing Scout: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java index 30935227b1c..4ebb7842328 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java @@ -31,7 +31,7 @@ public final class SilumgarMonument extends CardImpl { this.addAbility(new BlackManaAbility()); // {4}{U}{B}: Silumgar Monument becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect (new OjutaiMonumentToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{4}{U}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java index 55cc6f69cf3..c34e715fcf0 100644 --- a/Mage.Sets/src/mage/cards/s/SilverchaseFox.java +++ b/Mage.Sets/src/mage/cards/s/SilverchaseFox.java @@ -28,7 +28,7 @@ public final class SilverchaseFox extends CardImpl { this.toughness = new MageInt(2); // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetEnchantmentPermanent()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java index ef2e520bf80..821b2ed7f1c 100644 --- a/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java +++ b/Mage.Sets/src/mage/cards/s/SilvosRogueElemental.java @@ -31,7 +31,7 @@ public final class SilvosRogueElemental extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {G}: Regenerate Silvos, Rogue Elemental. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private SilvosRogueElemental(final SilvosRogueElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/SimianBrawler.java b/Mage.Sets/src/mage/cards/s/SimianBrawler.java index 8d36380cc9c..cdc30baa7e0 100644 --- a/Mage.Sets/src/mage/cards/s/SimianBrawler.java +++ b/Mage.Sets/src/mage/cards/s/SimianBrawler.java @@ -28,7 +28,7 @@ public final class SimianBrawler extends CardImpl { this.toughness = new MageInt(3); // Discard a land card: Simian Brawler 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 DiscardCardCost(new FilterLandCard("a land card")))); } diff --git a/Mage.Sets/src/mage/cards/s/SimicAscendancy.java b/Mage.Sets/src/mage/cards/s/SimicAscendancy.java index e5441d8e3ec..597f89cae71 100644 --- a/Mage.Sets/src/mage/cards/s/SimicAscendancy.java +++ b/Mage.Sets/src/mage/cards/s/SimicAscendancy.java @@ -33,7 +33,7 @@ public final class SimicAscendancy extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{G}{U}"); // {1}{G}{U}: Put a +1/+1 counter on target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{1}{G}{U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicBasilisk.java b/Mage.Sets/src/mage/cards/s/SimicBasilisk.java index cac9aa40e44..67e5997661d 100644 --- a/Mage.Sets/src/mage/cards/s/SimicBasilisk.java +++ b/Mage.Sets/src/mage/cards/s/SimicBasilisk.java @@ -42,7 +42,7 @@ public final class SimicBasilisk extends CardImpl { Effect effect = new CreateDelayedTriggeredAbilityEffect( new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true); effect.setText("destroy that creature at end of combat"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( new DealsDamageToACreatureTriggeredAbility(effect, true, false, true), Duration.EndOfTurn) .setText("Until end of turn, target creature with a +1/+1 counter on it gains \"Whenever this creature deals combat damage to a creature, destroy that creature at end of combat.\""), new ManaCostsImpl<>("{1}{G}")); diff --git a/Mage.Sets/src/mage/cards/s/SimicCluestone.java b/Mage.Sets/src/mage/cards/s/SimicCluestone.java index 1556c34e241..fd5c8bc1cf8 100644 --- a/Mage.Sets/src/mage/cards/s/SimicCluestone.java +++ b/Mage.Sets/src/mage/cards/s/SimicCluestone.java @@ -32,7 +32,7 @@ public final class SimicCluestone extends CardImpl { this.addAbility(new BlueManaAbility()); // {G}{U}, {T}, Sacrifice Simic Cluestone: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{G}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicFluxmage.java b/Mage.Sets/src/mage/cards/s/SimicFluxmage.java index 71860c9afc7..94318dc0e80 100644 --- a/Mage.Sets/src/mage/cards/s/SimicFluxmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicFluxmage.java @@ -34,7 +34,7 @@ public final class SimicFluxmage extends CardImpl { this.addAbility(new EvolveAbility()); // 1{U}, {T}: Move a +1/+1 counter from Simic Fluxmage onto target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCountersFromSourceToTargetEffect(),new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MoveCountersFromSourceToTargetEffect(),new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index 53f81c91cb4..861474e5e91 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -51,7 +51,7 @@ public final class SimicGuildmage extends CardImpl { this.toughness = new MageInt(2); // {1}{G}: Move a +1/+1 counter from target creature onto another target creature with the same controller. - Ability countersAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveCounterFromTargetToTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability countersAbility = new SimpleActivatedAbility(new MoveCounterFromTargetToTargetEffect(), new ManaCostsImpl<>("{1}{G}")); TargetCreaturePermanent target = new TargetCreaturePermanent( new FilterCreaturePermanent("creature (you take counter from)")); target.setTargetTag(1); @@ -67,7 +67,7 @@ public final class SimicGuildmage extends CardImpl { this.addAbility(countersAbility); // {1}{U}: Attach target Aura enchanting a permanent to another permanent with the same controller. - Ability auraAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MoveAuraEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability auraAbility = new SimpleActivatedAbility(new MoveAuraEffect(), new ManaCostsImpl<>("{1}{U}")); auraAbility.addTarget(new TargetPermanent(auraFilter)); this.addAbility(auraAbility); diff --git a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java index 12d4c0037e5..eb2401d0764 100644 --- a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java @@ -31,7 +31,7 @@ public final class SimicKeyrune extends CardImpl { this.addAbility(new BlueManaAbility()); // {G}{U}: Simic Keyrune becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SimicKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{U}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SimicKeyruneToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{U}"))); } private SimicKeyrune(final SimicKeyrune card) { diff --git a/Mage.Sets/src/mage/cards/s/SimicLocket.java b/Mage.Sets/src/mage/cards/s/SimicLocket.java index 28227c9f8b6..70b0fba848b 100644 --- a/Mage.Sets/src/mage/cards/s/SimicLocket.java +++ b/Mage.Sets/src/mage/cards/s/SimicLocket.java @@ -28,7 +28,7 @@ public final class SimicLocket extends CardImpl { this.addAbility(new BlueManaAbility()); // {G/U}{G/U}{G/U}{G/U}, {T}, Sacrifice Simic Locket: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{G/U}{G/U}{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{G/U}{G/U}{G/U}{G/U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SimicManipulator.java b/Mage.Sets/src/mage/cards/s/SimicManipulator.java index b86d77495ce..74b39998a51 100644 --- a/Mage.Sets/src/mage/cards/s/SimicManipulator.java +++ b/Mage.Sets/src/mage/cards/s/SimicManipulator.java @@ -46,7 +46,7 @@ public final class SimicManipulator extends CardImpl { this.addAbility(new EvolveAbility()); // {T}, Remove one or more +1/+1 counters from Simic Manipulator: Gain control of target creature with power less than or equal to the number of +1/+1 counters removed this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom, true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new GainControlTargetEffect(Duration.Custom, true), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1, 1, "Remove one or more +1/+1 counters from {this}")); ability.setTargetAdjuster(new PowerTargetAdjuster(GetXValue.instance, ComparisonType.OR_LESS)); diff --git a/Mage.Sets/src/mage/cards/s/SimicRagworm.java b/Mage.Sets/src/mage/cards/s/SimicRagworm.java index 2c86eac06aa..a7d019caa2c 100644 --- a/Mage.Sets/src/mage/cards/s/SimicRagworm.java +++ b/Mage.Sets/src/mage/cards/s/SimicRagworm.java @@ -25,7 +25,7 @@ public final class SimicRagworm extends CardImpl { this.toughness = new MageInt(3); // {U}: Untap Simic Ragworm. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); } private SimicRagworm(final SimicRagworm card) { diff --git a/Mage.Sets/src/mage/cards/s/Sindbad.java b/Mage.Sets/src/mage/cards/s/Sindbad.java index ed407a4b33a..90bec43d26b 100644 --- a/Mage.Sets/src/mage/cards/s/Sindbad.java +++ b/Mage.Sets/src/mage/cards/s/Sindbad.java @@ -30,7 +30,7 @@ public final class Sindbad 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 SindbadEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SindbadEffect(), new TapSourceCost())); } private Sindbad(final Sindbad card) { diff --git a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java index e25f287f012..1c00c32034f 100644 --- a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java +++ b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java @@ -48,7 +48,7 @@ public final class SingingBellStrike extends CardImpl { // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{6}: Untap this creature." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new GenericManaCost(6)); + Ability gainedAbility = new SimpleActivatedAbility(new UntapSourceEffect(), new GenericManaCost(6)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{6}: Untap this creature.\""); this.addAbility(new SimpleStaticAbility(effect)); diff --git a/Mage.Sets/src/mage/cards/s/SingingTree.java b/Mage.Sets/src/mage/cards/s/SingingTree.java index 9f33b537049..ed88f887331 100644 --- a/Mage.Sets/src/mage/cards/s/SingingTree.java +++ b/Mage.Sets/src/mage/cards/s/SingingTree.java @@ -32,7 +32,7 @@ public final class SingingTree extends CardImpl { this.toughness = new MageInt(3); // {tap}: Target attacking creature's power becomes 0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SingingTreeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SingingTreeEffect(), new TapSourceCost()); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SinisterConcoction.java b/Mage.Sets/src/mage/cards/s/SinisterConcoction.java index 67a26f69dd2..8db80090e2c 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterConcoction.java +++ b/Mage.Sets/src/mage/cards/s/SinisterConcoction.java @@ -26,7 +26,7 @@ public final class SinisterConcoction extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); // {B}, Pay 1 life, Put the top card of your library into your graveyard, Discard a card, Sacrifice Sinister Concoction: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new PayLifeCost(1)); ability.addCost(new MillCardsCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java index 5c787a8527e..4439304b560 100644 --- a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java +++ b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java @@ -46,7 +46,7 @@ public final class SinkingFeeling extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // Enchanted creature has "{1}, Put a -1/-1 counter on this creature: Untap this creature. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); + Ability ability2 = new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); ability2.addCost(new PutCountersSourceCost(CounterType.M1M1.createInstance()).setText("put a -1/-1 counter on this creature")); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.Custom, "Enchanted creature has \"{1}, Put a -1/-1 counter on this creature: Untap this creature.\""))); diff --git a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java index 2ce1344f656..84155e8aa4d 100644 --- a/Mage.Sets/src/mage/cards/s/SirenSongLyre.java +++ b/Mage.Sets/src/mage/cards/s/SirenSongLyre.java @@ -31,7 +31,7 @@ public final class SirenSongLyre extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has "{2}, {T}: Tap target creature." - Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(2)); + Ability grantedAbility = new SimpleActivatedAbility(new TapTargetEffect(), new GenericManaCost(2)); grantedAbility.addCost(new TapSourceCost()); grantedAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(grantedAbility, AttachmentType.EQUIPMENT))); diff --git a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java index a6752fb7ff4..4800139e41d 100644 --- a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java +++ b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java @@ -45,7 +45,7 @@ public final class SirenStormtamer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, Sacrifice Siren Stormtamer: Counter target spell or ability that targets you or a creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new SirenStormtamerTargetObject()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java index 532fe9cb4fc..3b6f50cb795 100644 --- a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java +++ b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java @@ -43,7 +43,7 @@ public final class SisaysIngenuity extends CardImpl { // When Sisay's Ingenuity enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{2}{U}: Target creature becomes the color of your choice until end of turn." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorTargetEffect(Duration.EndOfTurn), + ability = new SimpleActivatedAbility(new BecomesColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/s/SithEvoker.java b/Mage.Sets/src/mage/cards/s/SithEvoker.java index a7757930560..5361cf4ac16 100644 --- a/Mage.Sets/src/mage/cards/s/SithEvoker.java +++ b/Mage.Sets/src/mage/cards/s/SithEvoker.java @@ -42,7 +42,7 @@ public final class SithEvoker extends CardImpl { this.toughness = new MageInt(3); // {T}, {B}, Sacrifice a creature: You gain life equal to that creature's power or toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SithEvokerEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new SithEvokerEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/s/SithHolocron.java b/Mage.Sets/src/mage/cards/s/SithHolocron.java index 07d27c0c236..44c6af691dd 100644 --- a/Mage.Sets/src/mage/cards/s/SithHolocron.java +++ b/Mage.Sets/src/mage/cards/s/SithHolocron.java @@ -29,7 +29,7 @@ public final class SithHolocron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {T}: Put a charge counter on Sith Holocron. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), new TapSourceCost())); // {T}, Remove a charge counter from Sith Holocron: Add {U}, {B} or {R}. Cost cost = new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(1)); diff --git a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java index a6b143211a5..37b72e192d4 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java @@ -39,7 +39,7 @@ public final class SkarrgGuildmage extends CardImpl { Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), "Creatures you control gain trample until end of turn"), new ManaCostsImpl<>("{R}{G}"))); // {1}{R}{G}: Target land you control becomes a 4/4 Elemental creature until end of turn. It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect( + Ability ability = new SimpleActivatedAbility(new BecomesCreatureTargetEffect( new CreatureToken(4, 4, "4/4 Elemental creature", SubType.ELEMENTAL), false, true, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}") ); ability.addTarget(new TargetPermanent(new FilterControlledLandPermanent())); @@ -55,4 +55,4 @@ public final class SkarrgGuildmage extends CardImpl { public SkarrgGuildmage copy() { return new SkarrgGuildmage(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java b/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java index a5a02dfa033..11b5e57a0fd 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java +++ b/Mage.Sets/src/mage/cards/s/SkarrgTheRagePits.java @@ -26,7 +26,7 @@ public final class SkarrgTheRagePits extends CardImpl { public SkarrgTheRagePits(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn) .setText("target creature gets +1/+1"), new ManaCostsImpl<>("{R}{G}")); ability.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java index 3d34361c8f7..e8ed5249a1e 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java +++ b/Mage.Sets/src/mage/cards/s/SkarrganSkybreaker.java @@ -34,7 +34,7 @@ public final class SkarrganSkybreaker extends CardImpl { // Bloodthirst 3 this.addAbility(new BloodthirstAbility(3)); // {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE) .setText("It deals damage equal to its power to any target"), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java b/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java index a53e04f1238..d2617891bc1 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalChangeling.java @@ -28,7 +28,7 @@ public final class SkeletalChangeling extends CardImpl { // Changeling this.addAbility(new ChangelingAbility()); // {1}{B}: Regenerate Skeletal Changeling. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SkeletalChangeling(final SkeletalChangeling card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java index 0efec5787ea..81bd11a9d21 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java @@ -39,7 +39,7 @@ public final class SkeletalGrimace extends CardImpl { // Enchanted creature gets +1/+1 and has "{B}: Regenerate this creature." Ability staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability gainedAbility = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); staticAbility.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA) .setText("and has \"{B}: Regenerate this creature.\"")); this.addAbility(staticAbility); diff --git a/Mage.Sets/src/mage/cards/s/SkeletalKathari.java b/Mage.Sets/src/mage/cards/s/SkeletalKathari.java index e4b6232ed1a..a0a3ed27b5a 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalKathari.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalKathari.java @@ -32,7 +32,7 @@ public final class SkeletalKathari extends CardImpl { this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java index 32986991c66..39417e93404 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java @@ -39,11 +39,11 @@ public final class SkeletalVampire extends CardImpl { // When Skeletal Vampire enters the battlefield, create two 1/1 black Bat creature tokens with flying. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new BatToken(), 2))); // {3}{B}{B}, Sacrifice a Bat: Create two 1/1 black Bat creature tokens with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl<>("{3}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new BatToken(), 2), new ManaCostsImpl<>("{3}{B}{B}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // Sacrifice a Bat: Regenerate Skeletal Vampire. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); } private SkeletalVampire(final SkeletalVampire card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletalWurm.java b/Mage.Sets/src/mage/cards/s/SkeletalWurm.java index bdcf8a164b9..51aab4f01f1 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalWurm.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalWurm.java @@ -26,7 +26,7 @@ public final class SkeletalWurm extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(6); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SkeletalWurm(final SkeletalWurm card) { diff --git a/Mage.Sets/src/mage/cards/s/SkeletonShip.java b/Mage.Sets/src/mage/cards/s/SkeletonShip.java index 2c8cf8606c1..63982def91b 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletonShip.java +++ b/Mage.Sets/src/mage/cards/s/SkeletonShip.java @@ -35,7 +35,7 @@ public final class SkeletonShip extends CardImpl { new SacrificeSourceEffect())); // {tap}: Put a -1/-1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java index ebacc960bd7..4dd01f45e2f 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java +++ b/Mage.Sets/src/mage/cards/s/SkirkRidgeExhumer.java @@ -30,7 +30,7 @@ public final class SkirkRidgeExhumer extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}, Discard a card: Create a 1/1 black Zombie Goblin creature token named Festering Goblin. It has "When Festering Goblin dies, target creature gets -1/-1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new FesteringGoblinToken()), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new FesteringGoblinToken()), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java index 24d4fc882d2..3026a78baa0 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagCultist.java @@ -32,7 +32,7 @@ public final class SkirsdagCultist extends CardImpl { this.toughness = new MageInt(2); // {R}, {T}, Sacrifice a creature: Skirsdag Cultist deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java index 3002830eccb..6bb60e0b00b 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java @@ -33,7 +33,7 @@ public final class SkirsdagFlayer extends CardImpl { this.toughness = new MageInt(1); // {3}{B}, {tap}, Sacrifice a Human: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java b/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java index 4584ef08357..38ed811cc8e 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagSupplicant.java @@ -29,7 +29,7 @@ public final class SkirsdagSupplicant extends CardImpl { this.toughness = new MageInt(3); // {B}, {T}, Discard a card: Each player loses 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(2), new ManaCostsImpl<>("{B}")); + Ability ability = new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(2), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java index 277489fe902..0d5d415618b 100644 --- a/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java +++ b/Mage.Sets/src/mage/cards/s/SkithiryxTheBlightDragon.java @@ -36,8 +36,8 @@ public final class SkithiryxTheBlightDragon extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); this.addAbility(InfectAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}{B}"))); } private SkithiryxTheBlightDragon(final SkithiryxTheBlightDragon card) { diff --git a/Mage.Sets/src/mage/cards/s/SkullCatapult.java b/Mage.Sets/src/mage/cards/s/SkullCatapult.java index 0bcdde70303..a8c57185b69 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCatapult.java +++ b/Mage.Sets/src/mage/cards/s/SkullCatapult.java @@ -26,7 +26,7 @@ public final class SkullCatapult extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}"); // {1}, {tap}, Sacrifice a creature: Skull Catapult deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SkullCollector.java b/Mage.Sets/src/mage/cards/s/SkullCollector.java index 6fa42f59508..fd150caa16f 100644 --- a/Mage.Sets/src/mage/cards/s/SkullCollector.java +++ b/Mage.Sets/src/mage/cards/s/SkullCollector.java @@ -39,7 +39,7 @@ public final class SkullCollector extends CardImpl { // At the beginning of your upkeep, return a black creature you control to its owner's hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ReturnToHandChosenControlledPermanentEffect(filter))); // {1}{B}: Regenerate Skull Collector. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SkullCollector(final SkullCollector card) { diff --git a/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java b/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java index bd118590c3b..d7518dc39d0 100644 --- a/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java +++ b/Mage.Sets/src/mage/cards/s/SkullmeadCauldron.java @@ -22,11 +22,11 @@ public final class SkullmeadCauldron extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {tap}: You gain 1 life. - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost()); + Ability ability1 = new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost()); this.addAbility(ability1); // {tap}, Discard a card: You gain 3 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new TapSourceCost()); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(3), new TapSourceCost()); ability2.addCost(new DiscardCardCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SkyWeaver.java b/Mage.Sets/src/mage/cards/s/SkyWeaver.java index 8e79a2c1d06..d94cae2c327 100644 --- a/Mage.Sets/src/mage/cards/s/SkyWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SkyWeaver.java @@ -41,7 +41,7 @@ public final class SkyWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Skyshaper.java b/Mage.Sets/src/mage/cards/s/Skyshaper.java index 8bea3731cfa..94fa44f25b1 100644 --- a/Mage.Sets/src/mage/cards/s/Skyshaper.java +++ b/Mage.Sets/src/mage/cards/s/Skyshaper.java @@ -23,7 +23,7 @@ public final class Skyshaper extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Sacrifice Skyshaper: Creatures you control gain flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new GainAbilityControlledEffect( FlyingAbility.getInstance(), Duration.EndOfTurn, diff --git a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java index 63bf9d55249..18681cad8e2 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java +++ b/Mage.Sets/src/mage/cards/s/SkyshipWeatherlight.java @@ -38,7 +38,7 @@ public final class SkyshipWeatherlight extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SkyshipWeatherlightEffect(), false)); // {4}, {tap}, Choose a card at random that was removed from the game with Skyship Weatherlight. Put that card into your hand. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SkyshipWeatherlightEffect2(), new GenericManaCost(4)); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new SkyshipWeatherlightEffect2(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java b/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java index 81a25767e53..def019a5a0b 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudArcher.java @@ -38,7 +38,7 @@ public final class SkyshroudArcher extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature with flying gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java index 168cb5aae03..c1ece1d982e 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java @@ -37,7 +37,7 @@ public final class SkyshroudPoacher extends CardImpl { this.toughness = new MageInt(2); // {3}, {tap}: Search your library for an Elf permanent card and put it onto the battlefield. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java b/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java index cfb1f111486..28ea69e0000 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudTroll.java @@ -25,7 +25,7 @@ public final class SkyshroudTroll extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private SkyshroudTroll(final SkyshroudTroll card) { diff --git a/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java b/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java index 34b67309baf..7948b71877f 100644 --- a/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java +++ b/Mage.Sets/src/mage/cards/s/SkywardEyeProphets.java @@ -30,7 +30,7 @@ public final class SkywardEyeProphets extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // {tap}: Reveal the top card of your library. If it's a land card, put it onto the battlefield. Otherwise, put it into your hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealTopLandToBattlefieldElseHandEffect("it"), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RevealTopLandToBattlefieldElseHandEffect("it"), new TapSourceCost())); } private SkywardEyeProphets(final SkywardEyeProphets card) { diff --git a/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java b/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java index 9af1a025949..f7b6abff5b6 100644 --- a/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java +++ b/Mage.Sets/src/mage/cards/s/SlateOfAncestry.java @@ -25,7 +25,7 @@ public final class SlateOfAncestry extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {tap}, Discard your hand: Draw a card for each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED)), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SlaughterDrone.java b/Mage.Sets/src/mage/cards/s/SlaughterDrone.java index 86c1d8f1cfb..ad8e9a6f49e 100644 --- a/Mage.Sets/src/mage/cards/s/SlaughterDrone.java +++ b/Mage.Sets/src/mage/cards/s/SlaughterDrone.java @@ -31,7 +31,7 @@ public final class SlaughterDrone extends CardImpl { // Devoid this.addAbility(new DevoidAbility(this.color)); // {C}: Slaughter Drone gains deathtouch until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{C}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SlimyKavu.java b/Mage.Sets/src/mage/cards/s/SlimyKavu.java index 9d436ab3c3b..b060720ed2d 100644 --- a/Mage.Sets/src/mage/cards/s/SlimyKavu.java +++ b/Mage.Sets/src/mage/cards/s/SlimyKavu.java @@ -29,7 +29,7 @@ public final class SlimyKavu extends CardImpl { this.toughness = new MageInt(2); // {T}: Target land becomes a Swamp until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.SWAMP), new TapSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java b/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java index 275f9c60bca..16cd0477d76 100644 --- a/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SlingshotGoblin.java @@ -38,7 +38,7 @@ public final class SlingshotGoblin extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Slingshot Goblin deals 2 damage to target blue creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java b/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java index 33b1f7d3d86..021fd1b25a6 100644 --- a/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java +++ b/Mage.Sets/src/mage/cards/s/SlinkingSkirge.java @@ -31,7 +31,7 @@ public final class SlinkingSkirge extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}, Sacrifice Slinking Skirge: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SlithBloodletter.java b/Mage.Sets/src/mage/cards/s/SlithBloodletter.java index c13a7a3c8ee..26170fa730a 100644 --- a/Mage.Sets/src/mage/cards/s/SlithBloodletter.java +++ b/Mage.Sets/src/mage/cards/s/SlithBloodletter.java @@ -28,7 +28,7 @@ public final class SlithBloodletter extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private SlithBloodletter(final SlithBloodletter card) { diff --git a/Mage.Sets/src/mage/cards/s/SlitheringShade.java b/Mage.Sets/src/mage/cards/s/SlitheringShade.java index 5ddb67e0159..28d94f6a667 100644 --- a/Mage.Sets/src/mage/cards/s/SlitheringShade.java +++ b/Mage.Sets/src/mage/cards/s/SlitheringShade.java @@ -36,7 +36,7 @@ public final class SlitheringShade extends CardImpl { this.addAbility(DefenderAbility.getInstance()); //{B}: Slithering 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}"))); // Hellbent — Slithering Shade can attack as though it didn't have defender as long as you have no cards in hand. Effect effect = new ConditionalAsThoughEffect( diff --git a/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java b/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java index eb73d8a4c91..3a05afba653 100644 --- a/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java +++ b/Mage.Sets/src/mage/cards/s/SlivdraziMonstrosity.java @@ -59,7 +59,7 @@ public final class SlivdraziMonstrosity extends CardImpl { this.addAbility(ability); // {3}: Create a 1/1 colorless Eldrazi Sliver creature token. It has “Sacrifice this creature: Add {C}.” - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSliverToken()), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSliverToken()), new ManaCostsImpl<>("{3}"))); } private SlivdraziMonstrosity(final SlivdraziMonstrosity card) { @@ -106,4 +106,4 @@ class SlivdraziMonstrosityEffect extends ContinuousEffectImpl { private SlivdraziMonstrosityEffect(final SlivdraziMonstrosityEffect effect) { super(effect); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SliverOverlord.java b/Mage.Sets/src/mage/cards/s/SliverOverlord.java index a5e5a484ec9..9378ad98deb 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -39,10 +39,10 @@ public final class SliverOverlord extends CardImpl { this.toughness = new MageInt(7); // {3}: Search your library for a Sliver card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ManaCostsImpl<>("{3}"))); // {3}: Gain control of target Sliver. - Ability ability = (new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{3}"))); + Ability ability = (new SimpleActivatedAbility(new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{3}"))); Target target = new TargetPermanent(new FilterCreaturePermanent(SubType.SLIVER,"Sliver")); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SliverQueen.java b/Mage.Sets/src/mage/cards/s/SliverQueen.java index 54a1574f35d..c8a0ab31a50 100644 --- a/Mage.Sets/src/mage/cards/s/SliverQueen.java +++ b/Mage.Sets/src/mage/cards/s/SliverQueen.java @@ -29,7 +29,7 @@ public final class SliverQueen extends CardImpl { this.toughness = new MageInt(7); // {2}: Create a 1/1 colorless Sliver creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SliverToken()), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SliverToken()), new ManaCostsImpl<>("{2}"))); } private SliverQueen(final SliverQueen card) { diff --git a/Mage.Sets/src/mage/cards/s/Sliversmith.java b/Mage.Sets/src/mage/cards/s/Sliversmith.java index 39a8d1f1f3f..bf85f66c4d8 100644 --- a/Mage.Sets/src/mage/cards/s/Sliversmith.java +++ b/Mage.Sets/src/mage/cards/s/Sliversmith.java @@ -28,7 +28,7 @@ public final class Sliversmith extends CardImpl { this.toughness = new MageInt(1); // {1}, {T}, Discard a card: Create a 1/1 colorless Sliver artifact creature token named Metallic Sliver. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new MetallicSliverToken()), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new MetallicSliverToken()), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java index ef1e65895dc..33c5148ce51 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java +++ b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java @@ -34,7 +34,7 @@ public final class SludgeCrawler extends CardImpl { // Ingest this.addAbility(new IngestAbility()); // {2}: Sludge Crawler gets +1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2))); } private SludgeCrawler(final SludgeCrawler card) { diff --git a/Mage.Sets/src/mage/cards/s/SmokeTeller.java b/Mage.Sets/src/mage/cards/s/SmokeTeller.java index 6218bc6d059..77efc054b4e 100644 --- a/Mage.Sets/src/mage/cards/s/SmokeTeller.java +++ b/Mage.Sets/src/mage/cards/s/SmokeTeller.java @@ -43,7 +43,7 @@ public final class SmokeTeller extends CardImpl { this.toughness = new MageInt(2); // 1U: Look at target face-down creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SmokeTellerLookFaceDownEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new SmokeTellerLookFaceDownEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java b/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java index 88b7c3c2467..752ff991fda 100644 --- a/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java +++ b/Mage.Sets/src/mage/cards/s/SmokespewInvoker.java @@ -29,7 +29,7 @@ public final class SmokespewInvoker extends CardImpl { this.toughness = new MageInt(1); // {7}{B}: Target creature gets -3/-3 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl<>("{7}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java b/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java index f7868ec7478..4edc054e0f8 100644 --- a/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java +++ b/Mage.Sets/src/mage/cards/s/SmolderingWerewolf.java @@ -42,7 +42,7 @@ public final class SmolderingWerewolf extends CardImpl { // {4}{R}{R}: Transform Smoldering Werewolf. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(new TransformSourceEffect(), new ManaCostsImpl<>("{4}{R}{R}"))); } private SmolderingWerewolf(final SmolderingWerewolf card) { @@ -53,4 +53,4 @@ public final class SmolderingWerewolf extends CardImpl { public SmolderingWerewolf copy() { return new SmolderingWerewolf(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java index 4d7d511583d..c9e393437e2 100644 --- a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java +++ b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java @@ -36,7 +36,7 @@ public final class SnarlingUndorak extends CardImpl { this.toughness = new MageInt(3); // {2}{G}: Target Beast creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {1}{G}{G} diff --git a/Mage.Sets/src/mage/cards/s/SnowFortress.java b/Mage.Sets/src/mage/cards/s/SnowFortress.java index 910b5830720..1276c396fdf 100644 --- a/Mage.Sets/src/mage/cards/s/SnowFortress.java +++ b/Mage.Sets/src/mage/cards/s/SnowFortress.java @@ -44,13 +44,13 @@ public final class SnowFortress extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}: Snow Fortress gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(1))); // {1}: Snow Fortress gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(1))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(1))); // {3}: Snow Fortress deals 1 damage to target creature without flying that's attacking you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(3)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SnowHound.java b/Mage.Sets/src/mage/cards/s/SnowHound.java index ba72ef47f7d..eafb9f224bb 100644 --- a/Mage.Sets/src/mage/cards/s/SnowHound.java +++ b/Mage.Sets/src/mage/cards/s/SnowHound.java @@ -41,7 +41,7 @@ public final class SnowHound extends CardImpl { // {1}, {tap}: Return Snow Hound and target green or blue creature you control to their owner's hand. Effect effect = new ReturnToHandSourceEffect(true); effect.setText("Return {this}"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); effect = new ReturnToHandTargetEffect(); effect.setText("and target green or blue creature you control to their owner's hand"); diff --git a/Mage.Sets/src/mage/cards/s/SnowMercy.java b/Mage.Sets/src/mage/cards/s/SnowMercy.java index 684b43d4132..3f903c42cce 100644 --- a/Mage.Sets/src/mage/cards/s/SnowMercy.java +++ b/Mage.Sets/src/mage/cards/s/SnowMercy.java @@ -44,7 +44,7 @@ public final class SnowMercy extends CardImpl { this.addAbility(new AddGlobeCountersAbility()); // {t},{q},{t},{q},{t}: Tap all creatures with globe counters on them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapAllEffect(filter), new SnowMercyCost()); + Ability ability = new SimpleActivatedAbility(new TapAllEffect(filter), new SnowMercyCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoaringHope.java b/Mage.Sets/src/mage/cards/s/SoaringHope.java index a243b491527..5e2a7a7cccb 100644 --- a/Mage.Sets/src/mage/cards/s/SoaringHope.java +++ b/Mage.Sets/src/mage/cards/s/SoaringHope.java @@ -47,7 +47,7 @@ public final class SoaringHope extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // {W}: Put Soaring Hope on top of it's owner's library - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{W}"))); } private SoaringHope(final SoaringHope card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviDigger.java b/Mage.Sets/src/mage/cards/s/SoldeviDigger.java index c4184cddfd3..b2b4f206618 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviDigger.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviDigger.java @@ -25,7 +25,7 @@ public final class SoldeviDigger extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {2}: Put the top card of your graveyard on the bottom of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoldeviDiggerEffect(), new ManaCostsImpl<>("{2}"))); + this.addAbility(new SimpleActivatedAbility(new SoldeviDiggerEffect(), new ManaCostsImpl<>("{2}"))); } private SoldeviDigger(final SoldeviDigger card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java index ee00953d068..e4a86a3936b 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java @@ -44,7 +44,7 @@ public final class SoldeviExcavations extends CardImpl { this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(0, 1, 0, 0, 0, 0, 0, 1), new TapSourceCost())); // {1}, {tap}: Scry 1. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java b/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java index fdf987f70ea..dae99be9702 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviHeretic.java @@ -34,7 +34,7 @@ public final class SoldeviHeretic extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Prevent the next 2 damage that would be dealt to target creature this turn. Target opponent may draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn ,2), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn ,2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); Effect effect = new DrawCardTargetEffect(1, true); diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSage.java b/Mage.Sets/src/mage/cards/s/SoldeviSage.java index da91d3f2402..9a4e3332163 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSage.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSage.java @@ -32,7 +32,7 @@ public final class SoldeviSage extends CardImpl { this.toughness = new MageInt(1); // {T}, Sacrifice two lands: Draw three cards, then discard one of them. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardOneOfThemEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DrawDiscardOneOfThemEffect(3), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_LANDS)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java b/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java index 23980f84302..fb87ef9cf46 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSimulacrum.java @@ -30,7 +30,7 @@ public final class SoldeviSimulacrum extends CardImpl { // Cumulative upkeep {1} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // {1}: Soldevi Simulacrum gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); } private SoldeviSimulacrum(final SoldeviSimulacrum card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java b/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java index aaa5bc6a884..0b425e19297 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviSteamBeast.java @@ -33,7 +33,7 @@ public final class SoldeviSteamBeast extends CardImpl { this.addAbility(ability); // {2}: Regenerate Soldevi Steam Beast. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(2))); } private SoldeviSteamBeast(final SoldeviSteamBeast card) { diff --git a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java index 42f8da210a6..4d85e8b8ceb 100644 --- a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java +++ b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java @@ -30,7 +30,7 @@ public final class SoldierOfFortune extends CardImpl { this.toughness = new MageInt(1); // {R}, {T}: Target player shuffles their library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ShuffleLibraryTargetEffect(), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoldierReplica.java b/Mage.Sets/src/mage/cards/s/SoldierReplica.java index fb76a2119b9..302d0c9aa97 100644 --- a/Mage.Sets/src/mage/cards/s/SoldierReplica.java +++ b/Mage.Sets/src/mage/cards/s/SoldierReplica.java @@ -27,7 +27,7 @@ public final class SoldierReplica extends CardImpl { this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3, "it"), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Soliton.java b/Mage.Sets/src/mage/cards/s/Soliton.java index 4ca9d1fc070..cc3ec252179 100644 --- a/Mage.Sets/src/mage/cards/s/Soliton.java +++ b/Mage.Sets/src/mage/cards/s/Soliton.java @@ -24,7 +24,7 @@ public final class Soliton extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{U}"))); } private Soliton(final Soliton card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariCrusader.java b/Mage.Sets/src/mage/cards/s/SoltariCrusader.java index 5860aea0c83..51fac98a127 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariCrusader.java +++ b/Mage.Sets/src/mage/cards/s/SoltariCrusader.java @@ -30,7 +30,7 @@ public final class SoltariCrusader extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {1}{W}: Soltari Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private SoltariCrusader(final SoltariCrusader card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariEmissary.java b/Mage.Sets/src/mage/cards/s/SoltariEmissary.java index 3b811104d9c..6188925a7b2 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariEmissary.java +++ b/Mage.Sets/src/mage/cards/s/SoltariEmissary.java @@ -29,7 +29,7 @@ public final class SoltariEmissary extends CardImpl { this.toughness = new MageInt(1); // {W}: Soltari Emissary gains shadow until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShadowAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private SoltariEmissary(final SoltariEmissary card) { diff --git a/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java b/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java index 98a67dee050..d55c4560628 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java +++ b/Mage.Sets/src/mage/cards/s/SoltariGuerrillas.java @@ -39,7 +39,7 @@ public final class SoltariGuerrillas extends CardImpl { this.addAbility(ShadowAbility.getInstance()); // {0}: The next time Soltari Guerrillas would deal combat damage to an opponent this turn, it deals that damage to target creature instead. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoltariGuerrillasReplacementEffect(), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new SoltariGuerrillasReplacementEffect(), new GenericManaCost(0)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java index 84826cbedfe..8f276651c45 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldAlpha.java @@ -45,7 +45,7 @@ public final class SomberwaldAlpha extends CardImpl { this.addAbility(new BecomesBlockedAllTriggeredAbility(effect, false, filter, true)); // {1}{G}: Target creature you control gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/Soothsaying.java b/Mage.Sets/src/mage/cards/s/Soothsaying.java index 82a7200ccc9..45e9411451e 100644 --- a/Mage.Sets/src/mage/cards/s/Soothsaying.java +++ b/Mage.Sets/src/mage/cards/s/Soothsaying.java @@ -24,12 +24,12 @@ public final class Soothsaying extends CardImpl { // {3}{U}{U}: Shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{3}{U}{U}"))); // {X}: Look at the top X cards of your library, then put them back in any order. Effect effect = new LookLibraryControllerEffect(GetXValue.instance); effect.setText("Look at the top X cards of your library, then put them back in any order"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{X}"))); + this.addAbility(new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{X}"))); } private Soothsaying(final Soothsaying card) { diff --git a/Mage.Sets/src/mage/cards/s/SophicCentaur.java b/Mage.Sets/src/mage/cards/s/SophicCentaur.java index 171504dcd8b..23c59fe3e70 100644 --- a/Mage.Sets/src/mage/cards/s/SophicCentaur.java +++ b/Mage.Sets/src/mage/cards/s/SophicCentaur.java @@ -36,7 +36,7 @@ public final class SophicCentaur extends CardImpl { DynamicValue lifeToGainAmount = new MultipliedValue(CardsInControllerHandCount.instance, 2); Effect effect = new GainLifeEffect(lifeToGainAmount); effect.setText("You gain 2 life for each card in your hand"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{G}{G}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}{G}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java b/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java index 2bab6e90dd7..f9d465f320e 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiCloudChariot.java @@ -28,7 +28,7 @@ public final class SoratamiCloudChariot extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); // {2}: Target creature you control gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); @@ -36,7 +36,7 @@ public final class SoratamiCloudChariot extends CardImpl { Effect effect = new PreventDamageToTargetEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt to"); // and dealt by target creature you control this turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); effect = new PreventDamageByTargetEffect(Duration.EndOfTurn, true); effect.setText("and dealt by target creature you control this turn."); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java b/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java index a7ad947015c..e89aadcbd53 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiCloudskater.java @@ -37,7 +37,7 @@ public final class SoratamiCloudskater extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Draw a card, then discard a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawDiscardControllerEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java b/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java index 37721380861..fad971a7a4b 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMirrorGuard.java @@ -47,7 +47,7 @@ public final class SoratamiMirrorGuard extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}, Return a land you control to its owner's hand: Target creature with power 2 or less can't be blocked this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new CantBeBlockedTargetEffect(), new GenericManaCost(2)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java b/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java index 6e8a6cadacf..fe788c62fd9 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiMirrorMage.java @@ -38,7 +38,7 @@ public final class SoratamiMirrorMage extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return three lands you control to their owner's hand: Return target creature to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect(), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(3, 3, filter, true))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java b/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java index e2bbb9a9276..c3df8c097c3 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiRainshaper.java @@ -41,7 +41,7 @@ public final class SoratamiRainshaper extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Target creature you control gains shroud until end of turn. (It can't be the target of spells or abilities.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiSavant.java b/Mage.Sets/src/mage/cards/s/SoratamiSavant.java index 35d5fc2c9ef..258cba90b21 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiSavant.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiSavant.java @@ -39,7 +39,7 @@ public final class SoratamiSavant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}, Return a land you control to its owner's hand: Counter target spell unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), new GenericManaCost(3)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoratamiSeer.java b/Mage.Sets/src/mage/cards/s/SoratamiSeer.java index e3aae8f5939..0d678be5071 100644 --- a/Mage.Sets/src/mage/cards/s/SoratamiSeer.java +++ b/Mage.Sets/src/mage/cards/s/SoratamiSeer.java @@ -37,7 +37,7 @@ public final class SoratamiSeer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {4}, Return two lands you control to their owner's hand: Discard all the cards in your hand, then draw that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardHandDrawSameNumberSourceEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DiscardHandDrawSameNumberSourceEffect(), new GenericManaCost(4)); ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2, 2, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java index 665923a8f20..7548831e065 100644 --- a/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java +++ b/Mage.Sets/src/mage/cards/s/SorayaTheFalconer.java @@ -38,7 +38,7 @@ public final class SorayaTheFalconer extends CardImpl { new FilterCreaturePermanent(SubType.BIRD, "Bird creatures"), false))); // {1}{W}: Target Bird creature gains banding until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent(SubType.BIRD, "Bird creature"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java b/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java index 81ad49b9dee..a5f1b8be4f0 100644 --- a/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java +++ b/Mage.Sets/src/mage/cards/s/SorcerersStrongbox.java @@ -29,7 +29,7 @@ public final class SorcerersStrongbox extends CardImpl { Effect effect = new DrawCardSourceControllerEffect(3); effect.setText("and draw three cards"); flipCoinEffect.addEffectWon(effect); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, flipCoinEffect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(flipCoinEffect, new TapSourceCost()); ability.addCost(new GenericManaCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SorceressQueen.java b/Mage.Sets/src/mage/cards/s/SorceressQueen.java index 7a03b9669cd..1c7f147aefe 100644 --- a/Mage.Sets/src/mage/cards/s/SorceressQueen.java +++ b/Mage.Sets/src/mage/cards/s/SorceressQueen.java @@ -37,7 +37,7 @@ public final class SorceressQueen extends CardImpl { this.toughness = new MageInt(1); // {tap}: Target creature other than Sorceress Queen becomes 0/2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SetBasePowerToughnessTargetEffect(0, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulChanneling.java b/Mage.Sets/src/mage/cards/s/SoulChanneling.java index 5cd357e0563..87fe3d3fc2c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulChanneling.java +++ b/Mage.Sets/src/mage/cards/s/SoulChanneling.java @@ -32,7 +32,7 @@ public final class SoulChanneling extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Pay 2 life: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new PayLifeCost(2))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new PayLifeCost(2))); } private SoulChanneling(final SoulChanneling card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java b/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java index 0d2ea57b980..4cf29bc3c24 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfInnistrad.java @@ -32,7 +32,7 @@ public final class SoulOfInnistrad extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // {3}{B}{B}: 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}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{3}{B}{B}")); ability.addTarget(new TargetCardInYourGraveyard(0, 3, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java b/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java index cc289bfa397..d6a0310f35a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfNewPhyrexia.java @@ -34,7 +34,7 @@ public final class SoulOfNewPhyrexia extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // {5}: Permanents you control gain indestructible until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5))); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5))); // {5}, Exile Soul of New Phyrexia from your graveyard: Permanents you control gain indestructible until end of turn. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(5)); ability.addCost(new ExileSourceFromGraveCost()); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java b/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java index 4b0e86e84f5..dad384c2e10 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfRavnica.java @@ -33,7 +33,7 @@ public final class SoulOfRavnica extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {5}{U}{U}: Draw a card for each color among permanents you control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}"))); // {5}{U}{U}, Exile Soul of Ravnica from your graveyard: Draw a card for each color among permanents you control. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new DrawCardForEachColorAmongControlledPermanentsEffect(), new ManaCostsImpl<>("{5}{U}{U}")); @@ -50,4 +50,3 @@ public final class SoulOfRavnica extends CardImpl { return new SoulOfRavnica(this); } } - diff --git a/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java b/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java index b703a6b901a..c26c14ca77b 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfShandalar.java @@ -42,7 +42,7 @@ public final class SoulOfShandalar extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {3}{R}{R}: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulOfShandalarEffect(), new ManaCostsImpl<>("{3}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new SoulOfShandalarEffect(), new ManaCostsImpl<>("{3}{R}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); ability.addTarget(new SoulOfShandalarTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfTheros.java b/Mage.Sets/src/mage/cards/s/SoulOfTheros.java index 333e70bb19e..7021dd5f75d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfTheros.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfTheros.java @@ -40,7 +40,7 @@ public final class SoulOfTheros extends CardImpl { // {4}{W}{W}: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn. Effect effect1 = new BoostControlledEffect(2, 2, Duration.EndOfTurn); effect1.setText("Creatures you control get +2/+2"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{4}{W}{W}")); + Ability ability = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{4}{W}{W}")); Effect effect2 = new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES); effect2.setText("and gain first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java index fb093224fd7..b2719b8149c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java +++ b/Mage.Sets/src/mage/cards/s/SoulOfZendikar.java @@ -32,7 +32,7 @@ public final class SoulOfZendikar extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {3}{G}{G}: Create a 3/3 green Beast creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}"))); // {3}{G}{G}, Exile Soul of Zendikar from your graveyard: Create a 3/3 green Beast creature token. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new CreateTokenEffect(new BeastToken()), new ManaCostsImpl<>("{3}{G}{G}")); ability.addCost(new ExileSourceFromGraveCost()); diff --git a/Mage.Sets/src/mage/cards/s/SoulSeparator.java b/Mage.Sets/src/mage/cards/s/SoulSeparator.java index a9d940acf1c..c883e419e91 100644 --- a/Mage.Sets/src/mage/cards/s/SoulSeparator.java +++ b/Mage.Sets/src/mage/cards/s/SoulSeparator.java @@ -43,7 +43,7 @@ public final class SoulSeparator extends CardImpl { CreateTokenCopyTargetEffect copyEffect = new CreateTokenCopyTargetEffect(null, null, false, 1, false, false, null, 1, 1, true); copyEffect.withAdditionalSubType(SubType.SPIRIT); copyEffect.setText("Exile target creature card from your graveyard. Create a token that's a copy of that card, except it's 1/1, it's a Spirit in addition to its other types, and it has flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, copyEffect, new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(copyEffect, new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/s/SoulShepherd.java b/Mage.Sets/src/mage/cards/s/SoulShepherd.java index 65b4288bf3b..79c99ab0450 100644 --- a/Mage.Sets/src/mage/cards/s/SoulShepherd.java +++ b/Mage.Sets/src/mage/cards/s/SoulShepherd.java @@ -30,7 +30,7 @@ public final class SoulShepherd extends CardImpl { this.toughness = new MageInt(1); // {W}, Exile a creature card from your graveyard: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard")))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Souldrinker.java b/Mage.Sets/src/mage/cards/s/Souldrinker.java index 186982cfd89..85f9b49bef3 100644 --- a/Mage.Sets/src/mage/cards/s/Souldrinker.java +++ b/Mage.Sets/src/mage/cards/s/Souldrinker.java @@ -25,7 +25,7 @@ public final class Souldrinker extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new PayLifeCost(3))); } private Souldrinker(final Souldrinker card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java index fba280ab757..b6e6f71b085 100644 --- a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java +++ b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java @@ -52,7 +52,7 @@ public final class SoulfireGrandMaster extends CardImpl { this.addAbility(new SimpleStaticAbility(effect)); // {2}{U/R}{U/R}: The next time you cast an instant or sorcery spell from your hand this turn, put that card into your hand instead of your graveyard as it resolves. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl<>("{2}{U/R}{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new SoulfireGrandMasterCastFromHandReplacementEffect(), new ManaCostsImpl<>("{2}{U/R}{U/R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/Soulmender.java b/Mage.Sets/src/mage/cards/s/Soulmender.java index dfc5445b725..bee0b8a23f7 100644 --- a/Mage.Sets/src/mage/cards/s/Soulmender.java +++ b/Mage.Sets/src/mage/cards/s/Soulmender.java @@ -27,7 +27,7 @@ public final class Soulmender extends CardImpl { this.toughness = new MageInt(1); // {T}: You gain 1 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(1), new TapSourceCost())); } diff --git a/Mage.Sets/src/mage/cards/s/SoulswornJury.java b/Mage.Sets/src/mage/cards/s/SoulswornJury.java index 6e0dd31d0d5..513ee008522 100644 --- a/Mage.Sets/src/mage/cards/s/SoulswornJury.java +++ b/Mage.Sets/src/mage/cards/s/SoulswornJury.java @@ -33,7 +33,7 @@ public final class SoulswornJury extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{U}, Sacrifice Soulsworn Jury: Counter target creature spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_CREATURE)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SouthernPaladin.java b/Mage.Sets/src/mage/cards/s/SouthernPaladin.java index 89ee478a054..e4eb0984aa1 100644 --- a/Mage.Sets/src/mage/cards/s/SouthernPaladin.java +++ b/Mage.Sets/src/mage/cards/s/SouthernPaladin.java @@ -39,7 +39,7 @@ public final class SouthernPaladin extends CardImpl { this.toughness = new MageInt(3); // {W}{W}, {tap}: Destroy target red permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sparksmith.java b/Mage.Sets/src/mage/cards/s/Sparksmith.java index 2213e8335bf..40fd6b3e42f 100644 --- a/Mage.Sets/src/mage/cards/s/Sparksmith.java +++ b/Mage.Sets/src/mage/cards/s/Sparksmith.java @@ -36,7 +36,7 @@ public final class Sparksmith extends CardImpl { this.toughness = new MageInt(1); // {tap}: Sparksmith deals X damage to target creature and X damage to you, where X is the number of Goblins on the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.addEffect(new DamageControllerEffect(new PermanentsOnBattlefieldCount(filter))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Sparkspitter.java b/Mage.Sets/src/mage/cards/s/Sparkspitter.java index d76ed213efb..35f995cea76 100644 --- a/Mage.Sets/src/mage/cards/s/Sparkspitter.java +++ b/Mage.Sets/src/mage/cards/s/Sparkspitter.java @@ -30,7 +30,7 @@ public final class Sparkspitter extends CardImpl { this.toughness = new MageInt(3); // {R}, {tap}, Discard a card: Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SparkElementalToken()), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SparkElementalToken()), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SparringCollar.java b/Mage.Sets/src/mage/cards/s/SparringCollar.java index 78326ab733b..421b9430645 100644 --- a/Mage.Sets/src/mage/cards/s/SparringCollar.java +++ b/Mage.Sets/src/mage/cards/s/SparringCollar.java @@ -33,7 +33,7 @@ public final class SparringCollar extends CardImpl { // Equipped creature has first strike. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // {R}{R}: Attach Sparring Collar to target creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{R}{R}")); + Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature you control"), new ManaCostsImpl<>("{R}{R}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); // Equip {1} diff --git a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java index 9b2c6557ef3..1d8e956bd62 100644 --- a/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SpatulaOfTheAges.java @@ -38,7 +38,7 @@ public final class SpatulaOfTheAges extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {4}, {T}, Sacrifice Spatula of the Ages: You may put a silver-bordered permanent card from your hand onto the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpawningBed.java b/Mage.Sets/src/mage/cards/s/SpawningBed.java index cae999fecbd..bbd1177f37c 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningBed.java +++ b/Mage.Sets/src/mage/cards/s/SpawningBed.java @@ -27,7 +27,7 @@ public final class SpawningBed extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {6}, {T}, Sacrifice Spawning Bed: Create three 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: Add {C}." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziScionToken(), 3).withTextOptions(true), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new EldraziScionToken(), 3).withTextOptions(true), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java index dce5724f80f..8cb81dce4b2 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java +++ b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java @@ -40,7 +40,7 @@ public final class SpawningGrounds extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample." - Ability abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); + Ability abilityToGain = new SimpleActivatedAbility(new CreateTokenEffect(new SpawningGroundsBeastToken(), 1), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(abilityToGain, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 5/5 green Beast creature token with trample.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SpawningPit.java b/Mage.Sets/src/mage/cards/s/SpawningPit.java index bfdf83c41b3..965d4904db6 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningPit.java +++ b/Mage.Sets/src/mage/cards/s/SpawningPit.java @@ -26,9 +26,9 @@ public final class SpawningPit extends CardImpl { public SpawningPit(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SpawningPitToken()), new GenericManaCost(1)); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(2))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpawningPool.java b/Mage.Sets/src/mage/cards/s/SpawningPool.java index f0f6f2cedeb..f7e1da8e06c 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningPool.java +++ b/Mage.Sets/src/mage/cards/s/SpawningPool.java @@ -22,7 +22,7 @@ public final class SpawningPool extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new BlackManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SkeletonRegenerateToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SkeletonRegenerateToken(), CardType.LAND, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } private SpawningPool(final SpawningPool card) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index 416b861d79d..469f7a4b5fb 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -41,7 +41,7 @@ public final class SpawnsireOfUlamog extends CardImpl { this.addAbility(new AnnihilatorAbility(1)); // {4}: Create two 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}." - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new EldraziSpawnToken(), 2).withTextOptions(true), new GenericManaCost(4))); // {20}: Cast any number of Eldrazi cards you own from outside the game without paying their mana costs. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/SpectralLynx.java b/Mage.Sets/src/mage/cards/s/SpectralLynx.java index 7c980c52792..e9aafd039a7 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralLynx.java +++ b/Mage.Sets/src/mage/cards/s/SpectralLynx.java @@ -31,7 +31,7 @@ public final class SpectralLynx extends CardImpl { // Protection from green this.addAbility(ProtectionAbility.from(ObjectColor.GREEN)); // {B}: Regenerate Spectral Lynx. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private SpectralLynx(final SpectralLynx card) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralSliver.java b/Mage.Sets/src/mage/cards/s/SpectralSliver.java index 2f15918713c..6f6bbac6d9f 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSliver.java @@ -32,7 +32,7 @@ public final class SpectralSliver extends CardImpl { this.toughness = new MageInt(2); // All Sliver creatures have "{2}: This creature gets +1/+1 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("this creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn).setText("this creature gets +1/+1 until end of turn"), new ManaCostsImpl<>("{2}")); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_SLIVERS))); } diff --git a/Mage.Sets/src/mage/cards/s/Spellskite.java b/Mage.Sets/src/mage/cards/s/Spellskite.java index 4fe7615e3ca..8b10e2afdc7 100644 --- a/Mage.Sets/src/mage/cards/s/Spellskite.java +++ b/Mage.Sets/src/mage/cards/s/Spellskite.java @@ -38,7 +38,7 @@ public final class Spellskite extends CardImpl { this.toughness = new MageInt(4); // {U/P}: Change a target of target spell or ability to Spellskite. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpellskiteEffect(), new ManaCostsImpl<>("{U/P}")); + Ability ability = new SimpleActivatedAbility(new SpellskiteEffect(), new ManaCostsImpl<>("{U/P}")); ability.addTarget(new TargetStackObject()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java b/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java index e5f1b209957..1ffdc37bd98 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfMagosi.java @@ -30,7 +30,7 @@ public final class SphinxOfMagosi extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{U}")); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()).concatBy(", then")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java b/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java index b8fc0a5eb21..7d5070a531b 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java +++ b/Mage.Sets/src/mage/cards/s/SphinxOfTheChimes.java @@ -39,7 +39,7 @@ public final class SphinxOfTheChimes extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Discard two nonland cards with the same name: Draw four cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(4), new DiscardTwoNonlandCardsWithTheSameNameCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java index d15bf69e264..c3d35e6d9ae 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java +++ b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java @@ -36,7 +36,7 @@ public final class SphinxsTutelage extends CardImpl { this.addAbility(ability); // {5}{U}: Draw a card, then discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{5}{U}"))); + this.addAbility(new SimpleActivatedAbility(new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{5}{U}"))); } private SphinxsTutelage(final SphinxsTutelage card) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java index e50ba85ac60..2954e19dae4 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeBreeder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeBreeder.java @@ -36,13 +36,13 @@ public final class SpikeBreeder extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Breeder: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Spike Breeder: Create a 1/1 green Spike creature token. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SpikeToken()), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new CreateTokenEffect(new SpikeToken()), new GenericManaCost(2)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpikeColony.java b/Mage.Sets/src/mage/cards/s/SpikeColony.java index 994843b6987..01f89881bb2 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeColony.java +++ b/Mage.Sets/src/mage/cards/s/SpikeColony.java @@ -34,7 +34,7 @@ public final class SpikeColony extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(4)), "with four +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Colony: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeDrone.java b/Mage.Sets/src/mage/cards/s/SpikeDrone.java index 6d32b17ef8a..619fe1ce9fc 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeDrone.java +++ b/Mage.Sets/src/mage/cards/s/SpikeDrone.java @@ -34,7 +34,7 @@ public final class SpikeDrone extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), "with a +1/+1 counter on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeFeeder.java b/Mage.Sets/src/mage/cards/s/SpikeFeeder.java index 68730943b67..3be08fa3891 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeFeeder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeFeeder.java @@ -35,12 +35,12 @@ public final class SpikeFeeder extends CardImpl { // Spike Feeder enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Feeder: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Feeder: You gain 2 life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(2), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); } private SpikeFeeder(final SpikeFeeder card) { diff --git a/Mage.Sets/src/mage/cards/s/SpikeHatcher.java b/Mage.Sets/src/mage/cards/s/SpikeHatcher.java index 572380b3fcd..56c0085137c 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeHatcher.java +++ b/Mage.Sets/src/mage/cards/s/SpikeHatcher.java @@ -35,13 +35,13 @@ public final class SpikeHatcher extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6)), "with six +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Hatcher: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Hatcher: Regenerate Spike Hatcher. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new RegenerateSourceEffect(), new GenericManaCost(1)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SpikeRogue.java b/Mage.Sets/src/mage/cards/s/SpikeRogue.java index 741e66d9c8b..60054497861 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeRogue.java +++ b/Mage.Sets/src/mage/cards/s/SpikeRogue.java @@ -36,13 +36,13 @@ public final class SpikeRogue extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Rogue: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from a creature you control: Put a +1/+1 counter on Spike Rogue. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new GenericManaCost(2)); ability2.addCost(new RemoveCounterCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_CREATURE, true), CounterType.P1P1)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeSoldier.java b/Mage.Sets/src/mage/cards/s/SpikeSoldier.java index b1c05e27949..3784ea6d470 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeSoldier.java +++ b/Mage.Sets/src/mage/cards/s/SpikeSoldier.java @@ -36,12 +36,12 @@ public final class SpikeSoldier extends CardImpl { // Spike Soldier enters the battlefield with three +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Soldier: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // Remove a +1/+1 counter from Spike Soldier: Spike Soldier gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new RemoveCountersSourceCost(CounterType.P1P1.createInstance()))); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeTiller.java b/Mage.Sets/src/mage/cards/s/SpikeTiller.java index 489dc318354..2a88bc0ffcc 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeTiller.java +++ b/Mage.Sets/src/mage/cards/s/SpikeTiller.java @@ -39,13 +39,13 @@ public final class SpikeTiller extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Tiller: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Spike Tiller: Target land becomes a 2/2 creature that's still a land. Put a +1/+1 counter on it. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfGame).setText("Target land becomes a 2/2 creature that's still a land"), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new BecomesCreatureTargetEffect(new CreatureToken(2, 2), false, true, Duration.EndOfGame).setText("Target land becomes a 2/2 creature that's still a land"), new GenericManaCost(2)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability2.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance()).setText("Put a +1/+1 counter on it.")); ability2.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java index fab4e60b170..7c69fcf748d 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SpikeWeaver.java @@ -37,13 +37,13 @@ public final class SpikeWeaver extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(3)), "with three +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Weaver: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {1}, Remove a +1/+1 counter from Spike Weaver: Prevent all combat damage that would be dealt this turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new GenericManaCost(1)); + Ability ability2 = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new GenericManaCost(1)); ability2.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/SpikeWorker.java b/Mage.Sets/src/mage/cards/s/SpikeWorker.java index 18352b9eaaa..58be2311098 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeWorker.java +++ b/Mage.Sets/src/mage/cards/s/SpikeWorker.java @@ -33,7 +33,7 @@ public final class SpikeWorker extends CardImpl { // Spike Worker enters the battlefield with two +1/+1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it")); // {2}, Remove a +1/+1 counter from Spike Worker: Put a +1/+1 counter on target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java index 9e5dc870403..3777045c44f 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotElder.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotElder.java @@ -30,7 +30,7 @@ public final class SpikeshotElder extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotElderEffect(), new ManaCostsImpl<>("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(new SpikeshotElderEffect(), new ManaCostsImpl<>("{1}{R}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } @@ -85,4 +85,4 @@ class SpikeshotElderEffect extends OneShotEffect { return new SpikeshotElderEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java index 214bc43e0d2..d4ab1d5f00c 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SpikeshotGoblin.java @@ -30,7 +30,7 @@ public final class SpikeshotGoblin extends CardImpl { this.toughness = new MageInt(2); // {R}, {tap}: Spikeshot Goblin deals damage equal to its power to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); + Ability ability = new SimpleActivatedAbility(new SpikeshotGoblinEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpiketailDrake.java b/Mage.Sets/src/mage/cards/s/SpiketailDrake.java index 1bf115a8d75..361edc7ab5f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailDrake.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailDrake.java @@ -31,7 +31,7 @@ public final class SpiketailDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice Spiketail Drake: Counter target spell unless its controller pays {3}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{3}")), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{3}")), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } private SpiketailDrake(final SpiketailDrake card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java b/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java index a01e3b7d8b3..929da893e86 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailDrakeling.java @@ -32,7 +32,7 @@ public final class SpiketailDrakeling extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Sacrifice Spiketail Drakeling: Counter target spell unless its controller pays {2}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(2)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java b/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java index b1dc5d4aa05..0491be2bbff 100644 --- a/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java +++ b/Mage.Sets/src/mage/cards/s/SpiketailHatchling.java @@ -29,7 +29,7 @@ public final class SpiketailHatchling extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new GenericManaCost(1)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpinalParasite.java b/Mage.Sets/src/mage/cards/s/SpinalParasite.java index bfef870cc92..653693bc81d 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalParasite.java +++ b/Mage.Sets/src/mage/cards/s/SpinalParasite.java @@ -31,7 +31,7 @@ public final class SpinalParasite extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // Remove two +1/+1 counters from Spinal Parasite: Remove a counter from target permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(), + Ability ability = new SimpleActivatedAbility(new RemoveCounterTargetEffect(), new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2))); ability.addTarget(new TargetPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpinalVillain.java b/Mage.Sets/src/mage/cards/s/SpinalVillain.java index 7ade6b7d5e8..024d66d413c 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalVillain.java +++ b/Mage.Sets/src/mage/cards/s/SpinalVillain.java @@ -36,7 +36,7 @@ public final class SpinalVillain extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target blue creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpinedFluke.java b/Mage.Sets/src/mage/cards/s/SpinedFluke.java index e4b46bf04c3..12bd7d751f7 100644 --- a/Mage.Sets/src/mage/cards/s/SpinedFluke.java +++ b/Mage.Sets/src/mage/cards/s/SpinedFluke.java @@ -34,7 +34,7 @@ public final class SpinedFluke extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, ""))); // {B}: Regenerate Spined Fluke. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); } private SpinedFluke(final SpinedFluke card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java index b0bab22a115..a4b9a5b1f5e 100644 --- a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java +++ b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java @@ -35,7 +35,7 @@ public final class SpinyStarfish extends CardImpl { this.toughness = new MageInt(1); // {U}: Regenerate Spiny Starfish. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{U}"))); // At the beginning of each end step, if Spiny Starfish regenerated this turn, create a 0/1 blue Starfish creature token for each time it regenerated this turn. this.addAbility( diff --git a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java index 54f34b45176..09c1026c17e 100644 --- a/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java +++ b/Mage.Sets/src/mage/cards/s/SpiresOfOrazca.java @@ -41,7 +41,7 @@ public final class SpiresOfOrazca extends CardImpl { // {T}: Untap target attacking creature an opponent controls and remove it from combat. Effect effect = new UntapTargetEffect(); effect.setText("Untap target attacking creature an opponent controls and remove it from combat."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); effect = new RemoveFromCombatTargetEffect(); effect.setText(" "); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SpiritMirror.java b/Mage.Sets/src/mage/cards/s/SpiritMirror.java index 1208df0f810..27046c43c6f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMirror.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMirror.java @@ -42,7 +42,7 @@ public final class SpiritMirror extends CardImpl { "At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.")); // {0}: Destroy target Reflection. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(0)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(0)); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpiritShield.java b/Mage.Sets/src/mage/cards/s/SpiritShield.java index 0938284f06b..294a41b8393 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritShield.java +++ b/Mage.Sets/src/mage/cards/s/SpiritShield.java @@ -29,7 +29,7 @@ public final class SpiritShield extends CardImpl { // You may choose not to untap Spirit Shield during your untap step. this.addAbility(new SkipUntapOptionalAbility()); // {2}, {tap}: Target creature gets +0/+2 for as long as Spirit Shield remains tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleActivatedAbility(new ConditionalContinuousEffect( new BoostTargetEffect(0, 2, Duration.Custom), SourceTappedCondition.TAPPED, "target creature gets +0/+2 for as long as {this} remains tapped"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SpiritWeaver.java b/Mage.Sets/src/mage/cards/s/SpiritWeaver.java index a761b6479e4..15767aca4b7 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritWeaver.java +++ b/Mage.Sets/src/mage/cards/s/SpiritWeaver.java @@ -40,7 +40,7 @@ public final class SpiritWeaver extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2)); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Spiritmonger.java b/Mage.Sets/src/mage/cards/s/Spiritmonger.java index afcbc5ba343..1858684cbc1 100644 --- a/Mage.Sets/src/mage/cards/s/Spiritmonger.java +++ b/Mage.Sets/src/mage/cards/s/Spiritmonger.java @@ -33,9 +33,9 @@ public final class Spiritmonger extends CardImpl { // Whenever Spiritmonger deals damage to a creature, put a +1/+1 counter on Spiritmonger. this.addAbility(new DealsDamageToACreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), true), false, false, false)); // {B}: Regenerate Spiritmonger. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // {G}: Spiritmonger becomes the color of your choice until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private Spiritmonger(final Spiritmonger card) { diff --git a/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java b/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java index 3ff1fc06d6d..fbbfda61e20 100644 --- a/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java +++ b/Mage.Sets/src/mage/cards/s/SpiteflameWitch.java @@ -26,7 +26,7 @@ public final class SpiteflameWitch extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{B}{R}"))); } private SpiteflameWitch(final SpiteflameWitch card) { diff --git a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java index 7b721906358..89482efbd3e 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireBastion.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireBastion.java @@ -31,7 +31,7 @@ public final class SpitfireBastion extends CardImpl { this.addAbility(new RedManaAbility()); // {2}{R}, {T}: Spitfire Bastion deals 3 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(3), new TapSourceCost()); ability.addCost(new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java index 1b3c11cfcdf..b4760b23651 100644 --- a/Mage.Sets/src/mage/cards/s/SpitfireHandler.java +++ b/Mage.Sets/src/mage/cards/s/SpitfireHandler.java @@ -31,7 +31,7 @@ public final class SpitfireHandler extends CardImpl { this.addAbility(new SimpleStaticAbility(new SpitfireHandlerCantBlockEffect())); // {R}: Spitfire Handler gets +1/+0 until end of turn. - 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 SpitfireHandler(final SpitfireHandler card) { diff --git a/Mage.Sets/src/mage/cards/s/SpittingHydra.java b/Mage.Sets/src/mage/cards/s/SpittingHydra.java index 7967b111746..88794506863 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingHydra.java +++ b/Mage.Sets/src/mage/cards/s/SpittingHydra.java @@ -37,7 +37,7 @@ public final class SpittingHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(effect)); // {1}{R}, Remove a +1/+1 counter from Spitting Hydra: Spitting Hydra deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1, "it"), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpittingSpider.java b/Mage.Sets/src/mage/cards/s/SpittingSpider.java index 982db42fd36..cf98843aa42 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingSpider.java +++ b/Mage.Sets/src/mage/cards/s/SpittingSpider.java @@ -38,7 +38,7 @@ public final class SpittingSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Sacrifice a land: Spitting Spider deals 1 damage to each creature with flying. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); + this.addAbility(new SimpleActivatedAbility(new DamageAllEffect(1, filter), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } private SpittingSpider(final SpittingSpider card) { diff --git a/Mage.Sets/src/mage/cards/s/SplinterTwin.java b/Mage.Sets/src/mage/cards/s/SplinterTwin.java index af0df452683..87719f9040e 100644 --- a/Mage.Sets/src/mage/cards/s/SplinterTwin.java +++ b/Mage.Sets/src/mage/cards/s/SplinterTwin.java @@ -44,7 +44,7 @@ public final class SplinterTwin extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Create a token that's a copy of this creature, except it has haste. Exile it at the beginning of the next end step." - SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SplinterTwinEffect(), new TapSourceCost()); + SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(new SplinterTwinEffect(), new TapSourceCost()); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/s/SplinteringWind.java b/Mage.Sets/src/mage/cards/s/SplinteringWind.java index e9bc5fccd87..902abe374b4 100644 --- a/Mage.Sets/src/mage/cards/s/SplinteringWind.java +++ b/Mage.Sets/src/mage/cards/s/SplinteringWind.java @@ -35,7 +35,7 @@ public final class SplinteringWind extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); // {2}{G}: Splintering Wind deals 1 damage to target creature. Create a 1/1 green Splinter creature token. It has flying and “Cumulative upkeep {G}.” When it leaves the battlefield, it deals 1 damage to you and each creature you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{G}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{G}")); ability.addEffect(new SplinteringWindCreateTokenEffect()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java index 220acb9182f..111649e28f7 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTailMiko.java +++ b/Mage.Sets/src/mage/cards/s/SplitTailMiko.java @@ -27,7 +27,7 @@ public final class SplitTailMiko extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // {W}, {tap}: Prevent the next 2 damage that would be dealt to any target this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); + Ability ability = new SimpleActivatedAbility(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SporeFrog.java b/Mage.Sets/src/mage/cards/s/SporeFrog.java index e5bd9a1c5e4..507fc99bd2a 100644 --- a/Mage.Sets/src/mage/cards/s/SporeFrog.java +++ b/Mage.Sets/src/mage/cards/s/SporeFrog.java @@ -28,7 +28,7 @@ public final class SporeFrog extends CardImpl { this.toughness = new MageInt(1); // Sacrifice Spore Frog: Prevent all combat damage that would be dealt this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SporebackTroll.java b/Mage.Sets/src/mage/cards/s/SporebackTroll.java index 42ffe51f147..d5ef05423f6 100644 --- a/Mage.Sets/src/mage/cards/s/SporebackTroll.java +++ b/Mage.Sets/src/mage/cards/s/SporebackTroll.java @@ -33,7 +33,7 @@ public final class SporebackTroll extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {1}{G}: Regenerate target creature with a +1/+1 counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}{G}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java index ac5f37c4bce..e68eefa60a0 100644 --- a/Mage.Sets/src/mage/cards/s/SporesowerThallid.java +++ b/Mage.Sets/src/mage/cards/s/SporesowerThallid.java @@ -40,7 +40,7 @@ public final class SporesowerThallid extends CardImpl { // At the beginning of your upkeep, put a spore counter on each Fungus you control. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersAllEffect(CounterType.SPORE.createInstance(), filter))); // Remove three spore counters from Sporesower Thallid: Create a 1/1 green Saproling creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(3)))); } private SporesowerThallid(final SporesowerThallid card) { diff --git a/Mage.Sets/src/mage/cards/s/SporolothAncient.java b/Mage.Sets/src/mage/cards/s/SporolothAncient.java index 9c833fd1166..1a53aaee39b 100644 --- a/Mage.Sets/src/mage/cards/s/SporolothAncient.java +++ b/Mage.Sets/src/mage/cards/s/SporolothAncient.java @@ -38,7 +38,7 @@ public final class SporolothAncient extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.SPORE.createInstance()))); // Creatures you control have "Remove two spore counters from this creature: Create a 1/1 green Saproling creature token." Effect effect = new GainAbilityControlledEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), + new SimpleActivatedAbility(new CreateTokenEffect(new SaprolingToken()), new RemoveCountersSourceCost(CounterType.SPORE.createInstance(2))), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures you control") ); diff --git a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java index 27f896bb520..9b310b6a022 100644 --- a/Mage.Sets/src/mage/cards/s/SpringjackPasture.java +++ b/Mage.Sets/src/mage/cards/s/SpringjackPasture.java @@ -35,7 +35,7 @@ public final class SpringjackPasture extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}, {tap}: Create a 0/1 white Goat creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoatToken()), new ManaCostsImpl<>("{4}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new GoatToken()), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java index 112d15558aa..a1db48400fd 100644 --- a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java +++ b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java @@ -40,7 +40,7 @@ public final class SpurnmageAdvocate extends CardImpl { this.toughness = new MageInt(1); // {T}: Return two target cards from an opponent's graveyard to their hand. Destroy target attacking creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect() + Ability ability = new SimpleActivatedAbility(new ReturnToHandTargetEffect() .setText("return two target cards from an opponent's graveyard to their hand"), new TapSourceCost()); ability.addTarget(new TargetCardInASingleGraveyard(2, 2, filter)); Effect effect = new DestroyTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java index baecbfdb590..f16c245f6cf 100644 --- a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java +++ b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java @@ -40,7 +40,7 @@ public final class SpurredWolverine extends CardImpl { this.toughness = new MageInt(2); // Tap two untapped Beasts you control: Target creature gains first strike until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect( + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect( FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(2, 2, filter, false))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SquallDrifter.java b/Mage.Sets/src/mage/cards/s/SquallDrifter.java index 3840ecd38d0..cd1ca5dd579 100644 --- a/Mage.Sets/src/mage/cards/s/SquallDrifter.java +++ b/Mage.Sets/src/mage/cards/s/SquallDrifter.java @@ -34,7 +34,7 @@ public final class SquallDrifter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Squallmonger.java b/Mage.Sets/src/mage/cards/s/Squallmonger.java index 6d58257913d..e23adb6b275 100644 --- a/Mage.Sets/src/mage/cards/s/Squallmonger.java +++ b/Mage.Sets/src/mage/cards/s/Squallmonger.java @@ -38,7 +38,7 @@ public final class Squallmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Squallmonger deals 1 damage to each creature with flying and each player. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new ManaCostsImpl<>("{2}")); Effect effect = new DamagePlayersEffect(1); effect.setText("and each player"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SqueesToy.java b/Mage.Sets/src/mage/cards/s/SqueesToy.java index 27bc38c294f..e36121d70a8 100644 --- a/Mage.Sets/src/mage/cards/s/SqueesToy.java +++ b/Mage.Sets/src/mage/cards/s/SqueesToy.java @@ -21,7 +21,7 @@ public final class SqueesToy extends CardImpl { public SqueesToy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - 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 TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelNest.java b/Mage.Sets/src/mage/cards/s/SquirrelNest.java index 905425f11cf..c4666702641 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelNest.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelNest.java @@ -41,7 +41,7 @@ public final class SquirrelNest extends CardImpl { this.addAbility(ability); // Enchanted land has "{tap}: Create a 1/1 green Squirrel creature token." - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); + Ability gainedAbility = new SimpleActivatedAbility(new CreateTokenEffect(new SquirrelToken()), new TapSourceCost()); this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Create a 1/1 green Squirrel creature token.\""))); } diff --git a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java index 552ff358e78..f2c0bd6471f 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelWrangler.java @@ -37,12 +37,12 @@ public final class SquirrelWrangler extends CardImpl { this.toughness = new MageInt(2); // {1}{G}, Sacrifice a land: Create two 1/1 green Squirrel creature tokens. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SquirrelToken(), 2), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new SquirrelToken(), 2), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); // {1}{G}, Sacrifice a land: Squirrel creatures get +1/+1 until end of turn. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{1}{G}")); + ability = new SimpleActivatedAbility(new BoostAllEffect(1, 1, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StaffOfDomination.java b/Mage.Sets/src/mage/cards/s/StaffOfDomination.java index 8816dbd9c23..37bdb860596 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfDomination.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfDomination.java @@ -27,23 +27,23 @@ public final class StaffOfDomination extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {1}: Untap Staff of Domination. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}"))); + this.addAbility(new SimpleActivatedAbility(new UntapSourceEffect(), new ManaCostsImpl<>("{1}"))); // {2}, {tap}: You gain 1 life. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); + Ability ability2 = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{2}")); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); // {3}, {tap}: Untap target creature. - Ability ability3 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{3}")); + Ability ability3 = new SimpleActivatedAbility(new UntapTargetEffect(), new ManaCostsImpl<>("{3}")); ability3.addCost(new TapSourceCost()); ability3.addTarget(new TargetCreaturePermanent()); this.addAbility(ability3); // {4}, {tap}: Tap target creature. - Ability ability4 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{4}")); + Ability ability4 = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{4}")); ability4.addCost(new TapSourceCost()); ability4.addTarget(new TargetCreaturePermanent()); this.addAbility(ability4); // {5}, {tap}: Draw a card. - Ability ability5 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{5}")); + Ability ability5 = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{5}")); ability5.addCost(new TapSourceCost()); this.addAbility(ability5); } diff --git a/Mage.Sets/src/mage/cards/s/StaffOfNin.java b/Mage.Sets/src/mage/cards/s/StaffOfNin.java index e279e4c48a2..ba4d0afb2aa 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfNin.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfNin.java @@ -26,7 +26,7 @@ public final class StaffOfNin extends CardImpl { // At the beginning of your upkeep, draw a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1))); // {tap}: Staff of Nin 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/s/StaffOfZegon.java b/Mage.Sets/src/mage/cards/s/StaffOfZegon.java index 7a4023bda5b..fa57413efa5 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfZegon.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfZegon.java @@ -24,7 +24,7 @@ public final class StaffOfZegon extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {3}, {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java index 7759c4f6305..f0dfc6a5b67 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingAssassin.java +++ b/Mage.Sets/src/mage/cards/s/StalkingAssassin.java @@ -39,12 +39,12 @@ public final class StalkingAssassin extends CardImpl { this.toughness = new MageInt(1); // {3}{U}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {3}{B}, {T}: Destroy target tapped creature. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); + ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java b/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java index 48529d87719..79dbb234d16 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java +++ b/Mage.Sets/src/mage/cards/s/StalkingBloodsucker.java @@ -32,7 +32,7 @@ public final class StalkingBloodsucker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{B}, Discard a card: Stalking Bloodsucker gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StalkingStones.java b/Mage.Sets/src/mage/cards/s/StalkingStones.java index c84830bc90f..a3957fb69e6 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingStones.java +++ b/Mage.Sets/src/mage/cards/s/StalkingStones.java @@ -23,7 +23,7 @@ public final class StalkingStones extends CardImpl { public StalkingStones(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StalkingStonesToken(), CardType.LAND, Duration.WhileOnBattlefield) + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StalkingStonesToken(), CardType.LAND, Duration.WhileOnBattlefield) .setText("{this} becomes a 3/3 Elemental artifact creature that's still a land"), new GenericManaCost(6))); } diff --git a/Mage.Sets/src/mage/cards/s/Stamina.java b/Mage.Sets/src/mage/cards/s/Stamina.java index 9b046750f1d..ec2d7b4f22f 100644 --- a/Mage.Sets/src/mage/cards/s/Stamina.java +++ b/Mage.Sets/src/mage/cards/s/Stamina.java @@ -43,7 +43,7 @@ public final class Stamina extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); // Sacrifice Stamina: Regenerate enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new SacrificeSourceCost())); } private Stamina(final Stamina card) { diff --git a/Mage.Sets/src/mage/cards/s/StampedeDriver.java b/Mage.Sets/src/mage/cards/s/StampedeDriver.java index 03cf3daa8a3..1984083d6ac 100644 --- a/Mage.Sets/src/mage/cards/s/StampedeDriver.java +++ b/Mage.Sets/src/mage/cards/s/StampedeDriver.java @@ -35,7 +35,7 @@ public final class StampedeDriver extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new BoostControlledEffect(1, 1, Duration.EndOfTurn) .setText("creatures you control get +1/+1"), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); diff --git a/Mage.Sets/src/mage/cards/s/StarDestroyer.java b/Mage.Sets/src/mage/cards/s/StarDestroyer.java index 7da690f2d3f..274c770005a 100644 --- a/Mage.Sets/src/mage/cards/s/StarDestroyer.java +++ b/Mage.Sets/src/mage/cards/s/StarDestroyer.java @@ -46,15 +46,15 @@ public final class StarDestroyer extends CardImpl { this.addAbility(SpaceflightAbility.getInstance()); // {2}{U}: Tap target artifact creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addTarget(new TargetCreaturePermanent(filter1)); this.addAbility(ability); // {2}{B}: Create a 1/1 black Starship artifact creature token with spaceflight named TIE Fighter. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TIEFighterToken()), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new TIEFighterToken()), new ManaCostsImpl<>("{2}{B}"))); // {2}{R}: Star Destroyer deals 2 damge to target non-Starship creature or player. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); + ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetCreatureOrPlayer(filter3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java index 404a1bf4de3..15d53cb1f1c 100644 --- a/Mage.Sets/src/mage/cards/s/StarkeOfRath.java +++ b/Mage.Sets/src/mage/cards/s/StarkeOfRath.java @@ -34,7 +34,7 @@ public final class StarkeOfRath extends CardImpl { this.toughness = new MageInt(2); // {tap}: Destroy target artifact or creature. That permanent's controller gains control of Starke of Rath. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarkeOfRathEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new StarkeOfRathEffect(), new TapSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StarlightInvoker.java b/Mage.Sets/src/mage/cards/s/StarlightInvoker.java index abba8b57010..f009ac583e4 100644 --- a/Mage.Sets/src/mage/cards/s/StarlightInvoker.java +++ b/Mage.Sets/src/mage/cards/s/StarlightInvoker.java @@ -26,7 +26,7 @@ public final class StarlightInvoker extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(3); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl<>("{7}{W}"))); + this.addAbility(new SimpleActivatedAbility(new GainLifeEffect(5), new ManaCostsImpl<>("{7}{W}"))); } private StarlightInvoker(final StarlightInvoker card) { diff --git a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java index 87393395334..07f0bf8557c 100644 --- a/Mage.Sets/src/mage/cards/s/StarlitSanctum.java +++ b/Mage.Sets/src/mage/cards/s/StarlitSanctum.java @@ -35,12 +35,12 @@ public final class StarlitSanctum extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {W}, {T}, Sacrifice a Cleric creature: You gain life equal to the sacrificed creature's toughness. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarlitSanctumWhiteEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new StarlitSanctumWhiteEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); // {B}, {T}, Sacrifice a Cleric creature: Target player loses life equal to the sacrificed creature's power. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StarlitSanctumBlackEffect(), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new StarlitSanctumBlackEffect(), new ManaCostsImpl<>("{B}")); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(filter)); diff --git a/Mage.Sets/src/mage/cards/s/StarvedRusalka.java b/Mage.Sets/src/mage/cards/s/StarvedRusalka.java index 1b60cfee1a5..4712526ef67 100644 --- a/Mage.Sets/src/mage/cards/s/StarvedRusalka.java +++ b/Mage.Sets/src/mage/cards/s/StarvedRusalka.java @@ -29,7 +29,7 @@ public final class StarvedRusalka extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StasisCell.java b/Mage.Sets/src/mage/cards/s/StasisCell.java index 7fd85f3d85d..98eb8dc362a 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCell.java +++ b/Mage.Sets/src/mage/cards/s/StasisCell.java @@ -39,7 +39,7 @@ public final class StasisCell extends CardImpl { this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); // {3}{U}: Attach Stasis Cell to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "Attach {this} to target creature"), new ManaCostsImpl<>("{3}{U}")); + Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Detriment, "Attach {this} to target creature"), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SteamSpitter.java b/Mage.Sets/src/mage/cards/s/SteamSpitter.java index 28e2ee4bb0e..d8a2e2e4959 100644 --- a/Mage.Sets/src/mage/cards/s/SteamSpitter.java +++ b/Mage.Sets/src/mage/cards/s/SteamSpitter.java @@ -29,7 +29,7 @@ public final class SteamSpitter extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // {R}: Steam Spitter 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 SteamSpitter(final SteamSpitter card) { diff --git a/Mage.Sets/src/mage/cards/s/Steamclaw.java b/Mage.Sets/src/mage/cards/s/Steamclaw.java index 79fad49a395..e312e32439a 100644 --- a/Mage.Sets/src/mage/cards/s/Steamclaw.java +++ b/Mage.Sets/src/mage/cards/s/Steamclaw.java @@ -24,13 +24,13 @@ public final class Steamclaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {3}, {tap}: Exile target card from a graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new ExileTargetEffect(), new TapSourceCost()); ability.addCost(new GenericManaCost(3)); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); // {1}, Sacrifice Steamclaw: Exile target card from a graveyard. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(new ExileTargetEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SteelOverseer.java b/Mage.Sets/src/mage/cards/s/SteelOverseer.java index aecb2f3ceba..75a31f9ead5 100644 --- a/Mage.Sets/src/mage/cards/s/SteelOverseer.java +++ b/Mage.Sets/src/mage/cards/s/SteelOverseer.java @@ -36,7 +36,7 @@ public final class SteelOverseer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), new TapSourceCost())); } private SteelOverseer(final SteelOverseer card) { diff --git a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java index cb4543b17ba..35ebf5908a4 100644 --- a/Mage.Sets/src/mage/cards/s/SteelSquirrel.java +++ b/Mage.Sets/src/mage/cards/s/SteelSquirrel.java @@ -36,7 +36,7 @@ public final class SteelSquirrel extends CardImpl { this.addAbility(new SteelSquirrelTriggeredAbility()); // 6: Roll a six-sided die. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(6), new GenericManaCost(6)); + Ability ability = new SimpleActivatedAbility(new RollDiceEffect(6), new GenericManaCost(6)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java b/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java index a9702dd00a9..2e3fd56d482 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java +++ b/Mage.Sets/src/mage/cards/s/StensiaBloodhall.java @@ -26,7 +26,7 @@ public final class StensiaBloodhall extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{B}{R}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{B}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SteppeGlider.java b/Mage.Sets/src/mage/cards/s/SteppeGlider.java index d822ef9aa8e..5b01012e024 100644 --- a/Mage.Sets/src/mage/cards/s/SteppeGlider.java +++ b/Mage.Sets/src/mage/cards/s/SteppeGlider.java @@ -40,7 +40,7 @@ public final class SteppeGlider extends CardImpl { // {1}{W}: Target creature with a +1/+1 counter on it gains flying and vigilance until end of turn. Effect effect = new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature with a +1/+1 counter on it gains flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{1}{W}")); effect = new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn); effect.setText("and vigilance until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SterlingGrove.java b/Mage.Sets/src/mage/cards/s/SterlingGrove.java index bc40b994165..51c7ac61242 100644 --- a/Mage.Sets/src/mage/cards/s/SterlingGrove.java +++ b/Mage.Sets/src/mage/cards/s/SterlingGrove.java @@ -32,7 +32,7 @@ public final class SterlingGrove extends CardImpl { this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, new FilterEnchantmentPermanent("enchantments"), true))); // {1}, Sacrifice Sterling Grove: Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterEnchantmentCard("enchantment card")), true), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(new FilterEnchantmentCard("enchantment card")), true), new GenericManaCost(1)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SternConstable.java b/Mage.Sets/src/mage/cards/s/SternConstable.java index e3097516522..25e8cd2ee7d 100644 --- a/Mage.Sets/src/mage/cards/s/SternConstable.java +++ b/Mage.Sets/src/mage/cards/s/SternConstable.java @@ -30,7 +30,7 @@ public final class SternConstable extends CardImpl { this.toughness = new MageInt(1); // {T}, Discard a card: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect("tap target creature"), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect("tap target creature"), new TapSourceCost()); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SternMentor.java b/Mage.Sets/src/mage/cards/s/SternMentor.java index 616b2289999..e962932ea98 100644 --- a/Mage.Sets/src/mage/cards/s/SternMentor.java +++ b/Mage.Sets/src/mage/cards/s/SternMentor.java @@ -37,7 +37,7 @@ public final class SternMentor extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Stern Mentor is paired with another creature, each of those creatures has "{T}: Target player puts the top two cards of their library into their graveyard." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new MillCardsTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java b/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java index 73d8ab4ef0b..d5492257deb 100644 --- a/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java +++ b/Mage.Sets/src/mage/cards/s/StewardOfSolidarity.java @@ -33,7 +33,7 @@ public final class StewardOfSolidarity extends CardImpl { // {T}, Exert Steward of Solidarity: Create a 1/1 white Warrior creature token with vigilance. Effect effect = new CreateTokenEffect(new WarriorVigilantToken()); effect.setText("Create a 1/1 white Warrior creature token with vigilance"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StillLife.java b/Mage.Sets/src/mage/cards/s/StillLife.java index 5f8748e10b0..5e3350096fd 100644 --- a/Mage.Sets/src/mage/cards/s/StillLife.java +++ b/Mage.Sets/src/mage/cards/s/StillLife.java @@ -25,7 +25,7 @@ public final class StillLife extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}{G}"); // {G}{G}: Still Life becomes a 4/3 Centaur creature until end of turn. It's still an enchantment. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StillLifeCentaur(), CardType.ENCHANTMENT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StillLifeCentaur(), CardType.ENCHANTMENT, Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}"))); } private StillLife(final StillLife card) { diff --git a/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java b/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java index 3d6219f0596..c9cc735b04f 100644 --- a/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java +++ b/Mage.Sets/src/mage/cards/s/StillmoonCavalier.java @@ -35,11 +35,11 @@ public final class StillmoonCavalier extends CardImpl { // Protection from white and from black this.addAbility(ProtectionAbility.from(ObjectColor.WHITE, ObjectColor.BLACK)); // {WB}: Stillmoon Cavalier gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); // {WB}: Stillmoon Cavalier gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}"))); // {WB}{WB}: Stillmoon Cavalier gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W/B}{W/B}"))); } private StillmoonCavalier(final StillmoonCavalier card) { diff --git a/Mage.Sets/src/mage/cards/s/StingingBarrier.java b/Mage.Sets/src/mage/cards/s/StingingBarrier.java index 97abc3a5b4b..739ba96a408 100644 --- a/Mage.Sets/src/mage/cards/s/StingingBarrier.java +++ b/Mage.Sets/src/mage/cards/s/StingingBarrier.java @@ -30,7 +30,7 @@ public final class StingingBarrier extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {U}, {tap}: Stinging Barrier deals 1 damage to any target. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{U}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Stingmoggie.java b/Mage.Sets/src/mage/cards/s/Stingmoggie.java index f69162f0d6a..5346d0efae1 100644 --- a/Mage.Sets/src/mage/cards/s/Stingmoggie.java +++ b/Mage.Sets/src/mage/cards/s/Stingmoggie.java @@ -45,7 +45,7 @@ public final class Stingmoggie extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),"with two +1/+1 counters on it")); // {3}{R}, Remove a +1/+1 counter from Stingmoggie: Destroy target artifact or land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StirringWildwood.java b/Mage.Sets/src/mage/cards/s/StirringWildwood.java index b54b88d00fb..d017d4307af 100644 --- a/Mage.Sets/src/mage/cards/s/StirringWildwood.java +++ b/Mage.Sets/src/mage/cards/s/StirringWildwood.java @@ -30,7 +30,7 @@ public final class StirringWildwood extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); this.addAbility(new GreenManaAbility()); this.addAbility(new WhiteManaAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new StirringWildwoodToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new StirringWildwoodToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{1}{G}{W}"))); } private StirringWildwood(final StirringWildwood card) { diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java index d74e47300d3..bd9436d8a04 100644 --- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java +++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java @@ -37,7 +37,7 @@ public final class StitcherGeralf extends CardImpl { this.toughness = new MageInt(4); // {2}{U}, {tap}: Each player puts the top three cards of their library into their graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StitcherGeralfEffect(), new ManaCostsImpl<>("{2}{U}")); + Ability ability = new SimpleActivatedAbility(new StitcherGeralfEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java index 207afa3db9e..38087a1456c 100644 --- a/Mage.Sets/src/mage/cards/s/StitchersApprentice.java +++ b/Mage.Sets/src/mage/cards/s/StitchersApprentice.java @@ -31,7 +31,7 @@ public final class StitchersApprentice extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: Create a 2/2 blue Homunculus creature token, then sacrifice a creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new StitchersApprenticeHomunculusToken()), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new StitchersApprenticeHomunculusToken()), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addEffect(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, ", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java b/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java index 5499a272c9b..f9a151bbbc0 100644 --- a/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java +++ b/Mage.Sets/src/mage/cards/s/StoneHavenMedic.java @@ -28,7 +28,7 @@ public final class StoneHavenMedic extends CardImpl { this.toughness = new MageInt(3); // {W}, {T}: You gain 1 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StoneKavu.java b/Mage.Sets/src/mage/cards/s/StoneKavu.java index d09944766a7..dfecaf489d6 100644 --- a/Mage.Sets/src/mage/cards/s/StoneKavu.java +++ b/Mage.Sets/src/mage/cards/s/StoneKavu.java @@ -27,9 +27,9 @@ public final class StoneKavu extends CardImpl { this.toughness = new MageInt(3); // {R}: Stone Kavu 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}: Stone Kavu 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 StoneKavu(final StoneKavu card) { diff --git a/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java b/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java index d27bf4768ff..4cbefde53f8 100644 --- a/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java +++ b/Mage.Sets/src/mage/cards/s/StonefareCrocodile.java @@ -28,7 +28,7 @@ public final class StonefareCrocodile extends CardImpl { this.toughness = new MageInt(2); // {2}{B}: Stonefare Crocodile gains lifelink until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } private StonefareCrocodile(final StonefareCrocodile card) { diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java index fc66a5671e2..1a73daf275f 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java @@ -43,7 +43,7 @@ public final class StoneforgeMystic extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); // {1}{W}, {T}: You may put an Equipment card from your hand onto the battlefield. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Stonehands.java b/Mage.Sets/src/mage/cards/s/Stonehands.java index 3ccafa57429..b74119ae513 100644 --- a/Mage.Sets/src/mage/cards/s/Stonehands.java +++ b/Mage.Sets/src/mage/cards/s/Stonehands.java @@ -41,7 +41,7 @@ public final class Stonehands extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); // {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 Stonehands(final Stonehands card) { diff --git a/Mage.Sets/src/mage/cards/s/StonehornChanter.java b/Mage.Sets/src/mage/cards/s/StonehornChanter.java index 7adcf9ae4ba..b19e5f0977a 100644 --- a/Mage.Sets/src/mage/cards/s/StonehornChanter.java +++ b/Mage.Sets/src/mage/cards/s/StonehornChanter.java @@ -30,7 +30,7 @@ public final class StonehornChanter extends CardImpl { this.toughness = new MageInt(4); // {5}{W}: Stonehorn Chanter gains vigilance and lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn) + Ability ability = new SimpleActivatedAbility(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn) .setText("{this} gains vigilance"), new ManaCostsImpl<>("{5}{W}")); ability.addEffect(new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn) .setText("and lifelink until end of turn")); diff --git a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java index 5d10eab61bb..e9efff07687 100644 --- a/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java +++ b/Mage.Sets/src/mage/cards/s/StonewiseFortifier.java @@ -35,7 +35,7 @@ public final class StonewiseFortifier extends CardImpl { this.toughness = new MageInt(2); // {4}{W}: Prevent all damage that would be dealt to Stonewise Fortifier by target creature this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StonewiseFortifierPreventAllDamageToEffect(), new ManaCostsImpl<>("{4}{W}")); + Ability ability = new SimpleActivatedAbility(new StonewiseFortifierPreventAllDamageToEffect(), new ManaCostsImpl<>("{4}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java b/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java index 15375153a69..61360221fbe 100644 --- a/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java +++ b/Mage.Sets/src/mage/cards/s/StonewoodInvoker.java @@ -28,7 +28,7 @@ public final class StonewoodInvoker extends CardImpl { this.toughness = new MageInt(2); // {7}{G}: Stonewood Invoker gets +5/+5 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(5,5,Duration.EndOfTurn), new ManaCostsImpl<>("{7}{G}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(5,5,Duration.EndOfTurn), new ManaCostsImpl<>("{7}{G}"))); } private StonewoodInvoker(final StonewoodInvoker card) { diff --git a/Mage.Sets/src/mage/cards/s/Stonewright.java b/Mage.Sets/src/mage/cards/s/Stonewright.java index 60d8c29db32..93a659fcfe8 100644 --- a/Mage.Sets/src/mage/cards/s/Stonewright.java +++ b/Mage.Sets/src/mage/cards/s/Stonewright.java @@ -36,7 +36,7 @@ public final class Stonewright extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Stonewright is paired with another creature, each of those creatures has "{R}: This creature gets +1/+0 until end of turn." - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/s/StonybrookAngler.java b/Mage.Sets/src/mage/cards/s/StonybrookAngler.java index 987f179e7de..b51504c462f 100644 --- a/Mage.Sets/src/mage/cards/s/StonybrookAngler.java +++ b/Mage.Sets/src/mage/cards/s/StonybrookAngler.java @@ -30,7 +30,7 @@ public final class StonybrookAngler extends CardImpl { this.toughness = new MageInt(2); // {1}{U}, {tap}: You may tap or untap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); + Ability ability = new SimpleActivatedAbility(new MayTapOrUntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormElemental.java b/Mage.Sets/src/mage/cards/s/StormElemental.java index 7ccef8bfdfc..41673d298e1 100644 --- a/Mage.Sets/src/mage/cards/s/StormElemental.java +++ b/Mage.Sets/src/mage/cards/s/StormElemental.java @@ -44,13 +44,13 @@ public final class StormElemental extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}, Exile the top card of your library: Tap target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new ExileTopCardLibraryCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {U}, Exile the top card of your library: If the exiled card is a snow land, Storm Elemental gets +1/+1 until end of turn. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StormElementalEffect(), new ManaCostsImpl<>("{U}")); + Ability ability2 = new SimpleActivatedAbility(new StormElementalEffect(), new ManaCostsImpl<>("{U}")); ability2.addCost(new ExileTopCardLibraryCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/s/StormFront.java b/Mage.Sets/src/mage/cards/s/StormFront.java index 5c88d0bf640..c5eebd53499 100644 --- a/Mage.Sets/src/mage/cards/s/StormFront.java +++ b/Mage.Sets/src/mage/cards/s/StormFront.java @@ -31,7 +31,7 @@ public final class StormFront extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // {G}{G}: Tap target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{G}{G}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{G}{G}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormShaman.java b/Mage.Sets/src/mage/cards/s/StormShaman.java index 15afdf8a975..3a9fa2fa768 100644 --- a/Mage.Sets/src/mage/cards/s/StormShaman.java +++ b/Mage.Sets/src/mage/cards/s/StormShaman.java @@ -29,7 +29,7 @@ public final class StormShaman extends CardImpl { this.toughness = new MageInt(4); // {R}: Storm Shaman 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 StormShaman(final StormShaman card) { diff --git a/Mage.Sets/src/mage/cards/s/StormSpirit.java b/Mage.Sets/src/mage/cards/s/StormSpirit.java index 9d446ce1eb7..ffae2b547cb 100644 --- a/Mage.Sets/src/mage/cards/s/StormSpirit.java +++ b/Mage.Sets/src/mage/cards/s/StormSpirit.java @@ -31,7 +31,7 @@ public final class StormSpirit extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {tap}: Storm Spirit deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Stormbind.java b/Mage.Sets/src/mage/cards/s/Stormbind.java index fcde28f9454..31e148ecd6e 100644 --- a/Mage.Sets/src/mage/cards/s/Stormbind.java +++ b/Mage.Sets/src/mage/cards/s/Stormbind.java @@ -24,7 +24,7 @@ public final class Stormbind extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{G}"); // {2}, Discard a card at random: Stormbind deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(2), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java b/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java index 9f0845fecd3..c4f2bc10154 100644 --- a/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java +++ b/Mage.Sets/src/mage/cards/s/StormcallerOfKeranos.java @@ -30,7 +30,7 @@ public final class StormcallerOfKeranos extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // {1}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1), new ManaCostsImpl<>("{1}{U}"))); } private StormcallerOfKeranos(final StormcallerOfKeranos card) { diff --git a/Mage.Sets/src/mage/cards/s/StormcallersBoon.java b/Mage.Sets/src/mage/cards/s/StormcallersBoon.java index 3ffd65b7ff5..93a6530b5e4 100644 --- a/Mage.Sets/src/mage/cards/s/StormcallersBoon.java +++ b/Mage.Sets/src/mage/cards/s/StormcallersBoon.java @@ -27,7 +27,7 @@ public final class StormcallersBoon extends CardImpl { // Sacrifice Stormcaller's Boon: Creatures you control gain flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); + this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("Creatures")), new SacrificeSourceCost())); this.addAbility(new CascadeAbility()); } diff --git a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java index 2b0cc4284cf..a8f25dec02d 100644 --- a/Mage.Sets/src/mage/cards/s/StormchaserChimera.java +++ b/Mage.Sets/src/mage/cards/s/StormchaserChimera.java @@ -40,7 +40,7 @@ public final class StormchaserChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}{U}{R}: Scry 1, then reveal the top card of your library. Stormchaser Chimera gets +X/+0 until end of turn, where X is that card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new ManaCostsImpl<>("{2}{U}{R}")); + Ability ability = new SimpleActivatedAbility(new ScryEffect(1, false), new ManaCostsImpl<>("{2}{U}{R}")); ability.addEffect(new StormchaserChimeraEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java b/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java index b3aa559488f..ea5289ad853 100644 --- a/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java +++ b/Mage.Sets/src/mage/cards/s/StormcloudDjinn.java @@ -35,7 +35,7 @@ public final class StormcloudDjinn extends CardImpl { // Stormcloud Djinn can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); // {R}{R}: Stormcloud Djinn gets +2/+0 until end of turn and deals 1 damage to you. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}")); Effect effect = new DamageControllerEffect(1); effect.setText("and deals 1 damage to you"); diff --git a/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java b/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java index 2090746f790..47acb9a6cc8 100644 --- a/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/s/StormscapeApprentice.java @@ -32,12 +32,12 @@ public final class StormscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {W}, {T}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}, {T}: Target player loses 1 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StormscapeMaster.java b/Mage.Sets/src/mage/cards/s/StormscapeMaster.java index f272e72bbe6..16dfdce0731 100644 --- a/Mage.Sets/src/mage/cards/s/StormscapeMaster.java +++ b/Mage.Sets/src/mage/cards/s/StormscapeMaster.java @@ -37,13 +37,13 @@ public final class StormscapeMaster extends CardImpl { // {W}{W}, {T}: Target creature gains protection from the color of your choice until end of turn. Effect effect = new GainProtectionFromColorTargetEffect(Duration.EndOfTurn); effect.setText("Target creature gains protection from the color of your choice until end of turn."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {B}{B}, {T}: Target player loses 2 life and you gain 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); + ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new GainLifeEffect(2).setText("and you gain 2 life")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/StormwatchEagle.java b/Mage.Sets/src/mage/cards/s/StormwatchEagle.java index a744cef048c..bed20024051 100644 --- a/Mage.Sets/src/mage/cards/s/StormwatchEagle.java +++ b/Mage.Sets/src/mage/cards/s/StormwatchEagle.java @@ -32,7 +32,7 @@ public final class StormwatchEagle extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Sacrifice a land: Return Stormwatch Eagle to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleActivatedAbility( new ReturnToHandSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_LAND))); } diff --git a/Mage.Sets/src/mage/cards/s/StoryCircle.java b/Mage.Sets/src/mage/cards/s/StoryCircle.java index 3156d8a9f75..c39f8929f05 100644 --- a/Mage.Sets/src/mage/cards/s/StoryCircle.java +++ b/Mage.Sets/src/mage/cards/s/StoryCircle.java @@ -32,7 +32,7 @@ public final class StoryCircle extends CardImpl { // As Story Circle enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // {W}: The next time a source of your choice of the chosen color would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new StoryCircleEffect(), new ManaCostsImpl<>("{W}"))); + this.addAbility(new SimpleActivatedAbility(new StoryCircleEffect(), new ManaCostsImpl<>("{W}"))); } private StoryCircle(final StoryCircle card) { diff --git a/Mage.Sets/src/mage/cards/s/StrandsOfNight.java b/Mage.Sets/src/mage/cards/s/StrandsOfNight.java index 25614ec56c7..311f7b10c51 100644 --- a/Mage.Sets/src/mage/cards/s/StrandsOfNight.java +++ b/Mage.Sets/src/mage/cards/s/StrandsOfNight.java @@ -34,7 +34,7 @@ public final class StrandsOfNight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); // {B}{B}, Pay 2 life, Sacrifice a Swamp: Return target creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addCost(new PayLifeCost(2)); ability.addCost(new SacrificeTargetCost(filter)); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java index 3529d541a82..234b3f26a9d 100644 --- a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java +++ b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java @@ -38,7 +38,7 @@ public final class StrandsOfUndeath extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); Ability abilityDiscard = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(2)); abilityDiscard.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/s/StreamHopper.java b/Mage.Sets/src/mage/cards/s/StreamHopper.java index 68bdd5c3e03..c35ea94f701 100644 --- a/Mage.Sets/src/mage/cards/s/StreamHopper.java +++ b/Mage.Sets/src/mage/cards/s/StreamHopper.java @@ -27,7 +27,7 @@ public final class StreamHopper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U/R}"))); } private StreamHopper(final StreamHopper card) { diff --git a/Mage.Sets/src/mage/cards/s/StripMine.java b/Mage.Sets/src/mage/cards/s/StripMine.java index a1eee3244c5..0836967bd2a 100644 --- a/Mage.Sets/src/mage/cards/s/StripMine.java +++ b/Mage.Sets/src/mage/cards/s/StripMine.java @@ -27,7 +27,7 @@ public final class StripMine extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {T}, Sacrifice Strip Mine: Destroy target land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StromgaldCabal.java b/Mage.Sets/src/mage/cards/s/StromgaldCabal.java index 096269cadac..5c129322202 100644 --- a/Mage.Sets/src/mage/cards/s/StromgaldCabal.java +++ b/Mage.Sets/src/mage/cards/s/StromgaldCabal.java @@ -39,7 +39,7 @@ public final class StromgaldCabal extends CardImpl { this.toughness = new MageInt(2); // {tap}, Pay 1 life: Counter target white spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new TapSourceCost()); ability.addCost(new PayLifeCost(1)); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java b/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java index bdde6f6bef1..88291e83a54 100644 --- a/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java +++ b/Mage.Sets/src/mage/cards/s/StromgaldCrusader.java @@ -35,10 +35,10 @@ public final class StromgaldCrusader extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {B}: Stromgald Crusader gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {B}{B}: Stromgald Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); + this.addAbility(new SimpleActivatedAbility(new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}"))); } private StromgaldCrusader(final StromgaldCrusader card) { diff --git a/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java b/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java index 5bb96282802..cfa0017f30c 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdAssassin.java @@ -33,7 +33,7 @@ public final class StrongholdAssassin extends CardImpl { this.toughness = new MageInt(1); // {tap}, Sacrifice a creature: Destroy target nonblack creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE)); Target target = new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java b/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java index 34dbe63064d..1d82359bb80 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdMachinist.java @@ -32,7 +32,7 @@ public final class StrongholdMachinist extends CardImpl { this.toughness = new MageInt(1); // {U}{U}, {tap}, Discard a card: Counter target noncreature spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}{U}")); + Ability ability = new SimpleActivatedAbility(new CounterTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_NON_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java b/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java index 1ad200544cf..c9877b19a32 100644 --- a/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java +++ b/Mage.Sets/src/mage/cards/s/StrongholdOverseer.java @@ -45,7 +45,7 @@ public final class StrongholdOverseer extends CardImpl { // Shadow this.addAbility(ShadowAbility.getInstance()); // {B}{B}: Creatures with shadow get +1/+0 until end of turn and creatures without shadow get -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{B}")); + Ability ability = new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{B}{B}")); Effect effect = new BoostAllEffect(-1, 0, Duration.EndOfTurn, filter2, false); effect.setText("and creatures without shadow get -1/-0 until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/StuffyDoll.java b/Mage.Sets/src/mage/cards/s/StuffyDoll.java index 28f4560693f..2a323e1af7b 100644 --- a/Mage.Sets/src/mage/cards/s/StuffyDoll.java +++ b/Mage.Sets/src/mage/cards/s/StuffyDoll.java @@ -42,7 +42,7 @@ public final class StuffyDoll extends CardImpl { // Whenever Stuffy Doll is dealt damage, it deals that much damage to the chosen player. this.addAbility(new DealtDamageToSourceTriggeredAbility(new StuffyDollEffect(), false)); // {T}: Stuffy Doll deals 1 damage to itself. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageSelfEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new DamageSelfEffect(1), new TapSourceCost())); } private StuffyDoll(final StuffyDoll card) { diff --git a/Mage.Sets/src/mage/cards/s/StunSniper.java b/Mage.Sets/src/mage/cards/s/StunSniper.java index 92ed19b6b47..ce965c19ad1 100644 --- a/Mage.Sets/src/mage/cards/s/StunSniper.java +++ b/Mage.Sets/src/mage/cards/s/StunSniper.java @@ -31,7 +31,7 @@ public final class StunSniper extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new DamageTargetEffect(1), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addEffect(new TapTargetEffect().setText("tap that creature")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SturdyHatchling.java b/Mage.Sets/src/mage/cards/s/SturdyHatchling.java index 1dd0a756fc1..a9934ba016c 100644 --- a/Mage.Sets/src/mage/cards/s/SturdyHatchling.java +++ b/Mage.Sets/src/mage/cards/s/SturdyHatchling.java @@ -46,7 +46,7 @@ public final class SturdyHatchling extends CardImpl { // Sturdy Hatchling enters the battlefield with four -1/-1 counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)),"with four -1/-1 counters on it")); // {G/U}: Sturdy Hatchling gains shroud until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}"))); + this.addAbility(new SimpleActivatedAbility(new GainAbilitySourceEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}"))); // Whenever you cast a green spell, remove a -1/-1 counter from Sturdy Hatchling. this.addAbility(new SpellCastControllerTriggeredAbility(new RemoveCounterSourceEffect(CounterType.M1M1.createInstance(1)), filterGreenSpell, false)); // Whenever you cast a blue spell, remove a -1/-1 counter from Sturdy Hatchling. diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java b/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java index d6c96264990..86ebb39b7d6 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanHangar.java @@ -30,7 +30,7 @@ public final class SubterraneanHangar extends CardImpl { // Subterranean Hangar enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); // {tap}: Put a storage counter on Subterranean Hangar. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new AddCountersSourceEffect(CounterType.STORAGE.createInstance()), new TapSourceCost())); // {tap}, Remove any number of storage counters from Subterranean Hangar: Add {B} for each storage counter removed this way. Ability ability = new DynamicManaAbility( Mana.BlackMana(1), diff --git a/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java b/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java index 6dc4536597b..e305d5fc234 100644 --- a/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SubterraneanSpirit.java @@ -43,7 +43,7 @@ public final class SubterraneanSpirit extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {tap}: Subterranean Spirit deals 1 damage to each creature without flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new DamageAllEffect(1, filter), new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuicidalCharge.java b/Mage.Sets/src/mage/cards/s/SuicidalCharge.java index 446ae61f5f6..a85eb2ebf1b 100644 --- a/Mage.Sets/src/mage/cards/s/SuicidalCharge.java +++ b/Mage.Sets/src/mage/cards/s/SuicidalCharge.java @@ -26,7 +26,7 @@ public final class SuicidalCharge extends CardImpl { // Sacrifice Suicidal Charge: Creatures your opponents control get -1/-1 until end of turn. Those creatures attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostOpponentsEffect(-1, -1, Duration.EndOfTurn), new SacrificeSourceCost()); ability.addEffect(new SuicidalChargeEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SultaiBanner.java b/Mage.Sets/src/mage/cards/s/SultaiBanner.java index ec098570bc9..e7e37fd2f92 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiBanner.java +++ b/Mage.Sets/src/mage/cards/s/SultaiBanner.java @@ -31,7 +31,7 @@ public final class SultaiBanner extends CardImpl { this.addAbility(new BlueManaAbility()); // {B}{G}{U}, {T}, Sacrifice Sultai Banner: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}{U}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{G}{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SummoningStation.java b/Mage.Sets/src/mage/cards/s/SummoningStation.java index 85c9c110046..58dd3f3d9bb 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningStation.java +++ b/Mage.Sets/src/mage/cards/s/SummoningStation.java @@ -24,7 +24,7 @@ public final class SummoningStation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{7}"); // {tap}: Create a 2/2 colorless Pincher creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PincherToken()), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new PincherToken()), new TapSourceCost())); // Whenever an artifact is put into a graveyard from the battlefield, you may untap Summoning Station. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(new UntapSourceEffect(), true, StaticFilters.FILTER_PERMANENT_ARTIFACT_AN, false)); } diff --git a/Mage.Sets/src/mage/cards/s/SunClasp.java b/Mage.Sets/src/mage/cards/s/SunClasp.java index afb4684b3e0..f09522f6f63 100644 --- a/Mage.Sets/src/mage/cards/s/SunClasp.java +++ b/Mage.Sets/src/mage/cards/s/SunClasp.java @@ -40,7 +40,7 @@ public final class SunClasp extends CardImpl { // Enchanted creature gets +1/+3. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); // {W}: Return enchanted creature to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunClaspReturnEffect(), new ColoredManaCost(ColoredManaSymbol.W))); + this.addAbility(new SimpleActivatedAbility(new SunClaspReturnEffect(), new ColoredManaCost(ColoredManaSymbol.W))); } private SunClasp(final SunClasp card) { diff --git a/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java b/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java index 431bff2ebd7..1d7dc5b37d3 100644 --- a/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java +++ b/Mage.Sets/src/mage/cards/s/SunbeamSpellbomb.java @@ -23,10 +23,10 @@ public final class SunbeamSpellbomb extends CardImpl { public SunbeamSpellbomb(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); + Ability firstAbility = new SimpleActivatedAbility(new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new SacrificeSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/cards/s/Suncrusher.java b/Mage.Sets/src/mage/cards/s/Suncrusher.java index 1bde3d9e197..c8a5877bbc2 100644 --- a/Mage.Sets/src/mage/cards/s/Suncrusher.java +++ b/Mage.Sets/src/mage/cards/s/Suncrusher.java @@ -35,13 +35,13 @@ public final class Suncrusher extends CardImpl { // Sunburst this.addAbility(new SunburstAbility(this)); // {4}, {tap}, Remove a +1/+1 counter from Suncrusher: Destroy target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(4)); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new GenericManaCost(4)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Remove a +1/+1 counter from Suncrusher: Return Suncrusher to its owner's hand. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new GenericManaCost(2)); + ability = new SimpleActivatedAbility(new ReturnToHandSourceEffect(true), new GenericManaCost(2)); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunflareShaman.java b/Mage.Sets/src/mage/cards/s/SunflareShaman.java index f8b346a3395..70e6d1ada1a 100644 --- a/Mage.Sets/src/mage/cards/s/SunflareShaman.java +++ b/Mage.Sets/src/mage/cards/s/SunflareShaman.java @@ -35,7 +35,7 @@ public final class SunflareShaman extends CardImpl { this.toughness = new MageInt(1); // {1}{R}, {tap}: Sunflare Shaman deals X damage to any target and X damage to itself, where X is the number of Elemental cards in your graveyard. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SunflareShamanEffect(), new ManaCostsImpl<>("{1}{R}")); + Ability ability = new SimpleActivatedAbility(new SunflareShamanEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java b/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java index 17b9dbcc0a5..941a1158697 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeEnforcer.java @@ -36,7 +36,7 @@ public final class SunhomeEnforcer extends CardImpl { this.addAbility(new SunhomeEnforcerTriggeredAbility()); // {1}{R}: Sunhome Enforcer 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 SunhomeEnforcer(final SunhomeEnforcer card) { diff --git a/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java b/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java index 21e5cfcea51..4763d932d7a 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeFortressOfTheLegion.java @@ -25,7 +25,7 @@ public final class SunhomeFortressOfTheLegion extends CardImpl { public SunhomeFortressOfTheLegion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new ColorlessManaAbility()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}{W}")); + Ability ability = new SimpleActivatedAbility(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java index 189b02df32b..baa330e0679 100644 --- a/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SunhomeGuildmage.java @@ -29,10 +29,10 @@ public final class SunhomeGuildmage extends CardImpl { this.toughness = new MageInt(2); //{1}{R}{W}: Creatures you control get +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{W}"))); //{2}{R}{W}: Create a 1/1 red and white Soldier creature token with haste. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SoldierTokenWithHaste()), new ManaCostsImpl<>("{2}{R}{W}"))); + this.addAbility(new SimpleActivatedAbility(new CreateTokenEffect(new SoldierTokenWithHaste()), new ManaCostsImpl<>("{2}{R}{W}"))); } private SunhomeGuildmage(final SunhomeGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/s/SunkenField.java b/Mage.Sets/src/mage/cards/s/SunkenField.java index b0633c291c0..30dd13d2a7d 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenField.java +++ b/Mage.Sets/src/mage/cards/s/SunkenField.java @@ -40,7 +40,7 @@ public final class SunkenField extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Counter target spell unless its controller pays {1}." - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new TapSourceCost()); + ability = new SimpleActivatedAbility(new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new TapSourceCost()); ability.addTarget(new TargetSpell()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Counter target spell unless its controller pays {1}.\""); diff --git a/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java b/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java index 80bd1d8ebe7..b13a6db93a6 100644 --- a/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SunscapeApprentice.java @@ -33,13 +33,13 @@ public final class SunscapeApprentice extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}, {tap}: Put target creature you control on top of its owner's library. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), + ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SunscapeMaster.java b/Mage.Sets/src/mage/cards/s/SunscapeMaster.java index 8dfa9c11c6b..0de50d6fa6a 100644 --- a/Mage.Sets/src/mage/cards/s/SunscapeMaster.java +++ b/Mage.Sets/src/mage/cards/s/SunscapeMaster.java @@ -34,14 +34,14 @@ public final class SunscapeMaster extends CardImpl { // {G}{G}, {tap}: Creatures you control get +2/+2 until end of turn. Effect effect1 = new BoostControlledEffect(2, 2, Duration.EndOfTurn); effect1.setText("Creatures you control get +2/+2 until end of turn"); - Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect1, new ManaCostsImpl<>("{G}{G}")); + Ability ability1 = new SimpleActivatedAbility(effect1, new ManaCostsImpl<>("{G}{G}")); ability1.addCost(new TapSourceCost()); this.addAbility(ability1); // {U}{U}, {tap}: Return target creature to its owner's hand. Effect effect2 = new ReturnToHandTargetEffect(); effect2.setText("Return target creature to its owner's hand."); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new ManaCostsImpl<>("{U}{U}")); + Ability ability2 = new SimpleActivatedAbility(effect2, new ManaCostsImpl<>("{U}{U}")); ability2.addTarget(new TargetCreaturePermanent()); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/SunsetPyramid.java b/Mage.Sets/src/mage/cards/s/SunsetPyramid.java index 7c02537b622..ae696fdef07 100644 --- a/Mage.Sets/src/mage/cards/s/SunsetPyramid.java +++ b/Mage.Sets/src/mage/cards/s/SunsetPyramid.java @@ -30,13 +30,13 @@ public final class SunsetPyramid extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.BRICK.createInstance(3)), "with three brick counters on it")); // {2}, {T}, Remove a brick counter from Sunset Pyramid: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.BRICK.createInstance())); this.addAbility(ability); // {2}, {T}: Scry 1. - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1, false), new GenericManaCost(2)); + Ability ability2 = new SimpleActivatedAbility(new ScryEffect(1, false), new GenericManaCost(2)); ability2.addCost(new TapSourceCost()); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/s/Sunstone.java b/Mage.Sets/src/mage/cards/s/Sunstone.java index f6454431ee5..504d0d20949 100644 --- a/Mage.Sets/src/mage/cards/s/Sunstone.java +++ b/Mage.Sets/src/mage/cards/s/Sunstone.java @@ -35,7 +35,7 @@ public final class Sunstone extends CardImpl { // {2}, Sacrifice a snow land: Prevent all combat damage that would be dealt this turn. Effect effect = new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true); effect.setText("Prevent all combat damage that would be dealt this turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeTargetCost(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java index dc3844a54af..007dad01b53 100644 --- a/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java +++ b/Mage.Sets/src/mage/cards/s/SunstrikeLegionnaire.java @@ -48,7 +48,7 @@ public final class SunstrikeLegionnaire extends CardImpl { // Whenever another creature enters the battlefield, untap Sunstrike Legionnaire. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), untapFilter, false)); // {tap}: Tap target creature with converted mana cost 3 or less. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(tapFilter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java index 5e904f668d9..b35f178f0e5 100644 --- a/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java +++ b/Mage.Sets/src/mage/cards/s/SuqAtaFirewalker.java @@ -44,7 +44,7 @@ public final class SuqAtaFirewalker extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filterRed, Duration.WhileOnBattlefield))); //{T}: Suq'Ata Firewalker 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.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurgeNode.java b/Mage.Sets/src/mage/cards/s/SurgeNode.java index f8e87474f1a..8ab73e841c0 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeNode.java +++ b/Mage.Sets/src/mage/cards/s/SurgeNode.java @@ -27,7 +27,7 @@ public final class SurgeNode extends CardImpl { public SurgeNode(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(6)), "with six charge counters on it")); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); + Ability ability = new SimpleActivatedAbility(new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance())); ability.addTarget(new TargetArtifactPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java index 4c0a852cffa..aef5df6fd73 100644 --- a/Mage.Sets/src/mage/cards/s/SurveyorsScope.java +++ b/Mage.Sets/src/mage/cards/s/SurveyorsScope.java @@ -30,7 +30,7 @@ public final class SurveyorsScope extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // {tap}, Exile Surveyor's Scope: Search your library for up to X basic land cards, where X is the number of players who control at least two more lands than you. Put those cards onto the battlefield, then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SurveyorsScopeEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SurveyorsScopeEffect(), new TapSourceCost()); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java index 5021f8ffa32..dfb5a44adb2 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java +++ b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java @@ -27,7 +27,7 @@ public final class SurvivalOfTheFittest extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java index 69d72c70102..920f7dc923b 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/SurvivorOfTheUnseen.java @@ -38,7 +38,7 @@ public final class SurvivorOfTheUnseen extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{2}"))); // {T}: Draw two cards, then put a card from your hand on top of your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SurvivorOfTheUnseenEffect(), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(new SurvivorOfTheUnseenEffect(), new TapSourceCost())); } private SurvivorOfTheUnseen(final SurvivorOfTheUnseen card) { diff --git a/Mage.Sets/src/mage/cards/s/Sustenance.java b/Mage.Sets/src/mage/cards/s/Sustenance.java index 19b9b3fb427..5b9ae0fb4ca 100644 --- a/Mage.Sets/src/mage/cards/s/Sustenance.java +++ b/Mage.Sets/src/mage/cards/s/Sustenance.java @@ -27,7 +27,7 @@ public final class Sustenance extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {1}, Sacrifice a land: Target creature gets +1/+1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SutureSpirit.java b/Mage.Sets/src/mage/cards/s/SutureSpirit.java index 012c14d69b9..95074dac33b 100644 --- a/Mage.Sets/src/mage/cards/s/SutureSpirit.java +++ b/Mage.Sets/src/mage/cards/s/SutureSpirit.java @@ -28,7 +28,7 @@ public final class SutureSpirit extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{W/B}{W/B}{W/B}")); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new ManaCostsImpl<>("{W/B}{W/B}{W/B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java index d08faa37a01..cb7c56cadeb 100644 --- a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java +++ b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java @@ -29,7 +29,7 @@ public final class SvogthosTheRestlessTomb extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {3}{B}{G}: Until end of turn, Svogthos, the Restless Tomb becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new SvogthosToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{3}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new BecomesCreatureSourceEffect(new SvogthosToken(), CardType.LAND, Duration.EndOfTurn).withDurationRuleAtStart(true), new ManaCostsImpl<>("{3}{B}{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/Swarmyard.java b/Mage.Sets/src/mage/cards/s/Swarmyard.java index 77fd70c4ebe..b1833ba27e9 100644 --- a/Mage.Sets/src/mage/cards/s/Swarmyard.java +++ b/Mage.Sets/src/mage/cards/s/Swarmyard.java @@ -40,7 +40,7 @@ public final class Swarmyard extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {tap}: Regenerate target Insect, Rat, Spider, or Squirrel. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new RegenerateTargetEffect(), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java b/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java index 314fca9ee00..c10e1a02c9c 100644 --- a/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java +++ b/Mage.Sets/src/mage/cards/s/SwirlingSpriggan.java @@ -30,7 +30,7 @@ public final class SwirlingSpriggan extends CardImpl { this.toughness = new MageInt(3); // {GU}{GU}: Target creature you control becomes the color or colors of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}{G/U}")); + Ability ability = new SimpleActivatedAbility(new BecomesColorOrColorsTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{G/U}{G/U}")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwoopingTalon.java b/Mage.Sets/src/mage/cards/s/SwoopingTalon.java index 07dc5796025..b8be29e892c 100644 --- a/Mage.Sets/src/mage/cards/s/SwoopingTalon.java +++ b/Mage.Sets/src/mage/cards/s/SwoopingTalon.java @@ -31,7 +31,7 @@ public final class SwoopingTalon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}: Swooping Talon loses flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( + this.addAbility(new SimpleActivatedAbility(new LoseAbilitySourceEffect( FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}"))); // Provoke this.addAbility(new ProvokeAbility()); diff --git a/Mage.Sets/src/mage/cards/s/SwordDancer.java b/Mage.Sets/src/mage/cards/s/SwordDancer.java index cfe99b2eb83..4ae32e46df0 100644 --- a/Mage.Sets/src/mage/cards/s/SwordDancer.java +++ b/Mage.Sets/src/mage/cards/s/SwordDancer.java @@ -30,7 +30,7 @@ public final class SwordDancer extends CardImpl { this.toughness = new MageInt(2); // {W}{W}: Target attacking creature gets -1/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(-1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")); ability.addTarget(new TargetAttackingCreature()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java index 9ed885d513e..22683df8858 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheAges.java @@ -43,7 +43,7 @@ public final class SwordOfTheAges extends CardImpl { cost.setText("Sacrifice {this} and any number of creatures you control"); Cost cost2 = new SacrificeTargetCost(new TargetSacrifice(0, Integer.MAX_VALUE, StaticFilters.FILTER_PERMANENT_CREATURES)); cost2.setText(""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwordOfTheAgesEffect(), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new SwordOfTheAgesEffect(), new TapSourceCost()); ability.addCost(cost); ability.addCost(cost2); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java index 53fae9db0d2..cdb30c613c3 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java @@ -32,7 +32,7 @@ public final class SwordOfTheChosen extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // {tap}: Target legendary creature gets +2/+2 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(new BoostTargetEffect(2, 2, Duration.EndOfTurn), new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java index 84b69f93865..d57aded4b8b 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheParuns.java @@ -54,7 +54,7 @@ public final class SwordOfTheParuns extends CardImpl { ))); // {3}: You may tap or untap equipped creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapAttachedEffect(), new GenericManaCost(3))); + this.addAbility(new SimpleActivatedAbility(new MayTapOrUntapAttachedEffect(), new GenericManaCost(3))); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java index f1df57ec0ff..6cba8effd37 100644 --- a/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java +++ b/Mage.Sets/src/mage/cards/s/SydriGalvanicGenius.java @@ -46,13 +46,13 @@ public final class SydriGalvanicGenius extends CardImpl { this.toughness = new MageInt(2); // {U}: Target noncreature artifact becomes an artifact creature with power and toughness each equal to its converted mana cost until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SydriGalvanicGeniusEffect(), new ManaCostsImpl<>("{U}")); + Ability ability = new SimpleActivatedAbility(new SydriGalvanicGeniusEffect(), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetPermanent(filterNonCreature)); this.addAbility(ability); // {W}{B}: Target artifact creature gains deathtouch and lifelink until end of turn. Effect effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, "Target artifact creature gains deathtouch"); - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{W}{B}")); + ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{W}{B}")); ability.addEffect(new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, "and lifelink until end of turn")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java index cf3651929ec..ee980560b4f 100644 --- a/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java +++ b/Mage.Sets/src/mage/cards/s/SyggRiverGuide.java @@ -33,7 +33,7 @@ public final class SyggRiverGuide extends CardImpl { // Islandwalk this.addAbility(new IslandwalkAbility()); // {1}{W}: Target Merfolk you control gains protection from the color of your choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); + Ability ability = new SimpleActivatedAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java b/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java index d812973f995..77e8efdad53 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java +++ b/Mage.Sets/src/mage/cards/s/SylvanSafekeeper.java @@ -34,7 +34,7 @@ public final class SylvanSafekeeper extends CardImpl { this.toughness = new MageInt(1); // Sacrifice a land: Target creature you control gains shroud until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + Ability ability = new SimpleActivatedAbility( new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new SacrificeTargetCost(StaticFilters.FILTER_LAND)); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SylvokReplica.java b/Mage.Sets/src/mage/cards/s/SylvokReplica.java index 5b985911ae6..b6f880c1531 100644 --- a/Mage.Sets/src/mage/cards/s/SylvokReplica.java +++ b/Mage.Sets/src/mage/cards/s/SylvokReplica.java @@ -30,7 +30,7 @@ public final class SylvokReplica extends CardImpl { this.toughness = new MageInt(3); // {G}, Sacrifice Sylvok Replica: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); + Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java index c55c98ab5d6..bae31e2a3b7 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticDeployment.java @@ -36,7 +36,7 @@ public final class SymbioticDeployment extends CardImpl { this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // {1}, Tap two untapped creatures you control: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); + Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SynodArtificer.java b/Mage.Sets/src/mage/cards/s/SynodArtificer.java index a73a1a1b414..02624f9da43 100644 --- a/Mage.Sets/src/mage/cards/s/SynodArtificer.java +++ b/Mage.Sets/src/mage/cards/s/SynodArtificer.java @@ -43,7 +43,7 @@ public final class SynodArtificer extends CardImpl { // {X}, {tap}: Tap X target noncreature artifacts. Effect tapEffect = new TapTargetEffect(); tapEffect.setText("Tap X target noncreature artifacts."); - Ability tapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, tapEffect, new ManaCostsImpl<>("{X}")); + Ability tapAbility = new SimpleActivatedAbility(tapEffect, new ManaCostsImpl<>("{X}")); tapAbility.addCost(new TapSourceCost()); tapAbility.addTarget(new TargetPermanent(filter)); tapAbility.setTargetAdjuster(new XTargetsCountAdjuster()); @@ -52,7 +52,7 @@ public final class SynodArtificer extends CardImpl { // {X}, {tap}: Untap X target noncreature artifacts. Effect untapEffect = new UntapTargetEffect(); untapEffect.setText("Untap X target noncreature artifacts."); - Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, untapEffect, new ManaCostsImpl<>("{X}")); + Ability untapAbility = new SimpleActivatedAbility(untapEffect, new ManaCostsImpl<>("{X}")); untapAbility.addCost(new TapSourceCost()); untapAbility.addTarget(new TargetPermanent(filter)); untapAbility.setTargetAdjuster(new XTargetsCountAdjuster()); diff --git a/Mage.Sets/src/mage/cards/s/SynodSanctum.java b/Mage.Sets/src/mage/cards/s/SynodSanctum.java index 8347bc49892..3f300841cdf 100644 --- a/Mage.Sets/src/mage/cards/s/SynodSanctum.java +++ b/Mage.Sets/src/mage/cards/s/SynodSanctum.java @@ -41,7 +41,7 @@ public final class SynodSanctum extends CardImpl { // {2}, {tap}: Exile target permanent you control. SynodSanctumEffect effect = new SynodSanctumEffect(); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(effect, new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); Target target = new TargetPermanent(filter); ability.addTarget(target); @@ -49,7 +49,7 @@ public final class SynodSanctum extends CardImpl { // {2}, Sacrifice Synod Sanctum: Return all cards exiled with Synod Sanctum to the battlefield under your control. SynodSanctumEffect2 effect2 = new SynodSanctumEffect2(); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect2, new ManaCostsImpl<>("{2}")); + Ability ability2 = new SimpleActivatedAbility(effect2, new ManaCostsImpl<>("{2}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); }