diff --git a/Mage.Sets/src/mage/cards/p/PacificationArray.java b/Mage.Sets/src/mage/cards/p/PacificationArray.java index 74a0d75cc02..de0c07b4392 100644 --- a/Mage.Sets/src/mage/cards/p/PacificationArray.java +++ b/Mage.Sets/src/mage/cards/p/PacificationArray.java @@ -31,7 +31,7 @@ public final class PacificationArray extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // {2}, {t}: Tap target artifact or creature. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PackMastiff.java b/Mage.Sets/src/mage/cards/p/PackMastiff.java index 92413d6e2c3..d5c8d26b36a 100644 --- a/Mage.Sets/src/mage/cards/p/PackMastiff.java +++ b/Mage.Sets/src/mage/cards/p/PackMastiff.java @@ -35,7 +35,7 @@ public final class PackMastiff extends CardImpl { // {1}{R}: Each creature you control named Pack Mastiff gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(new BoostControlledEffect( 1, 0, Duration.EndOfTurn, filter - ).setText("Each creature you control named Pack Mastiff gets +1/+0 until end of turn."), new ManaCostsImpl("{1}{R}"))); + ).setText("Each creature you control named Pack Mastiff gets +1/+0 until end of turn."), new ManaCostsImpl<>("{1}{R}"))); } private PackMastiff(final PackMastiff card) { diff --git a/Mage.Sets/src/mage/cards/p/PackRat.java b/Mage.Sets/src/mage/cards/p/PackRat.java index ee923249540..80ca844a569 100644 --- a/Mage.Sets/src/mage/cards/p/PackRat.java +++ b/Mage.Sets/src/mage/cards/p/PackRat.java @@ -56,7 +56,7 @@ public final class PackRat extends CardImpl { // Pack Rat's power and toughness are each equal to the number of Rats you control. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); // {2}{B}, Discard a card: Create a token that's a copy of Pack Rat. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenCopySourceEffect(), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenCopySourceEffect(), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PactOfNegation.java b/Mage.Sets/src/mage/cards/p/PactOfNegation.java index 5ad4f74c55f..34b29c1e732 100644 --- a/Mage.Sets/src/mage/cards/p/PactOfNegation.java +++ b/Mage.Sets/src/mage/cards/p/PactOfNegation.java @@ -26,7 +26,7 @@ public final class PactOfNegation extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); this.getSpellAbility().addEffect(new CounterTargetEffect()); // At the beginning of your next upkeep, pay {3}{U}{U}. If you don't, you lose the game. - this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{3}{U}{U}")), false)); + this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl<>("{3}{U}{U}")), false)); } private PactOfNegation(final PactOfNegation card) { diff --git a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java index e8a8e2c45a5..c93c2fcb7d6 100644 --- a/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java +++ b/Mage.Sets/src/mage/cards/p/PactOfTheTitan.java @@ -25,7 +25,7 @@ public final class PactOfTheTitan extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new GiantToken())); // At the beginning of your next upkeep, pay {4}{R}. If you don't, you lose the game. - this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{4}{R}")))); + this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl<>("{4}{R}")))); } private PactOfTheTitan(final PactOfTheTitan card) { diff --git a/Mage.Sets/src/mage/cards/p/PainKami.java b/Mage.Sets/src/mage/cards/p/PainKami.java index 346ed331247..0c6955a4e4a 100644 --- a/Mage.Sets/src/mage/cards/p/PainKami.java +++ b/Mage.Sets/src/mage/cards/p/PainKami.java @@ -28,7 +28,7 @@ public final class PainKami extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PaladinOfPrahv.java b/Mage.Sets/src/mage/cards/p/PaladinOfPrahv.java index ff3bb29742c..97f3cc8081e 100644 --- a/Mage.Sets/src/mage/cards/p/PaladinOfPrahv.java +++ b/Mage.Sets/src/mage/cards/p/PaladinOfPrahv.java @@ -40,7 +40,7 @@ public final class PaladinOfPrahv extends CardImpl { // Forecast - {1}{W}, Reveal Paladin of Prahv from your hand: Whenever target creature deals damage this turn, you gain that much life. Ability ability = new ForecastAbility(new CreateDelayedTriggeredAbilityEffect( - new PaladinOfPrahvTriggeredAbility()), new ManaCostsImpl("{1}{W}")); + new PaladinOfPrahvTriggeredAbility()), new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PaleRecluse.java b/Mage.Sets/src/mage/cards/p/PaleRecluse.java index 13fcbd8854c..6cf3396cce4 100644 --- a/Mage.Sets/src/mage/cards/p/PaleRecluse.java +++ b/Mage.Sets/src/mage/cards/p/PaleRecluse.java @@ -30,9 +30,9 @@ public final class PaleRecluse extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Forestcycling {2} - this.addAbility(new ForestcyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new ForestcyclingAbility(new ManaCostsImpl<>("{2}"))); // plainscycling {2} - this.addAbility(new PlainscyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new PlainscyclingAbility(new ManaCostsImpl<>("{2}"))); } private PaleRecluse(final PaleRecluse card) { diff --git a/Mage.Sets/src/mage/cards/p/PaleWayfarer.java b/Mage.Sets/src/mage/cards/p/PaleWayfarer.java index 11a1bbbd767..2e8c25570e8 100644 --- a/Mage.Sets/src/mage/cards/p/PaleWayfarer.java +++ b/Mage.Sets/src/mage/cards/p/PaleWayfarer.java @@ -45,7 +45,7 @@ public final class PaleWayfarer extends CardImpl { this.toughness = new MageInt(4); // {2}{W}{W}, {untap}: Target creature gains protection from the color of its controller's choice until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PaleWayfarerEffect(), new ManaCostsImpl("{2}{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PaleWayfarerEffect(), new ManaCostsImpl<>("{2}{W}{W}")); ability.addCost(new UntapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Palinchron.java b/Mage.Sets/src/mage/cards/p/Palinchron.java index bf7a49c5261..31b64ed16f0 100644 --- a/Mage.Sets/src/mage/cards/p/Palinchron.java +++ b/Mage.Sets/src/mage/cards/p/Palinchron.java @@ -33,7 +33,7 @@ public final class Palinchron extends CardImpl { // When Palinchron enters the battlefield, untap up to seven lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(7))); // {2}{U}{U}: Return Palinchron to its owner's hand. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{2}{U}{U}"))); } private Palinchron(final Palinchron card) { diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMors.java b/Mage.Sets/src/mage/cards/p/PalladiaMors.java index a1cd77a5271..8fb59838cc4 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMors.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMors.java @@ -34,7 +34,7 @@ public final class PalladiaMors extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // At the beginning of your upkeep, sacrifice Palladia-Mors unless you pay {R}{G}{W}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{R}{G}{W}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{R}{G}{W}")), TargetController.YOU, false)); } private PalladiaMors(final PalladiaMors card) { diff --git a/Mage.Sets/src/mage/cards/p/Panacea.java b/Mage.Sets/src/mage/cards/p/Panacea.java index 33ca81d3033..aec61e49670 100644 --- a/Mage.Sets/src/mage/cards/p/Panacea.java +++ b/Mage.Sets/src/mage/cards/p/Panacea.java @@ -26,7 +26,7 @@ public final class Panacea extends CardImpl { // {X}{X}, {tap}: Prevent the next X damage that would be dealt to any target this turn. Ability ability = new SimpleActivatedAbility( new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, ManacostVariableValue.REGULAR), - new ManaCostsImpl("{X}{X}") + new ManaCostsImpl<>("{X}{X}") ); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java b/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java index 1becf600bf8..64c80b2f99b 100644 --- a/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java +++ b/Mage.Sets/src/mage/cards/p/PanicSpellbomb.java @@ -33,7 +33,7 @@ public final class PanicSpellbomb extends CardImpl { this.addAbility(ability); // When Panic Spellbomb is put into a graveyard from the battlefield, you may pay Red. If you do, draw a card. - this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{R}")), false, false)); + this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{R}")), false, false)); } private PanicSpellbomb(final PanicSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java index 677375e1d18..0c7a0249789 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfEternalWilds.java @@ -52,7 +52,7 @@ public final class ParagonOfEternalWilds extends CardImpl { // Other green creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterGreen, true))); // {G}, {t}: Another target green creature you control gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterGreen2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java index 3642008f526..82526174dbc 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfFierceDefiance.java @@ -51,7 +51,7 @@ public final class ParagonOfFierceDefiance extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {R}, {T}: Another target red creature you control gains haste until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java index a097a654ad3..181afc118bf 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfGatheringMists.java @@ -53,7 +53,7 @@ public final class ParagonOfGatheringMists extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // {U}, {T}: Another target blue creature you control gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(),Duration.EndOfTurn), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterBlue2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java index 768bb2d8e8f..3e957fbbd97 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfNewDawns.java @@ -52,7 +52,7 @@ public final class ParagonOfNewDawns extends CardImpl { // Other white creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter, true))); // {W}, {T}: Another target white creature you control gains vigilance until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java index 005a1a2a2cc..50165bfe0ee 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfOpenGraves.java @@ -51,7 +51,7 @@ public final class ParagonOfOpenGraves extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterCreatures, true))); // {2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent(filterCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java b/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java index f597c2fb270..a7f85fca4eb 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java @@ -36,7 +36,7 @@ public final class ParagonOfTheAmesha extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // {W}{U}{B}{R}{G}: Until end of turn, Paragon of the Amesha becomes an Angel, gets +3/+3, and gains flying and lifelink. - Ability ability = new SimpleActivatedAbility(new ParagonOfTheAmeshaEffect(), new ManaCostsImpl("{W}{U}{B}{R}{G}")); + Ability ability = new SimpleActivatedAbility(new ParagonOfTheAmeshaEffect(), new ManaCostsImpl<>("{W}{U}{B}{R}{G}")); Effect effect = new BoostSourceEffect(3, 3, Duration.EndOfTurn); effect.setText(", gets +3/+3"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java index cf3442e228c..de63b8f4d58 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxInhibitor.java @@ -34,7 +34,7 @@ public final class ParallaxInhibitor extends CardImpl { // {1}, {tap}, Sacrifice Parallax Inhibitor: Put a fade counter on each permanent with fading you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new AddCountersAllEffect(CounterType.FADE.createInstance(), filter), new ManaCostsImpl("{1}")); + new AddCountersAllEffect(CounterType.FADE.createInstance(), filter), new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java index 46ce42596c3..31ab539a34b 100644 --- a/Mage.Sets/src/mage/cards/p/ParallelEvolution.java +++ b/Mage.Sets/src/mage/cards/p/ParallelEvolution.java @@ -31,7 +31,7 @@ public final class ParallelEvolution extends CardImpl { this.getSpellAbility().addEffect(new ParallelEvolutionEffect()); // Flashback {4}{G}{G}{G} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{4}{G}{G}{G}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{G}{G}{G}"))); } private ParallelEvolution(final ParallelEvolution card) { diff --git a/Mage.Sets/src/mage/cards/p/ParapetWatchers.java b/Mage.Sets/src/mage/cards/p/ParapetWatchers.java index 005982a7186..4e2550471d6 100644 --- a/Mage.Sets/src/mage/cards/p/ParapetWatchers.java +++ b/Mage.Sets/src/mage/cards/p/ParapetWatchers.java @@ -27,7 +27,7 @@ public final class ParapetWatchers extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{W/U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{W/U}"))); } private ParapetWatchers(final ParapetWatchers card) { diff --git a/Mage.Sets/src/mage/cards/p/PardicCollaborator.java b/Mage.Sets/src/mage/cards/p/PardicCollaborator.java index e508c5afd19..e46013ddd76 100644 --- a/Mage.Sets/src/mage/cards/p/PardicCollaborator.java +++ b/Mage.Sets/src/mage/cards/p/PardicCollaborator.java @@ -30,7 +30,7 @@ public final class PardicCollaborator extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // {B}: Pardic Collaborator 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 PardicCollaborator(final PardicCollaborator card) { diff --git a/Mage.Sets/src/mage/cards/p/PardicDragon.java b/Mage.Sets/src/mage/cards/p/PardicDragon.java index 3643ef90119..fc1cb8064c1 100644 --- a/Mage.Sets/src/mage/cards/p/PardicDragon.java +++ b/Mage.Sets/src/mage/cards/p/PardicDragon.java @@ -41,7 +41,7 @@ public final class PardicDragon extends CardImpl { // {R}: Pardic Dragon gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); // Suspend 2-{R}{R} - this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{R}{R}"), this, true)); + this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{R}{R}"), this, true)); // Whenever an opponent casts a spell, if Pardic Dragon is suspended, that player may put a time counter on Pardic Dragon. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new SpellCastOpponentTriggeredAbility(Zone.EXILED, new PardicDragonEffect(), StaticFilters.FILTER_SPELL, false, SetTargetPointer.PLAYER), diff --git a/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java b/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java index 9675f69252f..3c2b8b72e63 100644 --- a/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java +++ b/Mage.Sets/src/mage/cards/p/PardicSwordsmith.java @@ -29,7 +29,7 @@ public final class PardicSwordsmith extends CardImpl { this.toughness = new MageInt(1); // {R}, Discard a card at random: Pardic Swordsmith gets +2/+0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PashalikMons.java b/Mage.Sets/src/mage/cards/p/PashalikMons.java index acf20bd78c7..0e9992efb2a 100644 --- a/Mage.Sets/src/mage/cards/p/PashalikMons.java +++ b/Mage.Sets/src/mage/cards/p/PashalikMons.java @@ -57,7 +57,7 @@ public final class PashalikMons extends CardImpl { // {3}{R}, Sacrifice a Goblin: Create two 1/1 red Goblin creature tokens. ability = new SimpleActivatedAbility( - new CreateTokenEffect(new GoblinToken(), 2), new ManaCostsImpl("{3}{R}") + new CreateTokenEffect(new GoblinToken(), 2), new ManaCostsImpl<>("{3}{R}") ); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter2))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PasswallAdept.java b/Mage.Sets/src/mage/cards/p/PasswallAdept.java index 7edee6bf8aa..75d14654001 100644 --- a/Mage.Sets/src/mage/cards/p/PasswallAdept.java +++ b/Mage.Sets/src/mage/cards/p/PasswallAdept.java @@ -31,7 +31,7 @@ public final class PasswallAdept extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), - new ManaCostsImpl("{2}{U}") + new ManaCostsImpl<>("{2}{U}") ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PatagiaGolem.java b/Mage.Sets/src/mage/cards/p/PatagiaGolem.java index 1dd64bb6ad2..e1163f91cba 100644 --- a/Mage.Sets/src/mage/cards/p/PatagiaGolem.java +++ b/Mage.Sets/src/mage/cards/p/PatagiaGolem.java @@ -29,7 +29,7 @@ public final class PatagiaGolem extends CardImpl { this.toughness = new MageInt(3); // {3}: Patagia Golem gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PathToTheWorldTree.java b/Mage.Sets/src/mage/cards/p/PathToTheWorldTree.java index b398d8868d5..a63557739e9 100644 --- a/Mage.Sets/src/mage/cards/p/PathToTheWorldTree.java +++ b/Mage.Sets/src/mage/cards/p/PathToTheWorldTree.java @@ -40,7 +40,7 @@ public final class PathToTheWorldTree extends CardImpl { // {2}{W}{U}{B}{R}{G}, Sacrifice Path to the World Tree: You gain 2 life and draw two cards. Target opponent loses 2 life. Path to the World Tree deals 2 damage to up to one target creature. You create a 2/2 green Bear creature token. Ability ability = new SimpleActivatedAbility( - new PathToTheWorldTreeEffect(), new ManaCostsImpl("{2}{W}{U}{B}{R}{G}") + new PathToTheWorldTreeEffect(), new ManaCostsImpl<>("{2}{W}{U}{B}{R}{G}") ); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java index 6e84699085b..ddf6797cf17 100644 --- a/Mage.Sets/src/mage/cards/p/PatrolSignaler.java +++ b/Mage.Sets/src/mage/cards/p/PatrolSignaler.java @@ -29,7 +29,7 @@ public final class PatrolSignaler extends CardImpl { this.toughness = new MageInt(1); // {1}{W}, {untap}: Create a 1/1 white Kithkin Soldier creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KithkinSoldierToken()), new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new KithkinSoldierToken()), new ManaCostsImpl<>("{1}{W}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java index 4b88e688772..ba83db280c5 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheMoon.java @@ -39,7 +39,7 @@ public final class PatronOfTheMoon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {1}: Put up to two land cards from your hand onto the battlefield tapped. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PatronOfTheMoonEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PatronOfTheMoonEffect(), new ManaCostsImpl<>("{1}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java index db5bedc0e9a..1fbcbef3f51 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java @@ -28,7 +28,7 @@ public final class PatronOfTheWild extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}"))); // When Patron of the Wild is turned face up, target creature gets +3/+3 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PavelMaliki.java b/Mage.Sets/src/mage/cards/p/PavelMaliki.java index 8e94ab0eb7c..2cc0efacf80 100644 --- a/Mage.Sets/src/mage/cards/p/PavelMaliki.java +++ b/Mage.Sets/src/mage/cards/p/PavelMaliki.java @@ -28,7 +28,7 @@ public final class PavelMaliki extends CardImpl { this.toughness = new MageInt(3); // {B}{R}: Pavel Maliki gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{B}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{R}"))); } private PavelMaliki(final PavelMaliki card) { diff --git a/Mage.Sets/src/mage/cards/p/PeaceOfMind.java b/Mage.Sets/src/mage/cards/p/PeaceOfMind.java index 72537875b1d..6c15253f513 100644 --- a/Mage.Sets/src/mage/cards/p/PeaceOfMind.java +++ b/Mage.Sets/src/mage/cards/p/PeaceOfMind.java @@ -23,7 +23,7 @@ public final class PeaceOfMind extends CardImpl { // {W}, Discard a card: You gain 3 life. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{W}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Peacekeeper.java b/Mage.Sets/src/mage/cards/p/Peacekeeper.java index c03256df290..68def0cccd8 100644 --- a/Mage.Sets/src/mage/cards/p/Peacekeeper.java +++ b/Mage.Sets/src/mage/cards/p/Peacekeeper.java @@ -28,7 +28,7 @@ public final class Peacekeeper extends CardImpl { this.toughness = new MageInt(1); // At the beginning of your upkeep, sacrifice Peacekeeper unless you pay {1}{W}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{1}{W}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{W}")), TargetController.YOU, false)); // Creatures can't attack. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PeacekeeperCantAttackEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java index 7e32a6c2720..2ea88045c18 100644 --- a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java +++ b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java @@ -42,7 +42,7 @@ public final class PeacewalkerColossus extends CardImpl { // {1}{W}: Another target Vehicle you control becomes an artifact creature until end of turn. Effect effect = new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.CREATURE); effect.setText("Another target Vehicle you control becomes an artifact creature until end of turn"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}")); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PearlDragon.java b/Mage.Sets/src/mage/cards/p/PearlDragon.java index 67045ce7065..c637ebb62ec 100644 --- a/Mage.Sets/src/mage/cards/p/PearlDragon.java +++ b/Mage.Sets/src/mage/cards/p/PearlDragon.java @@ -30,7 +30,7 @@ public final class PearlDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {1}{W}: Pearl Dragon gets +0/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"))); } private PearlDragon(final PearlDragon card) { diff --git a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java index 5c341c1067b..019b5ca2163 100644 --- a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java +++ b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java @@ -46,7 +46,7 @@ public final class PearlspearCourier extends CardImpl { // {2}{W}, {tap}: Target Soldier creature gets +2/+2 and has vigilance for as long as Pearlspear Courier remains tapped. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostTargetEffect(2, 2, Duration.Custom), SourceTappedCondition.TAPPED, - "target Soldier creature gets +2/+2"), new ManaCostsImpl("{2}{W}")); + "target Soldier creature gets +2/+2"), new ManaCostsImpl<>("{2}{W}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.Custom), SourceTappedCondition.TAPPED,"and has vigilance for as long as {this} remains tapped")); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/PedanticLearning.java b/Mage.Sets/src/mage/cards/p/PedanticLearning.java index 90b64d3527b..71b1cc1893d 100644 --- a/Mage.Sets/src/mage/cards/p/PedanticLearning.java +++ b/Mage.Sets/src/mage/cards/p/PedanticLearning.java @@ -40,7 +40,7 @@ public final class PedanticLearning extends CardImpl { class PedanticLearningTriggeredAbility extends TriggeredAbilityImpl { public PedanticLearningTriggeredAbility() { - super(Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}")), false); + super(Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}")), false); } public PedanticLearningTriggeredAbility(final PedanticLearningTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java index f616b034f2f..014dc6b2fc5 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusRefuge.java +++ b/Mage.Sets/src/mage/cards/p/PegasusRefuge.java @@ -23,7 +23,7 @@ public final class PegasusRefuge extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); // {2}, Discard a card: Create a 1/1 white Pegasus creature token with flying. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PegasusToken()), new ManaCostsImpl<>("{2}")); ability.addCost(new DiscardCardCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PemminsAura.java b/Mage.Sets/src/mage/cards/p/PemminsAura.java index bc68c07a2fa..4ea91e83d8d 100644 --- a/Mage.Sets/src/mage/cards/p/PemminsAura.java +++ b/Mage.Sets/src/mage/cards/p/PemminsAura.java @@ -42,18 +42,18 @@ public final class PemminsAura extends CardImpl { this.addAbility(ability); // {U}: Untap enchanted creature. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl("{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Enchanted creature gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), - AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {U}: Enchanted creature gains shroud until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), - AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl("{U}"))); + AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{U}"))); // {1}: Enchanted creature gets +1/-1 or -1/+1 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PemminsAuraBoostEnchantedEffect(), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PemminsAuraBoostEnchantedEffect(), new ManaCostsImpl<>("{1}"))); } private PemminsAura(final PemminsAura card) { diff --git a/Mage.Sets/src/mage/cards/p/PendrellDrake.java b/Mage.Sets/src/mage/cards/p/PendrellDrake.java index 8b2589c373c..287fce2d42b 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellDrake.java +++ b/Mage.Sets/src/mage/cards/p/PendrellDrake.java @@ -25,7 +25,7 @@ public final class PendrellDrake extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private PendrellDrake(final PendrellDrake card) { diff --git a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java index bf7b6338c09..4a105c5f3bb 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchPaladin.java +++ b/Mage.Sets/src/mage/cards/p/PentarchPaladin.java @@ -48,7 +48,7 @@ public final class PentarchPaladin extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment))); // {W}{W}, {tap}: Destroy target permanent of the chosen color. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{W}{W}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(PentarchPaladinAdjuster.instance); diff --git a/Mage.Sets/src/mage/cards/p/PerilousForays.java b/Mage.Sets/src/mage/cards/p/PerilousForays.java index 466359bb29b..1e5dc9dbd39 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousForays.java +++ b/Mage.Sets/src/mage/cards/p/PerilousForays.java @@ -42,7 +42,7 @@ public final class PerilousForays extends CardImpl { // {1}, Sacrifice a creature: Search your library for a land card with a basic land type and put it onto the battlefield tapped. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, Outcome.PutLandInPlay), - new ManaCostsImpl("{1}")); + new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PerilousShadow.java b/Mage.Sets/src/mage/cards/p/PerilousShadow.java index e96e52d6204..fad2116d4a1 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousShadow.java +++ b/Mage.Sets/src/mage/cards/p/PerilousShadow.java @@ -29,7 +29,7 @@ public final class PerilousShadow extends CardImpl { // {1}{B}: Perilous Shadow gets +2/+2 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2,2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PermafrostTrap.java b/Mage.Sets/src/mage/cards/p/PermafrostTrap.java index 2ce72d0925b..ca3e5e26a30 100644 --- a/Mage.Sets/src/mage/cards/p/PermafrostTrap.java +++ b/Mage.Sets/src/mage/cards/p/PermafrostTrap.java @@ -30,7 +30,7 @@ public final class PermafrostTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If an opponent had a green creature enter the battlefield under their control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), PermafrostTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{U}"), PermafrostTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher()); // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/p/Pestilence.java b/Mage.Sets/src/mage/cards/p/Pestilence.java index 648a8e5ba81..d78763b4828 100644 --- a/Mage.Sets/src/mage/cards/p/Pestilence.java +++ b/Mage.Sets/src/mage/cards/p/Pestilence.java @@ -33,7 +33,7 @@ public final class Pestilence extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(triggered, new CreatureCountCondition(0, TargetController.ANY), ruleText)); // {B}: Pestilence deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{B}"))); } private Pestilence(final Pestilence card) { diff --git a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java index 90c376e646c..5fac002feb6 100644 --- a/Mage.Sets/src/mage/cards/p/PestilenceDemon.java +++ b/Mage.Sets/src/mage/cards/p/PestilenceDemon.java @@ -30,7 +30,7 @@ public final class PestilenceDemon extends CardImpl { this.power = new MageInt(7); this.toughness = new MageInt(6); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PestilenceDemonEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PestilenceDemonEffect(), new ManaCostsImpl<>("{B}"))); } private PestilenceDemon(final PestilenceDemon card) { diff --git a/Mage.Sets/src/mage/cards/p/PestilentKathari.java b/Mage.Sets/src/mage/cards/p/PestilentKathari.java index a66abc788e4..efcb10eff2c 100644 --- a/Mage.Sets/src/mage/cards/p/PestilentKathari.java +++ b/Mage.Sets/src/mage/cards/p/PestilentKathari.java @@ -32,7 +32,7 @@ public final class PestilentKathari extends CardImpl { this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); this.addAbility(DeathtouchAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}"))); } private PestilentKathari(final PestilentKathari card) { diff --git a/Mage.Sets/src/mage/cards/p/Petradon.java b/Mage.Sets/src/mage/cards/p/Petradon.java index b35324d3a75..0da5daa8fd2 100644 --- a/Mage.Sets/src/mage/cards/p/Petradon.java +++ b/Mage.Sets/src/mage/cards/p/Petradon.java @@ -42,7 +42,7 @@ public final class Petradon extends CardImpl { .withReturnName("cards", "their owners'"), false)); // {R}: Petradon gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private Petradon(final Petradon card) { diff --git a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java index c948d95a5b9..6534c486adc 100644 --- a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java +++ b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java @@ -40,7 +40,7 @@ public final class PetrifiedPlating extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Suspend 2-{G} - this.addAbility(new SuspendAbility(2, new ManaCostsImpl("{G}"), this)); + this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{G}"), this)); } private PetrifiedPlating(final PetrifiedPlating card) { diff --git a/Mage.Sets/src/mage/cards/p/PewterGolem.java b/Mage.Sets/src/mage/cards/p/PewterGolem.java index 7c37fb0cf79..1eefd276eb4 100644 --- a/Mage.Sets/src/mage/cards/p/PewterGolem.java +++ b/Mage.Sets/src/mage/cards/p/PewterGolem.java @@ -23,7 +23,7 @@ public final class PewterGolem extends CardImpl { this.subtype.add(SubType.GOLEM); this.power = new MageInt(4); this.toughness = new MageInt(2); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}"))); } private PewterGolem(final PewterGolem card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java b/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java index 1990c6bbc25..7a838739fab 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalFiend.java @@ -28,10 +28,10 @@ public final class PhantasmalFiend extends CardImpl { this.toughness = new MageInt(5); // {B}: Phantasmal Fiend 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}"))); // {1}{U}: Switch Phantasmal Fiend's power and toughness until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SwitchPowerToughnessSourceEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{1}{U}"))); } private PhantasmalFiend(final PhantasmalFiend card) { diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalForces.java b/Mage.Sets/src/mage/cards/p/PhantasmalForces.java index f9c81d5869a..3b2e1401424 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalForces.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalForces.java @@ -28,7 +28,7 @@ public final class PhantasmalForces extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, sacrifice Phantasmal Forces unless you pay {U}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{U}")), TargetController.YOU, false)); } private PhantasmalForces(final PhantasmalForces card) { diff --git a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java index 7e488a0dd6c..a1d37649302 100644 --- a/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java +++ b/Mage.Sets/src/mage/cards/p/PharikaGodOfAffliction.java @@ -44,7 +44,7 @@ public final class PharikaGodOfAffliction extends CardImpl { .addHint(DevotionCount.BG.getHint())); // {B}{G}: Exile target creature card from a graveyard. It's owner creates a 1/1 black and green Snake enchantment creature token with deathtouch. - Ability ability = new SimpleActivatedAbility(new PharikaExileEffect(), new ManaCostsImpl("{B}{G}")); + Ability ability = new SimpleActivatedAbility(new PharikaExileEffect(), new ManaCostsImpl<>("{B}{G}")); ability.addTarget(new TargetCardInGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Phelddagrif.java b/Mage.Sets/src/mage/cards/p/Phelddagrif.java index 7e19d060b24..a245974efa2 100644 --- a/Mage.Sets/src/mage/cards/p/Phelddagrif.java +++ b/Mage.Sets/src/mage/cards/p/Phelddagrif.java @@ -37,19 +37,19 @@ public final class Phelddagrif extends CardImpl { this.toughness = new MageInt(4); // {G}: Phelddagrif gains trample until end of turn. Target opponent creates a 1/1 green Hippo creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); ability.addEffect(new CreateTokenTargetEffect(new HippoToken())); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {W}: Phelddagrif gains flying until end of turn. Target opponent gains 2 life. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")); ability.addEffect(new GainLifeTargetEffect(2)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); // {U}: Return Phelddagrif to its owner's hand. Target opponent may draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl("{U}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), new ManaCostsImpl<>("{U}")); ability.addEffect(new DrawCardTargetEffect(1, true)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java b/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java index ea3bba44b11..f1e2f7e701d 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandRaiders.java @@ -28,7 +28,7 @@ public final class PheresBandRaiders extends CardImpl { this.toughness = new MageInt(5); // Inspired — Whenever Pheres-Band Raiders becomes untapped, you may pay {2}{G}. If you do, create a 3/3 green Centaur enchantment creature token. - this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new CentaurEnchantmentCreatureToken()), new ManaCostsImpl("{2}{G}")))); + this.addAbility(new InspiredAbility(new DoIfCostPaid(new CreateTokenEffect(new CentaurEnchantmentCreatureToken()), new ManaCostsImpl<>("{2}{G}")))); } diff --git a/Mage.Sets/src/mage/cards/p/PhobianPhantasm.java b/Mage.Sets/src/mage/cards/p/PhobianPhantasm.java index 09fb08eae99..162cb69e05f 100644 --- a/Mage.Sets/src/mage/cards/p/PhobianPhantasm.java +++ b/Mage.Sets/src/mage/cards/p/PhobianPhantasm.java @@ -28,7 +28,7 @@ public final class PhobianPhantasm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(FearAbility.getInstance()); // Cumulative upkeep {B} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{B}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{B}"))); } private PhobianPhantasm(final PhobianPhantasm card) { diff --git a/Mage.Sets/src/mage/cards/p/PhoenixOfAsh.java b/Mage.Sets/src/mage/cards/p/PhoenixOfAsh.java index 0576e1d045e..970cf3a5c6b 100644 --- a/Mage.Sets/src/mage/cards/p/PhoenixOfAsh.java +++ b/Mage.Sets/src/mage/cards/p/PhoenixOfAsh.java @@ -36,7 +36,7 @@ public final class PhoenixOfAsh extends CardImpl { // {2}{R}: Phoenix of Ash gets +2/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}") + new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}") )); // Escape — {2}{R}{R}, Exile three other cards from your graveyard. diff --git a/Mage.Sets/src/mage/cards/p/Phthisis.java b/Mage.Sets/src/mage/cards/p/Phthisis.java index 1b12ac3620d..5de62b7f066 100644 --- a/Mage.Sets/src/mage/cards/p/Phthisis.java +++ b/Mage.Sets/src/mage/cards/p/Phthisis.java @@ -31,7 +31,7 @@ public final class Phthisis extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Suspend 5-{1}{B} - this.addAbility(new SuspendAbility(5, new ManaCostsImpl("{1}{B}"), this)); + this.addAbility(new SuspendAbility(5, new ManaCostsImpl<>("{1}{B}"), this)); } private Phthisis(final Phthisis card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianBattleflies.java b/Mage.Sets/src/mage/cards/p/PhyrexianBattleflies.java index 7d45906c444..7b361cab072 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianBattleflies.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianBattleflies.java @@ -30,7 +30,7 @@ public final class PhyrexianBattleflies extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: {this} gets +1/+0 until end of turn. Activate this ability no more than twice each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{B}"), 2)); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"), 2)); } private PhyrexianBattleflies(final PhyrexianBattleflies card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java b/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java index fb7d3381ded..cffe8c92bf0 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java @@ -25,7 +25,7 @@ public final class PhyrexianEtchings extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}{B}{B}"); // Cumulative upkeep-Pay {B}. - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{B}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{B}"))); // At the beginning of your end step, draw a card for each age counter on Phyrexian Etchings. this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)), false)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java b/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java index a6d24c8a59e..f58039f73e4 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianFurnace.java @@ -36,7 +36,7 @@ public final class PhyrexianFurnace extends CardImpl { this.addAbility(ability); // {1}, Sacrifice Phyrexian Furnace: Exile target card from a graveyard. Draw a card. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInGraveyard()); ability.addEffect(new DrawCardSourceControllerEffect(1)); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java index f2259094562..3fcc2f2214b 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianGrimoire.java @@ -33,7 +33,7 @@ public final class PhyrexianGrimoire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {4}, {tap}: Target opponent chooses one of the top two cards of your graveyard. Exile that card and put the other one into your hand. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianGrimoireEffect(), new ManaCostsImpl("{4}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianGrimoireEffect(), new ManaCostsImpl<>("{4}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java b/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java index 1ff5018dd8a..25b284b54d1 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianInfiltrator.java @@ -30,7 +30,7 @@ public final class PhyrexianInfiltrator extends CardImpl { // {2}{U}{U}: Exchange control of Phyrexian Infiltrator and target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExchangeControlTargetEffect(Duration.EndOfGame, - "Exchange control of {this} and target creature", true), new ManaCostsImpl("{2}{U}{U}")); + "Exchange control of {this} and target creature", true), new ManaCostsImpl<>("{2}{U}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java index 8dac37ec770..93b20ff6906 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianIronfoot.java @@ -33,7 +33,7 @@ public final class PhyrexianIronfoot extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); // {1}{S}: Untap Phyrexian Ironfoot. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl("{1}{S}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}{S}"))); } private PhyrexianIronfoot(final PhyrexianIronfoot card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java index 4a851f03506..9febffaeeee 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMarauder.java @@ -57,7 +57,7 @@ public final class PhyrexianMarauder extends CardImpl { class PhyrexianMarauderCantAttackUnlessYouPayEffect extends CantAttackBlockUnlessPaysSourceEffect { PhyrexianMarauderCantAttackUnlessYouPayEffect() { - super(new ManaCostsImpl("{0}"), RestrictType.ATTACK); + super(new ManaCostsImpl<>("{0}"), RestrictType.ATTACK); staticText = "{this} can't attack unless you pay {1} for each +1/+1 counter on it"; } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java b/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java index 282168ae6a6..7c5f0a7f393 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMonitor.java @@ -26,7 +26,7 @@ public final class PhyrexianMonitor extends CardImpl { this.toughness = new MageInt(2); // {B}: Regenerate Phyrexian Monitor. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); } private PhyrexianMonitor(final PhyrexianMonitor card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java b/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java index cb05f3da7cb..c2537686b43 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianPortal.java @@ -32,7 +32,7 @@ public final class PhyrexianPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // {3}: If your library has ten or more cards in it, target opponent looks at the top ten cards of your library and separates them into two face-down piles. Exile one of those piles. Search the other pile for a card, put it into your hand, then shuffle the rest of that pile into your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianPortalEffect(), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PhyrexianPortalEffect(), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java index c44cf992ea1..71d4542a32f 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianSnowcrusher.java @@ -32,7 +32,7 @@ public final class PhyrexianSnowcrusher extends CardImpl { // Phyrexian Snowcrusher attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // {1}{S}: Phyrexian Snowcrusher gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{S}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{S}"))); } private PhyrexianSnowcrusher(final PhyrexianSnowcrusher card) { diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java index 2bb514daa17..ec1211dbfca 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java @@ -37,7 +37,7 @@ public final class PhyrexianTotem extends CardImpl { this.addAbility(new BlackManaAbility()); // {2}{B}: {this} becomes a 5/5 black Horror artifact creature with trample until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( - new PhyrexianTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); + new PhyrexianTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{2}{B}"))); // Whenever {this} is dealt damage, if it's a creature, sacrifice that many permanents. this.addAbility(new PhyrexianTotemTriggeredAbility()); } diff --git a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java index e69a7e04aa8..7a7f35cea0a 100644 --- a/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java +++ b/Mage.Sets/src/mage/cards/p/PiaAndKiranNalaar.java @@ -42,7 +42,7 @@ public final class PiaAndKiranNalaar extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect)); // {2}{R}, Sacrifice an artifact: Pia and Kiran Nalaar deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}")); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, new FilterControlledArtifactPermanent("an artifact"), true))); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PilferingHawk.java b/Mage.Sets/src/mage/cards/p/PilferingHawk.java index b2132abe4f9..589f3277dfe 100644 --- a/Mage.Sets/src/mage/cards/p/PilferingHawk.java +++ b/Mage.Sets/src/mage/cards/p/PilferingHawk.java @@ -33,7 +33,7 @@ public final class PilferingHawk extends CardImpl { // {S}, {T}: Draw a card, then discard a card. Ability ability = new SimpleActivatedAbility( - new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl("{S}") + new DrawDiscardControllerEffect(1, 1), new ManaCostsImpl<>("{S}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PilferingImp.java b/Mage.Sets/src/mage/cards/p/PilferingImp.java index c7d4b230583..3a533cfe8ca 100644 --- a/Mage.Sets/src/mage/cards/p/PilferingImp.java +++ b/Mage.Sets/src/mage/cards/p/PilferingImp.java @@ -40,7 +40,7 @@ public final class PilferingImp extends CardImpl { new DiscardCardYouChooseTargetEffect( StaticFilters.FILTER_CARD_NON_LAND, TargetController.OPPONENT - ), new ManaCostsImpl("{1}{B}") + ), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java b/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java index 4567105d0de..7eceba26936 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimOfJustice.java @@ -38,7 +38,7 @@ public final class PilgrimOfJustice extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // {W}, Sacrifice Pilgrim of Justice: The next time a red source of your choice would deal damage this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfJusticeEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfJusticeEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java b/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java index 3d32b9de466..adbafa540fe 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimOfVirtue.java @@ -38,7 +38,7 @@ public final class PilgrimOfVirtue extends CardImpl { // Protection from black this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // {W}, Sacrifice Pilgrim of Virtue: The next time a black source of your choice would deal damage this turn, prevent that damage. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfVirtueEffect(), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PilgrimOfVirtueEffect(), new ManaCostsImpl<>("{W}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PiliPala.java b/Mage.Sets/src/mage/cards/p/PiliPala.java index 8491c99a9f5..60f36f61cb0 100644 --- a/Mage.Sets/src/mage/cards/p/PiliPala.java +++ b/Mage.Sets/src/mage/cards/p/PiliPala.java @@ -29,7 +29,7 @@ public final class PiliPala extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {2}, {untap}: Add one mana of any color. - Ability ability = new AnyColorManaAbility(new ManaCostsImpl("{2}")); + Ability ability = new AnyColorManaAbility(new ManaCostsImpl<>("{2}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PineWalker.java b/Mage.Sets/src/mage/cards/p/PineWalker.java index cf408f2214e..6357d5cf7eb 100644 --- a/Mage.Sets/src/mage/cards/p/PineWalker.java +++ b/Mage.Sets/src/mage/cards/p/PineWalker.java @@ -28,7 +28,7 @@ public final class PineWalker extends CardImpl { this.toughness = new MageInt(5); // Morph {4}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{4}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"))); // Whenever Pine Walker or another creature you control is turned face up, untap that creature. Effect effect = new UntapTargetEffect(); effect.setText("untap that creature"); diff --git a/Mage.Sets/src/mage/cards/p/PiperOfTheSwarm.java b/Mage.Sets/src/mage/cards/p/PiperOfTheSwarm.java index 4268f5cbb61..06d41422d4b 100644 --- a/Mage.Sets/src/mage/cards/p/PiperOfTheSwarm.java +++ b/Mage.Sets/src/mage/cards/p/PiperOfTheSwarm.java @@ -48,14 +48,14 @@ public final class PiperOfTheSwarm extends CardImpl { // {1}{B}, {T}: Create a 1/1 black Rat creature token. Ability ability = new SimpleActivatedAbility( - new CreateTokenEffect(new RatToken()), new ManaCostsImpl("{1}{B}") + new CreateTokenEffect(new RatToken()), new ManaCostsImpl<>("{1}{B}") ); ability.addCost(new TapSourceCost()); this.addAbility(ability); // {2}{B}{B}, {T}, Sacrifice three Rats: Gain control of target creature. ability = new SimpleActivatedAbility( - new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl("{2}{B}{B}") + new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{2}{B}{B}") ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, filter2))); diff --git a/Mage.Sets/src/mage/cards/p/PitImp.java b/Mage.Sets/src/mage/cards/p/PitImp.java index 1a35733f1d1..c1566c52b8e 100644 --- a/Mage.Sets/src/mage/cards/p/PitImp.java +++ b/Mage.Sets/src/mage/cards/p/PitImp.java @@ -29,7 +29,7 @@ public final class PitImp extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // {B}: Pit Imp gets +1/+0 until end of turn. Activate this ability no more than twice each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl("{B}"), 2)); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0,Duration.EndOfTurn), new ManaCostsImpl<>("{B}"), 2)); } private PitImp(final PitImp card) { diff --git a/Mage.Sets/src/mage/cards/p/PitRaptor.java b/Mage.Sets/src/mage/cards/p/PitRaptor.java index e3c8d9161ee..214f5d9e7dc 100644 --- a/Mage.Sets/src/mage/cards/p/PitRaptor.java +++ b/Mage.Sets/src/mage/cards/p/PitRaptor.java @@ -31,7 +31,7 @@ public final class PitRaptor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, sacrifice Pit Raptor unless you pay {2}{B}{B} - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{2}{B}{B}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{2}{B}{B}")), TargetController.YOU, false)); } private PitRaptor(final PitRaptor card) { diff --git a/Mage.Sets/src/mage/cards/p/PitSpawn.java b/Mage.Sets/src/mage/cards/p/PitSpawn.java index c6ad47b1bdf..6c6b048cf2e 100644 --- a/Mage.Sets/src/mage/cards/p/PitSpawn.java +++ b/Mage.Sets/src/mage/cards/p/PitSpawn.java @@ -31,7 +31,7 @@ public final class PitSpawn extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of your upkeep, sacrifice Pit Spawn unless you pay {B}{B}. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{B}")), TargetController.YOU, false)); // Whenever Pit Spawn deals damage to a creature, exile that creature. this.addAbility(new DealsDamageToACreatureTriggeredAbility(new ExileTargetEffect("exile that creature"), false, false, true)); diff --git a/Mage.Sets/src/mage/cards/p/PitfallTrap.java b/Mage.Sets/src/mage/cards/p/PitfallTrap.java index 18a6f9e0021..53eeccd0959 100644 --- a/Mage.Sets/src/mage/cards/p/PitfallTrap.java +++ b/Mage.Sets/src/mage/cards/p/PitfallTrap.java @@ -35,7 +35,7 @@ public final class PitfallTrap extends CardImpl { this.subtype.add(SubType.TRAP); // If exactly one creature is attacking, you may pay {W} rather than pay Pitfall Trap's mana cost. - this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{W}"), PitfallTrapCondition.instance)); + this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl<>("{W}"), PitfallTrapCondition.instance)); // Destroy target attacking creature without flying. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/p/PixieQueen.java b/Mage.Sets/src/mage/cards/p/PixieQueen.java index 9e82e8c689b..29ddaffe311 100644 --- a/Mage.Sets/src/mage/cards/p/PixieQueen.java +++ b/Mage.Sets/src/mage/cards/p/PixieQueen.java @@ -33,7 +33,7 @@ public final class PixieQueen extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {G}{G}{G}, {tap}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}{G}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}{G}{G}")); ability.addTarget(new TargetCreaturePermanent()); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlagueBoiler.java b/Mage.Sets/src/mage/cards/p/PlagueBoiler.java index 871a03f9f1f..e9856713bce 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBoiler.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBoiler.java @@ -37,7 +37,7 @@ public final class PlagueBoiler extends CardImpl { // At the beginning of your upkeep, put a plague counter on Plague Boiler. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.PLAGUE.createInstance()), TargetController.YOU, false)); // {1}{B}{G}: Put a plague counter on Plague Boiler or remove a plague counter from it. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlagueBoilerEffect(), new ManaCostsImpl("{1}{B}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlagueBoilerEffect(), new ManaCostsImpl<>("{1}{B}{G}"))); // When Plague Boiler has three or more plague counters on it, sacrifice it. If you do, destroy all nonland permanents. this.addAbility(new PlagueBoilerTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PlagueDogs.java b/Mage.Sets/src/mage/cards/p/PlagueDogs.java index 00dc8bec8ed..6c5058f85e9 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDogs.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDogs.java @@ -34,7 +34,7 @@ public final class PlagueDogs extends CardImpl { // When Plague Dogs dies, all creatures get -1/-1 until end of turn. this.addAbility(new DiesSourceTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn), false)); // {2}, Sacrifice Plague Dogs: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueWitch.java b/Mage.Sets/src/mage/cards/p/PlagueWitch.java index 2e4c9d09a8e..baf493095e5 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueWitch.java +++ b/Mage.Sets/src/mage/cards/p/PlagueWitch.java @@ -31,7 +31,7 @@ public final class PlagueWitch extends CardImpl { this.toughness = new MageInt(1); // {B}, {tap}, Discard a card: Target creature gets -1/-1 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/Plaguebearer.java b/Mage.Sets/src/mage/cards/p/Plaguebearer.java index 270cacdfc2c..7c06d809fc3 100644 --- a/Mage.Sets/src/mage/cards/p/Plaguebearer.java +++ b/Mage.Sets/src/mage/cards/p/Plaguebearer.java @@ -38,7 +38,7 @@ public final class Plaguebearer extends CardImpl { this.toughness = new MageInt(1); // {X}{X}{B}: Destroy target nonblack creature with converted mana cost X. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{X}{X}{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{X}{X}{B}")); ability.addTarget(new TargetPermanent(filter)); ability.setTargetAdjuster(XCMCPermanentAdjuster.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlanarGuide.java b/Mage.Sets/src/mage/cards/p/PlanarGuide.java index c366fbe99c7..06325abf7c1 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarGuide.java +++ b/Mage.Sets/src/mage/cards/p/PlanarGuide.java @@ -39,7 +39,7 @@ public final class PlanarGuide extends CardImpl { this.toughness = new MageInt(1); // {3}{W}, Exile Planar Guide: Exile all creatures. At the beginning of the next end step, return those cards to the battlefield under their owners' control. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlanarGuideExileEffect(), new ManaCostsImpl("{3}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlanarGuideExileEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new ExileSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlanarPortal.java b/Mage.Sets/src/mage/cards/p/PlanarPortal.java index 4123c4c1ee7..05a5af0a11a 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarPortal.java +++ b/Mage.Sets/src/mage/cards/p/PlanarPortal.java @@ -23,7 +23,7 @@ public final class PlanarPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {6}, {tap}: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl("{6}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlaneboundAccomplice.java b/Mage.Sets/src/mage/cards/p/PlaneboundAccomplice.java index 4d59ae3cda9..acfe5033a1b 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneboundAccomplice.java +++ b/Mage.Sets/src/mage/cards/p/PlaneboundAccomplice.java @@ -39,7 +39,7 @@ public final class PlaneboundAccomplice extends CardImpl { this.toughness = new MageInt(3); // {R}: You may put a planeswalker card from your hand onto the battlefield. Sacrifice it at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(new PlaneboundAccompliceEffect(), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(new PlaneboundAccompliceEffect(), new ManaCostsImpl<>("{R}"))); } private PlaneboundAccomplice(final PlaneboundAccomplice card) { diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java index 62f9bb6f814..1cbab680f84 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java @@ -34,7 +34,7 @@ public final class PlaneswalkersFavor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); // {3}{G}: Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFavorEffect(), new ManaCostsImpl("{3}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFavorEffect(), new ManaCostsImpl<>("{3}{G}")); Target target = new TargetOpponent(); ability.addTarget(target); target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java index c6817d6ee83..647c7997364 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java @@ -23,7 +23,7 @@ public final class PlaneswalkersFury extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // {3}{R}: Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFuryEffect(), new ManaCostsImpl("{3}{R}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFuryEffect(), new ManaCostsImpl<>("{3}{R}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java index a467798081f..d93af8ebee6 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java @@ -28,7 +28,7 @@ public final class PlaneswalkersMirth extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); // {3}{W}: Target opponent reveals a card at random from their hand. You gain life equal to that card's converted mana cost. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMirthEffect(), new ManaCostsImpl("{3}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMirthEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java index b20ed2ff547..0b84ad1c6d6 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java @@ -32,7 +32,7 @@ public final class PlaneswalkersMischief extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // {3}{U}: Target opponent reveals a card at random from their hand. If it's an instant or sorcery card, exile it. You may cast it without paying its mana cost for as long as it remains exiled. At the beginning of the next end step, if you haven't cast it, return it to its owner's hand. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMischiefEffect(), new ManaCostsImpl("{3}{U}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMischiefEffect(), new ManaCostsImpl<>("{3}{U}")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java index 8b80b4a4278..cba519d0043 100644 --- a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java +++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java @@ -34,7 +34,7 @@ public final class PlaneswalkersScorn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); // {3}{B}: Target opponent reveals a card at random from their hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost. Activate this ability only any time you could cast a sorcery. - Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersScornEffect(), new ManaCostsImpl("{3}{B}")); + Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersScornEffect(), new ManaCostsImpl<>("{3}{B}")); Target target = new TargetOpponent(); ability.addTarget(target); target = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/p/PlatedRootwalla.java b/Mage.Sets/src/mage/cards/p/PlatedRootwalla.java index a3fc18d42a2..d2c04edb83d 100644 --- a/Mage.Sets/src/mage/cards/p/PlatedRootwalla.java +++ b/Mage.Sets/src/mage/cards/p/PlatedRootwalla.java @@ -26,7 +26,7 @@ public final class PlatedRootwalla extends CardImpl { this.toughness = new MageInt(3); // {2}{G}: Plated Rootwalla gets +3/+3 until end of turn. Activate this ability only once each turn. - this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl("{2}{G}"))); + this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}"))); } private PlatedRootwalla(final PlatedRootwalla card) { diff --git a/Mage.Sets/src/mage/cards/p/PloKoon.java b/Mage.Sets/src/mage/cards/p/PloKoon.java index c2e35cc32f0..44071359807 100644 --- a/Mage.Sets/src/mage/cards/p/PloKoon.java +++ b/Mage.Sets/src/mage/cards/p/PloKoon.java @@ -32,7 +32,7 @@ public final class PloKoon extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ActivateAbilitiesAnyTimeYouCouldCastInstantEffect(MeditateAbility.class, "meditate abilities"))); // Meditate {1}{W} - this.addAbility(new MeditateAbility(new ManaCostsImpl("{1}{W}"))); + this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{W}"))); } private PloKoon(final PloKoon card) { diff --git a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java index 961d382203b..3e3123d345a 100644 --- a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java +++ b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java @@ -38,7 +38,7 @@ public final class PlumesOfPeace extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); // Forecast - {W}{U}, Reveal Plumes of Peace from your hand: Tap target creature. - ForecastAbility ability = new ForecastAbility(new TapTargetEffect(), new ManaCostsImpl("{W}{U}")); + ForecastAbility ability = new ForecastAbility(new TapTargetEffect(), new ManaCostsImpl<>("{W}{U}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Plunder.java b/Mage.Sets/src/mage/cards/p/Plunder.java index 4e67fc62d59..5e7e950b2b0 100644 --- a/Mage.Sets/src/mage/cards/p/Plunder.java +++ b/Mage.Sets/src/mage/cards/p/Plunder.java @@ -31,7 +31,7 @@ public final class Plunder extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); // Suspend 4-{1}{R} - this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{R}"), this)); + this.addAbility(new SuspendAbility(4, new ManaCostsImpl<>("{1}{R}"), this)); } private Plunder(final Plunder card) { diff --git a/Mage.Sets/src/mage/cards/p/PollutedMire.java b/Mage.Sets/src/mage/cards/p/PollutedMire.java index d73bd9df17b..452106ff897 100644 --- a/Mage.Sets/src/mage/cards/p/PollutedMire.java +++ b/Mage.Sets/src/mage/cards/p/PollutedMire.java @@ -22,7 +22,7 @@ public final class PollutedMire extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); this.addAbility(new EntersBattlefieldTappedAbility()); - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); this.addAbility(new BlackManaAbility()); } diff --git a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java index 01457a08f40..74f42224717 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java @@ -54,7 +54,7 @@ public final class PolukranosUnchained extends CardImpl { this.addAbility(new SimpleStaticAbility(new PreventDamageAndRemoveCountersEffect(true))); // {1}{B}{G}: Polukranos fights another target creature. - Ability ability = new SimpleActivatedAbility(new FightTargetSourceEffect(), new ManaCostsImpl("{1}{B}{G}")); + Ability ability = new SimpleActivatedAbility(new FightTargetSourceEffect(), new ManaCostsImpl<>("{1}{B}{G}")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java index c67129f4d5f..17f4f3174dd 100644 --- a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java +++ b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java @@ -36,7 +36,7 @@ public final class PonybackBrigade extends CardImpl { this.addAbility(new PonybackBrigadeAbility(new GoblinToken())); // Morph {2}{R}{W}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl("{2}{R}{W}{B}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}{W}{B}"))); } private PonybackBrigade(final PonybackBrigade card) { diff --git a/Mage.Sets/src/mage/cards/p/PoolingVenom.java b/Mage.Sets/src/mage/cards/p/PoolingVenom.java index b270ef918c8..a23f1253bcb 100644 --- a/Mage.Sets/src/mage/cards/p/PoolingVenom.java +++ b/Mage.Sets/src/mage/cards/p/PoolingVenom.java @@ -38,7 +38,7 @@ public final class PoolingVenom extends CardImpl { // Whenever enchanted land becomes tapped, its controller loses 2 life. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new LoseLifeControllerAttachedEffect(2), "enchanted land")); // {3}{B}: Destroy enchanted land. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAttachedToEffect("enchanted land"), new ManaCostsImpl("{3}{B}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyAttachedToEffect("enchanted land"), new ManaCostsImpl<>("{3}{B}"))); } private PoolingVenom(final PoolingVenom card) { diff --git a/Mage.Sets/src/mage/cards/p/PortOfKarfell.java b/Mage.Sets/src/mage/cards/p/PortOfKarfell.java index b838903cd1f..3f04b1d9830 100644 --- a/Mage.Sets/src/mage/cards/p/PortOfKarfell.java +++ b/Mage.Sets/src/mage/cards/p/PortOfKarfell.java @@ -37,7 +37,7 @@ public final class PortOfKarfell extends CardImpl { this.addAbility(new BlueManaAbility()); // {3}{U}{B}{B}, {T}, Sacrifice Port of Karfell: Mill four cards, then return a creature card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(new PortOfKarfellEffect(), new ManaCostsImpl("{3}{U}{B}{B}")); + Ability ability = new SimpleActivatedAbility(new PortOfKarfellEffect(), new ManaCostsImpl<>("{3}{U}{B}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PossessedAven.java b/Mage.Sets/src/mage/cards/p/PossessedAven.java index c4a08f7d8b6..30fcbadd80a 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedAven.java +++ b/Mage.Sets/src/mage/cards/p/PossessedAven.java @@ -59,7 +59,7 @@ public final class PossessedAven extends CardImpl { new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), diff --git a/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java b/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java index 5746b632770..7e0796082df 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java +++ b/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java @@ -59,7 +59,7 @@ public final class PossessedBarbarian extends CardImpl { new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), diff --git a/Mage.Sets/src/mage/cards/p/PossessedCentaur.java b/Mage.Sets/src/mage/cards/p/PossessedCentaur.java index 2251ac20a20..7cd4bdd00cf 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedCentaur.java +++ b/Mage.Sets/src/mage/cards/p/PossessedCentaur.java @@ -58,7 +58,7 @@ public final class PossessedCentaur extends CardImpl { new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), diff --git a/Mage.Sets/src/mage/cards/p/PossessedNomad.java b/Mage.Sets/src/mage/cards/p/PossessedNomad.java index 4718feffd42..6788d864e7a 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedNomad.java +++ b/Mage.Sets/src/mage/cards/p/PossessedNomad.java @@ -59,7 +59,7 @@ public final class PossessedNomad extends CardImpl { new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); - Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), diff --git a/Mage.Sets/src/mage/cards/p/PotionOfHealing.java b/Mage.Sets/src/mage/cards/p/PotionOfHealing.java index b036e33ea31..8a3b3451655 100644 --- a/Mage.Sets/src/mage/cards/p/PotionOfHealing.java +++ b/Mage.Sets/src/mage/cards/p/PotionOfHealing.java @@ -27,7 +27,7 @@ public final class PotionOfHealing extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // {W}, {T}, Sacrifice Potion of Healing: You gain 3 life. - Ability ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(new GainLifeEffect(3), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PowerArmor.java b/Mage.Sets/src/mage/cards/p/PowerArmor.java index 7c236b76b45..200ce7296c4 100644 --- a/Mage.Sets/src/mage/cards/p/PowerArmor.java +++ b/Mage.Sets/src/mage/cards/p/PowerArmor.java @@ -29,7 +29,7 @@ public final class PowerArmor extends CardImpl { // Domain - {3}, {tap}: Target creature gets +1/+1 until end of turn for each basic land type among lands you control. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect( DomainValue.REGULAR, DomainValue.REGULAR, Duration.EndOfTurn), new TapSourceCost()); - ability.addCost(new ManaCostsImpl("{3}")); + ability.addCost(new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); diff --git a/Mage.Sets/src/mage/cards/p/PowerTaint.java b/Mage.Sets/src/mage/cards/p/PowerTaint.java index 1cad22a987b..86355db3742 100644 --- a/Mage.Sets/src/mage/cards/p/PowerTaint.java +++ b/Mage.Sets/src/mage/cards/p/PowerTaint.java @@ -40,13 +40,13 @@ public final class PowerTaint extends CardImpl { // At the beginning of the upkeep of enchanted enchantment's controller, that player loses 2 life unless they pay {2}. Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new LoseLifeTargetEffect(2), - new ManaCostsImpl("{2}"), "that player loses 2 life unless they pay {2}"); + new ManaCostsImpl<>("{2}"), "that player loses 2 life unless they pay {2}"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.CONTROLLER_ATTACHED_TO, false, true, "At the beginning of the upkeep of enchanted enchantment's controller, ")); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } diff --git a/Mage.Sets/src/mage/cards/p/PradeshGypsies.java b/Mage.Sets/src/mage/cards/p/PradeshGypsies.java index d0cab7ce42a..d500aac6565 100644 --- a/Mage.Sets/src/mage/cards/p/PradeshGypsies.java +++ b/Mage.Sets/src/mage/cards/p/PradeshGypsies.java @@ -31,7 +31,7 @@ public final class PradeshGypsies extends CardImpl { this.toughness = new MageInt(1); // {1}{G}, {tap}: Target creature gets -2/-0 until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java b/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java index 6e312d8b7d0..01d3a0e5a17 100644 --- a/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java +++ b/Mage.Sets/src/mage/cards/p/PrahvSpiresOfOrder.java @@ -26,7 +26,7 @@ public final class PrahvSpiresOfOrder extends CardImpl { this.addAbility(new ColorlessManaAbility()); // {4}{W}{U}, {T}: Prevent all damage a source of your choice would deal this turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(), new ManaCostsImpl("{4}{W}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageBySourceEffect(), new ManaCostsImpl<>("{4}{W}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java b/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java index 020a8dd4d7b..6f47eaa4ab3 100644 --- a/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java +++ b/Mage.Sets/src/mage/cards/p/PravaOfTheSteelLegion.java @@ -48,7 +48,7 @@ public final class PravaOfTheSteelLegion extends CardImpl { // {3}{W}: Create a 1/1 white Soldier creature token. this.addAbility(new SimpleActivatedAbility( - new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl("{3}{W}") + new CreateTokenEffect(new SoldierToken()), new ManaCostsImpl<>("{3}{W}") )); // Partner diff --git a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java index 4e2ca392f6f..b9215dcb3c2 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorFlagship.java +++ b/Mage.Sets/src/mage/cards/p/PredatorFlagship.java @@ -36,12 +36,12 @@ public final class PredatorFlagship extends CardImpl { addSuperType(SuperType.LEGENDARY); // {2}: Target creature gains flying until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}")); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {5}, {T}: Destroy target creature with flying. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{5}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index 8adc07492d6..7e3fff0ed64 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -49,7 +49,7 @@ public final class PrideOfTheClouds extends CardImpl { this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield))); // Forecast - {2}{W}{U}, Reveal Pride of the Clouds from your hand: Create a 1/1 white and blue Bird creature token with flying. - this.addAbility(new ForecastAbility(new CreateTokenEffect(new WhiteBlueBirdToken()), new ManaCostsImpl("{2}{W}{U}"))); + this.addAbility(new ForecastAbility(new CreateTokenEffect(new WhiteBlueBirdToken()), new ManaCostsImpl<>("{2}{W}{U}"))); } private PrideOfTheClouds(final PrideOfTheClouds card) { diff --git a/Mage.Sets/src/mage/cards/p/PrideSovereign.java b/Mage.Sets/src/mage/cards/p/PrideSovereign.java index 625d470ed46..f72b39e8438 100644 --- a/Mage.Sets/src/mage/cards/p/PrideSovereign.java +++ b/Mage.Sets/src/mage/cards/p/PrideSovereign.java @@ -42,7 +42,7 @@ public final class PrideSovereign extends CardImpl { DynamicValue otherCats = new PermanentsOnBattlefieldCount(filter); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(otherCats, otherCats, Duration.WhileOnBattlefield))); // {W}, {t}, Exert Pride Sovereign: Create two 1/1 white Cat creature tokens with lifelink. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl("{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CatToken2(), 2), new ManaCostsImpl<>("{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new ExertSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java index 22aa6d23da8..ed5ff28f405 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfIroas.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfIroas.java @@ -30,7 +30,7 @@ public final class PriestOfIroas extends CardImpl { this.toughness = new MageInt(1); // {3}{W}, Sacrifice Priest of Iroas: Destroy target enchantment. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{W}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java index de09b3299f6..927f0020a37 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java @@ -52,7 +52,7 @@ public final class PriestOfTheWakeningSun extends CardImpl { // {3}{W}{W}, Sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(target), true, true), new ManaCostsImpl("{3}{W}{W}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(target), true, true), new ManaCostsImpl<>("{3}{W}{W}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalBoost.java b/Mage.Sets/src/mage/cards/p/PrimalBoost.java index abf0c3a7891..9bfd7ed6e61 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalBoost.java +++ b/Mage.Sets/src/mage/cards/p/PrimalBoost.java @@ -26,7 +26,7 @@ public final class PrimalBoost extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Cycling {2}{G} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}{G}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{G}"))); // When you cycle Primal Boost, you may have target creature get +1/+1 until end of turn. Ability ability = new CycleTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), true); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index 72a7275e076..647978989e7 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -40,7 +40,7 @@ public final class PrimalWhisperer extends CardImpl { PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // Morph {3}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{G}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}"))); } private PrimalWhisperer(final PrimalWhisperer card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimevalShambler.java b/Mage.Sets/src/mage/cards/p/PrimevalShambler.java index 83e255fe14f..dc2a8768530 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalShambler.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalShambler.java @@ -29,7 +29,7 @@ public final class PrimevalShambler extends CardImpl { this.toughness = new MageInt(3); // {B}: Primeval Shambler 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 PrimevalShambler(final PrimevalShambler card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimocEscapee.java b/Mage.Sets/src/mage/cards/p/PrimocEscapee.java index 086fa59300e..d86060cb8c4 100644 --- a/Mage.Sets/src/mage/cards/p/PrimocEscapee.java +++ b/Mage.Sets/src/mage/cards/p/PrimocEscapee.java @@ -28,7 +28,7 @@ public final class PrimocEscapee extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Cycling {2} - this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}"))); + this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); } private PrimocEscapee(final PrimocEscapee card) { diff --git a/Mage.Sets/src/mage/cards/p/PrismArray.java b/Mage.Sets/src/mage/cards/p/PrismArray.java index 9fc226c0850..4673bcf8b6d 100644 --- a/Mage.Sets/src/mage/cards/p/PrismArray.java +++ b/Mage.Sets/src/mage/cards/p/PrismArray.java @@ -40,7 +40,7 @@ public final class PrismArray extends CardImpl { this.addAbility(ability); // {W}{U}{B}{R}{G}: Scry 3. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(3), new ManaCostsImpl("{W}{U}{B}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScryEffect(3), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); } private PrismArray(final PrismArray card) { diff --git a/Mage.Sets/src/mage/cards/p/PrismaticCircle.java b/Mage.Sets/src/mage/cards/p/PrismaticCircle.java index 0357190dcf8..a896fa04546 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticCircle.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticCircle.java @@ -30,13 +30,13 @@ public final class PrismaticCircle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Cumulative upkeep {1} - this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}"))); + this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}"))); // As Prismatic Circle enters the battlefield, choose a color. this.addAbility(new EntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral))); // {1}: The next time a source of your choice of the chosen color would deal damage to you this turn, prevent that damage. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PrismaticCircleEffect(), new ManaCostsImpl("{1}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PrismaticCircleEffect(), new ManaCostsImpl<>("{1}"))); } private PrismaticCircle(final PrismaticCircle card) { diff --git a/Mage.Sets/src/mage/cards/p/PrismaticLens.java b/Mage.Sets/src/mage/cards/p/PrismaticLens.java index 2f5b2867445..c04d2a313ec 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticLens.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticLens.java @@ -23,7 +23,7 @@ public final class PrismaticLens extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {1}, {tap}: Add one mana of any color. - Ability ability = new AnyColorManaAbility(new ManaCostsImpl("{1}")); + Ability ability = new AnyColorManaAbility(new ManaCostsImpl<>("{1}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PrizedElephant.java b/Mage.Sets/src/mage/cards/p/PrizedElephant.java index c202d2a90e0..8c3ad3f8fcd 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedElephant.java +++ b/Mage.Sets/src/mage/cards/p/PrizedElephant.java @@ -47,7 +47,7 @@ public final class PrizedElephant extends CardImpl { new PermanentsOnTheBattlefieldCondition(filter), rule))); // {G}: Prized Elephant gains trample until end of turn. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{G}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java b/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java index e45cba5a1a1..f49e90a47a8 100644 --- a/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java +++ b/Mage.Sets/src/mage/cards/p/ProclamationOfRebirth.java @@ -34,7 +34,7 @@ public final class ProclamationOfRebirth extends CardImpl { this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); // Forecast - {5}{W}, Reveal Proclamation of Rebirth from your hand: Return target creature card with converted mana cost 1 or less from your graveyard to the battlefield. - ForecastAbility ability = new ForecastAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{5}{W}")); + ForecastAbility ability = new ForecastAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{5}{W}")); ability.addTarget(new TargetCardInYourGraveyard(filter1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Propaganda.java b/Mage.Sets/src/mage/cards/p/Propaganda.java index 7a1c4dae127..b06265e9198 100644 --- a/Mage.Sets/src/mage/cards/p/Propaganda.java +++ b/Mage.Sets/src/mage/cards/p/Propaganda.java @@ -20,7 +20,7 @@ public final class Propaganda extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // 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}")))); } private Propaganda(final Propaganda card) { diff --git a/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java b/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java index ae3d884b122..79610abb57d 100644 --- a/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java +++ b/Mage.Sets/src/mage/cards/p/ProphetOfDistortion.java @@ -30,7 +30,7 @@ public final class ProphetOfDistortion extends CardImpl { this.addAbility(new DevoidAbility(this.color)); // {3}{C}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{C}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{3}{C}"))); } private ProphetOfDistortion(final ProphetOfDistortion card) { diff --git a/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java b/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java index a74c315252d..6b189fb07bf 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java +++ b/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java @@ -33,7 +33,7 @@ public final class ProtectiveSphere extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // {1}, Pay 1 life: Prevent all damage that would be dealt to you this turn by a source of your choice that shares a color with the mana spent on this activation cost. - Ability ability = new SimpleActivatedAbility(new ProtectiveSphereEffect(), new ManaCostsImpl("{1}")); + Ability ability = new SimpleActivatedAbility(new ProtectiveSphereEffect(), new ManaCostsImpl<>("{1}")); ability.addCost(new PayLifeCost(1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ProteusMachine.java b/Mage.Sets/src/mage/cards/p/ProteusMachine.java index 4e8cb1312ff..9c55605dc46 100644 --- a/Mage.Sets/src/mage/cards/p/ProteusMachine.java +++ b/Mage.Sets/src/mage/cards/p/ProteusMachine.java @@ -26,7 +26,7 @@ public final class ProteusMachine extends CardImpl { this.toughness = new MageInt(2); // Morph {0} - this.addAbility(new MorphAbility(new ManaCostsImpl("{0}"))); + this.addAbility(new MorphAbility(new ManaCostsImpl<>("{0}"))); // When Proteus Machine is turned face up, it becomes the creature type of your choice. (This effect lasts indefinitely.) this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BecomesChosenCreatureTypeSourceEffect(false, Duration.Custom))); diff --git a/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java b/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java index 6b68dc4a4ef..f53ac66d86d 100644 --- a/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java +++ b/Mage.Sets/src/mage/cards/p/ProtomatterPowder.java @@ -25,7 +25,7 @@ public final class ProtomatterPowder extends CardImpl { // {4}{W}, {tap}, Sacrifice Protomatter Powder: Return target artifact card from your graveyard to the battlefield. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{4}{W}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{W}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/p/PrototypePortal.java b/Mage.Sets/src/mage/cards/p/PrototypePortal.java index 858ab8e3e50..25c137e7133 100644 --- a/Mage.Sets/src/mage/cards/p/PrototypePortal.java +++ b/Mage.Sets/src/mage/cards/p/PrototypePortal.java @@ -43,7 +43,7 @@ public final class PrototypePortal extends CardImpl { ); // {X}, {tap}: Create a token that's a copy of the exiled card. X is the converted mana cost of that card. - Ability ability = new SimpleActivatedAbility(new PrototypePortalCreateTokenEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(new PrototypePortalCreateTokenEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.setCostAdjuster(PrototypePortalAdjuster.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/ProvenCombatant.java b/Mage.Sets/src/mage/cards/p/ProvenCombatant.java index 3858ccb6729..7befdad044c 100644 --- a/Mage.Sets/src/mage/cards/p/ProvenCombatant.java +++ b/Mage.Sets/src/mage/cards/p/ProvenCombatant.java @@ -22,7 +22,7 @@ public final class ProvenCombatant extends CardImpl { toughness = new MageInt(1); //Eternalize 4UU - addAbility(new EternalizeAbility(new ManaCostsImpl("{4}{U}{U}"), this)); + addAbility(new EternalizeAbility(new ManaCostsImpl<>("{4}{U}{U}"), this)); } public ProvenCombatant(final ProvenCombatant provenCombatant){ diff --git a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java index d9998b81a06..9d528374f28 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java @@ -34,7 +34,7 @@ public final class PsychoticEpisode extends CardImpl { this.getSpellAbility().addEffect(new PsychoticEpisodeEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); // Madness {1}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{B}"))); } private PsychoticEpisode(final PsychoticEpisode card) { diff --git a/Mage.Sets/src/mage/cards/p/PsychoticHaze.java b/Mage.Sets/src/mage/cards/p/PsychoticHaze.java index e222257364b..94d6361e518 100644 --- a/Mage.Sets/src/mage/cards/p/PsychoticHaze.java +++ b/Mage.Sets/src/mage/cards/p/PsychoticHaze.java @@ -23,7 +23,7 @@ public final class PsychoticHaze extends CardImpl { this.getSpellAbility().addEffect(new DamageEverythingEffect(1)); // Madness {1}{B} - this.addAbility(new MadnessAbility(new ManaCostsImpl("{1}{B}"))); + this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{1}{B}"))); } private PsychoticHaze(final PsychoticHaze card) { diff --git a/Mage.Sets/src/mage/cards/p/Pteramander.java b/Mage.Sets/src/mage/cards/p/Pteramander.java index 4c85c1b069d..cbe6c0ff688 100644 --- a/Mage.Sets/src/mage/cards/p/Pteramander.java +++ b/Mage.Sets/src/mage/cards/p/Pteramander.java @@ -39,7 +39,7 @@ public final class Pteramander extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // {7}{U}: Adapt 4. This ability costs {1} less to activate for each instant and sorcery card in your graveyard. - Ability ability = new SimpleActivatedAbility(new AdaptEffect(4).setText("Adapt 4. This ability costs {1} less to activate for each instant and sorcery card in your graveyard."), new ManaCostsImpl("{7}{U}")); + Ability ability = new SimpleActivatedAbility(new AdaptEffect(4).setText("Adapt 4. This ability costs {1} less to activate for each instant and sorcery card in your graveyard."), new ManaCostsImpl<>("{7}{U}")); ability.setCostAdjuster(PteramanderAdjuster.instance); this.addAbility(ability.addHint(PteramanderAdjuster.getHint())); } diff --git a/Mage.Sets/src/mage/cards/p/PufferExtract.java b/Mage.Sets/src/mage/cards/p/PufferExtract.java index 8005874a67b..9dfc29df0c2 100644 --- a/Mage.Sets/src/mage/cards/p/PufferExtract.java +++ b/Mage.Sets/src/mage/cards/p/PufferExtract.java @@ -28,7 +28,7 @@ public final class PufferExtract extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); // {X}, {T}: Target creature you control gets +X/+X until end of turn. Destroy it at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(new PufferExtractEffect(), new ManaCostsImpl("{X}")); + Ability ability = new SimpleActivatedAbility(new PufferExtractEffect(), new ManaCostsImpl<>("{X}")); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java index fd222440119..eca9ccfa9ee 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java +++ b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java @@ -40,7 +40,7 @@ public final class PuppetConjurer extends CardImpl { this.toughness = new MageInt(2); // {U}, {tap}: Create a 0/1 blue Homunculus artifact creature token. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl("{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HomunculusToken()), new ManaCostsImpl<>("{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a Homunculus. diff --git a/Mage.Sets/src/mage/cards/p/PuppetMaster.java b/Mage.Sets/src/mage/cards/p/PuppetMaster.java index 831e818daf1..cf2076b74f5 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetMaster.java +++ b/Mage.Sets/src/mage/cards/p/PuppetMaster.java @@ -88,7 +88,7 @@ class PuppetMasterEffect extends OneShotEffect { if (card == null || card.getZoneChangeCounter(game) != source.getSourceObjectZoneChangeCounter() + 1) { return false; } - Cost cost = new ManaCostsImpl("{U}{U}{U}"); + Cost cost = new ManaCostsImpl<>("{U}{U}{U}"); if (!controller.chooseUse(Outcome.Neutral, "Pay " + cost.getText() + " to return " + card.getLogName() + " to its owner's hand?", source, game) || !cost.pay(source, game, source, controller.getId(), false, null)) { diff --git a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java index 1c1e36342f9..be0fd596d90 100644 --- a/Mage.Sets/src/mage/cards/p/PuresightMerrow.java +++ b/Mage.Sets/src/mage/cards/p/PuresightMerrow.java @@ -36,7 +36,7 @@ public final class PuresightMerrow extends CardImpl { this.toughness = new MageInt(2); // {WU}, {untap}: Look at the top card of your library. You may exile that card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PuresightMerrowEffect(), new ManaCostsImpl("{W/U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PuresightMerrowEffect(), new ManaCostsImpl<>("{W/U}")); ability.addCost(new UntapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PurifyTheGrave.java b/Mage.Sets/src/mage/cards/p/PurifyTheGrave.java index cca1e6de826..6e50c877544 100644 --- a/Mage.Sets/src/mage/cards/p/PurifyTheGrave.java +++ b/Mage.Sets/src/mage/cards/p/PurifyTheGrave.java @@ -26,7 +26,7 @@ public final class PurifyTheGrave extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInGraveyard()); // Flashback {W} - this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{W}"))); + this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{W}"))); } private PurifyTheGrave(final PurifyTheGrave card) { diff --git a/Mage.Sets/src/mage/cards/p/PurphorosBronzeBlooded.java b/Mage.Sets/src/mage/cards/p/PurphorosBronzeBlooded.java index 396936b60fb..f14e1293e00 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorosBronzeBlooded.java +++ b/Mage.Sets/src/mage/cards/p/PurphorosBronzeBlooded.java @@ -58,7 +58,7 @@ public final class PurphorosBronzeBlooded extends CardImpl { ))); // {2}{R}: You may put a red creature card or an artifact creature card from your hand onto the battlefield. Sacrifice it at the beginning of the next end step. - this.addAbility(new SimpleActivatedAbility(new PurphurosBronzeBloodedEffect(), new ManaCostsImpl("{2}{R}"))); + this.addAbility(new SimpleActivatedAbility(new PurphurosBronzeBloodedEffect(), new ManaCostsImpl<>("{2}{R}"))); } private PurphorosBronzeBlooded(final PurphorosBronzeBlooded card) { diff --git a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java index 03550f18927..07bd70e3ef6 100644 --- a/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java +++ b/Mage.Sets/src/mage/cards/p/PurphorosGodOfTheForge.java @@ -53,7 +53,7 @@ public final class PurphorosGodOfTheForge extends CardImpl { // {2}{R}: Creatures you control get +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility( - new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{2}{R}") + new BoostControlledEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{2}{R}") )); } diff --git a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java index 9257ef7fb93..43aea2a65e2 100644 --- a/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java +++ b/Mage.Sets/src/mage/cards/p/PurrajOfUrborg.java @@ -58,7 +58,7 @@ public final class PurrajOfUrborg extends CardImpl { this.addAbility(new SpellCastAllTriggeredAbility( new DoIfCostPaid( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - new ManaCostsImpl("{B}") + new ManaCostsImpl<>("{B}") ), filter, false )); diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java index 59b7c3a4493..3d622c12405 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java @@ -41,7 +41,7 @@ public final class PursuitOfFlight extends CardImpl { // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); - ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); + ability2.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{U}")), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java b/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java index c9c8c679b06..46a083b3be1 100644 --- a/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java +++ b/Mage.Sets/src/mage/cards/p/PygmyPyrosaur.java @@ -30,7 +30,7 @@ public final class PygmyPyrosaur extends CardImpl { // Pygmy Pyrosaur can't block. this.addAbility(new CantBlockAbility()); // {R}: Pygmy Pyrosaur gets +1/+0 until end of turn. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private PygmyPyrosaur(final PygmyPyrosaur card) { diff --git a/Mage.Sets/src/mage/cards/p/PygmyTroll.java b/Mage.Sets/src/mage/cards/p/PygmyTroll.java index 125ba277fb3..d023481edd0 100644 --- a/Mage.Sets/src/mage/cards/p/PygmyTroll.java +++ b/Mage.Sets/src/mage/cards/p/PygmyTroll.java @@ -31,7 +31,7 @@ public final class PygmyTroll extends CardImpl { this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); // {G}: Regenerate Pygmy Troll. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{G}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"))); } private PygmyTroll(final PygmyTroll card) { diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index f470fda641d..ee931e196fa 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -41,7 +41,7 @@ public final class Pyramids extends CardImpl { // {2}: Choose one - Destroy target Aura attached to a land; Effect effect = new DestroyTargetEffect(); effect.setText("Destroy target Aura attached to a land"); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}")); //or the next time target land would be destroyed this turn, remove all damage marked on it instead. Mode mode = new Mode(new PreventDamageToTargetEffect(Duration.EndOfTurn)); //back in the day this was not technically "damage", hopefully this modern description will work nowadays mode.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PyreCharger.java b/Mage.Sets/src/mage/cards/p/PyreCharger.java index 3712ff59af5..1997609e2a2 100644 --- a/Mage.Sets/src/mage/cards/p/PyreCharger.java +++ b/Mage.Sets/src/mage/cards/p/PyreCharger.java @@ -29,7 +29,7 @@ public final class PyreCharger extends CardImpl { this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } private PyreCharger(final PyreCharger card) { diff --git a/Mage.Sets/src/mage/cards/p/PyreZombie.java b/Mage.Sets/src/mage/cards/p/PyreZombie.java index 8ffa124b36a..8d292fa6711 100644 --- a/Mage.Sets/src/mage/cards/p/PyreZombie.java +++ b/Mage.Sets/src/mage/cards/p/PyreZombie.java @@ -33,10 +33,10 @@ public final class PyreZombie extends CardImpl { // At the beginning of your upkeep, if Pyre Zombie is in your graveyard, you may pay {1}{B}{B}. If you do, return Pyre Zombie to your hand. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, - new DoIfCostPaid(new ReturnToHandSourceEffect().setText("return {this} to your hand"), new ManaCostsImpl("{1}{B}{B}")), + new DoIfCostPaid(new ReturnToHandSourceEffect().setText("return {this} to your hand"), new ManaCostsImpl<>("{1}{B}{B}")), TargetController.YOU, false)); // {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{1}{R}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{1}{R}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PyrewildShaman.java b/Mage.Sets/src/mage/cards/p/PyrewildShaman.java index f6b9d15b274..2b593c1b06b 100644 --- a/Mage.Sets/src/mage/cards/p/PyrewildShaman.java +++ b/Mage.Sets/src/mage/cards/p/PyrewildShaman.java @@ -31,7 +31,7 @@ public final class PyrewildShaman extends CardImpl { // Whenever one or more creatures you control deal combat damage to a player, if Pyrewild Shaman is in your graveyard, you may pay {3}. If you do, return Pyrewild Shaman to your hand. this.addAbility(new DealCombatDamageControlledTriggeredAbility(Zone.GRAVEYARD, - new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{3}")) + new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{3}")) .setText("if {this} is in your graveyard, you may pay {3}. If you do, return {this} to your hand"))); } diff --git a/Mage.Sets/src/mage/cards/p/PyricSalamander.java b/Mage.Sets/src/mage/cards/p/PyricSalamander.java index d54a2f36040..1f74ecd0a8f 100644 --- a/Mage.Sets/src/mage/cards/p/PyricSalamander.java +++ b/Mage.Sets/src/mage/cards/p/PyricSalamander.java @@ -29,7 +29,7 @@ public final class PyricSalamander extends CardImpl { this.toughness = new MageInt(1); // {R}: Pyric Salamander gets +1/+0 until end of turn. Sacrifice Pyric Salamander at the beginning of the next end step. - Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); + Ability ability = new SimpleActivatedAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")); ability.addEffect(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new SacrificeSourceEffect()) ).setText("Sacrifice {this} at the beginning of the next end step")); diff --git a/Mage.Sets/src/mage/cards/p/PyroclasticElemental.java b/Mage.Sets/src/mage/cards/p/PyroclasticElemental.java index 2d342d355ec..8dcb9f4804a 100644 --- a/Mage.Sets/src/mage/cards/p/PyroclasticElemental.java +++ b/Mage.Sets/src/mage/cards/p/PyroclasticElemental.java @@ -27,7 +27,7 @@ public final class PyroclasticElemental extends CardImpl { // {1}{R}{R}: Pyroclastic Elemental deals 1 damage to target player. Ability ability = new SimpleActivatedAbility( - new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}{R}") + new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}{R}") ); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Pyrohemia.java b/Mage.Sets/src/mage/cards/p/Pyrohemia.java index e61a7e2d01c..523f6706252 100644 --- a/Mage.Sets/src/mage/cards/p/Pyrohemia.java +++ b/Mage.Sets/src/mage/cards/p/Pyrohemia.java @@ -33,7 +33,7 @@ public final class Pyrohemia extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(triggered, new CreatureCountCondition(0, TargetController.ANY), ruleText)); // {R}: Pyrohemia deals 1 damage to each creature and each player. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl("{R}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new ManaCostsImpl<>("{R}"))); } private Pyrohemia(final Pyrohemia card) { diff --git a/Mage.Sets/src/mage/cards/p/Pyromancy.java b/Mage.Sets/src/mage/cards/p/Pyromancy.java index f25926f146d..18b43223f48 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromancy.java +++ b/Mage.Sets/src/mage/cards/p/Pyromancy.java @@ -25,7 +25,7 @@ public final class Pyromancy extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}"); // {3}, Discard a card at random: Pyromancy deals damage to any target equal to the converted mana cost of the discarded card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl("{3}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(DiscardCostCardManaValue.instance), new ManaCostsImpl<>("{3}")); ability.addTarget(new TargetAnyTarget()); ability.addCost(new DiscardCardCost(true)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Pyromania.java b/Mage.Sets/src/mage/cards/p/Pyromania.java index 4fa0fe46fda..113e454f51e 100644 --- a/Mage.Sets/src/mage/cards/p/Pyromania.java +++ b/Mage.Sets/src/mage/cards/p/Pyromania.java @@ -24,12 +24,12 @@ public final class Pyromania extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); // {1}{R}, Discard a card at random: Pyromania deals 1 damage to any target. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new DiscardCardCost(true)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // {1}{R}, Sacrifice Pyromania: Pyromania deals 1 damage to any target. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability);