From 3e9cfa1e4b2894041d371c2417fd7a1a9d2eac6f Mon Sep 17 00:00:00 2001 From: DeepCrimson <98864333+DeepCrimson@users.noreply.github.com> Date: Sun, 12 Jun 2022 10:06:01 -0700 Subject: [PATCH] Refactor: fix raw use of parameterized class ManaCostsImpl - 'V' cards (#9087) --- Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java | 8 ++++---- Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java | 2 +- Mage.Sets/src/mage/cards/v/ValiantKnight.java | 2 +- Mage.Sets/src/mage/cards/v/ValiantRescuer.java | 2 +- Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java | 2 +- Mage.Sets/src/mage/cards/v/ValleyRannet.java | 4 ++-- Mage.Sets/src/mage/cards/v/VampireAristocrat.java | 2 +- Mage.Sets/src/mage/cards/v/VampireBats.java | 2 +- Mage.Sets/src/mage/cards/v/VampireOpportunist.java | 2 +- Mage.Sets/src/mage/cards/v/VampiricDragon.java | 2 +- Mage.Sets/src/mage/cards/v/Vandalblast.java | 2 +- Mage.Sets/src/mage/cards/v/Vanishing.java | 2 +- Mage.Sets/src/mage/cards/v/Vanishment.java | 2 +- Mage.Sets/src/mage/cards/v/VaporousDjinn.java | 2 +- Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java | 2 +- Mage.Sets/src/mage/cards/v/VectisSilencers.java | 2 +- Mage.Sets/src/mage/cards/v/VectorAsp.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenAethermage.java | 2 +- Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java | 2 +- Mage.Sets/src/mage/cards/v/VeiledApparition.java | 2 +- Mage.Sets/src/mage/cards/v/VeiledSerpent.java | 2 +- Mage.Sets/src/mage/cards/v/VeiledShade.java | 2 +- Mage.Sets/src/mage/cards/v/VeilingOddity.java | 2 +- Mage.Sets/src/mage/cards/v/VeinDrinker.java | 2 +- Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java | 2 +- Mage.Sets/src/mage/cards/v/VengefulArchon.java | 2 +- Mage.Sets/src/mage/cards/v/VengefulFirebrand.java | 2 +- Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java | 4 ++-- Mage.Sets/src/mage/cards/v/VentSentinel.java | 2 +- Mage.Sets/src/mage/cards/v/VentifactBottle.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantAutomaton.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantEidolon.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfEphemera.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfMalignity.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfNascency.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java | 2 +- Mage.Sets/src/mage/cards/v/VesselOfVolatility.java | 2 +- Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/v/VexingShusher.java | 2 +- Mage.Sets/src/mage/cards/v/VialOfDragonfire.java | 2 +- Mage.Sets/src/mage/cards/v/VialOfPoison.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoHeretic.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java | 2 +- Mage.Sets/src/mage/cards/v/VigeanGraftmage.java | 2 +- Mage.Sets/src/mage/cards/v/VigilForTheLost.java | 2 +- Mage.Sets/src/mage/cards/v/VigilantDrake.java | 2 +- Mage.Sets/src/mage/cards/v/VigilantMartyr.java | 2 +- Mage.Sets/src/mage/cards/v/VildinPackOutcast.java | 4 ++-- Mage.Sets/src/mage/cards/v/VileManifestation.java | 2 +- Mage.Sets/src/mage/cards/v/VileRedeemer.java | 2 +- Mage.Sets/src/mage/cards/v/VileRequiem.java | 2 +- Mage.Sets/src/mage/cards/v/VilisBrokerOfBlood.java | 2 +- Mage.Sets/src/mage/cards/v/VillageElder.java | 2 +- Mage.Sets/src/mage/cards/v/Vineweft.java | 2 +- Mage.Sets/src/mage/cards/v/VintaraElephant.java | 2 +- Mage.Sets/src/mage/cards/v/ViolentEruption.java | 2 +- Mage.Sets/src/mage/cards/v/ViolentImpact.java | 2 +- Mage.Sets/src/mage/cards/v/ViralDrake.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianLorebearers.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianScout.java | 2 +- Mage.Sets/src/mage/cards/v/ViridianZealot.java | 2 +- Mage.Sets/src/mage/cards/v/VisceraDragger.java | 4 ++-- Mage.Sets/src/mage/cards/v/VisceridArmor.java | 2 +- Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java | 4 ++-- Mage.Sets/src/mage/cards/v/VitalSplicer.java | 2 +- Mage.Sets/src/mage/cards/v/VithianStinger.java | 2 +- Mage.Sets/src/mage/cards/v/VitoThornOfTheDuskRose.java | 2 +- Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java | 2 +- Mage.Sets/src/mage/cards/v/ViviensArkbow.java | 2 +- Mage.Sets/src/mage/cards/v/ViviensGrizzly.java | 2 +- Mage.Sets/src/mage/cards/v/ViviensJaguar.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java | 2 +- Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/v/VodalianHypnotist.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianIllusionist.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianKnights.java | 2 +- Mage.Sets/src/mage/cards/v/VodalianMage.java | 4 ++-- Mage.Sets/src/mage/cards/v/VoidAttendant.java | 2 +- Mage.Sets/src/mage/cards/v/VoidBeckoner.java | 2 +- Mage.Sets/src/mage/cards/v/VoidStalker.java | 2 +- Mage.Sets/src/mage/cards/v/VoidmageApprentice.java | 2 +- Mage.Sets/src/mage/cards/v/VoidmageProdigy.java | 4 ++-- Mage.Sets/src/mage/cards/v/VolcanicRambler.java | 2 +- Mage.Sets/src/mage/cards/v/VolcanicSpray.java | 2 +- Mage.Sets/src/mage/cards/v/VolcanicSubmersion.java | 2 +- Mage.Sets/src/mage/cards/v/VolcanoImp.java | 2 +- Mage.Sets/src/mage/cards/v/VoldarenPariah.java | 2 +- Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathTheFallen.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsCurse.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/v/VolrathsStronghold.java | 2 +- Mage.Sets/src/mage/cards/v/VolunteerReserves.java | 2 +- Mage.Sets/src/mage/cards/v/VoodooDoll.java | 2 +- Mage.Sets/src/mage/cards/v/VoraciousNull.java | 2 +- Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java | 2 +- Mage.Sets/src/mage/cards/v/VoroshTheHunter.java | 2 +- Mage.Sets/src/mage/cards/v/VortexElemental.java | 4 ++-- Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java | 2 +- Mage.Sets/src/mage/cards/v/VulshokReplica.java | 2 +- 105 files changed, 118 insertions(+), 118 deletions(-) diff --git a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java index 6521ba8ea6c..71459124586 100644 --- a/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java +++ b/Mage.Sets/src/mage/cards/v/VaevictisAsmadi.java @@ -30,13 +30,13 @@ public final class VaevictisAsmadi extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice Vaevictis Asmadi unless you pay {B}{R}{G}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{R}{G}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{R}{G}")), TargetController.YOU, false)); // {B}: Vaevictis Asmadi gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); // {R}: Vaevictis Asmadi 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(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {G}: Vaevictis Asmadi gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); } private VaevictisAsmadi(final VaevictisAsmadi card) { diff --git a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java index 8d03d80469e..df1ba5d44c7 100644 --- a/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java +++ b/Mage.Sets/src/mage/cards/v/VagrantPlowbeasts.java @@ -37,7 +37,7 @@ public final class VagrantPlowbeasts extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), - new ManaCostsImpl("{1}")); + new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ValiantKnight.java b/Mage.Sets/src/mage/cards/v/ValiantKnight.java index e51fdac2af6..23dcf0f1cf2 100644 --- a/Mage.Sets/src/mage/cards/v/ValiantKnight.java +++ b/Mage.Sets/src/mage/cards/v/ValiantKnight.java @@ -47,7 +47,7 @@ public final class ValiantKnight extends CardImpl { new GainAbilityControlledEffect( DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, filter - ), new ManaCostsImpl("{3}{W}{W}") + ), new ManaCostsImpl<>("{3}{W}{W}") )); } diff --git a/Mage.Sets/src/mage/cards/v/ValiantRescuer.java b/Mage.Sets/src/mage/cards/v/ValiantRescuer.java index 3014e4aad79..6c1c956bf92 100644 --- a/Mage.Sets/src/mage/cards/v/ValiantRescuer.java +++ b/Mage.Sets/src/mage/cards/v/ValiantRescuer.java @@ -40,7 +40,7 @@ public final class ValiantRescuer extends CardImpl { this.addAbility(new ValiantRescuerTriggeredAbility()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private ValiantRescuer(final ValiantRescuer card) { diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java index 78e85638f85..923996eab43 100644 --- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java +++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java @@ -60,7 +60,7 @@ public final class ValkiGodOfLies extends ModalDoubleFacesCard { this.getLeftHalfCard().addAbility(new EntersBattlefieldTriggeredAbility(new ValkiGodOfLiesRevealExileEffect())); // X: Choose a creature card exiled with Valki with converted mana cost X. Valki becomes a copy of that card. - this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ValkiGodOfLiesCopyExiledEffect(), new ManaCostsImpl("{X}"))); + this.getLeftHalfCard().addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ValkiGodOfLiesCopyExiledEffect(), new ManaCostsImpl<>("{X}"))); // 2. // Tibalt, Cosmic Impostor diff --git a/Mage.Sets/src/mage/cards/v/ValleyRannet.java b/Mage.Sets/src/mage/cards/v/ValleyRannet.java index aad2ada9129..783499f759a 100644 --- a/Mage.Sets/src/mage/cards/v/ValleyRannet.java +++ b/Mage.Sets/src/mage/cards/v/ValleyRannet.java @@ -27,9 +27,9 @@ public final class ValleyRannet extends CardImpl { this.toughness = new MageInt(3); // Mountaincycling {2} - this.addAbility(new MountaincyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new MountaincyclingAbility(new ManaCostsImpl<>("{2}"))); // Forestcycling {2} - this.addAbility(new ForestcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new ForestcyclingAbility(new ManaCostsImpl<>("{2}"))); } private ValleyRannet(final ValleyRannet card) { diff --git a/Mage.Sets/src/mage/cards/v/VampireAristocrat.java b/Mage.Sets/src/mage/cards/v/VampireAristocrat.java index 2e190b8fc0a..dc6fc9f9e01 100644 --- a/Mage.Sets/src/mage/cards/v/VampireAristocrat.java +++ b/Mage.Sets/src/mage/cards/v/VampireAristocrat.java @@ -28,7 +28,7 @@ public final class VampireAristocrat extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(new FilterControlledCreaturePermanent("creature")))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VampireBats.java b/Mage.Sets/src/mage/cards/v/VampireBats.java index 4a6f296b3a6..0a9634e9338 100644 --- a/Mage.Sets/src/mage/cards/v/VampireBats.java +++ b/Mage.Sets/src/mage/cards/v/VampireBats.java @@ -30,7 +30,7 @@ public final class VampireBats extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Vampire Bats gets +1/+0 until end of turn. Activate this ability no more than twice each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{B}"), 2)); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"), 2)); } diff --git a/Mage.Sets/src/mage/cards/v/VampireOpportunist.java b/Mage.Sets/src/mage/cards/v/VampireOpportunist.java index d515ad02bcc..613b7d10046 100644 --- a/Mage.Sets/src/mage/cards/v/VampireOpportunist.java +++ b/Mage.Sets/src/mage/cards/v/VampireOpportunist.java @@ -27,7 +27,7 @@ public final class VampireOpportunist extends CardImpl { // {6}{B}: Each opponent loses 2 life and you gain 2 life. Ability ability = new SimpleActivatedAbility( - new LoseLifeOpponentsEffect(2), new ManaCostsImpl("{6}{B}") + new LoseLifeOpponentsEffect(2), new ManaCostsImpl<>("{6}{B}") ); ability.addEffect(new GainLifeEffect(2).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VampiricDragon.java b/Mage.Sets/src/mage/cards/v/VampiricDragon.java index 440c6b15acf..da334507dcf 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricDragon.java +++ b/Mage.Sets/src/mage/cards/v/VampiricDragon.java @@ -39,7 +39,7 @@ public final class VampiricDragon extends CardImpl { this.addAbility(new DealtDamageAndDiedTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // {1}{R}: Vampiric Dragon deals 1 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/Vandalblast.java b/Mage.Sets/src/mage/cards/v/Vandalblast.java index 6fc08164bf4..580d56d1bd4 100644 --- a/Mage.Sets/src/mage/cards/v/Vandalblast.java +++ b/Mage.Sets/src/mage/cards/v/Vandalblast.java @@ -32,7 +32,7 @@ public final class Vandalblast extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); // Overload {4}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.") - this.addAbility(new OverloadAbility(this, new DestroyAllEffect(FILTER), new ManaCostsImpl("{4}{R}"))); + this.addAbility(new OverloadAbility(this, new DestroyAllEffect(FILTER), new ManaCostsImpl<>("{4}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/v/Vanishing.java b/Mage.Sets/src/mage/cards/v/Vanishing.java index babeee24e71..2ab5c0fd9df 100644 --- a/Mage.Sets/src/mage/cards/v/Vanishing.java +++ b/Mage.Sets/src/mage/cards/v/Vanishing.java @@ -35,7 +35,7 @@ public final class Vanishing extends CardImpl { this.addAbility(ability); // {U}{U}: Enchanted creature phases out. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutAttachedEffect(), new ManaCostsImpl("{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutAttachedEffect(), new ManaCostsImpl<>("{U}{U}"))); } private Vanishing(final Vanishing card) { diff --git a/Mage.Sets/src/mage/cards/v/Vanishment.java b/Mage.Sets/src/mage/cards/v/Vanishment.java index fe05a92e193..f9d152a6227 100644 --- a/Mage.Sets/src/mage/cards/v/Vanishment.java +++ b/Mage.Sets/src/mage/cards/v/Vanishment.java @@ -25,7 +25,7 @@ public final class Vanishment extends CardImpl { this.getSpellAbility().addTarget(new TargetNonlandPermanent()); // Miracle {U} - this.addAbility(new MiracleAbility(this, new ManaCostsImpl("{U}"))); + this.addAbility(new MiracleAbility(this, new ManaCostsImpl<>("{U}"))); } private Vanishment(final Vanishment card) { diff --git a/Mage.Sets/src/mage/cards/v/VaporousDjinn.java b/Mage.Sets/src/mage/cards/v/VaporousDjinn.java index 70df115b41f..e4de6142f18 100644 --- a/Mage.Sets/src/mage/cards/v/VaporousDjinn.java +++ b/Mage.Sets/src/mage/cards/v/VaporousDjinn.java @@ -69,7 +69,7 @@ class VaporousDjinnEffect extends OneShotEffect { Permanent permanent = game.getPermanent(source.getSourceId()); Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - Cost cost = new ManaCostsImpl("{U}{U}"); + Cost cost = new ManaCostsImpl<>("{U}{U}"); String message = "Pay {U}{U} to prevent this permanent from phasing out?"; if (!(controller.chooseUse(Outcome.Benefit, message, source, game) && cost.pay(source, game, source, controller.getId(), false, null))) { diff --git a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java index d1e7cfb225d..f96689281ae 100644 --- a/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java +++ b/Mage.Sets/src/mage/cards/v/VarolzTheScarStriped.java @@ -71,7 +71,7 @@ class VarolzTheScarStripedEffect extends ContinuousEffectImpl { for (UUID cardId : controller.getGraveyard()) { Card card = game.getCard(cardId); if (card != null && card.isCreature(game)) { - ScavengeAbility ability = new ScavengeAbility(new ManaCostsImpl(card.getManaCost().getText())); + ScavengeAbility ability = new ScavengeAbility(new ManaCostsImpl<>(card.getManaCost().getText())); ability.setSourceId(cardId); ability.setControllerId(card.getOwnerId()); game.getState().addOtherAbility(card, ability); diff --git a/Mage.Sets/src/mage/cards/v/VectisSilencers.java b/Mage.Sets/src/mage/cards/v/VectisSilencers.java index 2fce88ec8dd..f2b8b232614 100644 --- a/Mage.Sets/src/mage/cards/v/VectisSilencers.java +++ b/Mage.Sets/src/mage/cards/v/VectisSilencers.java @@ -28,7 +28,7 @@ public final class VectisSilencers extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); } public VectisSilencers (final VectisSilencers card) { diff --git a/Mage.Sets/src/mage/cards/v/VectorAsp.java b/Mage.Sets/src/mage/cards/v/VectorAsp.java index 4a5804b4e15..13b2e4b92eb 100644 --- a/Mage.Sets/src/mage/cards/v/VectorAsp.java +++ b/Mage.Sets/src/mage/cards/v/VectorAsp.java @@ -27,7 +27,7 @@ public final class VectorAsp extends CardImpl { this.subtype.add(SubType.SNAKE); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(InfectAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(InfectAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } public VectorAsp (final VectorAsp card) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java b/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java index e1944051181..934096d0a1c 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java @@ -46,7 +46,7 @@ public final class VedalkenAethermage extends CardImpl { this.addAbility(ability); // Wizardcycling {3} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"), filter2, "Wizardcycling")); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"), filter2, "Wizardcycling")); } private VedalkenAethermage(final VedalkenAethermage card) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java b/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java index b7f57cb519f..2add95c6a0b 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenAnatomist.java @@ -32,7 +32,7 @@ public final class VedalkenAnatomist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.M1M1.createInstance()), new ManaCostsImpl<>("{2}{U}")); ability.addEffect(new MayTapOrUntapTargetEffect()); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VeiledApparition.java b/Mage.Sets/src/mage/cards/v/VeiledApparition.java index d2c0e860b69..8b3ef04ef29 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledApparition.java +++ b/Mage.Sets/src/mage/cards/v/VeiledApparition.java @@ -60,7 +60,7 @@ class VeilApparitionToken extends TokenImpl { subtype.add(SubType.ILLUSION); power = new MageInt(3); toughness = new MageInt(3); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DoUnlessControllerPaysEffect(new SacrificeSourceEffect(), new ManaCostsImpl("{1}{U}")), TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DoUnlessControllerPaysEffect(new SacrificeSourceEffect(), new ManaCostsImpl<>("{1}{U}")), TargetController.YOU, false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java index a17d802266c..06660de7454 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledSerpent.java +++ b/Mage.Sets/src/mage/cards/v/VeiledSerpent.java @@ -38,7 +38,7 @@ public final class VeiledSerpent extends CardImpl { "Whenever an opponent casts a spell, if Veiled Serpent is an enchantment, Veiled Serpent becomes a 4/4 Serpent creature that can't attack unless defending player controls an Island.")); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VeiledShade.java b/Mage.Sets/src/mage/cards/v/VeiledShade.java index c8cbfd10217..13d3e83de9d 100644 --- a/Mage.Sets/src/mage/cards/v/VeiledShade.java +++ b/Mage.Sets/src/mage/cards/v/VeiledShade.java @@ -29,7 +29,7 @@ public final class VeiledShade extends CardImpl { this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), - new ManaCostsImpl("{1}{B}") + new ManaCostsImpl<>("{1}{B}") )); } diff --git a/Mage.Sets/src/mage/cards/v/VeilingOddity.java b/Mage.Sets/src/mage/cards/v/VeilingOddity.java index d89fc782bdd..9772b69518f 100644 --- a/Mage.Sets/src/mage/cards/v/VeilingOddity.java +++ b/Mage.Sets/src/mage/cards/v/VeilingOddity.java @@ -32,7 +32,7 @@ public final class VeilingOddity extends CardImpl { this.toughness = new MageInt(3); // Suspend 4-{1}{U} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{U}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{1}{U}"), this)); // When the last time counter is removed from Veiling Oddity while it's exiled, creatures are unblockable this turn. this.addAbility(new VeilingOddityTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/v/VeinDrinker.java b/Mage.Sets/src/mage/cards/v/VeinDrinker.java index e8943b004b6..199c85b56fe 100644 --- a/Mage.Sets/src/mage/cards/v/VeinDrinker.java +++ b/Mage.Sets/src/mage/cards/v/VeinDrinker.java @@ -35,7 +35,7 @@ public final class VeinDrinker extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {R}, {tap}: Vein Drinker deals damage equal to its power to target creature. That creature deals damage equal to its power to Vein Drinker. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEachOtherEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java index 09a9360911d..2c95c37dc2c 100644 --- a/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java +++ b/Mage.Sets/src/mage/cards/v/VeldraneOfSengir.java @@ -32,7 +32,7 @@ public final class VeldraneOfSengir extends CardImpl { this.toughness = new MageInt(5); // {1}{B}{B}: Veldrane of Sengir gets -3/-0 and gains forestwalk until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-3, -0, Duration.EndOfTurn).setText("{this} gets -3/-0"), new ManaCostsImpl("{1}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-3, -0, Duration.EndOfTurn).setText("{this} gets -3/-0"), new ManaCostsImpl<>("{1}{B}{B}")); ability.addEffect(new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn).setText("and gains forestwalk until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VengefulArchon.java b/Mage.Sets/src/mage/cards/v/VengefulArchon.java index 2d6a43f5fe3..2ab3c212661 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulArchon.java +++ b/Mage.Sets/src/mage/cards/v/VengefulArchon.java @@ -37,7 +37,7 @@ public final class VengefulArchon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {X}: Prevent the next X damage that would be dealt to you this turn. If damage is prevented this way, Vengeful Archon deals that much damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VengefulArchonEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VengefulArchonEffect(), new ManaCostsImpl<>("{X}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java index 0d3c29e3c4e..6d9f6685813 100644 --- a/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java +++ b/Mage.Sets/src/mage/cards/v/VengefulFirebrand.java @@ -42,7 +42,7 @@ public final class VengefulFirebrand extends CardImpl { "{this} has haste as long as a Warrior card is in your graveyard"))); // {R}: Vengeful Firebrand 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(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private VengefulFirebrand(final VengefulFirebrand card) { diff --git a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java index 0b53797dc37..e314803ec5f 100644 --- a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java +++ b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java @@ -40,12 +40,12 @@ public final class VenomspoutBrackus extends CardImpl { this.toughness = new MageInt(5); // {1}{G}, {tap}: Venomspout Brackus deals 5 damage to target attacking or blocking creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VentSentinel.java b/Mage.Sets/src/mage/cards/v/VentSentinel.java index 9cc0be466a0..e37f6240c6a 100644 --- a/Mage.Sets/src/mage/cards/v/VentSentinel.java +++ b/Mage.Sets/src/mage/cards/v/VentSentinel.java @@ -38,7 +38,7 @@ public final class VentSentinel extends CardImpl { this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{1}{R}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VentifactBottle.java b/Mage.Sets/src/mage/cards/v/VentifactBottle.java index 1e48fcbda37..74841dec4c1 100644 --- a/Mage.Sets/src/mage/cards/v/VentifactBottle.java +++ b/Mage.Sets/src/mage/cards/v/VentifactBottle.java @@ -37,7 +37,7 @@ public final class VentifactBottle extends CardImpl { // {X}{1}, {tap}: Put X charge counters on Ventifact Bottle. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), ManacostVariableValue.REGULAR, true), - new ManaCostsImpl("{1}{X}")); + new ManaCostsImpl<>("{1}{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // At the beginning of your precombat main phase, if Ventifact Bottle has a charge counter on it, tap it and remove all charge counters from it. Add {C} for each charge counter removed this way. diff --git a/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java b/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java index d0535d82438..1e2fea4d353 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java +++ b/Mage.Sets/src/mage/cards/v/VerdantAutomaton.java @@ -27,7 +27,7 @@ public final class VerdantAutomaton extends CardImpl { this.toughness = new MageInt(2); // {3}{G}: Put a +1/+1 counter on Verdant Automaton. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl("{3}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), new ManaCostsImpl<>("{3}{G}"))); } private VerdantAutomaton(final VerdantAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/v/VerdantEidolon.java b/Mage.Sets/src/mage/cards/v/VerdantEidolon.java index 8a4ba939318..e5998ef463c 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantEidolon.java +++ b/Mage.Sets/src/mage/cards/v/VerdantEidolon.java @@ -30,7 +30,7 @@ public final class VerdantEidolon extends CardImpl { this.toughness = new MageInt(2); // {G}, Sacrifice Verdant Eidolon: Add three mana of any one color. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new ManaCostsImpl("{G}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(3), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // Whenever you cast a multicolored spell, you may return Verdant Eidolon from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java index 5501f47f0ab..de4fa245f94 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfEphemera.java @@ -26,7 +26,7 @@ public final class VesselOfEphemera extends CardImpl { // {2}{W}, Sacrifice Vessel of Ephemera: Create two 1/1 white Spirit creature tokens with flying. Effect effect = new CreateTokenEffect(new SpiritWhiteToken(), 2); effect.setText("Create two 1/1 white Spirit creature tokens with flying"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java b/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java index c6a0cc4cada..3a33a0017a1 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java @@ -27,7 +27,7 @@ public final class VesselOfMalignity extends CardImpl { Zone.BATTLEFIELD, new ExileFromZoneTargetEffect( Zone.HAND, StaticFilters.FILTER_CARD_CARDS, 2, false - ), new ManaCostsImpl("{1}{B}") + ), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java index 16672da473c..e1ac0ee88df 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java @@ -37,7 +37,7 @@ public final class VesselOfNascency extends CardImpl { // planeswalker card from among them into your hand. Put the rest into your graveyard. Ability ability = new SimpleActivatedAbility( new RevealLibraryPickControllerEffect(4, 1, filter, PutCards.HAND, PutCards.GRAVEYARD), - new ManaCostsImpl("{1}{G}")); + new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java index 3c5e3a9e4e0..805679d76e2 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java @@ -24,7 +24,7 @@ public final class VesselOfParamnesia extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); // {U}, Sacrifice Vessel of Paramnesia: Target player puts the top three cards of their library into their graveyard. Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{U}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/v/VesselOfVolatility.java b/Mage.Sets/src/mage/cards/v/VesselOfVolatility.java index de968d1ad95..b79fd069f9f 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfVolatility.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfVolatility.java @@ -22,7 +22,7 @@ public final class VesselOfVolatility extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); // {1}{R}, Sacrifice Vessel of Volatility: Add {R}{R}{R}{R}. - Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(4), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(4), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java index 77352641072..a5126f8a320 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java @@ -58,7 +58,7 @@ public final class VesuvanShapeshifter extends CardImpl { this.addAbility(ability); // Morph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"))); } private VesuvanShapeshifter(final VesuvanShapeshifter card) { diff --git a/Mage.Sets/src/mage/cards/v/VexingShusher.java b/Mage.Sets/src/mage/cards/v/VexingShusher.java index 34c279e0bdb..3579fe52228 100644 --- a/Mage.Sets/src/mage/cards/v/VexingShusher.java +++ b/Mage.Sets/src/mage/cards/v/VexingShusher.java @@ -38,7 +38,7 @@ public final class VexingShusher extends CardImpl { // Vexing Shusher can't be countered. this.addAbility(new CantBeCounteredSourceAbility()); // {R/G}: Target spell can't be countered. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingShusherCantCounterTargetEffect(), new ManaCostsImpl("{R/G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingShusherCantCounterTargetEffect(), new ManaCostsImpl<>("{R/G}")); ability.addTarget(new TargetSpell()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java b/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java index 17f06afc292..cd85383222d 100644 --- a/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java +++ b/Mage.Sets/src/mage/cards/v/VialOfDragonfire.java @@ -23,7 +23,7 @@ public final class VialOfDragonfire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // {2}, {T}, Sacrifice Vial of Dragonfire: Vial of Dragonfire deals 2 damage to target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VialOfPoison.java b/Mage.Sets/src/mage/cards/v/VialOfPoison.java index fb2b98279a0..3e83916c3f9 100644 --- a/Mage.Sets/src/mage/cards/v/VialOfPoison.java +++ b/Mage.Sets/src/mage/cards/v/VialOfPoison.java @@ -25,7 +25,7 @@ public final class VialOfPoison extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); // {1}, Sacrifice Vial of Poison: Target creature gains deathtouch until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java index 4c6d85ead97..2e3c2cba00b 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java @@ -33,7 +33,7 @@ public final class ViashinoHeretic extends CardImpl { this.toughness = new MageInt(3); // {1}{R}, {tap}: Destroy target artifact. Viashino Heretic deals damage to that artifact's controller equal to the artifact's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoHereticEffect(), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoHereticEffect(), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java index 40de15f8f6a..9eb39883412 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java @@ -40,7 +40,7 @@ public final class ViashinoSandsprinter extends CardImpl { )); // Cycling {R} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{R}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java index 0ccf0192b75..7bcf7422c87 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java @@ -32,7 +32,7 @@ public final class ViashinoSandswimmer extends CardImpl { this.toughness = new MageInt(2); // {R}: Flip a coin. If you win the flip, return Viashino Sandswimmer to its owner's hand. If you lose the flip, sacrifice Viashino Sandswimmer. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoSandswimmerEffect(), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ViashinoSandswimmerEffect(), new ManaCostsImpl<>("{R}"))); } private ViashinoSandswimmer(final ViashinoSandswimmer card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java index 1a0aa914086..462a2c189ec 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java @@ -29,7 +29,7 @@ public final class ViashinoSkeleton extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardTargetCost(new TargetCardInHand())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java b/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java index 1712bf985ab..543d7a23f7a 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java @@ -30,7 +30,7 @@ public final class ViashinoSlaughtermaster extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // {B}{G}: Viashino Slaughtermaster gets +1/+1 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{B}{G}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{G}"))); } private ViashinoSlaughtermaster(final ViashinoSlaughtermaster card) { diff --git a/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java b/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java index 7bd45ad6eda..12f21e894fc 100644 --- a/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java +++ b/Mage.Sets/src/mage/cards/v/VigeanGraftmage.java @@ -34,7 +34,7 @@ public final class VigeanGraftmage extends CardImpl { this.addAbility(new GraftAbility(this, 2)); // {1}{U}: Untap target creature with a +1/+1 counter on it. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{1}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{1}{U}")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_P1P1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VigilForTheLost.java b/Mage.Sets/src/mage/cards/v/VigilForTheLost.java index 23877129034..59346a0dd64 100644 --- a/Mage.Sets/src/mage/cards/v/VigilForTheLost.java +++ b/Mage.Sets/src/mage/cards/v/VigilForTheLost.java @@ -90,7 +90,7 @@ class VigilForTheLostEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - ManaCostsImpl cost = new ManaCostsImpl("{X}"); + ManaCostsImpl cost = new ManaCostsImpl<>("{X}"); cost.clearPaid(); if (cost.payOrRollback(source, game, source, source.getControllerId())) { Player player = game.getPlayer(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/v/VigilantDrake.java b/Mage.Sets/src/mage/cards/v/VigilantDrake.java index 7d7f036a52f..6107371449b 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantDrake.java +++ b/Mage.Sets/src/mage/cards/v/VigilantDrake.java @@ -30,7 +30,7 @@ public final class VigilantDrake extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {2}{U}: Untap Vigilant Drake. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}"))); } private VigilantDrake(final VigilantDrake card) { diff --git a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java index cf6745acbf9..101c6409f82 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantMartyr.java +++ b/Mage.Sets/src/mage/cards/v/VigilantMartyr.java @@ -46,7 +46,7 @@ public final class VigilantMartyr extends CardImpl { ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {W}{W}, {tap}, Sacrifice Vigilant Martyr: Counter target spell that targets an enchantment. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{W}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java b/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java index 60678b9ff21..8241e79e468 100644 --- a/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java +++ b/Mage.Sets/src/mage/cards/v/VildinPackOutcast.java @@ -35,11 +35,11 @@ public final class VildinPackOutcast extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {R}: Vildin-Pack Outcast gets +1/-1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // {5}{R}{R}: Transform Vildin-Pack Outcast. this.addAbility(new TransformAbility()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl("{5}{R}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{R}{R}"))); } private VildinPackOutcast(final VildinPackOutcast card) { diff --git a/Mage.Sets/src/mage/cards/v/VileManifestation.java b/Mage.Sets/src/mage/cards/v/VileManifestation.java index 1c8412c534a..3d70f29c7bc 100644 --- a/Mage.Sets/src/mage/cards/v/VileManifestation.java +++ b/Mage.Sets/src/mage/cards/v/VileManifestation.java @@ -50,7 +50,7 @@ public final class VileManifestation extends CardImpl { this.addAbility(ability); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VileRedeemer.java b/Mage.Sets/src/mage/cards/v/VileRedeemer.java index 23ab9ed9895..e22e703d170 100644 --- a/Mage.Sets/src/mage/cards/v/VileRedeemer.java +++ b/Mage.Sets/src/mage/cards/v/VileRedeemer.java @@ -45,7 +45,7 @@ public final class VileRedeemer extends CardImpl { this.addAbility(FlashAbility.getInstance()); // When you cast Vile Redeemer, you may pay {C}. If you do create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. They have "Sacrifice this creature: Add {C}." this.addAbility( - new CastSourceTriggeredAbility(new DoIfCostPaid(new VileRedeemerEffect(), new ManaCostsImpl("{C}"), "Pay {C} to create 1/1 colorless Eldrazi Scion creature tokens?"), false), + new CastSourceTriggeredAbility(new DoIfCostPaid(new VileRedeemerEffect(), new ManaCostsImpl<>("{C}"), "Pay {C} to create 1/1 colorless Eldrazi Scion creature tokens?"), false), new VileRedeemerNonTokenCreaturesDiedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/v/VileRequiem.java b/Mage.Sets/src/mage/cards/v/VileRequiem.java index 06f71dcea97..8a943b71576 100644 --- a/Mage.Sets/src/mage/cards/v/VileRequiem.java +++ b/Mage.Sets/src/mage/cards/v/VileRequiem.java @@ -45,7 +45,7 @@ public final class VileRequiem extends CardImpl { // {1}{B}, Sacrifice Vile Requiem: Destroy up to X target nonblack creatures, where X is the number of verse counters on Vile Requiem. They can't be regenerated. Effect effect = new DestroyTargetEffect(true); effect.setText("Destroy up to X target nonblack creatures, where X is the number of verse counters on {this}. They can't be regenerated"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 0, filter, false)); ability.setTargetAdjuster(VerseCounterAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/v/VilisBrokerOfBlood.java b/Mage.Sets/src/mage/cards/v/VilisBrokerOfBlood.java index 680cafe6aca..cc6c289d2bc 100644 --- a/Mage.Sets/src/mage/cards/v/VilisBrokerOfBlood.java +++ b/Mage.Sets/src/mage/cards/v/VilisBrokerOfBlood.java @@ -39,7 +39,7 @@ public final class VilisBrokerOfBlood extends CardImpl { // {B}, Pay 2 life: Target creature gets -1/-1 until end of turn. Ability ability = new SimpleActivatedAbility( - new BoostTargetEffect(-1, -1), new ManaCostsImpl("{B}") + new BoostTargetEffect(-1, -1), new ManaCostsImpl<>("{B}") ); ability.addCost(new PayLifeCost(2)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/VillageElder.java b/Mage.Sets/src/mage/cards/v/VillageElder.java index c04918b80b0..8565df58b74 100644 --- a/Mage.Sets/src/mage/cards/v/VillageElder.java +++ b/Mage.Sets/src/mage/cards/v/VillageElder.java @@ -37,7 +37,7 @@ public final class VillageElder extends CardImpl { this.toughness = new MageInt(1); // {G}, {tap}, Sacrifice a Forest: Regenerate target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/v/Vineweft.java b/Mage.Sets/src/mage/cards/v/Vineweft.java index 177e6e6b720..7e3f6d3d19c 100644 --- a/Mage.Sets/src/mage/cards/v/Vineweft.java +++ b/Mage.Sets/src/mage/cards/v/Vineweft.java @@ -42,7 +42,7 @@ public final class Vineweft extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1,Duration.WhileOnBattlefield))); // {4}{G}: Return Vineweft from your graveyard to your hand. - this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{4}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{4}{G}"))); } private Vineweft(final Vineweft card) { diff --git a/Mage.Sets/src/mage/cards/v/VintaraElephant.java b/Mage.Sets/src/mage/cards/v/VintaraElephant.java index 7bffc417653..87f82f76f5c 100644 --- a/Mage.Sets/src/mage/cards/v/VintaraElephant.java +++ b/Mage.Sets/src/mage/cards/v/VintaraElephant.java @@ -32,7 +32,7 @@ public final class VintaraElephant extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // {3}: Vintara Elephant loses trample until end of turn. Any player may activate this ability. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilitySourceEffect( - TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{3}")); + TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.setMayActivate(TargetController.ANY); ability.addEffect(new InfoEffect("Any player may activate this ability")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViolentEruption.java b/Mage.Sets/src/mage/cards/v/ViolentEruption.java index 531e6adb942..d5aac94e74e 100644 --- a/Mage.Sets/src/mage/cards/v/ViolentEruption.java +++ b/Mage.Sets/src/mage/cards/v/ViolentEruption.java @@ -23,7 +23,7 @@ public final class ViolentEruption extends CardImpl { this.getSpellAbility().addTarget(new TargetAnyTargetAmount(4)); // Madness {1}{R}{R} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{R}{R}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{R}{R}"))); } private ViolentEruption(final ViolentEruption card) { diff --git a/Mage.Sets/src/mage/cards/v/ViolentImpact.java b/Mage.Sets/src/mage/cards/v/ViolentImpact.java index d947afd7b2c..99fdf52fa05 100644 --- a/Mage.Sets/src/mage/cards/v/ViolentImpact.java +++ b/Mage.Sets/src/mage/cards/v/ViolentImpact.java @@ -33,7 +33,7 @@ public final class ViolentImpact extends CardImpl { getSpellAbility().addTarget(new TargetPermanent(filter)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/v/ViralDrake.java b/Mage.Sets/src/mage/cards/v/ViralDrake.java index 3b20768ad5c..696e286e074 100644 --- a/Mage.Sets/src/mage/cards/v/ViralDrake.java +++ b/Mage.Sets/src/mage/cards/v/ViralDrake.java @@ -34,7 +34,7 @@ public final class ViralDrake extends CardImpl { this.addAbility(InfectAbility.getInstance()); // {3}{U}: Proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new ManaCostsImpl("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ProliferateEffect(), new ManaCostsImpl<>("{3}{U}"))); } private ViralDrake(final ViralDrake card) { diff --git a/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java b/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java index 186ab72da1f..4c3790d2490 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java +++ b/Mage.Sets/src/mage/cards/v/ViridianLorebearers.java @@ -43,7 +43,7 @@ public final class ViridianLorebearers extends CardImpl { // {3}{G}, {tap}: Target creature gets +X/+X until end of turn, where X is the number of artifacts your opponents control. Effect effect = new BoostTargetEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.EndOfTurn, true); effect.setText("Target creature gets +X/+X until end of turn, where X is the number of artifacts your opponents control"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{G}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViridianScout.java b/Mage.Sets/src/mage/cards/v/ViridianScout.java index 9854797c99c..9e20d642fce 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianScout.java +++ b/Mage.Sets/src/mage/cards/v/ViridianScout.java @@ -38,7 +38,7 @@ public final class ViridianScout extends CardImpl { this.toughness = new MageInt(2); // {2}{G}, Sacrifice Viridian Scout: Viridian Scout deals 2 damage to target creature with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{G}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ViridianZealot.java b/Mage.Sets/src/mage/cards/v/ViridianZealot.java index df35c6d70c2..b4d3977ecd0 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianZealot.java +++ b/Mage.Sets/src/mage/cards/v/ViridianZealot.java @@ -31,7 +31,7 @@ public final class ViridianZealot extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, Sacrifice Viridian Zealot: Destroy target artifact or enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}{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/v/VisceraDragger.java b/Mage.Sets/src/mage/cards/v/VisceraDragger.java index cfa615059a6..9b4988626cd 100644 --- a/Mage.Sets/src/mage/cards/v/VisceraDragger.java +++ b/Mage.Sets/src/mage/cards/v/VisceraDragger.java @@ -26,8 +26,8 @@ public final class VisceraDragger extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); - this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{1}{B}"))); } private VisceraDragger(final VisceraDragger card) { diff --git a/Mage.Sets/src/mage/cards/v/VisceridArmor.java b/Mage.Sets/src/mage/cards/v/VisceridArmor.java index d963b4ba652..0377d82c724 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridArmor.java +++ b/Mage.Sets/src/mage/cards/v/VisceridArmor.java @@ -39,7 +39,7 @@ public final class VisceridArmor extends CardImpl { // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // {1}{U}: Return Viscerid Armor to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } private VisceridArmor(final VisceridArmor card) { diff --git a/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java b/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java index 34b690b2f96..08bff5187bf 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java +++ b/Mage.Sets/src/mage/cards/v/VisceridDeepwalker.java @@ -28,9 +28,9 @@ public final class VisceridDeepwalker extends CardImpl { this.toughness = new MageInt(3); // {U}: Viscerid Deepwalker gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // Suspend 4-{U} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{U}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{U}"), this)); } private VisceridDeepwalker(final VisceridDeepwalker card) { diff --git a/Mage.Sets/src/mage/cards/v/VitalSplicer.java b/Mage.Sets/src/mage/cards/v/VitalSplicer.java index 8bf587ebb74..ceded433c51 100644 --- a/Mage.Sets/src/mage/cards/v/VitalSplicer.java +++ b/Mage.Sets/src/mage/cards/v/VitalSplicer.java @@ -45,7 +45,7 @@ public final class VitalSplicer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new PhyrexianGolemToken()))); // {1}: Regenerate target Golem you control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VithianStinger.java b/Mage.Sets/src/mage/cards/v/VithianStinger.java index 1cbf11afc88..6b78f91dc49 100644 --- a/Mage.Sets/src/mage/cards/v/VithianStinger.java +++ b/Mage.Sets/src/mage/cards/v/VithianStinger.java @@ -35,7 +35,7 @@ public final class VithianStinger extends CardImpl { ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // Unearth {1}{R} - this.addAbility(new UnearthAbility(new ManaCostsImpl("{1}{R}"))); + this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{1}{R}"))); } private VithianStinger(final VithianStinger card) { diff --git a/Mage.Sets/src/mage/cards/v/VitoThornOfTheDuskRose.java b/Mage.Sets/src/mage/cards/v/VitoThornOfTheDuskRose.java index 77e717e596b..4c5bd7a45ea 100644 --- a/Mage.Sets/src/mage/cards/v/VitoThornOfTheDuskRose.java +++ b/Mage.Sets/src/mage/cards/v/VitoThornOfTheDuskRose.java @@ -39,7 +39,7 @@ public final class VitoThornOfTheDuskRose extends CardImpl { // {3}{B}{B}: Creatures you control gain lifelink until end of turn. this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES - ), new ManaCostsImpl("{3}{B}{B}"))); + ), new ManaCostsImpl<>("{3}{B}{B}"))); } private VitoThornOfTheDuskRose(final VitoThornOfTheDuskRose card) { diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java index 0202915be5f..dfc3c446810 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziGuildmage.java @@ -30,10 +30,10 @@ public final class VituGhaziGuildmage extends CardImpl { this.toughness = new MageInt(2); // {4}{G}{W}: Create a 3/3 green Centaur creature token. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new mage.game.permanent.token.CentaurToken()), new ManaCostsImpl("{4}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new mage.game.permanent.token.CentaurToken()), new ManaCostsImpl<>("{4}{G}{W}"))); // {2}{G}{W}: Populate. (Create a token that's a copy of a creature token you control.) - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl("{2}{G}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PopulateEffect(), new ManaCostsImpl<>("{2}{G}{W}"))); } private VituGhaziGuildmage(final VituGhaziGuildmage card) { diff --git a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java index 8b20558ed16..614cbc6f7e9 100644 --- a/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java +++ b/Mage.Sets/src/mage/cards/v/VituGhaziTheCityTree.java @@ -26,7 +26,7 @@ public final class VituGhaziTheCityTree extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}{G}{W}, {tap}: Create a 1/1 green Saproling creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl("{2}{G}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SaprolingToken()), new ManaCostsImpl<>("{2}{G}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/ViviensArkbow.java b/Mage.Sets/src/mage/cards/v/ViviensArkbow.java index 98cc6246800..c61d1ed196d 100644 --- a/Mage.Sets/src/mage/cards/v/ViviensArkbow.java +++ b/Mage.Sets/src/mage/cards/v/ViviensArkbow.java @@ -30,7 +30,7 @@ public final class ViviensArkbow extends CardImpl { // {X}, {T}, Discard a card: Look at the top X cards of your library. You may put a creature card with converted mana cost X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order. Ability ability = new SimpleActivatedAbility( - new ViviensArkbowEffect(), new ManaCostsImpl("{X}") + new ViviensArkbowEffect(), new ManaCostsImpl<>("{X}") ); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/v/ViviensGrizzly.java b/Mage.Sets/src/mage/cards/v/ViviensGrizzly.java index ed5c8912ac2..50c0d17ac8b 100644 --- a/Mage.Sets/src/mage/cards/v/ViviensGrizzly.java +++ b/Mage.Sets/src/mage/cards/v/ViviensGrizzly.java @@ -30,7 +30,7 @@ public final class ViviensGrizzly extends CardImpl { // {3}{G}: Look at the top card of your library. If it's a creature or planeswalker card, you may reveal it and put it into your hand. If you don't put the card into your hand, put it on the bottom of your library. this.addAbility(new SimpleActivatedAbility( - new ViviensGrizzlyEffect(), new ManaCostsImpl("{3}{G}") + new ViviensGrizzlyEffect(), new ManaCostsImpl<>("{3}{G}") )); } diff --git a/Mage.Sets/src/mage/cards/v/ViviensJaguar.java b/Mage.Sets/src/mage/cards/v/ViviensJaguar.java index d045a89aec7..8bd8ae4f22f 100644 --- a/Mage.Sets/src/mage/cards/v/ViviensJaguar.java +++ b/Mage.Sets/src/mage/cards/v/ViviensJaguar.java @@ -41,7 +41,7 @@ public final class ViviensJaguar extends CardImpl { this.addAbility(new ConditionalActivatedAbility( Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - new ManaCostsImpl("{2}{G}"), + new ManaCostsImpl<>("{2}{G}"), new PermanentsOnTheBattlefieldCondition(filter), "{2}{G}: Return {this} from your graveyard to your hand. " + "Activate only if you control a Vivien planeswalker." diff --git a/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java b/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java index 20a94d78395..c8036cd15ff 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java @@ -46,7 +46,7 @@ public final class VizierOfManyFaces extends CardImpl { this.addAbility(new EntersBattlefieldAbility(effect, true), new EmbalmedThisTurnWatcher()); // Embalm {3}{U}{U} - this.addAbility(new EmbalmAbility(new ManaCostsImpl("{3}{U}{U}"), this)); + this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{3}{U}{U}"), this)); } private VizierOfManyFaces(final VizierOfManyFaces card) { diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java index 316131bcea3..4511f7ac7e2 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTumblingSands.java @@ -48,7 +48,7 @@ public final class VizierOfTumblingSands extends CardImpl { this.addAbility(ability); // Cycling {1}{U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); // When you cycle Vizier of Tumbling Sands, untap target permanent. ability = new CycleTriggeredAbility(new UntapTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java index 30807270a53..5f024ed2865 100644 --- a/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java +++ b/Mage.Sets/src/mage/cards/v/VizkopaGuildmage.java @@ -45,12 +45,12 @@ public final class VizkopaGuildmage extends CardImpl { this.toughness = new MageInt(2); // 1{W}{B}: Target creature gains lifelink until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}{B}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // 1{W}{B}: Whenever you gain life this turn, each opponent loses that much life. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new VizkopaGuildmageDelayedTriggeredAbility()), new ManaCostsImpl("{1}{W}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new VizkopaGuildmageDelayedTriggeredAbility()), new ManaCostsImpl<>("{1}{W}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VodalianHypnotist.java b/Mage.Sets/src/mage/cards/v/VodalianHypnotist.java index 645e2f8f67f..457354033c0 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianHypnotist.java +++ b/Mage.Sets/src/mage/cards/v/VodalianHypnotist.java @@ -30,7 +30,7 @@ public final class VodalianHypnotist extends CardImpl { // {2}{B}, {T}: Target player discards a card. Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), - new ManaCostsImpl("{2}{B}")); + new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java b/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java index 4afc7134ec7..016662c2e7e 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java +++ b/Mage.Sets/src/mage/cards/v/VodalianIllusionist.java @@ -29,7 +29,7 @@ public final class VodalianIllusionist extends CardImpl { this.toughness = new MageInt(2); // {U}{U}, {tap}: Target creature phases out. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutTargetEffect(), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhaseOutTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VodalianKnights.java b/Mage.Sets/src/mage/cards/v/VodalianKnights.java index 449cda39c4c..8c275d5c35e 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianKnights.java +++ b/Mage.Sets/src/mage/cards/v/VodalianKnights.java @@ -42,7 +42,7 @@ public final class VodalianKnights extends CardImpl { new SacrificeSourceEffect())); // {U}: Vodalian Knights gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private VodalianKnights(final VodalianKnights card) { diff --git a/Mage.Sets/src/mage/cards/v/VodalianMage.java b/Mage.Sets/src/mage/cards/v/VodalianMage.java index 4b957d7985d..1dd0dc416de 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianMage.java +++ b/Mage.Sets/src/mage/cards/v/VodalianMage.java @@ -29,8 +29,8 @@ public final class VodalianMage extends CardImpl { this.toughness = new MageInt(1); // {U}, {tap}: Counter target spell unless its controller pays {1}. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl("{1}")), - new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), + new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoidAttendant.java b/Mage.Sets/src/mage/cards/v/VoidAttendant.java index 5d11f1e97c1..e6e001886d7 100644 --- a/Mage.Sets/src/mage/cards/v/VoidAttendant.java +++ b/Mage.Sets/src/mage/cards/v/VoidAttendant.java @@ -36,7 +36,7 @@ public final class VoidAttendant extends CardImpl { // {1}{G}, Put a card an opponent owns from exile into that player's graveyard: Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." Effect effect = new CreateTokenEffect(new EldraziScionToken()); effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C}.\""); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")); ability.addCost(new ExileOpponentsCardFromExileToGraveyardCost(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoidBeckoner.java b/Mage.Sets/src/mage/cards/v/VoidBeckoner.java index e4ce9c7a2e2..0ae8e864541 100644 --- a/Mage.Sets/src/mage/cards/v/VoidBeckoner.java +++ b/Mage.Sets/src/mage/cards/v/VoidBeckoner.java @@ -33,7 +33,7 @@ public final class VoidBeckoner extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Cycling {2}{B} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{B}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{B}"))); // When you cycle Void Beckoner, put a deathtouch counter on target creature you control. Ability ability = new CycleTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/v/VoidStalker.java b/Mage.Sets/src/mage/cards/v/VoidStalker.java index 082852cd430..e053603139e 100644 --- a/Mage.Sets/src/mage/cards/v/VoidStalker.java +++ b/Mage.Sets/src/mage/cards/v/VoidStalker.java @@ -34,7 +34,7 @@ public final class VoidStalker extends CardImpl { this.toughness = new MageInt(1); // {2}{U}, {tap}: Put Void Stalker and target creature on top of their owners' libraries, then those players shuffle their libraries. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl("{2}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VoidStalkerEffect(), new ManaCostsImpl<>("{2}{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java index 2094448457b..ee13db0676d 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java @@ -28,7 +28,7 @@ public final class VoidmageApprentice extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}"))); // When Voidmage Apprentice is turned face up, counter target spell. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CounterTargetEffect(), false); diff --git a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java index c4440d9c3e6..adab7d5df9c 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java @@ -40,14 +40,14 @@ public final class VoidmageProdigy extends CardImpl { this.toughness = new MageInt(1); // {U}{U}, Sacrifice a Wizard: Counter target spell. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterTargetEffect(), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); Target target = new TargetSpell(); ability.addTarget(target); this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); } private VoidmageProdigy(final VoidmageProdigy card) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicRambler.java b/Mage.Sets/src/mage/cards/v/VolcanicRambler.java index 2dc6053084c..a74398b8ca7 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicRambler.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicRambler.java @@ -27,7 +27,7 @@ public final class VolcanicRambler extends CardImpl { this.toughness = new MageInt(4); // {2}{R}: Volcanic Rambler deals 1 damage to target player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{2}{R}")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VolcanicSpray.java b/Mage.Sets/src/mage/cards/v/VolcanicSpray.java index 86995eb086e..2e18e4c8560 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicSpray.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicSpray.java @@ -32,7 +32,7 @@ public final class VolcanicSpray extends CardImpl { // Volcanic Spray deals 1 damage to each creature without flying and each player. this.getSpellAbility().addEffect(new DamageEverythingEffect(1, filter)); // Flashback {1}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{1}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{1}{R}"))); } private VolcanicSpray(final VolcanicSpray card) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanicSubmersion.java b/Mage.Sets/src/mage/cards/v/VolcanicSubmersion.java index cf28ab517e6..76bd8aeb7a3 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicSubmersion.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicSubmersion.java @@ -34,7 +34,7 @@ public final class VolcanicSubmersion extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private VolcanicSubmersion(final VolcanicSubmersion card) { diff --git a/Mage.Sets/src/mage/cards/v/VolcanoImp.java b/Mage.Sets/src/mage/cards/v/VolcanoImp.java index 25727e76deb..7e792b47d01 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanoImp.java +++ b/Mage.Sets/src/mage/cards/v/VolcanoImp.java @@ -31,7 +31,7 @@ public final class VolcanoImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{R}: Volcano Imp gains first strike until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java index 0e683e68206..d48b00e527e 100644 --- a/Mage.Sets/src/mage/cards/v/VoldarenPariah.java +++ b/Mage.Sets/src/mage/cards/v/VoldarenPariah.java @@ -49,7 +49,7 @@ public final class VoldarenPariah extends CardImpl { new SacrificeTargetCost(new TargetControlledPermanent(3, 3, filter, false)))); // Madness {B}{B}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{B}{B}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{B}{B}{B}"))); } private VoldarenPariah(final VoldarenPariah card) { diff --git a/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java b/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java index 3901e5c299d..a5d545f66f1 100644 --- a/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java +++ b/Mage.Sets/src/mage/cards/v/VolleyOfBoulders.java @@ -23,7 +23,7 @@ public final class VolleyOfBoulders extends CardImpl { this.getSpellAbility().addEffect(new DamageMultiEffect(6)); this.getSpellAbility().addTarget(new TargetAnyTargetAmount(6)); // Flashback {R}{R}{R}{R}{R}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{R}{R}{R}{R}{R}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{R}{R}{R}{R}{R}{R}"))); } private VolleyOfBoulders(final VolleyOfBoulders card) { diff --git a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java index d8e325e3c2a..18d4f05bed7 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java +++ b/Mage.Sets/src/mage/cards/v/VolrathTheFallen.java @@ -40,7 +40,7 @@ public final class VolrathTheFallen extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, effect, - new ManaCostsImpl("{1}{B}")); + new ManaCostsImpl<>("{1}{B}")); ability.addCost(new DiscardCardCost(StaticFilters.FILTER_CARD_CREATURE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java index fe6b2771b3f..35c757ee0ea 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java @@ -52,7 +52,7 @@ public final class VolrathsCurse extends CardImpl { this.addAbility(new VolrathsCurseSpecialAction()); // {1}{U}: Return Volrath's Curse to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index b670ec41915..e9fbc8c3c6b 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -32,7 +32,7 @@ public final class VolrathsShapeshifter extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VolrathsShapeshifterEffect())); // {2}: Discard a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl("{2}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl<>("{2}"))); } private VolrathsShapeshifter(final VolrathsShapeshifter card) { diff --git a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java index 07ba1eb2b1f..d965df71db8 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsStronghold.java @@ -36,7 +36,7 @@ public final class VolrathsStronghold extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {1}{B}, {tap}: Put target creature card from your graveyard on top of your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VolunteerReserves.java b/Mage.Sets/src/mage/cards/v/VolunteerReserves.java index 8fc9b22b184..fff277353ce 100644 --- a/Mage.Sets/src/mage/cards/v/VolunteerReserves.java +++ b/Mage.Sets/src/mage/cards/v/VolunteerReserves.java @@ -30,7 +30,7 @@ public final class VolunteerReserves extends CardImpl { this.addAbility(BandingAbility.getInstance()); // Cumulative upkeep-Pay {1}. - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); } public VolunteerReserves (final VolunteerReserves card) { diff --git a/Mage.Sets/src/mage/cards/v/VoodooDoll.java b/Mage.Sets/src/mage/cards/v/VoodooDoll.java index 50b63d6c081..729ba8e813f 100644 --- a/Mage.Sets/src/mage/cards/v/VoodooDoll.java +++ b/Mage.Sets/src/mage/cards/v/VoodooDoll.java @@ -52,7 +52,7 @@ public final class VoodooDoll extends CardImpl { // {X}{X}, {T}: Voodoo Doll deals damage equal to the number of pin counters on it to any target. X is the number of pin counters on Voodoo Doll. ability = new SimpleActivatedAbility( - new DamageTargetEffect(new CountersSourceCount(CounterType.PIN)), new ManaCostsImpl("{X}{X}") + new DamageTargetEffect(new CountersSourceCount(CounterType.PIN)), new ManaCostsImpl<>("{X}{X}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/v/VoraciousNull.java b/Mage.Sets/src/mage/cards/v/VoraciousNull.java index cc001da5c93..7528eb6e0f6 100644 --- a/Mage.Sets/src/mage/cards/v/VoraciousNull.java +++ b/Mage.Sets/src/mage/cards/v/VoraciousNull.java @@ -30,7 +30,7 @@ public final class VoraciousNull extends CardImpl { this.toughness = new MageInt(2); // {1}{B}, Sacrifice another creature: Put two +1/+1 counters on Voracious Null. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl("{1}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java index a744d7e09f6..eb4fb682a93 100644 --- a/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java +++ b/Mage.Sets/src/mage/cards/v/VorelOfTheHullClade.java @@ -47,7 +47,7 @@ public final class VorelOfTheHullClade extends CardImpl { this.toughness = new MageInt(4); // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl<>("{G}{U}")); ability.addTarget(new TargetPermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java b/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java index 5994e359368..e13f555c7bc 100644 --- a/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java +++ b/Mage.Sets/src/mage/cards/v/VoroshTheHunter.java @@ -33,7 +33,7 @@ public final class VoroshTheHunter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Vorosh, the Hunter deals combat damage to a player, you may pay {2}{G}. If you do, put six +1/+1 counters on Vorosh. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6), true), new ManaCostsImpl("{2}{G}")), false)); + new DoIfCostPaid(new AddCountersSourceEffect(CounterType.P1P1.createInstance(6), true), new ManaCostsImpl<>("{2}{G}")), false)); } private VoroshTheHunter(final VoroshTheHunter card) { diff --git a/Mage.Sets/src/mage/cards/v/VortexElemental.java b/Mage.Sets/src/mage/cards/v/VortexElemental.java index 40e2e810ff6..2ce1dbc643a 100644 --- a/Mage.Sets/src/mage/cards/v/VortexElemental.java +++ b/Mage.Sets/src/mage/cards/v/VortexElemental.java @@ -38,10 +38,10 @@ public final class VortexElemental extends CardImpl { this.toughness = new MageInt(1); // {U}: Put Vortex Elemental and each creature blocking or blocked by it on top of their owners' libraries, then those players shuffle their libraries. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new VortexElementalEffect(), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new VortexElementalEffect(), new ManaCostsImpl<>("{U}"))); // {3}{U}{U}: Target creature blocks Vortex Elemental this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl("{3}{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByTargetSourceEffect(), new ManaCostsImpl<>("{3}{U}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java b/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java index 0c08575cdd5..d021cc454aa 100644 --- a/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java +++ b/Mage.Sets/src/mage/cards/v/VotaryOfTheConclave.java @@ -26,7 +26,7 @@ public final class VotaryOfTheConclave extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{2}{G}"))); } public VotaryOfTheConclave (final VotaryOfTheConclave card) { diff --git a/Mage.Sets/src/mage/cards/v/VulshokReplica.java b/Mage.Sets/src/mage/cards/v/VulshokReplica.java index 8834d5b3a12..d4a9a3fa41c 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokReplica.java +++ b/Mage.Sets/src/mage/cards/v/VulshokReplica.java @@ -26,7 +26,7 @@ public final class VulshokReplica extends CardImpl { this.subtype.add(SubType.BERSERKER); this.power = new MageInt(3); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability);