diff --git a/Mage.Sets/src/mage/cards/w/WakeOfVultures.java b/Mage.Sets/src/mage/cards/w/WakeOfVultures.java index 5c928ddddb..8302e5ed7b 100644 --- a/Mage.Sets/src/mage/cards/w/WakeOfVultures.java +++ b/Mage.Sets/src/mage/cards/w/WakeOfVultures.java @@ -32,7 +32,7 @@ public final class WakeOfVultures extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{B}, Sacrifice a creature: Regenerate Wake of Vultures. - 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 SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java b/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java index 2841af08c0..01bd6b29f7 100644 --- a/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/w/WakerOfTheWilds.java @@ -42,7 +42,7 @@ public final class WakerOfTheWilds extends CardImpl { CounterType.P1P1.createInstance(0), ManacostVariableValue.REGULAR ).setText("Put X +1/+1 counters on target land you control."), - new ManaCostsImpl("{X}{G}{G}") + new ManaCostsImpl<>("{X}{G}{G}") ); Effect effect = new BecomesCreatureTargetEffect(new WallOfResurgenceToken(), false, true, Duration.Custom); effect.setText("That land becomes a 0/0 Elemental creature with haste. It's still a land"); diff --git a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java index fd0ab8f41e..69f2dcc76d 100644 --- a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java +++ b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java @@ -36,7 +36,7 @@ public final class WakerOfWaves extends CardImpl { // {1}{U}, Discard Waker of Waves: Look at the top two cards of your library. Put one of them into your hand and the other into your graveyard. Ability ability = new SimpleActivatedAbility(Zone.HAND, new LookLibraryAndPickControllerEffect(2, 1, PutCards.HAND, PutCards.GRAVEYARD), - new ManaCostsImpl("{1}{U}")); + new ManaCostsImpl<>("{1}{U}")); ability.addCost(new DiscardSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WakerootElemental.java b/Mage.Sets/src/mage/cards/w/WakerootElemental.java index 7ecf8172b3..0402b8a290 100644 --- a/Mage.Sets/src/mage/cards/w/WakerootElemental.java +++ b/Mage.Sets/src/mage/cards/w/WakerootElemental.java @@ -35,7 +35,7 @@ public final class WakerootElemental extends CardImpl { // {G}{G}{G}{G}{G}: Untap target land you control. It becomes a 5/5 Elemental creature with haste. It's still a land. Ability ability = new SimpleActivatedAbility( - new UntapTargetEffect(), new ManaCostsImpl("{G}{G}{G}{G}{G}") + new UntapTargetEffect(), new ManaCostsImpl<>("{G}{G}{G}{G}{G}") ); ability.addEffect(new BecomesCreatureTargetEffect( new WakerootElementalToken(), false, true, Duration.Custom diff --git a/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java b/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java index 6681aa8af1..f0e5ebc158 100644 --- a/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java +++ b/Mage.Sets/src/mage/cards/w/WakestoneGargoyle.java @@ -40,7 +40,7 @@ public final class WakestoneGargoyle extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Creatures you control with defender can attack this turn as though they didn't have defender. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.EndOfTurn, filter), new ManaCostsImpl("{1}{W}") )); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItDidntHaveDefenderAllEffect(Duration.EndOfTurn, filter), new ManaCostsImpl<>("{1}{W}") )); } private WakestoneGargoyle(final WakestoneGargoyle card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java b/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java index c7c6d38899..7dab83b140 100644 --- a/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java +++ b/Mage.Sets/src/mage/cards/w/WalkerOfSecretWays.java @@ -49,7 +49,7 @@ public final class WalkerOfSecretWays extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new WalkerOfSecretWaysEffect(), false, true)); // {1}{U}: Return target Ninja you control to its owner's hand. Activate this ability only during your turn. - Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}"), MyTurnCondition.instance); + Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{U}"), MyTurnCondition.instance); ability.addTarget(new TargetControlledCreaturePermanent(1, 1, filterCreature, false)); ability.addHint(MyTurnHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WalkingArchive.java b/Mage.Sets/src/mage/cards/w/WalkingArchive.java index ce7dc15069..d91ab644f4 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingArchive.java +++ b/Mage.Sets/src/mage/cards/w/WalkingArchive.java @@ -42,7 +42,7 @@ public final class WalkingArchive extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(new CountersSourceCount(CounterType.P1P1)), TargetController.ANY, false)); // {2}{W}{U}: Put a +1/+1 counter on Walking Archive. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{2}{W}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl<>("{2}{W}{U}"))); } private WalkingArchive(final WalkingArchive card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkingDead.java b/Mage.Sets/src/mage/cards/w/WalkingDead.java index 78ff2c2fcc..6f66b086ea 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDead.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDead.java @@ -25,7 +25,7 @@ public final class WalkingDead extends CardImpl { this.toughness = new MageInt(1); // {B}: Regenerate Walking Dead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WalkingDead(final WalkingDead card) { diff --git a/Mage.Sets/src/mage/cards/w/WalkingDesecration.java b/Mage.Sets/src/mage/cards/w/WalkingDesecration.java index b372f53116..ab8b969052 100644 --- a/Mage.Sets/src/mage/cards/w/WalkingDesecration.java +++ b/Mage.Sets/src/mage/cards/w/WalkingDesecration.java @@ -33,7 +33,7 @@ public final class WalkingDesecration extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}: Creatures of the creature type of your choice attack this turn if able. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WalkingDesecrationEffect(), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WalkingDesecrationEffect(), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfBone.java b/Mage.Sets/src/mage/cards/w/WallOfBone.java index 04fe0e434a..65e003854e 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfBone.java +++ b/Mage.Sets/src/mage/cards/w/WallOfBone.java @@ -28,7 +28,7 @@ public final class WallOfBone extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(4); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WallOfBone(final WallOfBone card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfBrambles.java b/Mage.Sets/src/mage/cards/w/WallOfBrambles.java index 90d6fea93e..dada270c6a 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfBrambles.java +++ b/Mage.Sets/src/mage/cards/w/WallOfBrambles.java @@ -29,7 +29,7 @@ public final class WallOfBrambles extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {G}: Regenerate Wall of Brambles. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private WallOfBrambles(final WallOfBrambles card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java index ca619f7b95..0ae5c58355 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java @@ -34,10 +34,10 @@ public final class WallOfDeceit extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {3}: Turn Wall of Deceit face down. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WallOfDeceitEffect(), new ManaCostsImpl("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WallOfDeceitEffect(), new ManaCostsImpl<>("{3}"))); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); } private WallOfDeceit(final WallOfDeceit card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfDistortion.java b/Mage.Sets/src/mage/cards/w/WallOfDistortion.java index 0eb79866fa..4d6bdd11b8 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDistortion.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDistortion.java @@ -33,7 +33,7 @@ public final class WallOfDistortion extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}{B}, {tap}: 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}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WallOfFaith.java b/Mage.Sets/src/mage/cards/w/WallOfFaith.java index d47de0a06b..a723071fa0 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfFaith.java +++ b/Mage.Sets/src/mage/cards/w/WallOfFaith.java @@ -29,7 +29,7 @@ public final class WallOfFaith extends CardImpl { this.toughness = new MageInt(5); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); } private WallOfFaith(final WallOfFaith card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfKelp.java b/Mage.Sets/src/mage/cards/w/WallOfKelp.java index c0da5040a3..5fdc0bf2d6 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfKelp.java +++ b/Mage.Sets/src/mage/cards/w/WallOfKelp.java @@ -33,7 +33,7 @@ public final class WallOfKelp extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {U}{U}, {tap}: Create a 0/1 blue Plant Wall creature token with defender named Kelp. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KelpToken()), new ManaCostsImpl("{U}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KelpToken()), new ManaCostsImpl<>("{U}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfLava.java b/Mage.Sets/src/mage/cards/w/WallOfLava.java index 2c071c5578..3302bb4978 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfLava.java +++ b/Mage.Sets/src/mage/cards/w/WallOfLava.java @@ -31,7 +31,7 @@ public final class WallOfLava extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {R}: Wall of Lava 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}"))); } private WallOfLava(final WallOfLava card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfLimbs.java b/Mage.Sets/src/mage/cards/w/WallOfLimbs.java index f75454b2e8..8b67e7dfb3 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfLimbs.java +++ b/Mage.Sets/src/mage/cards/w/WallOfLimbs.java @@ -47,7 +47,7 @@ public final class WallOfLimbs extends CardImpl { // {5}{B}{B}, Sacrifice Wall of Limbs: Target player loses X life, where X is Wall of Limbs's power. Effect effect = new LoseLifeTargetEffect(new SourcePermanentPowerCount()); effect.setText("Target player loses X life, where X is {this}'s power."); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{5}{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{5}{B}{B}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WallOfOneThousandCuts.java b/Mage.Sets/src/mage/cards/w/WallOfOneThousandCuts.java index 0e771c86e7..dedcc9a0af 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfOneThousandCuts.java +++ b/Mage.Sets/src/mage/cards/w/WallOfOneThousandCuts.java @@ -34,7 +34,7 @@ public final class WallOfOneThousandCuts extends CardImpl { // {W}: Wall of One Thousand Cuts can attack this turn as though it didn't have defender. this.addAbility(new SimpleActivatedAbility( - new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}") + new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{W}") )); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java b/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java index 39cd0f47e0..d3755aefde 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java +++ b/Mage.Sets/src/mage/cards/w/WallOfPineNeedles.java @@ -30,7 +30,7 @@ public final class WallOfPineNeedles extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {G}: Regenerate Wall of Pine Needles. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java index 8527930ee8..06de1efbba 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java +++ b/Mage.Sets/src/mage/cards/w/WallOfTanglecord.java @@ -30,7 +30,7 @@ public final class WallOfTanglecord extends CardImpl { this.addAbility(DefenderAbility.getInstance()); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(ReachAbility.getInstance(), Duration.EndOfTurn), - new ManaCostsImpl("{G}"))); + new ManaCostsImpl<>("{G}"))); } public WallOfTanglecord (final WallOfTanglecord card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfVipers.java b/Mage.Sets/src/mage/cards/w/WallOfVipers.java index b82b64302e..9ade8eb21f 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfVipers.java +++ b/Mage.Sets/src/mage/cards/w/WallOfVipers.java @@ -39,7 +39,7 @@ public final class WallOfVipers extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {3}: Destroy Wall of Vipers and target creature it's blocking. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(), new ManaCostsImpl("{3}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroySourceEffect(), new ManaCostsImpl<>("{3}")); ability.addEffect(new DestroyTargetEffect(" and target creature it's blocking")); ability.addTarget(new TargetCreaturePermanent(new WallOfVipersFilter())); ability.setMayActivate(TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/w/WallOfWater.java b/Mage.Sets/src/mage/cards/w/WallOfWater.java index 4bc2081159..e7940eed42 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfWater.java +++ b/Mage.Sets/src/mage/cards/w/WallOfWater.java @@ -31,7 +31,7 @@ public final class WallOfWater extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // {U}: Wall of Water 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}"))); } private WallOfWater(final WallOfWater card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfWonder.java b/Mage.Sets/src/mage/cards/w/WallOfWonder.java index e4c67d6ca4..9d36ef9f70 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfWonder.java +++ b/Mage.Sets/src/mage/cards/w/WallOfWonder.java @@ -33,7 +33,7 @@ public final class WallOfWonder extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {2}{U}{U}: Wall of Wonder gets +4/-4 until end of turn and can attack this turn as though it didn't have defender. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(4, -4, Duration.EndOfTurn), - new ManaCostsImpl("{2}{U}{U}")); + new ManaCostsImpl<>("{2}{U}{U}")); ability.addEffect(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn, "and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java index de9255bab1..643d45fdfc 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java +++ b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java @@ -39,7 +39,7 @@ public final class WanderingFumarole extends CardImpl { // "0: Switch this creature's power and toughness until end of turn." It's still a land. Effect effect = new BecomesCreatureSourceEffect(new WanderingFumaroleToken(), "land", Duration.EndOfTurn); effect.setText("{this} becomes a 1/4 blue and red Elemental creature with \"0: Switch this creature's power and toughness until end of turn.\" It's still a land"); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{U}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{U}{R}"))); } private WanderingFumarole(final WanderingFumarole card) { @@ -62,7 +62,7 @@ class WanderingFumaroleToken extends TokenImpl { color.setBlue(true); power = new MageInt(1); toughness = new MageInt(4); - addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{0}"))); + addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{0}"))); } public WanderingFumaroleToken(final WanderingFumaroleToken token) { super(token); diff --git a/Mage.Sets/src/mage/cards/w/WanderingMage.java b/Mage.Sets/src/mage/cards/w/WanderingMage.java index c3284c8835..316a906200 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMage.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMage.java @@ -50,20 +50,20 @@ public final class WanderingMage extends CardImpl { // {W}, Pay 1 life: Prevent the next 2 damage that would be dealt to target creature this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{W}")); + new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{W}")); ability.addCost(new PayLifeCost(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {U}: Prevent the next 1 damage that would be dealt to target Cleric or Wizard creature this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{U}")); + new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{U}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // {B}, Put a -1/-1 counter on a creature you control: Prevent the next 2 damage that would be dealt to target player this turn. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl("{B}")); + new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ManaCostsImpl<>("{B}")); ability.addCost(new WanderingMageCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); Target target = new TargetControlledCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/w/WarBehemoth.java b/Mage.Sets/src/mage/cards/w/WarBehemoth.java index c2f8422e56..185faa4c3d 100644 --- a/Mage.Sets/src/mage/cards/w/WarBehemoth.java +++ b/Mage.Sets/src/mage/cards/w/WarBehemoth.java @@ -24,7 +24,7 @@ public final class WarBehemoth extends CardImpl { this.toughness = new MageInt(6); // Morph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"))); } private WarBehemoth(final WarBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/w/WarCadence.java b/Mage.Sets/src/mage/cards/w/WarCadence.java index ba1df721d9..0b1bb4d3c1 100644 --- a/Mage.Sets/src/mage/cards/w/WarCadence.java +++ b/Mage.Sets/src/mage/cards/w/WarCadence.java @@ -28,7 +28,7 @@ public final class WarCadence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // {X}{R}: This turn, creatures can't block unless their controller pays {X} for each blocking creature they control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarCadenceReplacementEffect(), new ManaCostsImpl("{X}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarCadenceReplacementEffect(), new ManaCostsImpl<>("{X}{R}"))); } @@ -62,7 +62,7 @@ class WarCadenceReplacementEffect extends ReplacementEffectImpl { int amount = xCosts.calculate(game, source, this); if (amount > 0) { String mana = "{" + amount + '}'; - ManaCostsImpl cost = new ManaCostsImpl(mana); + ManaCostsImpl cost = new ManaCostsImpl<>(mana); if (cost.canPay(source, source, event.getPlayerId(), game) && player.chooseUse(Outcome.Benefit, "Pay " + mana + " to declare blocker?", source, game)) { if (cost.payOrRollback(source, game, source, event.getPlayerId())) { diff --git a/Mage.Sets/src/mage/cards/w/WarChariot.java b/Mage.Sets/src/mage/cards/w/WarChariot.java index 30fdf34896..d0a071a943 100644 --- a/Mage.Sets/src/mage/cards/w/WarChariot.java +++ b/Mage.Sets/src/mage/cards/w/WarChariot.java @@ -26,7 +26,7 @@ public final class WarChariot extends CardImpl { // {3}, {tap}: Target creature gains trample until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), - Duration.EndOfTurn), new ManaCostsImpl("{3}")); + Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WarScreecher.java b/Mage.Sets/src/mage/cards/w/WarScreecher.java index cc39efb675..bbe67a44c9 100644 --- a/Mage.Sets/src/mage/cards/w/WarScreecher.java +++ b/Mage.Sets/src/mage/cards/w/WarScreecher.java @@ -33,7 +33,7 @@ public final class WarScreecher extends CardImpl { // {5}{W}, {T}: Other creatures you control get +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(new BoostControlledEffect( 1, 1, Duration.EndOfTurn, true - ), new ManaCostsImpl("{5}{W}")); + ), new ManaCostsImpl<>("{5}{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WarTax.java b/Mage.Sets/src/mage/cards/w/WarTax.java index f99701148c..5425ecc695 100644 --- a/Mage.Sets/src/mage/cards/w/WarTax.java +++ b/Mage.Sets/src/mage/cards/w/WarTax.java @@ -30,7 +30,7 @@ public final class WarTax extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // {X}{U}: This turn, creatures can't attack unless their controller pays {X} for each attacking creature they control. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarTaxCantAttackUnlessPaysEffect(), new ManaCostsImpl("{X}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WarTaxCantAttackUnlessPaysEffect(), new ManaCostsImpl<>("{X}{U}"))); } private WarTax(final WarTax card) { diff --git a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java index 5ce640adae..12edcdfe4b 100644 --- a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java +++ b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java @@ -28,7 +28,7 @@ public final class WarbreakTrumpeter extends CardImpl { this.toughness = new MageInt(1); // Morph {X}{X}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl("{X}{X}{R}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{X}{X}{R}"))); // When Warbreak Trumpeter is turned face up, create X 1/1 red Goblin creature tokens. DynamicValue morphX = MorphManacostVariableValue.instance; diff --git a/Mage.Sets/src/mage/cards/w/WarcryPhoenix.java b/Mage.Sets/src/mage/cards/w/WarcryPhoenix.java index cf08d9fde7..68943bd30a 100644 --- a/Mage.Sets/src/mage/cards/w/WarcryPhoenix.java +++ b/Mage.Sets/src/mage/cards/w/WarcryPhoenix.java @@ -38,7 +38,7 @@ public final class WarcryPhoenix extends CardImpl { // Whenever you attack with three or more creatures, you may pay {2}{R}. If you do, return Warcry Phoenix from your graveyard to the battlefield tapped and attacking. this.addAbility(new AttacksWithCreaturesTriggeredAbility(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(true, true, -1), - new ManaCostsImpl("{2}{R}")) + new ManaCostsImpl<>("{2}{R}")) .setText("you may pay {2}{R}. If you do, return {this} from your graveyard to the battlefield tapped and attacking"), 3, StaticFilters.FILTER_PERMANENT_CREATURES)); } diff --git a/Mage.Sets/src/mage/cards/w/WardOfPiety.java b/Mage.Sets/src/mage/cards/w/WardOfPiety.java index 1bebc326f8..ff23225d6b 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfPiety.java +++ b/Mage.Sets/src/mage/cards/w/WardOfPiety.java @@ -41,7 +41,7 @@ public final class WardOfPiety extends CardImpl { this.addAbility(ability); // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to any target instead. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl("{1}{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WardOfPietyPreventDamageTargetEffect(), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java index d88bc23d6a..d15e605d28 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java @@ -41,7 +41,7 @@ public final class WardenOfTheFirstTree extends CardImpl { // {1}{W/B}: Warden of the First Tree becomes a Human Warrior with base power and toughness 3/3. Ability ability = new SimpleActivatedAbility(new AddCardSubTypeSourceEffect( Duration.Custom, SubType.HUMAN, SubType.WARRIOR - ).setText("{this} becomes a Human Warrior"), new ManaCostsImpl("{1}{W/B}")); + ).setText("{this} becomes a Human Warrior"), new ManaCostsImpl<>("{1}{W/B}")); ability.addEffect(new SetPowerToughnessSourceEffect( 3, 3, Duration.Custom, SubLayer.SetPT_7b ).setText("with base power and toughness 3/3")); @@ -49,7 +49,7 @@ public final class WardenOfTheFirstTree extends CardImpl { // {2}{W/B}{W/B}: If Warden of the First Tree is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink. this.addAbility(new SimpleActivatedAbility( - new WardenOfTheFirstTreeEffect(), new ManaCostsImpl("{2}{W/B}{W/B}") + new WardenOfTheFirstTreeEffect(), new ManaCostsImpl<>("{2}{W/B}{W/B}") )); // {3}{W/B}{W/B}{W/B}: If Warden of the First Tree is a Spirit, put five +1/+1 counters on it. @@ -57,7 +57,7 @@ public final class WardenOfTheFirstTree extends CardImpl { new ConditionalOneShotEffect( new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)), condition, "If {this} is a Spirit, put five +1/+1 counters on it" - ), new ManaCostsImpl("{3}{W/B}{W/B}{W/B}") + ), new ManaCostsImpl<>("{3}{W/B}{W/B}{W/B}") )); } diff --git a/Mage.Sets/src/mage/cards/w/WarmongerHellkite.java b/Mage.Sets/src/mage/cards/w/WarmongerHellkite.java index a29a363f0a..3b7c7aab88 100644 --- a/Mage.Sets/src/mage/cards/w/WarmongerHellkite.java +++ b/Mage.Sets/src/mage/cards/w/WarmongerHellkite.java @@ -36,7 +36,7 @@ public final class WarmongerHellkite extends CardImpl { this.addAbility(new SimpleStaticAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // {1}{R}: Attacking creatures get +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new ManaCostsImpl("{1}{R}"))); + this.addAbility(new SimpleActivatedAbility(new BoostAllEffect(1, 0, Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, false), new ManaCostsImpl<>("{1}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WarpingWurm.java b/Mage.Sets/src/mage/cards/w/WarpingWurm.java index 5c57816dd0..8be0fda8df 100644 --- a/Mage.Sets/src/mage/cards/w/WarpingWurm.java +++ b/Mage.Sets/src/mage/cards/w/WarpingWurm.java @@ -36,7 +36,7 @@ public final class WarpingWurm extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility( new DoUnlessControllerPaysEffect( new PhaseOutSourceEffect(), - new ManaCostsImpl("{2}{G}{U}") + new ManaCostsImpl<>("{2}{G}{U}") ).setText("{this} phases out unless you pay {2}{G}{U}"), TargetController.YOU, false )); diff --git a/Mage.Sets/src/mage/cards/w/WastelandScorpion.java b/Mage.Sets/src/mage/cards/w/WastelandScorpion.java index 6f89e0ac68..bd7ebc151b 100644 --- a/Mage.Sets/src/mage/cards/w/WastelandScorpion.java +++ b/Mage.Sets/src/mage/cards/w/WastelandScorpion.java @@ -28,7 +28,7 @@ public final class WastelandScorpion extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java b/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java index 183d0a3b8e..1cd4a541c7 100644 --- a/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java +++ b/Mage.Sets/src/mage/cards/w/WatchfulAutomaton.java @@ -26,7 +26,7 @@ public final class WatchfulAutomaton extends CardImpl { this.toughness = new MageInt(2); // {2}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl("{2}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(1), new ManaCostsImpl<>("{2}{U}"))); } private WatchfulAutomaton(final WatchfulAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/w/WaterServant.java b/Mage.Sets/src/mage/cards/w/WaterServant.java index 865a0d3bc6..1fd8cb1203 100644 --- a/Mage.Sets/src/mage/cards/w/WaterServant.java +++ b/Mage.Sets/src/mage/cards/w/WaterServant.java @@ -27,8 +27,8 @@ public final class WaterServant extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(-1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private WaterServant(final WaterServant card) { diff --git a/Mage.Sets/src/mage/cards/w/Watercourser.java b/Mage.Sets/src/mage/cards/w/Watercourser.java index 1aefc46513..bde896d35c 100644 --- a/Mage.Sets/src/mage/cards/w/Watercourser.java +++ b/Mage.Sets/src/mage/cards/w/Watercourser.java @@ -27,7 +27,7 @@ public final class Watercourser extends CardImpl { this.toughness = new MageInt(3); // {U}: Watercourser 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(Zone.BATTLEFIELD, new BoostSourceEffect(1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); } private Watercourser(final Watercourser card) { diff --git a/Mage.Sets/src/mage/cards/w/WaveElemental.java b/Mage.Sets/src/mage/cards/w/WaveElemental.java index 28c8e6e4a5..6d99291d93 100644 --- a/Mage.Sets/src/mage/cards/w/WaveElemental.java +++ b/Mage.Sets/src/mage/cards/w/WaveElemental.java @@ -39,7 +39,7 @@ public final class WaveElemental extends CardImpl { this.toughness = new MageInt(3); // {U}, {tap}, Sacrifice Wave Elemental: Tap up to three target creatures without flying. - Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(new TapTargetEffect(), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetPermanent(0, 4, filter, false)); diff --git a/Mage.Sets/src/mage/cards/w/WaveOfTerror.java b/Mage.Sets/src/mage/cards/w/WaveOfTerror.java index 7d218498b0..111a586f6e 100644 --- a/Mage.Sets/src/mage/cards/w/WaveOfTerror.java +++ b/Mage.Sets/src/mage/cards/w/WaveOfTerror.java @@ -30,7 +30,7 @@ public final class WaveOfTerror extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // At the beginning of your draw step, destroy each creature with converted mana cost equal to the number of age counters on Wave of Terror. They can't be regenerated. this.addAbility(new BeginningOfDrawTriggeredAbility(new WaveOfTerrorEffect(), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/w/WaywardSoul.java b/Mage.Sets/src/mage/cards/w/WaywardSoul.java index cba8358486..64a3cd7420 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardSoul.java +++ b/Mage.Sets/src/mage/cards/w/WaywardSoul.java @@ -29,7 +29,7 @@ public final class WaywardSoul extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}: Put Wayward Soul on top of its owner's library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibrarySourceEffect(true), new ManaCostsImpl<>("{U}"))); } private WaywardSoul(final WaywardSoul card) { diff --git a/Mage.Sets/src/mage/cards/w/WeaponSurge.java b/Mage.Sets/src/mage/cards/w/WeaponSurge.java index 52e9b1bc69..b3a65ebb82 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponSurge.java +++ b/Mage.Sets/src/mage/cards/w/WeaponSurge.java @@ -42,7 +42,7 @@ public final class WeaponSurge extends CardImpl { this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Overload {1}{R} - Ability ability = new OverloadAbility(this, new BoostAllEffect(1,0, Duration.EndOfTurn, filter, false), new ManaCostsImpl("{1}{R}")); + Ability ability = new OverloadAbility(this, new BoostAllEffect(1,0, Duration.EndOfTurn, filter, false), new ManaCostsImpl<>("{1}{R}")); ability.addEffect(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WeaselbackRedcap.java b/Mage.Sets/src/mage/cards/w/WeaselbackRedcap.java index 3526c27452..26ab1d70c4 100644 --- a/Mage.Sets/src/mage/cards/w/WeaselbackRedcap.java +++ b/Mage.Sets/src/mage/cards/w/WeaselbackRedcap.java @@ -27,7 +27,7 @@ public final class WeaselbackRedcap extends CardImpl { // {1}{R}: Weaselback Redcap gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{R}") + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java index 873c3a4070..ab40d678e8 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java @@ -38,7 +38,7 @@ public final class WeatheredBodyguards extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WeatheredBodyguardsEffect())); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java b/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java index 4d0d03c303..15e9e8e392 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java @@ -37,7 +37,7 @@ public final class WeatheredWayfarer extends CardImpl { Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true, true), - new ManaCostsImpl("{W}"), + new ManaCostsImpl<>("{W}"), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java index 144b913e01..bb95c0b7c3 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java @@ -45,7 +45,7 @@ public final class WeaverOfLies extends CardImpl { this.toughness = new MageInt(4); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); // When Weaver of Lies is turned face up, turn any number of target creatures with a morph ability other than Weaver of Lies face down. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new WeaverOfLiesEffect(), false, false); diff --git a/Mage.Sets/src/mage/cards/w/WeirdedVampire.java b/Mage.Sets/src/mage/cards/w/WeirdedVampire.java index 4c39160da4..43b3bf67f3 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdedVampire.java +++ b/Mage.Sets/src/mage/cards/w/WeirdedVampire.java @@ -24,7 +24,7 @@ public final class WeirdedVampire extends CardImpl { this.toughness = new MageInt(3); // Madness {2}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{2}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{2}{B}"))); } private WeirdedVampire(final WeirdedVampire card) { diff --git a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java index 51d7a3e263..96e76a8b1e 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java @@ -36,7 +36,7 @@ public final class WeirdingShaman extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinRogueToken(), 2), new ManaCostsImpl("{3}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinRogueToken(), 2), new ManaCostsImpl<>("{3}{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java index 96ceb05678..bb6c0ac6be 100644 --- a/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java +++ b/Mage.Sets/src/mage/cards/w/WelcomeToTheFold.java @@ -28,7 +28,7 @@ public final class WelcomeToTheFold extends CardImpl { // Madness {X}{U}{U} (If you discard this card // discard it into exile. When you do // cast it for its madness cost or put it into your graveyard. - Ability ability = new MadnessAbility(new ManaCostsImpl("{X}{U}{U}")); + Ability ability = new MadnessAbility(new ManaCostsImpl<>("{X}{U}{U}")); ability.setRuleAtTheTop(true); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WelderAutomaton.java b/Mage.Sets/src/mage/cards/w/WelderAutomaton.java index 1b1ed2a954..ac7fec3929 100644 --- a/Mage.Sets/src/mage/cards/w/WelderAutomaton.java +++ b/Mage.Sets/src/mage/cards/w/WelderAutomaton.java @@ -27,7 +27,7 @@ public final class WelderAutomaton extends CardImpl { this.toughness = new MageInt(1); // {3}{R}: Welder Automaton deals 1 damage to each opponent. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl("{3}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT), new ManaCostsImpl<>("{3}{R}"))); } private WelderAutomaton(final WelderAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java index e73aec31ea..fb26f41955 100644 --- a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java +++ b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java @@ -39,7 +39,7 @@ public final class WellgabberApothecary extends CardImpl { this.toughness = new MageInt(3); // {1}{W} : Prevent all damage that would be dealt to target tapped Merfolk or Kithkin creatuer this turn - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new ManaCostsImpl("{1}{W}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WesternPaladin.java b/Mage.Sets/src/mage/cards/w/WesternPaladin.java index cd00734e1b..95ddd81e1f 100644 --- a/Mage.Sets/src/mage/cards/w/WesternPaladin.java +++ b/Mage.Sets/src/mage/cards/w/WesternPaladin.java @@ -40,7 +40,7 @@ public final class WesternPaladin extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{B}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WheelOfFate.java b/Mage.Sets/src/mage/cards/w/WheelOfFate.java index c756454ab8..c4d1940463 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfFate.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfFate.java @@ -22,7 +22,7 @@ public final class WheelOfFate extends CardImpl { this.color.setRed(true); // Suspend 4-{1}{R} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{R}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{1}{R}"), this)); // Each player discards their hand, then draws seven cards. this.getSpellAbility().addEffect(new DiscardHandAllEffect()); this.getSpellAbility().addEffect(new DrawCardAllEffect(7).setText(", then draws seven cards")); diff --git a/Mage.Sets/src/mage/cards/w/Whetwheel.java b/Mage.Sets/src/mage/cards/w/Whetwheel.java index f242143fdd..b4c1f72aa3 100644 --- a/Mage.Sets/src/mage/cards/w/Whetwheel.java +++ b/Mage.Sets/src/mage/cards/w/Whetwheel.java @@ -26,12 +26,12 @@ public final class Whetwheel extends CardImpl { // {X}{X}, {tap}: Target player puts the top X cards of their library into their graveyard. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect( - ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}{X}")); + ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Morph {3} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}"))); } private Whetwheel(final Whetwheel card) { diff --git a/Mage.Sets/src/mage/cards/w/WhipOfErebos.java b/Mage.Sets/src/mage/cards/w/WhipOfErebos.java index a33e03bb00..0769d2bdb9 100644 --- a/Mage.Sets/src/mage/cards/w/WhipOfErebos.java +++ b/Mage.Sets/src/mage/cards/w/WhipOfErebos.java @@ -50,7 +50,7 @@ public final class WhipOfErebos extends CardImpl { // If it would leave the battlefield, exile it instead of putting it anywhere else. // Activate this ability only any time you could cast a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility( - Zone.BATTLEFIELD, new WhipOfErebosEffect(), new ManaCostsImpl("{2}{B}{B}") + Zone.BATTLEFIELD, new WhipOfErebosEffect(), new ManaCostsImpl<>("{2}{B}{B}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/w/WhipSergeant.java b/Mage.Sets/src/mage/cards/w/WhipSergeant.java index f2015ae1a2..222fe72e3b 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSergeant.java +++ b/Mage.Sets/src/mage/cards/w/WhipSergeant.java @@ -31,7 +31,7 @@ public final class WhipSergeant extends CardImpl { // {R}: Target creature gains haste until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")); + new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java index fd52c58058..a09150b317 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java +++ b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java @@ -26,7 +26,7 @@ public final class WhipSpineDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}"))); } private WhipSpineDrake(final WhipSpineDrake card) { diff --git a/Mage.Sets/src/mage/cards/w/Whipcorder.java b/Mage.Sets/src/mage/cards/w/Whipcorder.java index 5b63a9718e..df11de1758 100644 --- a/Mage.Sets/src/mage/cards/w/Whipcorder.java +++ b/Mage.Sets/src/mage/cards/w/Whipcorder.java @@ -32,12 +32,12 @@ public final class Whipcorder extends CardImpl { this.toughness = new MageInt(2); // {W}, {tap}: Tap target creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); } private Whipcorder(final Whipcorder card) { diff --git a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java index 574fb429f6..1d84afd6fb 100644 --- a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java +++ b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java @@ -40,7 +40,7 @@ public final class WhipgrassEntangler extends CardImpl { Ability abilityToGain = new SimpleStaticAbility(Zone.BATTLEFIELD, new WhipgrassEntanglerCantAttackUnlessYouPayEffect()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(abilityToGain, Duration.EndOfTurn).setText("Until end of turn, target creature gains \"This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield.\""), - new ManaCostsImpl("{1}{W}")); + new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); @@ -65,7 +65,7 @@ class WhipgrassEntanglerCantAttackUnlessYouPayEffect extends CantAttackBlockUnle } WhipgrassEntanglerCantAttackUnlessYouPayEffect() { - super(new ManaCostsImpl("{0}"), RestrictType.ATTACK_AND_BLOCK); + super(new ManaCostsImpl<>("{0}"), RestrictType.ATTACK_AND_BLOCK); staticText = "This creature can't attack or block unless its controller pays {1} for each Cleric on the battlefield"; } diff --git a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java index b2acb46a77..fb28b691a4 100644 --- a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java +++ b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java @@ -28,7 +28,7 @@ public final class WhiplashTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent had two or more creatures enter the battlefield under their control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), WhiplashTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{U}"), WhiplashTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); // Return two target creatures to their owners' hands. this.getSpellAbility().addEffect(new ReturnToHandTargetEffect().setText("return two target creatures to their owners' hands")); diff --git a/Mage.Sets/src/mage/cards/w/WhipstitchedZombie.java b/Mage.Sets/src/mage/cards/w/WhipstitchedZombie.java index f3155a4c4f..3432c2c560 100644 --- a/Mage.Sets/src/mage/cards/w/WhipstitchedZombie.java +++ b/Mage.Sets/src/mage/cards/w/WhipstitchedZombie.java @@ -25,7 +25,7 @@ public final class WhipstitchedZombie extends CardImpl { this.toughness = new MageInt(2); // At the beginning of your upkeep, sacrifice Whipstitched Zombie unless you pay {B}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}")), TargetController.YOU, false)); } private WhipstitchedZombie(final WhipstitchedZombie card) { diff --git a/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java b/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java index 0117ccc0e1..8d13b52a4c 100644 --- a/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java +++ b/Mage.Sets/src/mage/cards/w/WhiptongueFrog.java @@ -27,7 +27,7 @@ public final class WhiptongueFrog extends CardImpl { this.toughness = new MageInt(3); // {U}: Whiptongue Frog 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 WhiptongueFrog(final WhiptongueFrog card) { diff --git a/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java b/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java index 33dc4f9fd1..d03207c171 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java +++ b/Mage.Sets/src/mage/cards/w/WhirlingCatapult.java @@ -30,7 +30,7 @@ public final class WhirlingCatapult extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // {2}, Exile the top two cards of your library: Whirling Catapult deals 1 damage to each creature with flying and each player. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1, filter), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1, filter), new ManaCostsImpl<>("{2}")); ability.addCost(new ExileFromTopOfLibraryCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java index fa7b46b945..3e7adde49e 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java +++ b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java @@ -40,7 +40,7 @@ public final class WhirlpoolWarrior extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect())); // {R}, Sacrifice Whirlpool Warrior: Each player shuffles the cards from their hand into their library, then draws that many cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhirlpoolWarriorActivatedEffect(), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhirlpoolWarriorActivatedEffect(), new ManaCostsImpl<>("{R}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WhisperSquad.java b/Mage.Sets/src/mage/cards/w/WhisperSquad.java index 8287ccb25e..131911a62c 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperSquad.java +++ b/Mage.Sets/src/mage/cards/w/WhisperSquad.java @@ -36,7 +36,7 @@ public final class WhisperSquad extends CardImpl { // {1}{B}: Search your library for a card named Whisper Squad, put it onto the battlefield tapped, then shuffle your library. this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(filter), true, true - ), new ManaCostsImpl("{1}{B}"))); + ), new ManaCostsImpl<>("{1}{B}"))); } private WhisperSquad(final WhisperSquad card) { diff --git a/Mage.Sets/src/mage/cards/w/WhisperingShade.java b/Mage.Sets/src/mage/cards/w/WhisperingShade.java index dc6265c353..686fc253d2 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperingShade.java +++ b/Mage.Sets/src/mage/cards/w/WhisperingShade.java @@ -30,7 +30,7 @@ public final class WhisperingShade extends CardImpl { // Swampwalk this.addAbility(new SwampwalkAbility()); // {B}: Whispering 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(Zone.BATTLEFIELD, new BoostSourceEffect(1,1,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } private WhisperingShade(final WhisperingShade card) { diff --git a/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java b/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java index ea07b209e5..0cb69f5e32 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java +++ b/Mage.Sets/src/mage/cards/w/WhiteShieldCrusader.java @@ -35,10 +35,10 @@ public final class WhiteShieldCrusader extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}: White Shield Crusader gains flying until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}{W}: White Shield Crusader gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private WhiteShieldCrusader(final WhiteShieldCrusader card) { diff --git a/Mage.Sets/src/mage/cards/w/WildAesthir.java b/Mage.Sets/src/mage/cards/w/WildAesthir.java index b5076a4c49..0266bea429 100644 --- a/Mage.Sets/src/mage/cards/w/WildAesthir.java +++ b/Mage.Sets/src/mage/cards/w/WildAesthir.java @@ -33,7 +33,7 @@ public final class WildAesthir extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {W}{W}: Wild Aesthir gets +2/+0 until end of turn. Activate this ability only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}"))); + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}"))); } private WildAesthir(final WildAesthir card) { diff --git a/Mage.Sets/src/mage/cards/w/WildDogs.java b/Mage.Sets/src/mage/cards/w/WildDogs.java index d12a37f068..fa40fdf7c8 100644 --- a/Mage.Sets/src/mage/cards/w/WildDogs.java +++ b/Mage.Sets/src/mage/cards/w/WildDogs.java @@ -38,7 +38,7 @@ public final class WildDogs extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new WildDogsEffect(), TargetController.YOU, false)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private WildDogs(final WildDogs card) { diff --git a/Mage.Sets/src/mage/cards/w/WildHunger.java b/Mage.Sets/src/mage/cards/w/WildHunger.java index 6b213997a2..5c5ea4d1b1 100644 --- a/Mage.Sets/src/mage/cards/w/WildHunger.java +++ b/Mage.Sets/src/mage/cards/w/WildHunger.java @@ -29,7 +29,7 @@ public final class WildHunger extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(3, 1, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); // Flashback {3}{R} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{R}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{R}"))); } private WildHunger(final WildHunger card) { diff --git a/Mage.Sets/src/mage/cards/w/WildMight.java b/Mage.Sets/src/mage/cards/w/WildMight.java index fe7a4e806c..6d6ee602d4 100644 --- a/Mage.Sets/src/mage/cards/w/WildMight.java +++ b/Mage.Sets/src/mage/cards/w/WildMight.java @@ -23,7 +23,7 @@ public final class WildMight extends CardImpl { // Target creature gets +1/+1 until end of turn. That creature gets an additional +4/+4 until end of turn unless any player pays {2}. this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); - Effect effect = new DoUnlessAnyPlayerPaysEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl("{2}")); + Effect effect = new DoUnlessAnyPlayerPaysEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); effect.setText("That creature gets an additional +4/+4 until end of turn unless any player pays {2}"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java index 04608291c2..d9a017db39 100644 --- a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java +++ b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java @@ -87,7 +87,7 @@ class WildbornPreserverCreateReflexiveTriggerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - ManaCosts cost = new ManaCostsImpl("{X}"); + ManaCosts cost = new ManaCostsImpl<>("{X}"); if (player == null) { return false; } diff --git a/Mage.Sets/src/mage/cards/w/WildfireEmissary.java b/Mage.Sets/src/mage/cards/w/WildfireEmissary.java index e8af5da9fe..e983ac1723 100644 --- a/Mage.Sets/src/mage/cards/w/WildfireEmissary.java +++ b/Mage.Sets/src/mage/cards/w/WildfireEmissary.java @@ -31,7 +31,7 @@ public final class WildfireEmissary extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // {1}{R}: Wildfire Emissary 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(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}"))); } private WildfireEmissary(final WildfireEmissary card) { diff --git a/Mage.Sets/src/mage/cards/w/WildheartInvoker.java b/Mage.Sets/src/mage/cards/w/WildheartInvoker.java index f35b7977c7..fa548b6a11 100644 --- a/Mage.Sets/src/mage/cards/w/WildheartInvoker.java +++ b/Mage.Sets/src/mage/cards/w/WildheartInvoker.java @@ -30,7 +30,7 @@ public final class WildheartInvoker extends CardImpl { SimpleActivatedAbility ability = new SimpleActivatedAbility(new BoostTargetEffect( 5, 5, Duration.EndOfTurn - ).setText("target creature gets +5/+5"), new ManaCostsImpl("{8}")); + ).setText("target creature gets +5/+5"), new ManaCostsImpl<>("{8}")); ability.addEffect(new GainAbilityTargetEffect( TrampleAbility.getInstance(), Duration.EndOfTurn ).setText("and gains trample until end of turn")); diff --git a/Mage.Sets/src/mage/cards/w/WillOTheWisp.java b/Mage.Sets/src/mage/cards/w/WillOTheWisp.java index 17c57e4174..ba7fa53ded 100644 --- a/Mage.Sets/src/mage/cards/w/WillOTheWisp.java +++ b/Mage.Sets/src/mage/cards/w/WillOTheWisp.java @@ -29,7 +29,7 @@ public final class WillOTheWisp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Regenerate Will-o'-the-Wisp. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private WillOTheWisp(final WillOTheWisp card) { diff --git a/Mage.Sets/src/mage/cards/w/WillOfTheAllHunter.java b/Mage.Sets/src/mage/cards/w/WillOfTheAllHunter.java index 8e0ae18cfc..afc631a883 100644 --- a/Mage.Sets/src/mage/cards/w/WillOfTheAllHunter.java +++ b/Mage.Sets/src/mage/cards/w/WillOfTheAllHunter.java @@ -29,7 +29,7 @@ public final class WillOfTheAllHunter extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private WillOfTheAllHunter(final WillOfTheAllHunter card) { diff --git a/Mage.Sets/src/mage/cards/w/Willbender.java b/Mage.Sets/src/mage/cards/w/Willbender.java index a768c03026..957c1c58c9 100644 --- a/Mage.Sets/src/mage/cards/w/Willbender.java +++ b/Mage.Sets/src/mage/cards/w/Willbender.java @@ -37,7 +37,7 @@ public final class Willbender extends CardImpl { this.toughness = new MageInt(2); // Morph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl("{1}{U}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"))); // When Willbender is turned face up, change the target of target spell or ability with a single target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ChooseNewTargetsTargetEffect(true, true)); ability.addTarget(new TargetStackObject(FILTER)); diff --git a/Mage.Sets/src/mage/cards/w/WillowPriestess.java b/Mage.Sets/src/mage/cards/w/WillowPriestess.java index df8fffae3e..68872c5010 100644 --- a/Mage.Sets/src/mage/cards/w/WillowPriestess.java +++ b/Mage.Sets/src/mage/cards/w/WillowPriestess.java @@ -51,7 +51,7 @@ public final class WillowPriestess extends CardImpl { // {2}{G}: Target green creature gains protection from black until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl("{2}{G}")); + new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}")); Target target = new TargetPermanent(greenCreature); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/Wilt.java b/Mage.Sets/src/mage/cards/w/Wilt.java index 4a44f03293..5a79c997fe 100644 --- a/Mage.Sets/src/mage/cards/w/Wilt.java +++ b/Mage.Sets/src/mage/cards/w/Wilt.java @@ -24,7 +24,7 @@ public final class Wilt extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private Wilt(final Wilt card) { diff --git a/Mage.Sets/src/mage/cards/w/WindbornMuse.java b/Mage.Sets/src/mage/cards/w/WindbornMuse.java index cfd4ea3a09..41cbba0b1f 100644 --- a/Mage.Sets/src/mage/cards/w/WindbornMuse.java +++ b/Mage.Sets/src/mage/cards/w/WindbornMuse.java @@ -29,7 +29,7 @@ public final class WindbornMuse extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouUnlessPayManaAllEffect(new ManaCostsImpl("{2}")))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouUnlessPayManaAllEffect(new ManaCostsImpl<>("{2}")))); } diff --git a/Mage.Sets/src/mage/cards/w/WindbriskHeights.java b/Mage.Sets/src/mage/cards/w/WindbriskHeights.java index a1e998e525..17ed6c5a3a 100644 --- a/Mage.Sets/src/mage/cards/w/WindbriskHeights.java +++ b/Mage.Sets/src/mage/cards/w/WindbriskHeights.java @@ -38,7 +38,7 @@ public final class WindbriskHeights extends CardImpl { new HideawayPlayEffect(), WindbriskHeightsAttackersCondition.instance, "you may play the exiled card without paying its mana cost " + "if you attacked with three or more creatures this turn" - ), new ManaCostsImpl("{W}")); + ), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/w/WindcallerAven.java b/Mage.Sets/src/mage/cards/w/WindcallerAven.java index 1adafb8900..38d4a51fd3 100644 --- a/Mage.Sets/src/mage/cards/w/WindcallerAven.java +++ b/Mage.Sets/src/mage/cards/w/WindcallerAven.java @@ -33,7 +33,7 @@ public final class WindcallerAven extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Cycling {U} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{U}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{U}"))); // When you cycle Windcaller Aven, target creature gains flying until end of turn. Ability ability = new CycleTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/w/Windreaver.java b/Mage.Sets/src/mage/cards/w/Windreaver.java index 9b39714e28..69ad39b6a1 100644 --- a/Mage.Sets/src/mage/cards/w/Windreaver.java +++ b/Mage.Sets/src/mage/cards/w/Windreaver.java @@ -34,13 +34,13 @@ public final class Windreaver extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {W}: Windreaver gains vigilance until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {W}: Windreaver 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(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W}"))); // {U}: Switch Windreaver's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {U}: Return Windreaver to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}"))); } private Windreaver(final Windreaver card) { diff --git a/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java b/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java index c4ee3546c4..171d90a85f 100644 --- a/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java +++ b/Mage.Sets/src/mage/cards/w/WindsOfAbandon.java @@ -37,7 +37,7 @@ public final class WindsOfAbandon extends CardImpl { // Overload {4}{W}{W} this.addAbility(new OverloadAbility( - this, new WindsOfAbandonOverloadEffect(), new ManaCostsImpl("{4}{W}{W}") + this, new WindsOfAbandonOverloadEffect(), new ManaCostsImpl<>("{4}{W}{W}") )); } diff --git a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java index e5b209b817..cad31785b8 100644 --- a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java +++ b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java @@ -34,7 +34,7 @@ public final class WingbeatWarrior extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{W}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}"))); // When Wingbeat Warrior is turned face up, target creature gains first strike until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WingedShepherd.java b/Mage.Sets/src/mage/cards/w/WingedShepherd.java index 917e9f0a1d..735d49f5b3 100644 --- a/Mage.Sets/src/mage/cards/w/WingedShepherd.java +++ b/Mage.Sets/src/mage/cards/w/WingedShepherd.java @@ -32,7 +32,7 @@ public final class WingedShepherd extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Cycling {W} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{W}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WingspanMentor.java b/Mage.Sets/src/mage/cards/w/WingspanMentor.java index ef784e55b1..4fe019786a 100644 --- a/Mage.Sets/src/mage/cards/w/WingspanMentor.java +++ b/Mage.Sets/src/mage/cards/w/WingspanMentor.java @@ -54,7 +54,7 @@ public final class WingspanMentor extends CardImpl { // {2}{U}, {T}: Put a +1/+1 counter on each creature you control with flying. ability = new SimpleActivatedAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl("{2}{U}") + new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter2), new ManaCostsImpl<>("{2}{U}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WipeClean.java b/Mage.Sets/src/mage/cards/w/WipeClean.java index 966e405b09..b08bc42a47 100644 --- a/Mage.Sets/src/mage/cards/w/WipeClean.java +++ b/Mage.Sets/src/mage/cards/w/WipeClean.java @@ -23,7 +23,7 @@ public final class WipeClean extends CardImpl { this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addEffect(new ExileTargetEffect()); // Cycling {3} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{3}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"))); } private WipeClean(final WipeClean card) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodGuardian.java b/Mage.Sets/src/mage/cards/w/WirewoodGuardian.java index a9fcd3bf8a..c8015a5262 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodGuardian.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodGuardian.java @@ -25,7 +25,7 @@ public final class WirewoodGuardian extends CardImpl { this.toughness = new MageInt(6); // Forestcycling {2} - this.addAbility(new ForestcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new ForestcyclingAbility(new ManaCostsImpl<>("{2}"))); } private WirewoodGuardian(final WirewoodGuardian card) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java index 4e6bf2580c..5bd4487deb 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java @@ -35,7 +35,7 @@ public final class WirewoodLodge extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {G}, {T}: Untap target Elf. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java b/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java index 6a67aede9f..3c6d34502d 100644 --- a/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java +++ b/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java @@ -31,7 +31,7 @@ public final class WishfulMerfolk extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // {1}{U}: Wishful Merfolk loses defender and becomes a Human until end of turn. - this.addAbility(new SimpleActivatedAbility(new WishfulMerfolkEffect(), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(new WishfulMerfolkEffect(), new ManaCostsImpl<>("{1}{U}"))); } private WishfulMerfolk(final WishfulMerfolk card) { diff --git a/Mage.Sets/src/mage/cards/w/Wishmonger.java b/Mage.Sets/src/mage/cards/w/Wishmonger.java index 7898d858a3..e0c85ebb80 100644 --- a/Mage.Sets/src/mage/cards/w/Wishmonger.java +++ b/Mage.Sets/src/mage/cards/w/Wishmonger.java @@ -45,7 +45,7 @@ public final class Wishmonger extends CardImpl { this.toughness = new MageInt(3); // {2}: Target creature gains protection from the color of its controller's choice until end of turn. Any player may activate this ability. - SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WishmongerEffect(), new ManaCostsImpl("{2}")); + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WishmongerEffect(), 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/w/WitchHunter.java b/Mage.Sets/src/mage/cards/w/WitchHunter.java index 3bb5681a92..cc9a0cb86f 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunter.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunter.java @@ -37,7 +37,7 @@ public final class WitchHunter extends CardImpl { this.addAbility(damageAbility); // {1}{W}{W}, {tap}: Return target creature an opponent controls to its owner's hand. - Ability returnAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{W}{W}")); + Ability returnAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}")); returnAbility.addCost(new TapSourceCost()); TargetCreaturePermanent target = new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE); returnAbility.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/w/WitchingWell.java b/Mage.Sets/src/mage/cards/w/WitchingWell.java index 8a5d98740c..80d81f875d 100644 --- a/Mage.Sets/src/mage/cards/w/WitchingWell.java +++ b/Mage.Sets/src/mage/cards/w/WitchingWell.java @@ -28,7 +28,7 @@ public final class WitchingWell extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(2))); // {3}{U}, Sacrifice Witching Well: Draw two cards. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), new ManaCostsImpl<>("{3}{U}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WitchsCauldron.java b/Mage.Sets/src/mage/cards/w/WitchsCauldron.java index dec55cffba..0ce941ea54 100644 --- a/Mage.Sets/src/mage/cards/w/WitchsCauldron.java +++ b/Mage.Sets/src/mage/cards/w/WitchsCauldron.java @@ -24,7 +24,7 @@ public final class WitchsCauldron extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{B}"); // {1}{B}, {T}, Sacrifice a creature: You gain 1 life and draw a card. - Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl("{1}{B}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(1), new ManaCostsImpl<>("{1}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); diff --git a/Mage.Sets/src/mage/cards/w/WitchsMist.java b/Mage.Sets/src/mage/cards/w/WitchsMist.java index df3ba5d9ba..db115c6541 100644 --- a/Mage.Sets/src/mage/cards/w/WitchsMist.java +++ b/Mage.Sets/src/mage/cards/w/WitchsMist.java @@ -32,7 +32,7 @@ public final class WitchsMist extends CardImpl { // {2}{B}, {T}: Destroy target creature that was dealt damage this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl<>("{2}{B}")); ability.addTarget(new TargetCreaturePermanent(filter)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WitheringWisps.java b/Mage.Sets/src/mage/cards/w/WitheringWisps.java index 01e3c7f8ba..a0cad332c3 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringWisps.java +++ b/Mage.Sets/src/mage/cards/w/WitheringWisps.java @@ -66,7 +66,7 @@ class WitheringWispsActivatedAbility extends ActivatedAbilityImpl { } public WitheringWispsActivatedAbility() { - super(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{B}")); + super(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}")); } diff --git a/Mage.Sets/src/mage/cards/w/WithoutWeakness.java b/Mage.Sets/src/mage/cards/w/WithoutWeakness.java index 5cdd7fd1cf..68c4a116db 100644 --- a/Mage.Sets/src/mage/cards/w/WithoutWeakness.java +++ b/Mage.Sets/src/mage/cards/w/WithoutWeakness.java @@ -26,7 +26,7 @@ public final class WithoutWeakness extends CardImpl { this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java index 7ac769d030..08d0589cb8 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java +++ b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java @@ -24,7 +24,7 @@ public final class WitnessOfTheAges extends CardImpl { this.toughness = new MageInt(4); // Morph {5} - this.addAbility(new MorphAbility(new ManaCostsImpl("{5}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}"))); } private WitnessOfTheAges(final WitnessOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/w/WitnessOfTomorrows.java b/Mage.Sets/src/mage/cards/w/WitnessOfTomorrows.java index 68c3bce0f1..aa46260487 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessOfTomorrows.java +++ b/Mage.Sets/src/mage/cards/w/WitnessOfTomorrows.java @@ -28,7 +28,7 @@ public final class WitnessOfTomorrows extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {3}{U}: Scry 1. - this.addAbility(new SimpleActivatedAbility(new ScryEffect(1, false), new ManaCostsImpl("{3}{U}"))); + this.addAbility(new SimpleActivatedAbility(new ScryEffect(1, false), new ManaCostsImpl<>("{3}{U}"))); } private WitnessOfTomorrows(final WitnessOfTomorrows card) { diff --git a/Mage.Sets/src/mage/cards/w/Woeleecher.java b/Mage.Sets/src/mage/cards/w/Woeleecher.java index 03b3db9cb0..b37437c7a6 100644 --- a/Mage.Sets/src/mage/cards/w/Woeleecher.java +++ b/Mage.Sets/src/mage/cards/w/Woeleecher.java @@ -35,7 +35,7 @@ public final class Woeleecher extends CardImpl { this.toughness = new MageInt(5); // {W}, {tap}: Remove a -1/-1 counter from target creature. If you do, you gain 2 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WoeleecherEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WoeleecherEffect(), new ManaCostsImpl<>("{W}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WolfbittenCaptive.java b/Mage.Sets/src/mage/cards/w/WolfbittenCaptive.java index 947f1e86a9..ab976d8286 100644 --- a/Mage.Sets/src/mage/cards/w/WolfbittenCaptive.java +++ b/Mage.Sets/src/mage/cards/w/WolfbittenCaptive.java @@ -31,7 +31,7 @@ public final class WolfbittenCaptive extends CardImpl { this.secondSideCardClazz = mage.cards.k.KrallenhordeKiller.class; // {1}{G}: Wolfbitten Captive gets +2/+2 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"))); // At the beginning of each upkeep, if no spells were cast last turn, transform Wolfbitten Captive. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/w/WolfirAvenger.java b/Mage.Sets/src/mage/cards/w/WolfirAvenger.java index 8bdd01ae61..b24602327f 100644 --- a/Mage.Sets/src/mage/cards/w/WolfirAvenger.java +++ b/Mage.Sets/src/mage/cards/w/WolfirAvenger.java @@ -29,7 +29,7 @@ public final class WolfirAvenger extends CardImpl { this.addAbility(FlashAbility.getInstance()); // {1}{G}: Regenerate Wolfir Avenger. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"))); } private WolfirAvenger(final WolfirAvenger card) { diff --git a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java index 5d5abd19b6..e38787096a 100644 --- a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java +++ b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java @@ -46,7 +46,7 @@ public final class WolfwillowHaven extends CardImpl { // {4}{G}, Sacrifice Wolfwillow Haven: Create a 2/2 green Wolf creature token. Activate this ability only during your turn. ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken()), - new ManaCostsImpl("{4}{G}"), MyTurnCondition.instance + new ManaCostsImpl<>("{4}{G}"), MyTurnCondition.instance ); ability.addCost(new SacrificeSourceCost()); ability.addHint(MyTurnHint.instance); diff --git a/Mage.Sets/src/mage/cards/w/Woodcloaker.java b/Mage.Sets/src/mage/cards/w/Woodcloaker.java index fcd7ce6054..273de71512 100644 --- a/Mage.Sets/src/mage/cards/w/Woodcloaker.java +++ b/Mage.Sets/src/mage/cards/w/Woodcloaker.java @@ -29,7 +29,7 @@ public final class Woodcloaker extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}{G}"))); // When Woodcloaker is turned face up, target creature gains trample until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WoodedBastion.java b/Mage.Sets/src/mage/cards/w/WoodedBastion.java index 65fce8b9e2..ee96c681e8 100644 --- a/Mage.Sets/src/mage/cards/w/WoodedBastion.java +++ b/Mage.Sets/src/mage/cards/w/WoodedBastion.java @@ -24,15 +24,15 @@ public final class WoodedBastion extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {GW}, {tap}: Add {G}{G}, {G}{W}, or {W}{W}. - SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl("{G/W}")); + SimpleManaAbility ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(2), new ManaCostsImpl<>("{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 0, 1, 0, 0, 0), new ManaCostsImpl("{G/W}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, new Mana(1, 0, 0, 0, 1, 0, 0, 0), new ManaCostsImpl<>("{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl("{G/W}")); + ability = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(2), new ManaCostsImpl<>("{G/W}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/Woodripper.java b/Mage.Sets/src/mage/cards/w/Woodripper.java index 038cc738d6..f2833ccf85 100644 --- a/Mage.Sets/src/mage/cards/w/Woodripper.java +++ b/Mage.Sets/src/mage/cards/w/Woodripper.java @@ -32,7 +32,7 @@ public final class Woodripper extends CardImpl { // Fading 3 this.addAbility(new FadingAbility(3, this)); // {1}, Remove a fade counter from Woodripper: Destroy target artifact. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new RemoveCountersSourceCost(CounterType.FADE.createInstance())); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java index e1dc9de960..0dbcc5e71d 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java +++ b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java @@ -25,7 +25,7 @@ public final class WoollyLoxodon extends CardImpl { this.toughness = new MageInt(7); // Morph 5G - this.addAbility(new MorphAbility(new ManaCostsImpl("{5}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}"))); } private WoollyLoxodon(final WoollyLoxodon card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWaste.java b/Mage.Sets/src/mage/cards/w/WordsOfWaste.java index 3c26a417e3..8a98962f87 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWaste.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWaste.java @@ -28,7 +28,7 @@ public final class WordsOfWaste extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // {1}: The next time you would draw a card this turn, each opponent discards a card instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWasteEffect(), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWasteEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWaste(final WordsOfWaste card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWilding.java b/Mage.Sets/src/mage/cards/w/WordsOfWilding.java index c211448332..61d3c648ba 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWilding.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWilding.java @@ -28,7 +28,7 @@ public final class WordsOfWilding extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // {1}: The next time you would draw a card this turn, create a 2/2 green Bear creature token instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWildingEffect(), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWildingEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWilding(final WordsOfWilding card) { diff --git a/Mage.Sets/src/mage/cards/w/WordsOfWind.java b/Mage.Sets/src/mage/cards/w/WordsOfWind.java index 57cc1af92f..2b35430d10 100644 --- a/Mage.Sets/src/mage/cards/w/WordsOfWind.java +++ b/Mage.Sets/src/mage/cards/w/WordsOfWind.java @@ -30,7 +30,7 @@ public final class WordsOfWind extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // {1}: The next time you would draw a card this turn, each player returns a permanent they control to its owner's hand instead. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWindEffect(), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WordsOfWindEffect(), new ManaCostsImpl<>("{1}"))); } private WordsOfWind(final WordsOfWind card) { diff --git a/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java b/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java index a5ab1ecd19..2339845694 100644 --- a/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java +++ b/Mage.Sets/src/mage/cards/w/WorldBottlingKit.java @@ -30,7 +30,7 @@ public final class WorldBottlingKit extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {5}, Sacrifice World-Bottling Kit: Choose a Magic set. Exile all permanents with that set’s expansion symbol except for basic lands. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WorldBottlingKitEffect(), new ManaCostsImpl("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WorldBottlingKitEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WorldBreaker.java b/Mage.Sets/src/mage/cards/w/WorldBreaker.java index 85bedc3034..75c26d34a2 100644 --- a/Mage.Sets/src/mage/cards/w/WorldBreaker.java +++ b/Mage.Sets/src/mage/cards/w/WorldBreaker.java @@ -56,7 +56,7 @@ public final class WorldBreaker extends CardImpl { this.addAbility(ReachAbility.getInstance()); // {2}{C}, Sacrifice a land: Return World Breaker from your graveyard to your hand. - ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{2}{C}")); + ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl<>("{2}{C}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WormholeSerpent.java b/Mage.Sets/src/mage/cards/w/WormholeSerpent.java index ec3b6e6623..f9aca97c47 100644 --- a/Mage.Sets/src/mage/cards/w/WormholeSerpent.java +++ b/Mage.Sets/src/mage/cards/w/WormholeSerpent.java @@ -28,7 +28,7 @@ public final class WormholeSerpent extends CardImpl { // {3}{U}: Target creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility( - new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{3}{U}") + new CantBeBlockedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{3}{U}") ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java index 3b4675346c..106dc523ac 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodDryad.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodDryad.java @@ -31,13 +31,13 @@ public final class WormwoodDryad extends CardImpl { // {G}: Wormwood Dryad gains forestwalk until end of turn and deals 1 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{G}")); + new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); // {B}: Wormwood Dryad gains swampwalk until end of turn and deals 1 damage to you. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{B}")); + new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addEffect(new DamageControllerEffect(1).setText("and deals 1 damage to you")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java index 21aead36da..47855f9867 100644 --- a/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java +++ b/Mage.Sets/src/mage/cards/w/WormwoodTreefolk.java @@ -31,13 +31,13 @@ public final class WormwoodTreefolk extends CardImpl { // {G}{G}: Wormwood Treefolk gains forestwalk until end of turn and deals 2 damage to you. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{G}{G}")); + new GainAbilitySourceEffect(new ForestwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); // {B}{B}: Wormwood Treefolk gains swampwalk until end of turn and deals 2 damage to you. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl("{B}{B}")); + new GainAbilitySourceEffect(new SwampwalkAbility(false), Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")); ability.addEffect(new DamageControllerEffect(2).setText("and deals 2 damage to you")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WritOfPassage.java b/Mage.Sets/src/mage/cards/w/WritOfPassage.java index b7489c31d4..b991d13f65 100644 --- a/Mage.Sets/src/mage/cards/w/WritOfPassage.java +++ b/Mage.Sets/src/mage/cards/w/WritOfPassage.java @@ -48,7 +48,7 @@ public final class WritOfPassage extends CardImpl { new AttachedToMatchesFilterCondition(filter), "Whenever enchanted creature attacks, if its power is 2 or less, it can't be blocked this turn."); this.addAbility(ability); // Forecast - {1}{U}, Reveal Writ of Passage from your hand: Target creature with power 2 or less is unblockable this turn. - ForecastAbility ability2 = new ForecastAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl("{1}{U}")); + ForecastAbility ability2 = new ForecastAbility(new CantBeBlockedTargetEffect(), new ManaCostsImpl<>("{1}{U}")); FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature with power 2 or less"); filter2.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3)); ability2.addTarget(new TargetCreaturePermanent(filter2)); diff --git a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java index b3b4fa93b3..44237d1424 100644 --- a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java @@ -47,7 +47,7 @@ public final class WurmweaverCoil extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); - Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl("{G}{G}{G}")); + Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); activatedAbility.addCost(new SacrificeSourceCost()); this.addAbility(activatedAbility); } diff --git a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java index 8147bd23ef..026420fa78 100644 --- a/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java +++ b/Mage.Sets/src/mage/cards/w/WydwenTheBitingGale.java @@ -36,7 +36,7 @@ public final class WydwenTheBitingGale extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {U}{B}, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{U}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}{B}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); }