diff --git a/Mage.Sets/src/mage/cards/a/Abrade.java b/Mage.Sets/src/mage/cards/a/Abrade.java index 04f0720ef7f..77c030fbbed 100644 --- a/Mage.Sets/src/mage/cards/a/Abrade.java +++ b/Mage.Sets/src/mage/cards/a/Abrade.java @@ -26,8 +26,8 @@ public final class Abrade extends CardImpl { // Destroy target artifact. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AbunasChant.java b/Mage.Sets/src/mage/cards/a/AbunasChant.java index 77dbd3358c5..f4b6f4438fe 100644 --- a/Mage.Sets/src/mage/cards/a/AbunasChant.java +++ b/Mage.Sets/src/mage/cards/a/AbunasChant.java @@ -29,8 +29,8 @@ public final class AbunasChant extends CardImpl { this.getSpellAbility().addEffect(new GainLifeEffect(5)); //or prevent the next 5 damage that would be dealt to target creature this turn. Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 5)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 5)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} this.addAbility(new EntwineAbility("{2}")); diff --git a/Mage.Sets/src/mage/cards/a/AbzanCharm.java b/Mage.Sets/src/mage/cards/a/AbzanCharm.java index 18c2577c1e0..a9519adabb6 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanCharm.java +++ b/Mage.Sets/src/mage/cards/a/AbzanCharm.java @@ -39,14 +39,14 @@ public final class AbzanCharm extends CardImpl { // *You draw two cards and you lose 2 life Mode mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(2)); - mode.getEffects().add(new LoseLifeSourceControllerEffect(2)); + mode.addEffect(new DrawCardSourceControllerEffect(2)); + mode.addEffect(new LoseLifeSourceControllerEffect(2)); this.getSpellAbility().addMode(mode); // *Distribute two +1/+1 counters among one or two target creatures. mode = new Mode(); - mode.getEffects().add(new DistributeCountersEffect(CounterType.P1P1, 2, false, "one or two target creatures")); - mode.getTargets().add(new TargetCreaturePermanentAmount(2)); + mode.addEffect(new DistributeCountersEffect(CounterType.P1P1, 2, false, "one or two target creatures")); + mode.addTarget(new TargetCreaturePermanentAmount(2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java index bd8c4eb4322..4497ba90dcd 100644 --- a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java +++ b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java @@ -38,8 +38,8 @@ public final class ActiveVolcano extends CardImpl { // or return target Island to its owner's hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetPermanent(filterIsland)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetPermanent(filterIsland)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AetherShockwave.java b/Mage.Sets/src/mage/cards/a/AetherShockwave.java index 02e969ae582..d27f0a86a4b 100644 --- a/Mage.Sets/src/mage/cards/a/AetherShockwave.java +++ b/Mage.Sets/src/mage/cards/a/AetherShockwave.java @@ -33,7 +33,7 @@ public final class AetherShockwave extends CardImpl { this.getSpellAbility().addEffect(new TapAllEffect(filterSpirit)); Mode mode = new Mode(); - mode.getEffects().add(new TapAllEffect(filterNonSpirit)); + mode.addEffect(new TapAllEffect(filterNonSpirit)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/Afterburn.java b/Mage.Sets/src/mage/cards/a/Afterburn.java index 87470510022..80f2aa3aac7 100644 --- a/Mage.Sets/src/mage/cards/a/Afterburn.java +++ b/Mage.Sets/src/mage/cards/a/Afterburn.java @@ -31,8 +31,8 @@ public final class Afterburn extends CardImpl { // Remove target creature from combat. Mode mode = new Mode(); - mode.getEffects().add(new RemoveFromCombatTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new RemoveFromCombatTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AinokGuide.java b/Mage.Sets/src/mage/cards/a/AinokGuide.java index d964db9bfe5..2136d4f9769 100644 --- a/Mage.Sets/src/mage/cards/a/AinokGuide.java +++ b/Mage.Sets/src/mage/cards/a/AinokGuide.java @@ -36,7 +36,7 @@ public final class AinokGuide extends CardImpl { // * Search your library for a basic land card, reveal it, then shuffle your library and put that card on top of it. Mode mode = new Mode(); - mode.getEffects().add(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true)); + mode.addEffect(new SearchLibraryPutOnLibraryEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java index 7e24a9bf8ef..2e918e1fe18 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterPotion.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterPotion.java @@ -26,8 +26,8 @@ public final class AlabasterPotion extends CardImpl { this.getSpellAbility().addEffect(new GainLifeTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, new ManacostVariableValue())); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, false, true, new ManacostVariableValue())); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AlleyEvasion.java b/Mage.Sets/src/mage/cards/a/AlleyEvasion.java index 04f7cb8de8c..6c3e8b955a1 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyEvasion.java +++ b/Mage.Sets/src/mage/cards/a/AlleyEvasion.java @@ -27,8 +27,8 @@ public final class AlleyEvasion extends CardImpl { // Return target creature you control to its owner's hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetControlledCreaturePermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java index 433d9bc8e78..386cb7f67d7 100644 --- a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java +++ b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java @@ -55,7 +55,7 @@ public final class AtalyaSamiteMaster extends CardImpl { // or you gain X life Mode mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(new ManacostVariableValue()).setText("You gain X life. Spend only white mana on X.")); + mode.addEffect(new GainLifeEffect(new ManacostVariableValue()).setText("You gain X life. Spend only white mana on X.")); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AtarkasCommand.java b/Mage.Sets/src/mage/cards/a/AtarkasCommand.java index 8bd03760325..cb3175d052b 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkasCommand.java +++ b/Mage.Sets/src/mage/cards/a/AtarkasCommand.java @@ -35,22 +35,22 @@ public final class AtarkasCommand extends CardImpl { // or Atarka's Command deals 3 damage to each opponent; Mode mode = new Mode(); - mode.getEffects().add(new DamagePlayersEffect(3, TargetController.OPPONENT)); + mode.addEffect(new DamagePlayersEffect(3, TargetController.OPPONENT)); this.getSpellAbility().addMode(mode); // or You may put a land card from your hand onto the battlefield; mode = new Mode(); - mode.getEffects().add(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A)); + mode.addEffect(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A)); this.getSpellAbility().addMode(mode); // or Creatures you control get +1/+1 and gain reach until the end of turn. mode = new Mode(); Effect effect = new BoostControlledEffect(1, 1, Duration.EndOfTurn); effect.setText("Creatures you control get +1/+1"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityControlledEffect(ReachAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gain reach until the end of turn"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AustereCommand.java b/Mage.Sets/src/mage/cards/a/AustereCommand.java index 71339579e68..76503ff207b 100644 --- a/Mage.Sets/src/mage/cards/a/AustereCommand.java +++ b/Mage.Sets/src/mage/cards/a/AustereCommand.java @@ -37,15 +37,15 @@ public final class AustereCommand extends CardImpl { this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterArtifactPermanent("artifacts"))); // or destroy all enchantments; Mode mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(new FilterEnchantmentPermanent("enchantments"))); + mode.addEffect(new DestroyAllEffect(new FilterEnchantmentPermanent("enchantments"))); this.getSpellAbility().getModes().addMode(mode); // or destroy all creatures with converted mana cost 3 or less; mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(filter3orLess)); + mode.addEffect(new DestroyAllEffect(filter3orLess)); this.getSpellAbility().getModes().addMode(mode); // or destroy all creatures with converted mana cost 4 or greater. mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(filter4orMore)); + mode.addEffect(new DestroyAllEffect(filter4orMore)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java index 2153c5f1b3e..9104c32febe 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java +++ b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java @@ -38,8 +38,8 @@ public final class AvenSurveyor extends CardImpl { // * Return target creature to its owner's hand Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AzoriusCharm.java b/Mage.Sets/src/mage/cards/a/AzoriusCharm.java index 611f935937c..e749a8ddfba 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusCharm.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusCharm.java @@ -29,13 +29,13 @@ public final class AzoriusCharm extends CardImpl { // or draw a card; Mode mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(1)); + mode.addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addMode(mode); // or put target attacking or blocking creature on top of its owner's library. mode = new Mode(); - mode.getTargets().add(new TargetAttackingOrBlockingCreature()); - mode.getEffects().add(new PutOnLibraryTargetEffect(true)); + mode.addTarget(new TargetAttackingOrBlockingCreature()); + mode.addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java index ad1a669e758..8ee894caa0f 100644 --- a/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java +++ b/Mage.Sets/src/mage/cards/b/BalmOfRestoration.java @@ -33,8 +33,8 @@ public final class BalmOfRestoration extends CardImpl { // or prevent the next 2 damage that would be dealt to any target this turn. Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 2)); + mode.addTarget(new TargetAnyTarget()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BantCharm.java b/Mage.Sets/src/mage/cards/b/BantCharm.java index ba94c016a81..5948547aa9e 100644 --- a/Mage.Sets/src/mage/cards/b/BantCharm.java +++ b/Mage.Sets/src/mage/cards/b/BantCharm.java @@ -36,13 +36,13 @@ public final class BantCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetArtifactPermanent()); // or put target creature on the bottom of its owner's library; Mode mode = new Mode(); - mode.getEffects().add(new PutOnLibraryTargetEffect(false)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new PutOnLibraryTargetEffect(false)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or counter target instant spell. mode = new Mode(); - mode.getEffects().add(new CounterTargetEffect()); - mode.getTargets().add(new TargetSpell(filter)); + mode.addEffect(new CounterTargetEffect()); + mode.addTarget(new TargetSpell(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BarbedLightning.java b/Mage.Sets/src/mage/cards/b/BarbedLightning.java index 53f94f504db..34bfa6646f5 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedLightning.java +++ b/Mage.Sets/src/mage/cards/b/BarbedLightning.java @@ -26,8 +26,8 @@ public final class BarbedLightning extends CardImpl { // or Barbed Lightning deals 3 damage to target player. Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(3)); - mode.getTargets().add(new TargetPlayerOrPlaneswalker()); + mode.addEffect(new DamageTargetEffect(3)); + mode.addTarget(new TargetPlayerOrPlaneswalker()); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} diff --git a/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java b/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java index b2c9ae65abd..960d4b90189 100644 --- a/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java +++ b/Mage.Sets/src/mage/cards/b/BetrayalOfFlesh.java @@ -34,8 +34,8 @@ public final class BetrayalOfFlesh extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or return target creature card from your graveyard to the battlefield. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); + mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().getModes().addMode(mode); // Entwine-Sacrifice three lands. this.addAbility(new EntwineAbility(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterControlledLandPermanent("three lands"), true)))); diff --git a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java index cc5d01b8f2d..78760197e76 100644 --- a/Mage.Sets/src/mage/cards/b/BlessedAlliance.java +++ b/Mage.Sets/src/mage/cards/b/BlessedAlliance.java @@ -54,14 +54,14 @@ public final class BlessedAlliance extends CardImpl { Mode mode = new Mode(); effect = new UntapTargetEffect(); effect.setText("Untap up to two target creatures"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(0, 2, filterCreature, false)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(0, 2, filterCreature, false)); this.getSpellAbility().addMode(mode); // Target opponent sacrifices an attacking creature. mode = new Mode(); - mode.getEffects().add(new SacrificeEffect(new FilterAttackingCreature(), 1, "Target opponent")); - mode.getTargets().add(new TargetPlayer(1, 1, false, filterSacrifice)); + mode.addEffect(new SacrificeEffect(new FilterAttackingCreature(), 1, "Target opponent")); + mode.addTarget(new TargetPlayer(1, 1, false, filterSacrifice)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BlindingBeam.java b/Mage.Sets/src/mage/cards/b/BlindingBeam.java index 3ce3042afd7..92ab1a86272 100644 --- a/Mage.Sets/src/mage/cards/b/BlindingBeam.java +++ b/Mage.Sets/src/mage/cards/b/BlindingBeam.java @@ -42,8 +42,8 @@ public final class BlindingBeam extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(2,2)); // or creatures don't untap during target player's next untap step. Mode mode = new Mode(); - mode.getEffects().add(new BlindingBeamEffect()); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new BlindingBeamEffect()); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // Entwine {1} diff --git a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java index 0b8fc235a68..1fb2a4c3a27 100644 --- a/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java +++ b/Mage.Sets/src/mage/cards/b/BlizzardSpecter.java @@ -41,7 +41,7 @@ public final class BlizzardSpecter extends CardImpl { // or that player discards a card. Mode mode = new Mode(); - mode.getEffects().add(new DiscardTargetEffect(1, false)); + mode.addEffect(new DiscardTargetEffect(1, false)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java b/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java index f4c139b882a..5bf9a754650 100644 --- a/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java +++ b/Mage.Sets/src/mage/cards/b/BlueElementalBlast.java @@ -38,8 +38,8 @@ public final class BlueElementalBlast extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(filterSpell)); Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filterPermanent)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filterPermanent)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BorosCharm.java b/Mage.Sets/src/mage/cards/b/BorosCharm.java index 9264ea0620b..b43d9a32a38 100644 --- a/Mage.Sets/src/mage/cards/b/BorosCharm.java +++ b/Mage.Sets/src/mage/cards/b/BorosCharm.java @@ -33,12 +33,12 @@ public final class BorosCharm extends CardImpl { Mode mode = new Mode(); Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent(), false); effect.setText("permanents you control are indestructible this turn"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); //or target creature gains double strike until end of turn. Mode mode2 = new Mode(); - mode2.getEffects().add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); - mode2.getTargets().add(new TargetCreaturePermanent()); + mode2.addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); + mode2.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/b/BorrowedGrace.java b/Mage.Sets/src/mage/cards/b/BorrowedGrace.java index 7029a622496..b9b9fa7bcd9 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedGrace.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedGrace.java @@ -32,7 +32,7 @@ public final class BorrowedGrace extends CardImpl { // Creatures you control get +0/+2 until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new BoostControlledEffect(0, 2, Duration.EndOfTurn)); + mode.addEffect(new BoostControlledEffect(0, 2, Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BorrowedHostility.java b/Mage.Sets/src/mage/cards/b/BorrowedHostility.java index bdcf746f21c..08d172459b5 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedHostility.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedHostility.java @@ -45,8 +45,8 @@ public final class BorrowedHostility extends CardImpl { Mode mode = new Mode(); effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("Target creature gains first strike until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterFirstStrike)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterFirstStrike)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java b/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java index 3b985e8e6dd..83f0a7859b6 100644 --- a/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java +++ b/Mage.Sets/src/mage/cards/b/BorrowedMalevolence.java @@ -43,8 +43,8 @@ public final class BorrowedMalevolence extends CardImpl { Mode mode = new Mode(); effect = new BoostTargetEffect(-1, -1, Duration.EndOfTurn); effect.setText("Target creature gets -1/-1 until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterCreatureMinus)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterCreatureMinus)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BowOfNylea.java b/Mage.Sets/src/mage/cards/b/BowOfNylea.java index 015d08a910a..f1897c10e6c 100644 --- a/Mage.Sets/src/mage/cards/b/BowOfNylea.java +++ b/Mage.Sets/src/mage/cards/b/BowOfNylea.java @@ -56,18 +56,18 @@ public final class BowOfNylea extends CardImpl { ability.addCost(new TapSourceCost()); // or Bow of Nylea deals 2 damage to target creature with flying; Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(2)); + mode.addEffect(new DamageTargetEffect(2)); Target target = new TargetCreaturePermanent(filterFlying); - mode.getTargets().add(target); + mode.addTarget(target); ability.addMode(mode); // or you gain 3 life; mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(3)); + mode.addEffect(new GainLifeEffect(3)); ability.addMode(mode); // or put up to four target cards from your graveyard on the bottom of your library in any order. mode = new Mode(); - mode.getEffects().add(new PutCardsFromGraveyardToLibraryEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(0,4, new FilterCard())); + mode.addEffect(new PutCardsFromGraveyardToLibraryEffect()); + mode.addTarget(new TargetCardInYourGraveyard(0,4, new FilterCard())); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BranchingBolt.java b/Mage.Sets/src/mage/cards/b/BranchingBolt.java index dafaf252383..d0e790242f2 100644 --- a/Mage.Sets/src/mage/cards/b/BranchingBolt.java +++ b/Mage.Sets/src/mage/cards/b/BranchingBolt.java @@ -44,8 +44,8 @@ public final class BranchingBolt extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filterFlying)); // or Branching Bolt deals 3 damage to target creature without flying. Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(3)); - mode.getTargets().add(new TargetCreaturePermanent(filterNotFlying)); + mode.addEffect(new DamageTargetEffect(3)); + mode.addTarget(new TargetCreaturePermanent(filterNotFlying)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java index 3f0c1e2985e..ba36808b695 100644 --- a/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java +++ b/Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java @@ -49,13 +49,13 @@ public final class BreyaEtheriumShaper extends CardImpl { // Target creature gets -4/-4 until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); // or You gain 5 life. mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(5)); + mode.addEffect(new GainLifeEffect(5)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java index 51d27761460..02e9ffdb08e 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java +++ b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java @@ -43,11 +43,11 @@ public final class BrutalExpulsion extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); // or Brutal Expulsion deals 2 damage to target creature or planeswalker. If that permanent would be put into a graveyard this turn, exile it instead. Mode mode = new Mode(); - mode.getTargets().add(new TargetCreatureOrPlaneswalker()); - mode.getEffects().add(new DamageTargetEffect(2)); + mode.addTarget(new TargetCreatureOrPlaneswalker()); + mode.addEffect(new DamageTargetEffect(2)); Effect effect = new DealtDamageToCreatureBySourceDies(this, Duration.EndOfTurn); effect.setText("If that permanent would be put into a graveyard this turn, exile it instead"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); this.getSpellAbility().addWatcher(new DamagedByWatcher(true)); } diff --git a/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java b/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java index 7b5168057f4..39e2f957b2e 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java +++ b/Mage.Sets/src/mage/cards/b/BrutalizerExarch.java @@ -49,8 +49,8 @@ public final class BrutalizerExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new SearchLibraryPutOnLibraryEffect(target, true, true), false); // or put target noncreature permanent on the bottom of its owner's library. Mode mode = new Mode(); - mode.getEffects().add(new BrutalizerExarchEffect2()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new BrutalizerExarchEffect2()); + mode.addTarget(new TargetPermanent(filter)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java b/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java index 45f16952818..f20894e3e96 100644 --- a/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java +++ b/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java @@ -39,9 +39,9 @@ public final class BuccaneersBravado extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn).setText("and gains first strike until end of turn")); // Target Pirate gets +1/+1 and gains double strike until end of turn. Mode mode = new Mode(); - mode.getTargets().add(new TargetPermanent(filter)); - mode.getEffects().add(new BoostTargetEffect(1, 1, Duration.EndOfTurn).setText("Target Pirate gets +1/+1")); - mode.getEffects().add(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn).setText("and gains double strike until end of turn")); + mode.addTarget(new TargetPermanent(filter)); + mode.addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn).setText("Target Pirate gets +1/+1")); + mode.addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn).setText("and gains double strike until end of turn")); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/ChaosCharm.java b/Mage.Sets/src/mage/cards/c/ChaosCharm.java index 78ae9a01ecb..e90b303b799 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosCharm.java +++ b/Mage.Sets/src/mage/cards/c/ChaosCharm.java @@ -37,13 +37,13 @@ public final class ChaosCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter)); // or Chaos Charm deals 1 damage to target creature Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(1)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new DamageTargetEffect(1)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or target creature gains haste until end of turn. mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/ClanDefiance.java b/Mage.Sets/src/mage/cards/c/ClanDefiance.java index c1e0243d4e6..49d307e93ed 100644 --- a/Mage.Sets/src/mage/cards/c/ClanDefiance.java +++ b/Mage.Sets/src/mage/cards/c/ClanDefiance.java @@ -40,13 +40,13 @@ public final class ClanDefiance extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // Clan Defiance deals X damage to target creature without flying; Mode mode1 = new Mode(); - mode1.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode1.getTargets().add(new TargetCreaturePermanent(filter2)); + mode1.addEffect(new DamageTargetEffect(new ManacostVariableValue())); + mode1.addTarget(new TargetCreaturePermanent(filter2)); this.getSpellAbility().addMode(mode1); // and/or Clan Defiance deals X damage to target player. Mode mode2 = new Mode(); - mode2.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode2.getTargets().add(new TargetPlayerOrPlaneswalker()); + mode2.addEffect(new DamageTargetEffect(new ManacostVariableValue())); + mode2.addTarget(new TargetPlayerOrPlaneswalker()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/c/CleansingNova.java b/Mage.Sets/src/mage/cards/c/CleansingNova.java index c3b1237329c..457c54e923d 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingNova.java +++ b/Mage.Sets/src/mage/cards/c/CleansingNova.java @@ -27,7 +27,7 @@ public final class CleansingNova extends CardImpl { // • Destroy all artifacts and enchantments. Mode mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(filter)); + mode.addEffect(new DestroyAllEffect(filter)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CleansingRay.java b/Mage.Sets/src/mage/cards/c/CleansingRay.java index 62dbb482ae1..52bc1eb9022 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingRay.java +++ b/Mage.Sets/src/mage/cards/c/CleansingRay.java @@ -31,8 +31,8 @@ public final class CleansingRay extends CardImpl { // - Destroy target enchantment. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetEnchantmentPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java index 26133075d31..eda44953671 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java @@ -65,19 +65,19 @@ public final class CollectiveBrutality extends CardImpl { Mode mode = new Mode(); effect = new BoostTargetEffect(-2, -2, Duration.EndOfTurn); effect.setText("Target creature gets -2/-2 until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterCreatureMinus)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterCreatureMinus)); this.getSpellAbility().addMode(mode); // Target opponent loses 2 life and you gain 2 life. mode = new Mode(); effect = new LoseLifeTargetEffect(2); effect.setText("Target opponent loses 2 life"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetPlayer(1, 1, false, filterLoseLife)); + mode.addEffect(effect); + mode.addTarget(new TargetPlayer(1, 1, false, filterLoseLife)); effect = new GainLifeEffect(2); effect.setText("and you gain 2 life"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java index 13e9dd83031..75f3d464fbf 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java @@ -49,16 +49,16 @@ public final class CollectiveDefiance extends CardImpl { Mode mode = new Mode(); Effect effect = new DamageTargetEffect(4); effect.setText("{this} deals 4 damage to target creature"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterCreature)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterCreature)); this.getSpellAbility().addMode(mode); // Collective Defiance deals 3 damage to target opponent or planeswalker. mode = new Mode(); effect = new DamageTargetEffect(3); effect.setText("{this} deals 3 damage to target opponent or planeswalker"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetOpponentOrPlaneswalker()); + mode.addEffect(effect); + mode.addTarget(new TargetOpponentOrPlaneswalker()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java index 26d03a9d4e7..bdf26e0adb7 100644 --- a/Mage.Sets/src/mage/cards/c/CollectiveEffort.java +++ b/Mage.Sets/src/mage/cards/c/CollectiveEffort.java @@ -68,16 +68,16 @@ public final class CollectiveEffort extends CardImpl { Mode mode = new Mode(); Effect effect = new DestroyTargetEffect(); effect.setText("Destroy target enchantment"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetEnchantmentPermanent(filterDestroyEnchantment)); + mode.addEffect(effect); + mode.addTarget(new TargetEnchantmentPermanent(filterDestroyEnchantment)); this.getSpellAbility().addMode(mode); // Put a +1/+1 counter on each creature target player controls. mode = new Mode(); effect = new CollectiveEffortEffect(); effect.setText("Put a +1/+1 counter on each creature target player controls"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetPlayer(1, 1, false, filterPlayer)); + mode.addEffect(effect); + mode.addTarget(new TargetPlayer(1, 1, false, filterPlayer)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java b/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java index 54c4ab21135..87498d73cec 100644 --- a/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java +++ b/Mage.Sets/src/mage/cards/c/ConsultTheNecrosages.java @@ -24,8 +24,8 @@ public final class ConsultTheNecrosages extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DrawCardTargetEffect(2)); Mode mode = new Mode(); - mode.getTargets().add(new TargetPlayer()); - mode.getEffects().add(new DiscardTargetEffect(2)); + mode.addTarget(new TargetPlayer()); + mode.addEffect(new DiscardTargetEffect(2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java index 97287b6037c..9546725a191 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java @@ -41,8 +41,8 @@ public final class ConsumingBonfire extends CardImpl { //or Consuming Bonfire deals 7 damage to target Treefolk creature. Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(7)); - mode.getTargets().add(new TargetPermanent(filter2)); + mode.addEffect(new DamageTargetEffect(7)); + mode.addTarget(new TargetPermanent(filter2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java b/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java index 744fca6f321..116a5ac642d 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingSinkhole.java @@ -41,8 +41,8 @@ public final class ConsumingSinkhole extends CardImpl { // Consuming Sinkhole deals 4 damage to target player. Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetPlayerOrPlaneswalker()); + mode.addEffect(new DamageTargetEffect(4)); + mode.addTarget(new TargetPlayerOrPlaneswalker()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CrosissCharm.java b/Mage.Sets/src/mage/cards/c/CrosissCharm.java index 74d7286209b..62734db8323 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissCharm.java +++ b/Mage.Sets/src/mage/cards/c/CrosissCharm.java @@ -37,14 +37,14 @@ public final class CrosissCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent()); // or destroy target nonblack creature, and it can't be regenerated; Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect(true)); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DestroyTargetEffect(true)); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); // or destroy target artifact. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); + mode.addEffect(new DestroyTargetEffect()); Target target = new TargetArtifactPermanent(); - mode.getTargets().add(target); + mode.addTarget(target); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java b/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java index aef90bc19d8..178cef7c56d 100644 --- a/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java +++ b/Mage.Sets/src/mage/cards/c/CrueltyOfTheSith.java @@ -38,15 +38,15 @@ public final class CrueltyOfTheSith extends CardImpl { // Target player sacrifices a creture. Mode mode = new Mode(); - mode.getEffects().add(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "Target player")); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "Target player")); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); // Cruelty of the Sith deals 3 damage to target player. That player discards a card. mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(3)); - mode.getEffects().add(new DiscardTargetEffect(1)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new DamageTargetEffect(3)); + mode.addEffect(new DiscardTargetEffect(1)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CrushContraband.java b/Mage.Sets/src/mage/cards/c/CrushContraband.java index 6cbe26f8dbb..9bd0f01ec17 100644 --- a/Mage.Sets/src/mage/cards/c/CrushContraband.java +++ b/Mage.Sets/src/mage/cards/c/CrushContraband.java @@ -28,8 +28,8 @@ public final class CrushContraband extends CardImpl { this.getSpellAbility().addEffect(new ExileTargetEffect()); Mode mode1 = new Mode(); - mode1.getTargets().add(new TargetEnchantmentPermanent()); - mode1.getEffects().add(new ExileTargetEffect()); + mode1.addTarget(new TargetEnchantmentPermanent()); + mode1.addEffect(new ExileTargetEffect()); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/c/CrushingCanopy.java b/Mage.Sets/src/mage/cards/c/CrushingCanopy.java index 949a2f17bcb..7038a6ef5cc 100644 --- a/Mage.Sets/src/mage/cards/c/CrushingCanopy.java +++ b/Mage.Sets/src/mage/cards/c/CrushingCanopy.java @@ -34,8 +34,8 @@ public final class CrushingCanopy extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); // * Destroy target enchantment. Mode mode = new Mode(); - mode.getTargets().add(new TargetEnchantmentPermanent()); - mode.getEffects().add(new DestroyTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent()); + mode.addEffect(new DestroyTargetEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CrushingVines.java b/Mage.Sets/src/mage/cards/c/CrushingVines.java index 1d8a37dc262..4401947c325 100644 --- a/Mage.Sets/src/mage/cards/c/CrushingVines.java +++ b/Mage.Sets/src/mage/cards/c/CrushingVines.java @@ -33,8 +33,8 @@ public final class CrushingVines extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect()); Mode mode = new Mode(); - mode.getTargets().add(new TargetArtifactPermanent()); - mode.getEffects().add(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CruxOfFate.java b/Mage.Sets/src/mage/cards/c/CruxOfFate.java index 495f8fdb04f..ff9fe2802fa 100644 --- a/Mage.Sets/src/mage/cards/c/CruxOfFate.java +++ b/Mage.Sets/src/mage/cards/c/CruxOfFate.java @@ -32,7 +32,7 @@ public final class CruxOfFate extends CardImpl { this.getSpellAbility().addEffect(new DestroyAllEffect(new FilterCreaturePermanent(SubType.DRAGON, "Dragon creatures"))); // * Destroy all non-Dragon creatures. Mode mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(new FilterCreaturePermanent(filterNonDragon))); + mode.addEffect(new DestroyAllEffect(new FilterCreaturePermanent(filterNonDragon))); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/c/CrypticCommand.java b/Mage.Sets/src/mage/cards/c/CrypticCommand.java index 1d8ee21d147..445a6cfbe86 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticCommand.java +++ b/Mage.Sets/src/mage/cards/c/CrypticCommand.java @@ -39,16 +39,16 @@ public final class CrypticCommand extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); // or return target permanent to its owner's hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetPermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetPermanent()); this.getSpellAbility().getModes().addMode(mode); // or tap all creatures your opponents control; mode = new Mode(); - mode.getEffects().add(new CrypticCommandEffect()); + mode.addEffect(new CrypticCommandEffect()); this.getSpellAbility().getModes().addMode(mode); // or draw a card. mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(1)); + mode.addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java index 4afedcd4723..68bc7456288 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCharm.java @@ -33,14 +33,14 @@ public final class DarigaazsCharm extends CardImpl { // or Darigaaz's Charm deals 3 damage to any target; Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(3)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new DamageTargetEffect(3)); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); // or target creature gets +3/+3 until end of turn. mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DawnCharm.java b/Mage.Sets/src/mage/cards/d/DawnCharm.java index c35c1d6e93f..7c2f8786576 100644 --- a/Mage.Sets/src/mage/cards/d/DawnCharm.java +++ b/Mage.Sets/src/mage/cards/d/DawnCharm.java @@ -39,13 +39,13 @@ public final class DawnCharm extends CardImpl { this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true)); // or regenerate target creature; Mode mode = new Mode(); - mode.getEffects().add(new RegenerateTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new RegenerateTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or counter target spell that targets you. mode = new Mode(); - mode.getEffects().add(new CounterTargetEffect()); - mode.getTargets().add(new TargetSpell(filter)); + mode.addEffect(new CounterTargetEffect()); + mode.addTarget(new TargetSpell(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DawnToDusk.java b/Mage.Sets/src/mage/cards/d/DawnToDusk.java index 91cdf0c196a..8b6ffa80cbd 100644 --- a/Mage.Sets/src/mage/cards/d/DawnToDusk.java +++ b/Mage.Sets/src/mage/cards/d/DawnToDusk.java @@ -36,8 +36,8 @@ public final class DawnToDusk extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filterCard)); // and/or destroy target enchantment. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetEnchantmentPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DeafeningClarion.java b/Mage.Sets/src/mage/cards/d/DeafeningClarion.java index 70dbbd52c8d..ad002fdd2a1 100644 --- a/Mage.Sets/src/mage/cards/d/DeafeningClarion.java +++ b/Mage.Sets/src/mage/cards/d/DeafeningClarion.java @@ -31,7 +31,7 @@ public final class DeafeningClarion extends CardImpl { // • Creatures you control gain lifelink until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityControlledEffect( + mode.addEffect(new GainAbilityControlledEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES diff --git a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java index f0a142803fa..04fa192c341 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverExarch.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverExarch.java @@ -43,8 +43,8 @@ public final class DeceiverExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect()); ability.addTarget(new TargetControlledPermanent()); Mode mode = new Mode(); - mode.getEffects().add(new TapTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new TapTargetEffect()); + mode.addTarget(new TargetPermanent(filter)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantOgre.java b/Mage.Sets/src/mage/cards/d/DefiantOgre.java index 47d56737bfc..96405180ce3 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantOgre.java +++ b/Mage.Sets/src/mage/cards/d/DefiantOgre.java @@ -33,8 +33,8 @@ public final class DefiantOgre extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); // * Destroy target artifact. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DelayTactic.java b/Mage.Sets/src/mage/cards/d/DelayTactic.java index 0353df6c847..a51d607b436 100644 --- a/Mage.Sets/src/mage/cards/d/DelayTactic.java +++ b/Mage.Sets/src/mage/cards/d/DelayTactic.java @@ -43,8 +43,8 @@ public final class DelayTactic extends CardImpl { // Creatures target opponent controls don't untap during his or her next untap step. Mode mode = new Mode(); - mode.getEffects().add(new DelayTacticEffect()); - mode.getTargets().add(new TargetOpponent()); + mode.addEffect(new DelayTacticEffect()); + mode.addTarget(new TargetOpponent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DemonicPact.java b/Mage.Sets/src/mage/cards/d/DemonicPact.java index aefe13d81ce..bfea1c7652b 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicPact.java +++ b/Mage.Sets/src/mage/cards/d/DemonicPact.java @@ -38,18 +38,18 @@ public final class DemonicPact extends CardImpl { // - Target opponent discards two cards Mode mode = new Mode(); - mode.getTargets().add(new TargetOpponent()); - mode.getEffects().add(new DiscardTargetEffect(2)); + mode.addTarget(new TargetOpponent()); + mode.addEffect(new DiscardTargetEffect(2)); ability.addMode(mode); // - Draw two cards mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(2)); + mode.addEffect(new DrawCardSourceControllerEffect(2)); ability.addMode(mode); // - You lose the game. mode = new Mode(); - mode.getEffects().add(new LoseGameSourceControllerEffect()); + mode.addEffect(new LoseGameSourceControllerEffect()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DestructiveTampering.java b/Mage.Sets/src/mage/cards/d/DestructiveTampering.java index 1e07a63875e..561e401bdea 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveTampering.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveTampering.java @@ -37,7 +37,7 @@ public final class DestructiveTampering extends CardImpl { // * Creatures without flying can't block this turn. Mode mode = new Mode(); - mode.getEffects().add(new CantBlockAllEffect(filter, Duration.EndOfTurn)); + mode.addEffect(new CantBlockAllEffect(filter, Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DimirCharm.java b/Mage.Sets/src/mage/cards/d/DimirCharm.java index 53a972d285e..16d827dd031 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCharm.java +++ b/Mage.Sets/src/mage/cards/d/DimirCharm.java @@ -47,14 +47,14 @@ public final class DimirCharm extends CardImpl { //or destroy target creature with power 2 or less Mode mode1 = new Mode(); - mode1.getEffects().add(new DestroyTargetEffect()); - mode1.getTargets().add(new TargetCreaturePermanent(filterCreature)); + mode1.addEffect(new DestroyTargetEffect()); + mode1.addTarget(new TargetCreaturePermanent(filterCreature)); this.getSpellAbility().addMode(mode1); //or look at the top three cards of target player's library, then put one back and the rest into that player's graveyard Mode mode2 = new Mode(); - mode2.getEffects().add(new DimirCharmEffect()); - mode2.getTargets().add(new TargetPlayer()); + mode2.addEffect(new DimirCharmEffect()); + mode2.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java index 9d1b2a15654..8fabd46578e 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfTheRing.java @@ -52,19 +52,19 @@ public final class DiscipleOfTheRing extends CardImpl { // or Disciple of the Ring gets +1/+1 until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new BoostSourceEffect(1, 1, Duration.EndOfTurn)); + mode.addEffect(new BoostSourceEffect(1, 1, Duration.EndOfTurn)); ability.addMode(mode); // or Tap target creature; mode = new Mode(); - mode.getEffects().add(new TapTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new TapTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); // or Untap target creature. mode = new Mode(); - mode.getEffects().add(new UntapTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new UntapTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java b/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java index f80123275b0..aa7fa1a6c17 100644 --- a/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java +++ b/Mage.Sets/src/mage/cards/d/DisplayOfDominance.java @@ -52,7 +52,7 @@ public final class DisplayOfDominance extends CardImpl { // or Permanents you control can't be the targets of blue or black spells your opponents control this turn Mode mode = new Mode(); - mode.getEffects().add(new DisplayOfDominanceEffect()); + mode.addEffect(new DisplayOfDominanceEffect()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/Doomfall.java b/Mage.Sets/src/mage/cards/d/Doomfall.java index e6657abee46..f66ae408c8e 100644 --- a/Mage.Sets/src/mage/cards/d/Doomfall.java +++ b/Mage.Sets/src/mage/cards/d/Doomfall.java @@ -37,9 +37,9 @@ public final class Doomfall extends CardImpl { // • Target opponent reveals their hand. You choose a nonland card from it. Exile that card. Mode mode = new Mode(); - mode.getEffects().add(new ExileCardYouChooseTargetOpponentEffect(StaticFilters.FILTER_CARD_A_NON_LAND) + mode.addEffect(new ExileCardYouChooseTargetOpponentEffect(StaticFilters.FILTER_CARD_A_NON_LAND) .setText("Target opponent reveals their hand. You choose a nonland card from it. Exile that card")); - mode.getTargets().add(new TargetOpponent()); + mode.addTarget(new TargetOpponent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DreamsGrip.java b/Mage.Sets/src/mage/cards/d/DreamsGrip.java index f136d9ceeb4..c15e109f6ab 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsGrip.java +++ b/Mage.Sets/src/mage/cards/d/DreamsGrip.java @@ -33,9 +33,9 @@ public final class DreamsGrip extends CardImpl { //or untap target permanent. Mode mode = new Mode(); TargetPermanent target2 = new TargetPermanent(new FilterPermanent("Permanent to untap")); - mode.getTargets().add(target2); + mode.addTarget(target2); Effect untapEffect = new UntapTargetEffect(); - mode.getEffects().add(untapEffect); + mode.addEffect(untapEffect); this.getSpellAbility().addMode(mode); // Entwine {1} diff --git a/Mage.Sets/src/mage/cards/d/DromarsCharm.java b/Mage.Sets/src/mage/cards/d/DromarsCharm.java index 3defc227f3e..a158e1d80c8 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsCharm.java +++ b/Mage.Sets/src/mage/cards/d/DromarsCharm.java @@ -26,12 +26,12 @@ public final class DromarsCharm extends CardImpl { // Choose one - You gain 5 life; or counter target spell; or target creature gets -2/-2 until end of turn. this.getSpellAbility().addEffect(new GainLifeEffect(5)); Mode mode = new Mode(); - mode.getEffects().add(new CounterTargetEffect()); - mode.getTargets().add(new TargetSpell()); + mode.addEffect(new CounterTargetEffect()); + mode.addTarget(new TargetSpell()); this.getSpellAbility().addMode(mode); mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DromokasCommand.java b/Mage.Sets/src/mage/cards/d/DromokasCommand.java index 185c7bd0f3e..9774d414088 100644 --- a/Mage.Sets/src/mage/cards/d/DromokasCommand.java +++ b/Mage.Sets/src/mage/cards/d/DromokasCommand.java @@ -52,25 +52,25 @@ public final class DromokasCommand extends CardImpl { Mode mode = new Mode(); Effect effect = new SacrificeEffect(filterEnchantment, 1, "target player"); effect.setText("Target player sacrifices an enchantment"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(effect); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // Put a +1/+1 counter on target creature; mode = new Mode(); effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); effect.setText("Put a +1/+1 counter on target creature"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterCreature)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterCreature)); this.getSpellAbility().getModes().addMode(mode); // or Target creature you control fights target creature you don't control. mode = new Mode(); effect = new FightTargetsEffect(); effect.setText("Target creature you control fights target creature you don't control"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetControlledCreaturePermanent()); - mode.getTargets().add(new TargetCreaturePermanent(filterUncontrolledCreature)); + mode.addEffect(effect); + mode.addTarget(new TargetControlledCreaturePermanent()); + mode.addTarget(new TargetCreaturePermanent(filterUncontrolledCreature)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/d/DustOfMoments.java b/Mage.Sets/src/mage/cards/d/DustOfMoments.java index 742418813e3..c461e965efe 100644 --- a/Mage.Sets/src/mage/cards/d/DustOfMoments.java +++ b/Mage.Sets/src/mage/cards/d/DustOfMoments.java @@ -40,7 +40,7 @@ public final class DustOfMoments extends CardImpl { // Or put two time counters on each permanent with a time counter on it and each suspended card Mode mode = new Mode(); - mode.getEffects().add(new AddCountersEffect()); + mode.addEffect(new AddCountersEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EbonyCharm.java b/Mage.Sets/src/mage/cards/e/EbonyCharm.java index 3c29cf2f245..1f0852ce651 100644 --- a/Mage.Sets/src/mage/cards/e/EbonyCharm.java +++ b/Mage.Sets/src/mage/cards/e/EbonyCharm.java @@ -35,14 +35,14 @@ public final class EbonyCharm extends CardImpl { // or exile up to three target cards from a single graveyard; Mode mode = new Mode(); - mode.getEffects().add(new EbonyCharmExileEffect()); - mode.getTargets().add((new TargetCardInASingleGraveyard(0, 3, new FilterCard("up to three target cards from a single graveyard")))); + mode.addEffect(new EbonyCharmExileEffect()); + mode.addTarget((new TargetCardInASingleGraveyard(0, 3, new FilterCard("up to three target cards from a single graveyard")))); this.getSpellAbility().addMode(mode); // or target creature gains fear until end of turn. mode = new Mode(); - mode.getTargets().add(new TargetCreaturePermanent()); - mode.getEffects().add(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java index 730c1efc3a7..bb67f751f5f 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java @@ -40,14 +40,14 @@ public final class EmeraldCharm extends CardImpl { // or destroy target non-Aura enchantment; Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetEnchantmentPermanent(filter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent(filter)); this.getSpellAbility().addMode(mode); // or target creature loses flying until end of turn. mode = new Mode(); - mode.getEffects().add(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyBolt.java b/Mage.Sets/src/mage/cards/e/EnergyBolt.java index 1ee26f7ef9b..ef5fe784bbc 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyBolt.java +++ b/Mage.Sets/src/mage/cards/e/EnergyBolt.java @@ -25,8 +25,8 @@ public final class EnergyBolt extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue())); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); Mode mode = new Mode(); - mode.getEffects().add(new GainLifeTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new GainLifeTargetEffect(new ManacostVariableValue())); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyChamber.java b/Mage.Sets/src/mage/cards/e/EnergyChamber.java index fafd1fc73ab..bd906d312c0 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyChamber.java +++ b/Mage.Sets/src/mage/cards/e/EnergyChamber.java @@ -43,8 +43,8 @@ public final class EnergyChamber extends CardImpl { // or put a charge counter on target noncreature artifact. Mode mode = new Mode(); - mode.getEffects().add(new AddCountersTargetEffect(CounterType.CHARGE.createInstance(), Outcome.BoostCreature)); - mode.getTargets().add(new TargetPermanent(filter2)); + mode.addEffect(new AddCountersTargetEffect(CounterType.CHARGE.createInstance(), Outcome.BoostCreature)); + mode.addTarget(new TargetPermanent(filter2)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EngineeredMight.java b/Mage.Sets/src/mage/cards/e/EngineeredMight.java index 5db6638c8d9..834919d8346 100644 --- a/Mage.Sets/src/mage/cards/e/EngineeredMight.java +++ b/Mage.Sets/src/mage/cards/e/EngineeredMight.java @@ -41,10 +41,10 @@ public final class EngineeredMight extends CardImpl { Mode mode = new Mode(); effect = new BoostControlledEffect(2, 2, Duration.EndOfTurn); effect.setText("Creatures you control get +2/+2"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent()); effect.setText("and gain vigilance until end of turn"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EntomberExarch.java b/Mage.Sets/src/mage/cards/e/EntomberExarch.java index ff4b4c5d6e7..9a43353a32d 100644 --- a/Mage.Sets/src/mage/cards/e/EntomberExarch.java +++ b/Mage.Sets/src/mage/cards/e/EntomberExarch.java @@ -42,8 +42,8 @@ public final class EntomberExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); Mode mode = new Mode(); - mode.getEffects().add(new EntomberExarchEffect()); - mode.getTargets().add(new TargetOpponent()); + mode.addEffect(new EntomberExarchEffect()); + mode.addTarget(new TargetOpponent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/EsperCharm.java b/Mage.Sets/src/mage/cards/e/EsperCharm.java index 2d077d48f16..560283f8c59 100644 --- a/Mage.Sets/src/mage/cards/e/EsperCharm.java +++ b/Mage.Sets/src/mage/cards/e/EsperCharm.java @@ -27,12 +27,12 @@ public final class EsperCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetEnchantmentPermanent()); // or draw two cards; Mode mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(2)); + mode.addEffect(new DrawCardSourceControllerEffect(2)); this.getSpellAbility().addMode(mode); // or target player discards two cards. mode = new Mode(); - mode.getEffects().add(new DiscardTargetEffect(2)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new DiscardTargetEffect(2)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java index 542b34c3af6..af14f566d53 100644 --- a/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java +++ b/Mage.Sets/src/mage/cards/e/EtherwroughtPage.java @@ -37,12 +37,12 @@ public final class EtherwroughtPage extends CardImpl { // or look at the top card of your library, then you may put that card into your graveyard; Mode mode = new Mode(); - mode.getEffects().add(new EtherwroughtPageEffect()); + mode.addEffect(new EtherwroughtPageEffect()); ability.addMode(mode); // or each opponent loses 1 life Mode mode1 = new Mode(); - mode1.getEffects().add(new LoseLifeOpponentsEffect(1)); + mode1.addEffect(new LoseLifeOpponentsEffect(1)); ability.addMode(mode1); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java index feefb4dde2b..d552e8ff702 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java @@ -31,14 +31,14 @@ public final class EvolutionCharm extends CardImpl { // or return target creature card from your graveyard to your hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().addMode(mode); // or target creature gains flying until end of turn. mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/Fascination.java b/Mage.Sets/src/mage/cards/f/Fascination.java index c24543f8e9d..d53a9219841 100644 --- a/Mage.Sets/src/mage/cards/f/Fascination.java +++ b/Mage.Sets/src/mage/cards/f/Fascination.java @@ -26,7 +26,7 @@ public final class Fascination extends CardImpl { // * Each player puts the top X cards of their library into their graveyard. Mode mode = new Mode(); - mode.getEffects().add(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(new ManacostVariableValue(), TargetController.ANY)); + mode.addEffect(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(new ManacostVariableValue(), TargetController.ANY)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java index a8b2d0b4b1f..f0ac4772747 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOrFamine.java +++ b/Mage.Sets/src/mage/cards/f/FeastOrFamine.java @@ -37,8 +37,8 @@ public final class FeastOrFamine extends CardImpl { // or destroy target nonartifact, nonblack creature and it can't be regenerated. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect(true)); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DestroyTargetEffect(true)); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java index e846026f4db..85e42cac3bf 100644 --- a/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/f/FerocityOfTheUnderworld.java @@ -38,14 +38,14 @@ public final class FerocityOfTheUnderworld extends CardImpl { // Copy target instant or sorcery spell. You may choose new targets for the copy. Mode mode = new Mode(); - mode.getEffects().add(new CopyTargetSpellEffect()); - mode.getTargets().add(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); + mode.addEffect(new CopyTargetSpellEffect()); + mode.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.getSpellAbility().addMode(mode); // Return target card from your graveyard to your hand. mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard()); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FeverCharm.java b/Mage.Sets/src/mage/cards/f/FeverCharm.java index c989812773d..155b3f2d57c 100644 --- a/Mage.Sets/src/mage/cards/f/FeverCharm.java +++ b/Mage.Sets/src/mage/cards/f/FeverCharm.java @@ -36,13 +36,13 @@ public final class FeverCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or target creature gets +2/+0 until end of turn Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or Fever Charm deals 3 damage to target Wizard creature. mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(3)); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DamageTargetEffect(3)); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FieryConfluence.java b/Mage.Sets/src/mage/cards/f/FieryConfluence.java index 530b53be805..6d15e1f1647 100644 --- a/Mage.Sets/src/mage/cards/f/FieryConfluence.java +++ b/Mage.Sets/src/mage/cards/f/FieryConfluence.java @@ -32,13 +32,13 @@ public final class FieryConfluence extends CardImpl { // Fiery Confluence deals 2 damage to each opponent; Mode mode = new Mode(); - mode.getEffects().add(new DamagePlayersEffect(2, TargetController.OPPONENT)); + mode.addEffect(new DamagePlayersEffect(2, TargetController.OPPONENT)); this.getSpellAbility().getModes().addMode(mode); // Destroy target artifact. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FieryIntervention.java b/Mage.Sets/src/mage/cards/f/FieryIntervention.java index cb0c469a014..a6f1d272779 100644 --- a/Mage.Sets/src/mage/cards/f/FieryIntervention.java +++ b/Mage.Sets/src/mage/cards/f/FieryIntervention.java @@ -27,8 +27,8 @@ public final class FieryIntervention extends CardImpl { // -Destroy target artifact. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FinalRevels.java b/Mage.Sets/src/mage/cards/f/FinalRevels.java index 5944b0285b7..0b732ddcb93 100644 --- a/Mage.Sets/src/mage/cards/f/FinalRevels.java +++ b/Mage.Sets/src/mage/cards/f/FinalRevels.java @@ -21,7 +21,7 @@ public final class FinalRevels extends CardImpl { this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); Mode mode = new Mode(); - mode.getEffects().add(new BoostAllEffect(0, -2, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); + mode.addEffect(new BoostAllEffect(0, -2, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FissureVent.java b/Mage.Sets/src/mage/cards/f/FissureVent.java index 4ebdfecea73..8e522fa5ab4 100644 --- a/Mage.Sets/src/mage/cards/f/FissureVent.java +++ b/Mage.Sets/src/mage/cards/f/FissureVent.java @@ -27,8 +27,8 @@ public final class FissureVent extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); Mode mode1 = new Mode(); - mode1.getTargets().add(new TargetNonBasicLandPermanent()); - mode1.getEffects().add(new DestroyTargetEffect()); + mode1.addTarget(new TargetNonBasicLandPermanent()); + mode1.addEffect(new DestroyTargetEffect()); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/f/FlashFlood.java b/Mage.Sets/src/mage/cards/f/FlashFlood.java index 40a32ebe3b7..7a5ab5d8ecd 100644 --- a/Mage.Sets/src/mage/cards/f/FlashFlood.java +++ b/Mage.Sets/src/mage/cards/f/FlashFlood.java @@ -37,8 +37,8 @@ public final class FlashFlood extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter1)); // or return target Mountain to its owner's hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter2)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetPermanent(filter2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/ForceStasis.java b/Mage.Sets/src/mage/cards/f/ForceStasis.java index ed4e6e25aee..bca7faa324b 100644 --- a/Mage.Sets/src/mage/cards/f/ForceStasis.java +++ b/Mage.Sets/src/mage/cards/f/ForceStasis.java @@ -43,8 +43,8 @@ public final class ForceStasis extends CardImpl { // Return target instant or sorcery spell you don't control to its owner's hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetSpell(filter)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetSpell(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/Fortify.java b/Mage.Sets/src/mage/cards/f/Fortify.java index cf0a112bc38..5035a402d71 100644 --- a/Mage.Sets/src/mage/cards/f/Fortify.java +++ b/Mage.Sets/src/mage/cards/f/Fortify.java @@ -22,7 +22,7 @@ public final class Fortify extends CardImpl { // Choose one - Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); Mode mode = new Mode(); - mode.getEffects().add(new BoostControlledEffect(0, 2, Duration.EndOfTurn)); + mode.addEffect(new BoostControlledEffect(0, 2, Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FortuitousFind.java b/Mage.Sets/src/mage/cards/f/FortuitousFind.java index 7b4a1dfd77c..6b1c5284971 100644 --- a/Mage.Sets/src/mage/cards/f/FortuitousFind.java +++ b/Mage.Sets/src/mage/cards/f/FortuitousFind.java @@ -30,8 +30,8 @@ public final class FortuitousFind extends CardImpl { // or Return target creature card from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FuneralCharm.java b/Mage.Sets/src/mage/cards/f/FuneralCharm.java index abbced9ea52..b2825391538 100644 --- a/Mage.Sets/src/mage/cards/f/FuneralCharm.java +++ b/Mage.Sets/src/mage/cards/f/FuneralCharm.java @@ -28,12 +28,12 @@ public final class FuneralCharm extends CardImpl { this.getSpellAbility().addEffect(new DiscardTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(new SwampwalkAbility(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/f/FuryCharm.java b/Mage.Sets/src/mage/cards/f/FuryCharm.java index 4f7888dd719..1668f4053c2 100644 --- a/Mage.Sets/src/mage/cards/f/FuryCharm.java +++ b/Mage.Sets/src/mage/cards/f/FuryCharm.java @@ -52,16 +52,16 @@ public final class FuryCharm extends CardImpl { Mode mode = new Mode(); Effect effect = new BoostTargetEffect(1,1, Duration.EndOfTurn); effect.setText("target creature gets +1/+1"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(),Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // or remove two time counters from target permanent or suspended card. mode = new Mode(); - mode.getTargets().add(new TargetPermanentOrSuspendedCard()); - mode.getEffects().add(new FuryCharmRemoveCounterEffect()); + mode.addTarget(new TargetPermanentOrSuspendedCard()); + mode.addEffect(new FuryCharmRemoveCounterEffect()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java index 52faf34e7c9..7489c019824 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java @@ -33,8 +33,8 @@ public final class GhoulcallersChant extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); // or return two target Zombie cards from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(2, filter)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(2, filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java b/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java index bfd07f08b78..ae1334c38e1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCratermaker.java @@ -50,8 +50,8 @@ public final class GoblinCratermaker extends CardImpl { // • Destroy target colorless nonland permanent. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filter)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GolgariCharm.java b/Mage.Sets/src/mage/cards/g/GolgariCharm.java index b9d39e88600..780735c0ecb 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariCharm.java +++ b/Mage.Sets/src/mage/cards/g/GolgariCharm.java @@ -29,13 +29,13 @@ public final class GolgariCharm extends CardImpl { // or destroy target enchantment; Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetEnchantmentPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); // or regenerate each creature you control. mode = new Mode(); - mode.getEffects().add(new RegenerateAllEffect(new FilterControlledCreaturePermanent())); + mode.addEffect(new RegenerateAllEffect(new FilterControlledCreaturePermanent())); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index 6887c32aa95..b60430110dd 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/Mage.Sets/src/mage/cards/g/GrabTheReins.java @@ -48,10 +48,10 @@ public final class GrabTheReins extends CardImpl { this.getSpellAbility().addTarget(target); // or sacrifice a creature, then Grab the Reins deals damage equal to that creature's power to any target. Mode mode = new Mode(); - mode.getEffects().add(new GrabTheReinsEffect()); + mode.addEffect(new GrabTheReinsEffect()); TargetAnyTarget target2 = new TargetAnyTarget(); target2.setTargetName("a creature or player to damage"); - mode.getTargets().add(target2); + mode.addTarget(target2); this.getSpellAbility().getModes().addMode(mode); // Entwine {2}{R} diff --git a/Mage.Sets/src/mage/cards/g/GrenzoHavocRaiser.java b/Mage.Sets/src/mage/cards/g/GrenzoHavocRaiser.java index 693c82d0822..1ebed78a460 100644 --- a/Mage.Sets/src/mage/cards/g/GrenzoHavocRaiser.java +++ b/Mage.Sets/src/mage/cards/g/GrenzoHavocRaiser.java @@ -60,7 +60,7 @@ public final class GrenzoHavocRaiser extends CardImpl { Ability ability = new GrenzoHavocRaiserTriggeredAbility(effect); //or Exile the top card of that player's library. Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it. Mode mode = new Mode(); - mode.getEffects().add(new GrenzoHavocRaiserEffect()); + mode.addEffect(new GrenzoHavocRaiserEffect()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrimDiscovery.java b/Mage.Sets/src/mage/cards/g/GrimDiscovery.java index 9a1c49c1024..c6dab5f4a20 100644 --- a/Mage.Sets/src/mage/cards/g/GrimDiscovery.java +++ b/Mage.Sets/src/mage/cards/g/GrimDiscovery.java @@ -30,8 +30,8 @@ public final class GrimDiscovery extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); // and/or return target land card from your graveyard to your hand. Mode mode1 = new Mode(); - mode1.getEffects().add(new ReturnToHandTargetEffect()); - mode1.getTargets().add(new TargetCardInYourGraveyard(filterLandCard)); + mode1.addEffect(new ReturnToHandTargetEffect()); + mode1.addTarget(new TargetCardInYourGraveyard(filterLandCard)); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/g/GrixisCharm.java b/Mage.Sets/src/mage/cards/g/GrixisCharm.java index fc2783a4539..98c5d8a1bbe 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisCharm.java +++ b/Mage.Sets/src/mage/cards/g/GrixisCharm.java @@ -28,12 +28,12 @@ public final class GrixisCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent()); // or target creature gets -4/-4 until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-4, -4, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or creatures you control get +2/+0 until end of turn. mode = new Mode(); - mode.getEffects().add(new BoostControlledEffect(2, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); + mode.addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/g/GruulCharm.java b/Mage.Sets/src/mage/cards/g/GruulCharm.java index 1619d04689e..592a8760d6e 100644 --- a/Mage.Sets/src/mage/cards/g/GruulCharm.java +++ b/Mage.Sets/src/mage/cards/g/GruulCharm.java @@ -43,12 +43,12 @@ public final class GruulCharm extends CardImpl { // or gain control of all permanents you own; Mode mode = new Mode(); - mode.getEffects().add(new GainControlAllEffect(Duration.EndOfGame, filter2)); + mode.addEffect(new GainControlAllEffect(Duration.EndOfGame, filter2)); this.getSpellAbility().addMode(mode); // or Gruul Charm deals 3 damage to each creature with flying. Mode mode2 = new Mode(); - mode2.getEffects().add(new DamageAllEffect(3, filter3)); + mode2.addEffect(new DamageAllEffect(3, filter3)); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/h/HealingLeaves.java b/Mage.Sets/src/mage/cards/h/HealingLeaves.java index b651a40580e..d13d4ae1342 100644 --- a/Mage.Sets/src/mage/cards/h/HealingLeaves.java +++ b/Mage.Sets/src/mage/cards/h/HealingLeaves.java @@ -25,8 +25,8 @@ public final class HealingLeaves extends CardImpl { this.getSpellAbility().addEffect(new GainLifeTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HealingSalve.java b/Mage.Sets/src/mage/cards/h/HealingSalve.java index 8aaf06388e1..d5dc9a4d842 100644 --- a/Mage.Sets/src/mage/cards/h/HealingSalve.java +++ b/Mage.Sets/src/mage/cards/h/HealingSalve.java @@ -27,8 +27,8 @@ public final class HealingSalve extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 3)); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HearthCharm.java b/Mage.Sets/src/mage/cards/h/HearthCharm.java index f8c673bfaa5..5b6e3d7aece 100644 --- a/Mage.Sets/src/mage/cards/h/HearthCharm.java +++ b/Mage.Sets/src/mage/cards/h/HearthCharm.java @@ -40,12 +40,12 @@ public final class HearthCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter1)); // or attacking creatures get +1/+0 until end of turn Mode mode = new Mode(); - mode.getEffects().add(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter2, false)); + mode.addEffect(new BoostAllEffect(1, 0, Duration.EndOfTurn, filter2, false)); this.getSpellAbility().addMode(mode); // or target creature with power 2 or less is unblockable this turn. mode = new Mode(); - mode.getEffects().add(new CantBeBlockedTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter3)); + mode.addEffect(new CantBeBlockedTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(filter3)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HoodedAssassin.java b/Mage.Sets/src/mage/cards/h/HoodedAssassin.java index b36e831fdd0..45b6f8dc6ca 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedAssassin.java +++ b/Mage.Sets/src/mage/cards/h/HoodedAssassin.java @@ -41,8 +41,8 @@ public final class HoodedAssassin extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); // * Destroy target creature that was dealt damage this turn. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(filter)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HopeCharm.java b/Mage.Sets/src/mage/cards/h/HopeCharm.java index 484bf6c34d7..7dc8185e84e 100644 --- a/Mage.Sets/src/mage/cards/h/HopeCharm.java +++ b/Mage.Sets/src/mage/cards/h/HopeCharm.java @@ -38,13 +38,13 @@ public final class HopeCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or target player gains 2 life Mode mode = new Mode(); - mode.getEffects().add(new GainLifeTargetEffect(2)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new GainLifeTargetEffect(2)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); // or destroy target Aura. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HullBreach.java b/Mage.Sets/src/mage/cards/h/HullBreach.java index ef415f23c3d..cd01d316058 100644 --- a/Mage.Sets/src/mage/cards/h/HullBreach.java +++ b/Mage.Sets/src/mage/cards/h/HullBreach.java @@ -27,17 +27,17 @@ public final class HullBreach extends CardImpl { this.getSpellAbility().addTarget(target); // or destroy target enchantment; Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); + mode.addEffect(new DestroyTargetEffect()); target = new TargetEnchantmentPermanent(); - mode.getTargets().add(target); + mode.addTarget(target); this.getSpellAbility().addMode(mode); // or destroy target artifact and target enchantment. mode = new Mode(); Effect effect = new DestroyTargetEffect(false, true); effect.setText("destroy target artifact and target enchantment"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetArtifactPermanent()); - mode.getTargets().add(new TargetEnchantmentPermanent()); + mode.addEffect(effect); + mode.addTarget(new TargetArtifactPermanent()); + mode.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/HurlyBurly.java b/Mage.Sets/src/mage/cards/h/HurlyBurly.java index a7cba498936..128c5c74a6e 100644 --- a/Mage.Sets/src/mage/cards/h/HurlyBurly.java +++ b/Mage.Sets/src/mage/cards/h/HurlyBurly.java @@ -31,7 +31,7 @@ public final class HurlyBurly extends CardImpl { this.getSpellAbility().addEffect(new DamageAllEffect(1, filterWithFlying)); Mode mode = new Mode(); - mode.getEffects().add(new DamageAllEffect(1, filterWithoutFlying)); + mode.addEffect(new DamageAllEffect(1, filterWithoutFlying)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/h/Hydroblast.java b/Mage.Sets/src/mage/cards/h/Hydroblast.java index e76b9d5287c..53da9f524dd 100644 --- a/Mage.Sets/src/mage/cards/h/Hydroblast.java +++ b/Mage.Sets/src/mage/cards/h/Hydroblast.java @@ -30,8 +30,8 @@ public final class Hydroblast extends CardImpl { // or destroy target permanent if it's red. Mode mode = new Mode(); - mode.getEffects().add(new HydroblastDestroyEffect()); - mode.getTargets().add(new TargetPermanent()); + mode.addEffect(new HydroblastDestroyEffect()); + mode.addTarget(new TargetPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java index 09c0a32b172..656ae6401ed 100644 --- a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java +++ b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java @@ -37,16 +37,16 @@ public final class IncendiaryCommand extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); // or Incendiary Command deals 2 damage to each creature; Mode mode = new Mode(); - mode.getEffects().add(new DamageAllEffect(2, new FilterCreaturePermanent())); + mode.addEffect(new DamageAllEffect(2, new FilterCreaturePermanent())); this.getSpellAbility().getModes().addMode(mode); // or destroy target nonbasic land; mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetNonBasicLandPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetNonBasicLandPermanent()); this.getSpellAbility().getModes().addMode(mode); // or each player discards all the cards in their hand, then draws that many cards. mode = new Mode(); - mode.getEffects().add(new IncendiaryCommandDrawEffect()); + mode.addEffect(new IncendiaryCommandDrawEffect()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/InciteWar.java b/Mage.Sets/src/mage/cards/i/InciteWar.java index 6a1b2835cac..efdbf9c83af 100644 --- a/Mage.Sets/src/mage/cards/i/InciteWar.java +++ b/Mage.Sets/src/mage/cards/i/InciteWar.java @@ -46,7 +46,7 @@ public final class InciteWar extends CardImpl { // or creatures you control gain first strike until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter)); + mode.addEffect(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, filter)); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} diff --git a/Mage.Sets/src/mage/cards/i/InquisitorExarch.java b/Mage.Sets/src/mage/cards/i/InquisitorExarch.java index 99e56fa80d2..600e14d21f8 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorExarch.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorExarch.java @@ -29,8 +29,8 @@ public final class InquisitorExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)); Mode mode = new Mode(); - mode.getEffects().add(new LoseLifeTargetEffect(2)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new LoseLifeTargetEffect(2)); + mode.addTarget(new TargetPlayer()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InsidiousWill.java b/Mage.Sets/src/mage/cards/i/InsidiousWill.java index 48904be3766..6d62b408f75 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousWill.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousWill.java @@ -31,14 +31,14 @@ public final class InsidiousWill extends CardImpl { // You may choose new targets for target spell.; Mode mode = new Mode(); - mode.getEffects().add(new ChooseNewTargetsTargetEffect()); - mode.getTargets().add(new TargetSpell()); + mode.addEffect(new ChooseNewTargetsTargetEffect()); + mode.addTarget(new TargetSpell()); this.getSpellAbility().addMode(mode); // Copy target instant or sorcery spell. You may choose new targets for the copy. mode = new Mode(); - mode.getEffects().add(new CopyTargetSpellEffect()); - mode.getTargets().add(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); + mode.addEffect(new CopyTargetSpellEffect()); + mode.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_INSTANT_OR_SORCERY)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/InvigoratedRampage.java b/Mage.Sets/src/mage/cards/i/InvigoratedRampage.java index d28ed87d4a3..2f36ea72174 100644 --- a/Mage.Sets/src/mage/cards/i/InvigoratedRampage.java +++ b/Mage.Sets/src/mage/cards/i/InvigoratedRampage.java @@ -36,11 +36,11 @@ public final class InvigoratedRampage extends CardImpl { Mode mode = new Mode(); effect = new BoostTargetEffect(2, 0, Duration.EndOfTurn); effect.setText("Two target creatures each get +2/+0"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gain trample until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(2)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java b/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java index 5576aff06b4..9e74d88bb52 100644 --- a/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java +++ b/Mage.Sets/src/mage/cards/i/InvokeTheFiremind.java @@ -23,8 +23,8 @@ public final class InvokeTheFiremind extends CardImpl { this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new ManacostVariableValue())); Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new DamageTargetEffect(new ManacostVariableValue())); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/IvoryCharm.java b/Mage.Sets/src/mage/cards/i/IvoryCharm.java index 6a98c5c041d..90a62baf27b 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryCharm.java +++ b/Mage.Sets/src/mage/cards/i/IvoryCharm.java @@ -26,13 +26,13 @@ public final class IvoryCharm extends CardImpl { this.getSpellAbility().addEffect(new BoostAllEffect(-2, 0, Duration.EndOfTurn)); // or tap target creature Mode mode = new Mode(); - mode.getEffects().add(new TapTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new TapTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or prevent the next 1 damage that would be dealt to any target this turn. mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 1)); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/i/IzzetCharm.java b/Mage.Sets/src/mage/cards/i/IzzetCharm.java index d21d500d664..92f255d6c8f 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetCharm.java +++ b/Mage.Sets/src/mage/cards/i/IzzetCharm.java @@ -37,13 +37,13 @@ public final class IzzetCharm extends CardImpl { // or Izzet Charm deals 2 damage to target creature; Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(2)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new DamageTargetEffect(2)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or draw two cards, then discard two cards. mode = new Mode(); - mode.getEffects().add(new DrawDiscardControllerEffect(2, 2)); + mode.addEffect(new DrawDiscardControllerEffect(2, 2)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/j/JeskaiCharm.java b/Mage.Sets/src/mage/cards/j/JeskaiCharm.java index 3e1fba2effb..76ec93b06a7 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiCharm.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiCharm.java @@ -32,17 +32,17 @@ public final class JeskaiCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // - Jeskai Charm deals 4 damage to target opponent. Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetOpponentOrPlaneswalker()); + mode.addEffect(new DamageTargetEffect(4)); + mode.addTarget(new TargetOpponentOrPlaneswalker()); this.getSpellAbility().addMode(mode); // - Creatures you control get +1/+1 and gain lifelink until end of turn. mode = new Mode(); Effect effect = new BoostControlledEffect(1, 1, Duration.EndOfTurn); effect.setText("Creatures you control get +1/+1"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent()); effect.setText("and gain lifelink until end of turn"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/j/JourneyOfDiscovery.java b/Mage.Sets/src/mage/cards/j/JourneyOfDiscovery.java index 60316b7c9fd..6c9a3df5359 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyOfDiscovery.java +++ b/Mage.Sets/src/mage/cards/j/JourneyOfDiscovery.java @@ -28,7 +28,7 @@ public final class JourneyOfDiscovery extends CardImpl { // or you may play up to two additional lands this turn. Mode mode = new Mode(); - mode.getEffects().add(new PlayAdditionalLandsControllerEffect(2, Duration.EndOfTurn)); + mode.addEffect(new PlayAdditionalLandsControllerEffect(2, Duration.EndOfTurn)); this.getSpellAbility().getModes().addMode(mode); // Entwine {2}{G} diff --git a/Mage.Sets/src/mage/cards/j/JundCharm.java b/Mage.Sets/src/mage/cards/j/JundCharm.java index 6328baa49ac..2dbc88e7a33 100644 --- a/Mage.Sets/src/mage/cards/j/JundCharm.java +++ b/Mage.Sets/src/mage/cards/j/JundCharm.java @@ -30,12 +30,12 @@ public final class JundCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // or Jund Charm deals 2 damage to each creature; Mode mode = new Mode(); - mode.getEffects().add(new DamageAllEffect(2, new FilterCreaturePermanent())); + mode.addEffect(new DamageAllEffect(2, new FilterCreaturePermanent())); this.getSpellAbility().addMode(mode); // or put two +1/+1 counters on target creature. mode = new Mode(); - mode.getEffects().add(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(2), Outcome.BoostCreature)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java index ea2fd1ab067..9229d1a77fa 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghansCommand.java +++ b/Mage.Sets/src/mage/cards/k/KolaghansCommand.java @@ -43,20 +43,20 @@ public final class KolaghansCommand extends CardImpl { // or Target player discards a card; Mode mode = new Mode(); - mode.getEffects().add(new DiscardTargetEffect(1)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new DiscardTargetEffect(1)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // or Destroy target artifact; mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filter)); this.getSpellAbility().getModes().addMode(mode); // or Kolaghan's Command deals 2 damage to any target. mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(2)); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new DamageTargetEffect(2)); + mode.addTarget(new TargetAnyTarget()); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java b/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java index fd997f407c9..5a533907519 100644 --- a/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java +++ b/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java @@ -31,7 +31,7 @@ public final class LibraryOfLatNam extends CardImpl { Mode mode = new Mode(); Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true); //effect.setText("you search your library for a card, put that card into your hand, then shuffle your library"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index 376f6f8ac4f..7d5a219f10c 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -65,13 +65,13 @@ public final class MarathWillOfTheWild extends CardImpl { // or Marath deals X damage to any target; Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); - mode.getTargets().add(new TargetAnyTarget()); + mode.addEffect(new DamageTargetEffect(new ManacostVariableValue())); + mode.addTarget(new TargetAnyTarget()); ability.addMode(mode); // or create an X/X green Elemental creature token. mode = new Mode(); - mode.getEffects().add(new MarathWillOfTheWildCreateTokenEffect()); + mode.addEffect(new MarathWillOfTheWildCreateTokenEffect()); ability.addMode(mode); // X can't be 0. diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java b/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java index 07fb0af7a69..0ddede3205d 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java @@ -34,8 +34,8 @@ public final class MarchOfTheDrowned extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); // • Return two target Pirate cards from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(2, filter)); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(2, filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MarduCharm.java b/Mage.Sets/src/mage/cards/m/MarduCharm.java index 50a4c9a412f..9872d5acac0 100644 --- a/Mage.Sets/src/mage/cards/m/MarduCharm.java +++ b/Mage.Sets/src/mage/cards/m/MarduCharm.java @@ -51,13 +51,13 @@ public final class MarduCharm extends CardImpl { // * Create two 1/1 white Warrior creature tokens. They gain first strike until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new MarduCharmCreateTokenEffect()); + mode.addEffect(new MarduCharmCreateTokenEffect()); this.getSpellAbility().addMode(mode); // * Target opponent reveals their hand. You choose a noncreature, nonland card from it. That player discards that card. mode = new Mode(); - mode.getEffects().add(new DiscardCardYouChooseTargetEffect(filter)); - mode.getTargets().add(new TargetOpponent()); + mode.addEffect(new DiscardCardYouChooseTargetEffect(filter)); + mode.addTarget(new TargetOpponent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java b/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java index f0917ed5f8e..58068869557 100644 --- a/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java +++ b/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java @@ -26,7 +26,7 @@ public final class MastermindsAcquisition extends CardImpl { // Choose a card you own from outside the game and put it into your hand. Mode mode = new Mode(); - mode.getEffects().add(new WishEffect(new FilterCard(), false)); + mode.addEffect(new WishEffect(new FilterCard(), false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MercilessEviction.java b/Mage.Sets/src/mage/cards/m/MercilessEviction.java index e275be01bdb..b71a9d1a17c 100644 --- a/Mage.Sets/src/mage/cards/m/MercilessEviction.java +++ b/Mage.Sets/src/mage/cards/m/MercilessEviction.java @@ -25,15 +25,15 @@ public final class MercilessEviction extends CardImpl { this.getSpellAbility().addEffect(new ExileAllEffect(new FilterArtifactPermanent("artifacts"))); // or exile all creatures Mode mode = new Mode(); - mode.getEffects().add(new ExileAllEffect(FILTER_PERMANENT_CREATURES)); + mode.addEffect(new ExileAllEffect(FILTER_PERMANENT_CREATURES)); this.getSpellAbility().addMode(mode); // or exile all enchantments Mode mode2 = new Mode(); - mode2.getEffects().add(new ExileAllEffect(new FilterEnchantmentPermanent("enchantments"))); + mode2.addEffect(new ExileAllEffect(new FilterEnchantmentPermanent("enchantments"))); this.getSpellAbility().addMode(mode2); // or exile all planeswalkers. Mode mode3 = new Mode(); - mode3.getEffects().add(new ExileAllEffect(new FilterPlaneswalkerPermanent("planeswalkers"))); + mode3.addEffect(new ExileAllEffect(new FilterPlaneswalkerPermanent("planeswalkers"))); this.getSpellAbility().addMode(mode3); } diff --git a/Mage.Sets/src/mage/cards/m/MidnightCharm.java b/Mage.Sets/src/mage/cards/m/MidnightCharm.java index f704b0be087..cecfceb71f2 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightCharm.java +++ b/Mage.Sets/src/mage/cards/m/MidnightCharm.java @@ -28,12 +28,12 @@ public final class MidnightCharm extends CardImpl { this.getSpellAbility().addEffect(new GainLifeEffect(1).setText("and you gain 1 life")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); mode = new Mode(); - mode.getEffects().add(new TapTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new TapTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MightOfTheWild.java b/Mage.Sets/src/mage/cards/m/MightOfTheWild.java index c9ce6c95e5b..c7d78e13973 100644 --- a/Mage.Sets/src/mage/cards/m/MightOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MightOfTheWild.java @@ -42,13 +42,13 @@ public final class MightOfTheWild extends CardImpl { // Destroy target artifact or enchantment. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filterMode2)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filterMode2)); this.getSpellAbility().addMode(mode); // Creatures you control gain indestructible this turn. mode = new Mode(); - mode.getEffects().add(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"))); + mode.addEffect(new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"))); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MiseryCharm.java b/Mage.Sets/src/mage/cards/m/MiseryCharm.java index e347ec9ab21..c0195ee9530 100644 --- a/Mage.Sets/src/mage/cards/m/MiseryCharm.java +++ b/Mage.Sets/src/mage/cards/m/MiseryCharm.java @@ -39,13 +39,13 @@ public final class MiseryCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter1)); // or return target Cleric card from your graveyard to your hand Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(filter2)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(filter2)); this.getSpellAbility().addMode(mode); // or target player loses 2 life. mode = new Mode(); - mode.getEffects().add(new LoseLifeTargetEffect(2)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new LoseLifeTargetEffect(2)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MobRule.java b/Mage.Sets/src/mage/cards/m/MobRule.java index 35e12d740f2..65c22263939 100644 --- a/Mage.Sets/src/mage/cards/m/MobRule.java +++ b/Mage.Sets/src/mage/cards/m/MobRule.java @@ -34,7 +34,7 @@ public final class MobRule extends CardImpl { // Gain control of all creatures with power 3 or less until end of turn. Untap those creatures. They gain haste until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new MobRuleEffect(ComparisonType.FEWER_THAN, 4)); + mode.addEffect(new MobRuleEffect(ComparisonType.FEWER_THAN, 4)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/m/MysticConfluence.java b/Mage.Sets/src/mage/cards/m/MysticConfluence.java index 0617f72617c..71defae9ed8 100644 --- a/Mage.Sets/src/mage/cards/m/MysticConfluence.java +++ b/Mage.Sets/src/mage/cards/m/MysticConfluence.java @@ -33,13 +33,13 @@ public final class MysticConfluence extends CardImpl { // Return target creature to its owner's hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // Draw a card. mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(1)); + mode.addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/n/NayaCharm.java b/Mage.Sets/src/mage/cards/n/NayaCharm.java index 520eb601daf..9df44f48e8a 100644 --- a/Mage.Sets/src/mage/cards/n/NayaCharm.java +++ b/Mage.Sets/src/mage/cards/n/NayaCharm.java @@ -28,13 +28,13 @@ public final class NayaCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or return target card from a graveyard to its owner's hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInGraveyard()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInGraveyard()); this.getSpellAbility().addMode(mode); // or tap all creatures target player controls. mode = new Mode(); - mode.getEffects().add(new TapAllTargetPlayerControlsEffect(FILTER_PERMANENT_CREATURES)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new TapAllTargetPlayerControlsEffect(FILTER_PERMANENT_CREATURES)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/o/OddlyUneven.java b/Mage.Sets/src/mage/cards/o/OddlyUneven.java index 977754139ec..49944a6422a 100644 --- a/Mage.Sets/src/mage/cards/o/OddlyUneven.java +++ b/Mage.Sets/src/mage/cards/o/OddlyUneven.java @@ -28,7 +28,7 @@ public final class OddlyUneven extends CardImpl { this.getSpellAbility().addEffect(new OddOrEvenEffect(true)); // * Destroy each creature with an even number of words in its name. Mode mode = new Mode(); - mode.getEffects().add(new OddOrEvenEffect(false)); + mode.addEffect(new OddOrEvenEffect(false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/o/OjutaiExemplars.java b/Mage.Sets/src/mage/cards/o/OjutaiExemplars.java index 51c0839087a..c4fd7a50597 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiExemplars.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiExemplars.java @@ -54,15 +54,15 @@ public final class OjutaiExemplars extends CardImpl { Mode mode = new Mode(); Effect effect = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); effect.setText("{this} gains first strike"); - mode.getEffects().add(effect); + mode.addEffect(effect); Effect effect2 = new GainAbilitySourceEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn); effect2.setText("and lifelink until end of turn"); - mode.getEffects().add(effect2); + mode.addEffect(effect2); ability.addMode(mode); // or Exile Ojutai Exemplars, then return it to the battlefield tapped under its owner's control. mode = new Mode(); - mode.getEffects().add(new OjutaiExemplarsEffect()); + mode.addEffect(new OjutaiExemplarsEffect()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OjutaisCommand.java b/Mage.Sets/src/mage/cards/o/OjutaisCommand.java index 1e4f6dcc47c..38da309eb76 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaisCommand.java +++ b/Mage.Sets/src/mage/cards/o/OjutaisCommand.java @@ -43,18 +43,18 @@ public final class OjutaisCommand extends CardImpl { // or You gain 4 life; Mode mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(4)); + mode.addEffect(new GainLifeEffect(4)); this.getSpellAbility().getModes().addMode(mode); // or Counter target creature spell; mode = new Mode(); - mode.getTargets().add(new TargetSpell(StaticFilters.FILTER_SPELL_CREATURE)); - mode.getEffects().add(new CounterTargetEffect()); + mode.addTarget(new TargetSpell(StaticFilters.FILTER_SPELL_CREATURE)); + mode.addEffect(new CounterTargetEffect()); this.getSpellAbility().getModes().addMode(mode); // or Draw a card mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(1)); + mode.addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/o/OneDozenEyes.java b/Mage.Sets/src/mage/cards/o/OneDozenEyes.java index 42bb0c0f5f9..a49609571ed 100644 --- a/Mage.Sets/src/mage/cards/o/OneDozenEyes.java +++ b/Mage.Sets/src/mage/cards/o/OneDozenEyes.java @@ -27,7 +27,7 @@ public final class OneDozenEyes extends CardImpl { this.getSpellAbility().addEffect(new CreateTokenEffect(new OneDozenEyesBeastToken())); // or create five 1/1 green Insect creature tokens. Mode mode = new Mode(); - mode.getEffects().add(new CreateTokenEffect(new InsectToken(), 5)); + mode.addEffect(new CreateTokenEffect(new InsectToken(), 5)); this.getSpellAbility().addMode(mode); // Entwine {G}{G}{G} this.addAbility(new EntwineAbility("{G}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovCharm.java b/Mage.Sets/src/mage/cards/o/OrzhovCharm.java index bf6486b1cb5..ef49630a60a 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovCharm.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovCharm.java @@ -45,14 +45,14 @@ public final class OrzhovCharm extends CardImpl { // or destroy target creature and you lose life equal to its toughness; Mode mode = new Mode(); - mode.getEffects().add(new OrzhovCharmDestroyAndLoseLifeEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new OrzhovCharmDestroyAndLoseLifeEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or return target creature card with converted mana cost 1 or less from your graveyard to the battlefield. Mode mode2 = new Mode(); - mode2.getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect()); - mode2.getTargets().add(new TargetCardInYourGraveyard(filter)); + mode2.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); + mode2.addTarget(new TargetCardInYourGraveyard(filter)); this.getSpellAbility().addMode(mode2); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java b/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java index 02e084e063a..34017c4171e 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovPontiff.java @@ -41,7 +41,7 @@ public final class OrzhovPontiff extends CardImpl { // When Orzhov Pontiff enters the battlefield or the creature it haunts dies, choose one - Creatures you control get +1/+1 until end of turn; or creatures you don't control get -1/-1 until end of turn. Ability ability = new HauntAbility(this, new BoostAllEffect(1,1, Duration.EndOfTurn, filterControlled, false)); Mode mode = new Mode(); - mode.getEffects().add(new BoostAllEffect(-1,-1, Duration.EndOfTurn, filterNotControlled, false)); + mode.addEffect(new BoostAllEffect(-1,-1, Duration.EndOfTurn, filterNotControlled, false)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Parch.java b/Mage.Sets/src/mage/cards/p/Parch.java index 7019802d230..bed5546837a 100644 --- a/Mage.Sets/src/mage/cards/p/Parch.java +++ b/Mage.Sets/src/mage/cards/p/Parch.java @@ -33,8 +33,8 @@ public final class Parch extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(2)); this.getSpellAbility().addTarget(new TargetAnyTarget()); Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DamageTargetEffect(4)); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/p/PietyCharm.java b/Mage.Sets/src/mage/cards/p/PietyCharm.java index d76b2c9a82e..157fcab4374 100644 --- a/Mage.Sets/src/mage/cards/p/PietyCharm.java +++ b/Mage.Sets/src/mage/cards/p/PietyCharm.java @@ -43,12 +43,12 @@ public final class PietyCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter1)); // or target Soldier creature gets +2/+2 until end of turn Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent(filter2)); + mode.addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent(filter2)); this.getSpellAbility().addMode(mode); // or creatures you control gain vigilance until end of turn. mode = new Mode(); - mode.getEffects().add(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"))); + mode.addEffect(new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures you control"))); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/p/PiracyCharm.java b/Mage.Sets/src/mage/cards/p/PiracyCharm.java index 2b612fd12d1..c654fc0bfcd 100644 --- a/Mage.Sets/src/mage/cards/p/PiracyCharm.java +++ b/Mage.Sets/src/mage/cards/p/PiracyCharm.java @@ -29,13 +29,13 @@ public final class PiracyCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or target creature gets +2/-1 until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(2, -1, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or target player discards a card. mode = new Mode(); - mode.getEffects().add(new DiscardTargetEffect(1)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new DiscardTargetEffect(1)); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java b/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java index 51e4271bddd..869d5153fc5 100644 --- a/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java @@ -41,7 +41,7 @@ public final class PlungeIntoDarkness extends CardImpl { this.getSpellAbility().addEffect(new PlungeIntoDarknessLifeEffect()); // or pay X life, then look at the top X cards of your library, put one of those cards into your hand, and exile the rest. Mode mode = new Mode(); - mode.getEffects().add(new PlungeIntoDarknessSearchEffect()); + mode.addEffect(new PlungeIntoDarknessSearchEffect()); this.getSpellAbility().getModes().addMode(mode); // Entwine {B} diff --git a/Mage.Sets/src/mage/cards/p/PowerConduit.java b/Mage.Sets/src/mage/cards/p/PowerConduit.java index 4fde62b1c8e..bdf4af27b0d 100644 --- a/Mage.Sets/src/mage/cards/p/PowerConduit.java +++ b/Mage.Sets/src/mage/cards/p/PowerConduit.java @@ -31,8 +31,8 @@ public final class PowerConduit extends CardImpl { ability.addCost(new RemoveCounterCost(new TargetControlledPermanent())); ability.addTarget(new TargetArtifactPermanent()); Mode mode = new Mode(); - mode.getEffects().add(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalCommand.java b/Mage.Sets/src/mage/cards/p/PrimalCommand.java index 970dae2cdfc..d20b5bf91cb 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalCommand.java +++ b/Mage.Sets/src/mage/cards/p/PrimalCommand.java @@ -48,18 +48,18 @@ public final class PrimalCommand extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); // or put target noncreature permanent on top of its owner's library; Mode mode = new Mode(); - mode.getEffects().add(new PutOnLibraryTargetEffect(true)); + mode.addEffect(new PutOnLibraryTargetEffect(true)); Target target = new TargetPermanent(filterNonCreature); - mode.getTargets().add(target); + mode.addTarget(target); this.getSpellAbility().getModes().addMode(mode); // or target player shuffles their graveyard into their library; mode = new Mode(); - mode.getEffects().add(new PrimalCommandShuffleGraveyardEffect()); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new PrimalCommandShuffleGraveyardEffect()); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // or search your library for a creature card, reveal it, put it into your hand, then shuffle your library. mode = new Mode(); - mode.getEffects().add(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCreatureCard()), true, true)); + mode.addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCreatureCard()), true, true)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/p/ProfaneCommand.java b/Mage.Sets/src/mage/cards/p/ProfaneCommand.java index 8a7f5767ed1..6f32b271f72 100644 --- a/Mage.Sets/src/mage/cards/p/ProfaneCommand.java +++ b/Mage.Sets/src/mage/cards/p/ProfaneCommand.java @@ -46,23 +46,23 @@ public final class ProfaneCommand extends CardImpl { // * Return target creature card with converted mana cost X or less from your graveyard to the battlefield. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with converted mana cost X or less from your graveyard"))); + mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(new FilterCreatureCard("creature card with converted mana cost X or less from your graveyard"))); this.getSpellAbility().addMode(mode); // * Target creature gets -X/-X until end of turn. DynamicValue minusValue = new SignInversionDynamicValue(xValue); mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(minusValue, minusValue, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(minusValue, minusValue, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // * Up to X target creatures gain fear until end of turn. mode = new Mode(); Effect effect = new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn); effect.setText("Up to X target creatures gain fear until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(0, 1)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(0, 1)); this.getSpellAbility().addMode(mode); } @@ -76,13 +76,13 @@ public final class ProfaneCommand extends CardImpl { int xValue = ability.getManaCostsToPay().getX(); FilterCard filter = new FilterCreatureCard("creature card with converted mana cost " + xValue + " or less from your graveyard"); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); - mode.getTargets().add(new TargetCardInYourGraveyard(filter)); + mode.addTarget(new TargetCardInYourGraveyard(filter)); } if (effect instanceof GainAbilityTargetEffect) { mode.getTargets().clear(); int xValue = ability.getManaCostsToPay().getX(); FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures gain fear until end of turn"); - mode.getTargets().add(new TargetCreaturePermanent(0, xValue, filter, false)); + mode.addTarget(new TargetCreaturePermanent(0, xValue, filter, false)); } } } diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfPower.java b/Mage.Sets/src/mage/cards/p/PromiseOfPower.java index 36a3fa8c29b..44788d015ed 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfPower.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfPower.java @@ -41,7 +41,7 @@ public final class PromiseOfPower extends CardImpl { // - Create an X/X black Demon creature token with flying, where X is the number of cards in your hand. Mode mode = new Mode(); - mode.getEffects().add(new PromiseOfPowerEffect()); + mode.addEffect(new PromiseOfPowerEffect()); this.getSpellAbility().getModes().addMode(mode); // Entwine {4} diff --git a/Mage.Sets/src/mage/cards/p/PutridWarrior.java b/Mage.Sets/src/mage/cards/p/PutridWarrior.java index a26efaf80fd..a80e4163de5 100644 --- a/Mage.Sets/src/mage/cards/p/PutridWarrior.java +++ b/Mage.Sets/src/mage/cards/p/PutridWarrior.java @@ -38,7 +38,7 @@ public final class PutridWarrior extends CardImpl { // Whenever Putrid Warrior deals damage, choose one - Each player loses 1 life; or each player gains 1 life. Ability ability = new PutridWarriorDealsDamageTriggeredAbility(new LoseLifeAllPlayersEffect(1)); Mode mode = new Mode(); - mode.getEffects().add(new PutridWarriorGainLifeEffect()); + mode.addEffect(new PutridWarriorGainLifeEffect()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index 5d2b3d3ceb7..4dafc88e564 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -45,8 +45,8 @@ public final class Pyramids extends CardImpl { 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(); //back in the day this was not technically "damage", hopefully this modern description will work nowadays - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn)); - mode.getTargets().add(new TargetLandPermanent()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn)); + mode.addTarget(new TargetLandPermanent()); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/Pyroblast.java b/Mage.Sets/src/mage/cards/p/Pyroblast.java index 3c61105ebda..e65d8908ae8 100644 --- a/Mage.Sets/src/mage/cards/p/Pyroblast.java +++ b/Mage.Sets/src/mage/cards/p/Pyroblast.java @@ -28,8 +28,8 @@ public final class Pyroblast extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell()); Mode mode = new Mode(); - mode.getEffects().add(new PyroblastDestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent()); + mode.addEffect(new PyroblastDestroyTargetEffect()); + mode.addTarget(new TargetPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/q/QuietDisrepair.java b/Mage.Sets/src/mage/cards/q/QuietDisrepair.java index 2906000b219..f1837b83674 100644 --- a/Mage.Sets/src/mage/cards/q/QuietDisrepair.java +++ b/Mage.Sets/src/mage/cards/q/QuietDisrepair.java @@ -40,7 +40,7 @@ public final class QuietDisrepair extends CardImpl { // At the beginning of your upkeep, choose one - Destroy enchanted permanent; or you gain 2 life. ability = new BeginningOfUpkeepTriggeredAbility(new DestroyAttachedToEffect("enchanted permanent"), TargetController.YOU, false); Mode mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(2)); + mode.addEffect(new GainLifeEffect(2)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RainOfRust.java b/Mage.Sets/src/mage/cards/r/RainOfRust.java index f89ae7d9fb4..641ff24a4f4 100644 --- a/Mage.Sets/src/mage/cards/r/RainOfRust.java +++ b/Mage.Sets/src/mage/cards/r/RainOfRust.java @@ -26,8 +26,8 @@ public final class RainOfRust extends CardImpl { this.getSpellAbility().addTarget(new TargetArtifactPermanent()); //or destroy target land. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetLandPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetLandPermanent()); this.getSpellAbility().getModes().addMode(mode); // Entwine {3}{R} this.addAbility(new EntwineAbility("{3}{R}")); diff --git a/Mage.Sets/src/mage/cards/r/RainOfThorns.java b/Mage.Sets/src/mage/cards/r/RainOfThorns.java index c7553429fa1..28f11b316e5 100644 --- a/Mage.Sets/src/mage/cards/r/RainOfThorns.java +++ b/Mage.Sets/src/mage/cards/r/RainOfThorns.java @@ -29,13 +29,13 @@ public final class RainOfThorns extends CardImpl { this.getSpellAbility().getModes().setMaxModes(3); Mode mode1 = new Mode(); - mode1.getEffects().add(new DestroyTargetEffect()); - mode1.getTargets().add(new TargetEnchantmentPermanent()); + mode1.addEffect(new DestroyTargetEffect()); + mode1.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().addMode(mode1); Mode mode2 = new Mode(); - mode2.getEffects().add(new DestroyTargetEffect()); - mode2.getTargets().add(new TargetLandPermanent()); + mode2.addEffect(new DestroyTargetEffect()); + mode2.addTarget(new TargetLandPermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/r/RakdosCharm.java b/Mage.Sets/src/mage/cards/r/RakdosCharm.java index 1b5cfc01910..ee46d6514bf 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCharm.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCharm.java @@ -34,13 +34,13 @@ public final class RakdosCharm extends CardImpl { // or destroy target artifact; Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addMode(mode); // or each creature deals 1 damage to its controller. mode = new Mode(); - mode.getEffects().add(new RakdosCharmDamageEffect()); + mode.addEffect(new RakdosCharmDamageEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RealitySpasm.java b/Mage.Sets/src/mage/cards/r/RealitySpasm.java index 43dc46c176c..3d016b3fd9f 100644 --- a/Mage.Sets/src/mage/cards/r/RealitySpasm.java +++ b/Mage.Sets/src/mage/cards/r/RealitySpasm.java @@ -28,7 +28,7 @@ public final class RealitySpasm extends CardImpl { // Choose one - Tap X target permanents; or untap X target permanents. this.getSpellAbility().addEffect(new RealitySpasmTapEffect()); Mode mode = new Mode(); - mode.getEffects().add(new RealitySpasmUntapEffect()); + mode.addEffect(new RealitySpasmUntapEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/ReapAndSow.java b/Mage.Sets/src/mage/cards/r/ReapAndSow.java index e510ca8165e..5f60426003c 100644 --- a/Mage.Sets/src/mage/cards/r/ReapAndSow.java +++ b/Mage.Sets/src/mage/cards/r/ReapAndSow.java @@ -31,7 +31,7 @@ public final class ReapAndSow extends CardImpl { this.getSpellAbility().addTarget(new TargetLandPermanent()); //or search your library for a land card, put that card onto the battlefield, then shuffle your library. Mode mode = new Mode(); - mode.getEffects().add(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterLandCard()))); + mode.addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterLandCard()))); this.getSpellAbility().getModes().addMode(mode); // Entwine {1}{G} diff --git a/Mage.Sets/src/mage/cards/r/Recuperate.java b/Mage.Sets/src/mage/cards/r/Recuperate.java index eac1cf5e397..2188c648df6 100644 --- a/Mage.Sets/src/mage/cards/r/Recuperate.java +++ b/Mage.Sets/src/mage/cards/r/Recuperate.java @@ -25,8 +25,8 @@ public final class Recuperate extends CardImpl { this.getSpellAbility().addEffect(new GainLifeEffect(6)); // or prevent the next 6 damage that would be dealt to target creature this turn. Mode mode = new Mode(); - mode.getEffects().add(new PreventDamageToTargetEffect(Duration.EndOfTurn, 6)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, 6)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RedElementalBlast.java b/Mage.Sets/src/mage/cards/r/RedElementalBlast.java index cb0e684dac0..aa86c011445 100644 --- a/Mage.Sets/src/mage/cards/r/RedElementalBlast.java +++ b/Mage.Sets/src/mage/cards/r/RedElementalBlast.java @@ -37,8 +37,8 @@ public final class RedElementalBlast extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(filterSpell)); Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filterPermanent)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filterPermanent)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/ReignOfChaos.java b/Mage.Sets/src/mage/cards/r/ReignOfChaos.java index 6c1eaef8841..0688a7bd835 100644 --- a/Mage.Sets/src/mage/cards/r/ReignOfChaos.java +++ b/Mage.Sets/src/mage/cards/r/ReignOfChaos.java @@ -41,9 +41,9 @@ public final class ReignOfChaos extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter1)); this.getSpellAbility().addTarget(new TargetPermanent(filter2)); Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect(false, true)); - mode.getTargets().add(new TargetPermanent(filter3)); - mode.getTargets().add(new TargetPermanent(filter4)); + mode.addEffect(new DestroyTargetEffect(false, true)); + mode.addTarget(new TargetPermanent(filter3)); + mode.addTarget(new TargetPermanent(filter4)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RelicBind.java b/Mage.Sets/src/mage/cards/r/RelicBind.java index 3068f732e7c..546f42f7214 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBind.java +++ b/Mage.Sets/src/mage/cards/r/RelicBind.java @@ -50,8 +50,8 @@ public final class RelicBind extends CardImpl { ability2.addTarget(new TargetPlayerOrPlaneswalker()); // — Target player gains 1 life. Mode mode = new Mode(); - mode.getEffects().add(new GainLifeTargetEffect(1)); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new GainLifeTargetEffect(1)); + mode.addTarget(new TargetPlayer()); ability2.addMode(mode); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/r/RememberTheFallen.java b/Mage.Sets/src/mage/cards/r/RememberTheFallen.java index 3a4c87cf212..657a43e97cf 100644 --- a/Mage.Sets/src/mage/cards/r/RememberTheFallen.java +++ b/Mage.Sets/src/mage/cards/r/RememberTheFallen.java @@ -32,8 +32,8 @@ public final class RememberTheFallen extends CardImpl { // • Return target artifact card from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(filterArtifact)); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(filterArtifact)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RetreatToCoralhelm.java b/Mage.Sets/src/mage/cards/r/RetreatToCoralhelm.java index 71c9b5267f3..a8768402b7d 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToCoralhelm.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToCoralhelm.java @@ -24,7 +24,7 @@ public final class RetreatToCoralhelm extends CardImpl { LandfallAbility ability = new LandfallAbility(new MayTapOrUntapTargetEffect(), false); ability.addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); - mode.getEffects().add(new ScryEffect(1)); + mode.addEffect(new ScryEffect(1)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java b/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java index bdcd4513147..b628cbfbc01 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToEmeria.java @@ -24,7 +24,7 @@ public final class RetreatToEmeria extends CardImpl { // Landfall — Whenever a land enters the battlefield under you control, choose one - Create a 1/1 white Kor Ally creature token; or Creatures you control get +1/+1 until end of turn. LandfallAbility ability = new LandfallAbility(new CreateTokenEffect(new KorAllyToken()), false); Mode mode = new Mode(); - mode.getEffects().add(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); + mode.addEffect(new BoostControlledEffect(1, 1, Duration.EndOfTurn)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RetreatToHagra.java b/Mage.Sets/src/mage/cards/r/RetreatToHagra.java index 056271f18e9..1b6856cecbe 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToHagra.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToHagra.java @@ -32,10 +32,10 @@ public final class RetreatToHagra extends CardImpl { // or Each opponent loses 1 life and you gain 1 life. Mode mode = new Mode(); - mode.getEffects().add(new LoseLifeOpponentsEffect(1)); + mode.addEffect(new LoseLifeOpponentsEffect(1)); Effect effect = new GainLifeEffect(1); effect.setText("and you gain 1 life"); - mode.getEffects().add(effect); + mode.addEffect(effect); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RetreatToKazandu.java b/Mage.Sets/src/mage/cards/r/RetreatToKazandu.java index 62556929375..32f48be82f4 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToKazandu.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToKazandu.java @@ -25,7 +25,7 @@ public final class RetreatToKazandu extends CardImpl { LandfallAbility ability = new LandfallAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); ability.addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(2)); + mode.addEffect(new GainLifeEffect(2)); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RetreatToValakut.java b/Mage.Sets/src/mage/cards/r/RetreatToValakut.java index 21ca19630ae..e1a5c5c82b5 100644 --- a/Mage.Sets/src/mage/cards/r/RetreatToValakut.java +++ b/Mage.Sets/src/mage/cards/r/RetreatToValakut.java @@ -27,8 +27,8 @@ public final class RetreatToValakut extends CardImpl { // or Target creature can't block this turn. Mode mode = new Mode(); - mode.getEffects().add(new CantBlockTargetEffect(Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new CantBlockTargetEffect(Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RevivingMelody.java b/Mage.Sets/src/mage/cards/r/RevivingMelody.java index 8ee252ba8cc..3c3be8d8bbb 100644 --- a/Mage.Sets/src/mage/cards/r/RevivingMelody.java +++ b/Mage.Sets/src/mage/cards/r/RevivingMelody.java @@ -36,8 +36,8 @@ public final class RevivingMelody extends CardImpl { this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); // and/or return target enchantment card from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(filterCard)); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(filterCard)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RighteousConfluence.java b/Mage.Sets/src/mage/cards/r/RighteousConfluence.java index 3d37750f4f9..3f43115e4a9 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousConfluence.java +++ b/Mage.Sets/src/mage/cards/r/RighteousConfluence.java @@ -31,13 +31,13 @@ public final class RighteousConfluence extends CardImpl { // - Exile target enchantment; Mode mode = new Mode(); - mode.getEffects().add(new ExileTargetEffect()); - mode.getTargets().add(new TargetEnchantmentPermanent()); + mode.addEffect(new ExileTargetEffect()); + mode.addTarget(new TargetEnchantmentPermanent()); this.getSpellAbility().getModes().addMode(mode); // You gain 5 life; mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(5)); + mode.addEffect(new GainLifeEffect(5)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RithsCharm.java b/Mage.Sets/src/mage/cards/r/RithsCharm.java index 5fd83f54455..19ac8401d5d 100644 --- a/Mage.Sets/src/mage/cards/r/RithsCharm.java +++ b/Mage.Sets/src/mage/cards/r/RithsCharm.java @@ -27,12 +27,12 @@ public final class RithsCharm extends CardImpl { // or create three 1/1 green Saproling creature tokens; Mode mode = new Mode(); - mode.getEffects().add(new CreateTokenEffect(new SaprolingToken(), 3)); + mode.addEffect(new CreateTokenEffect(new SaprolingToken(), 3)); this.getSpellAbility().addMode(mode); // or prevent all damage a source of your choice would deal this turn. mode = new Mode(); - mode.getEffects().add(new PreventDamageBySourceEffect()); + mode.addEffect(new PreventDamageBySourceEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheKha.java b/Mage.Sets/src/mage/cards/r/RoarOfTheKha.java index 02c81f0a7f8..5fc4c8a788d 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheKha.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheKha.java @@ -28,7 +28,7 @@ public final class RoarOfTheKha extends CardImpl { // or untap all creatures you control. Mode mode = new Mode(); - mode.getEffects().add(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), rule)); + mode.addEffect(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), rule)); this.getSpellAbility().getModes().addMode(mode); // Entwine {1}{W} diff --git a/Mage.Sets/src/mage/cards/r/RudeAwakening.java b/Mage.Sets/src/mage/cards/r/RudeAwakening.java index 8a34ec94d15..9e16198f991 100644 --- a/Mage.Sets/src/mage/cards/r/RudeAwakening.java +++ b/Mage.Sets/src/mage/cards/r/RudeAwakening.java @@ -32,7 +32,7 @@ public final class RudeAwakening extends CardImpl { this.getSpellAbility().addEffect(new UntapAllLandsControllerEffect()); // or until end of turn, lands you control become 2/2 creatures that are still lands. Mode mode = new Mode(); - mode.getEffects().add(new BecomesCreatureAllEffect( + mode.addEffect(new BecomesCreatureAllEffect( new CreatureToken(2, 2), "lands", new FilterControlledLandPermanent("lands you control"), Duration.EndOfTurn, false)); this.getSpellAbility().getModes().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/r/RuthlessInstincts.java b/Mage.Sets/src/mage/cards/r/RuthlessInstincts.java index 9c11f4f079d..6d186763b37 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessInstincts.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessInstincts.java @@ -54,11 +54,11 @@ public final class RuthlessInstincts extends CardImpl { Mode mode = new Mode(); effect = new BoostTargetEffect(2,2,Duration.EndOfTurn); effect.setText("Target attacking creature gets +2/+2"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterAttacking)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterAttacking)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SaheelisArtistry.java b/Mage.Sets/src/mage/cards/s/SaheelisArtistry.java index c51d0036b83..3e8e2fa6a22 100644 --- a/Mage.Sets/src/mage/cards/s/SaheelisArtistry.java +++ b/Mage.Sets/src/mage/cards/s/SaheelisArtistry.java @@ -29,11 +29,11 @@ public final class SaheelisArtistry extends CardImpl { this.getSpellAbility().addEffect(effect); // • Create a token that's a copy of target creature, except that it's an artifact in addition to its other types. Mode mode1 = new Mode(); - mode1.getTargets().add(new TargetCreaturePermanent()); + mode1.addTarget(new TargetCreaturePermanent()); effect = new CreateTokenCopyTargetEffect(); effect.setBecomesArtifact(true); effect.setText("Create a token that's a copy of target creature, except that it's an artifact in addition to its other types"); - mode1.getEffects().add(effect); + mode1.addEffect(effect); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java b/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java index eaba57ceae7..fcc419c66af 100644 --- a/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java +++ b/Mage.Sets/src/mage/cards/s/SandsteppeOutcast.java @@ -34,7 +34,7 @@ public final class SandsteppeOutcast extends CardImpl { // * Create a 1/1 white Spirit creature token with flying. Mode mode = new Mode(); - mode.getEffects().add(new CreateTokenEffect(new SpiritWhiteToken("FRF"))); + mode.addEffect(new CreateTokenEffect(new SpiritWhiteToken("FRF"))); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SapphireCharm.java b/Mage.Sets/src/mage/cards/s/SapphireCharm.java index 102db8d6137..ca483f086ae 100644 --- a/Mage.Sets/src/mage/cards/s/SapphireCharm.java +++ b/Mage.Sets/src/mage/cards/s/SapphireCharm.java @@ -44,14 +44,14 @@ public final class SapphireCharm extends CardImpl { // or target creature gains flying until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or target creature an opponent controls phases out. mode = new Mode(); - mode.getEffects().add(new PhaseOutTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new PhaseOutTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SavageAlliance.java b/Mage.Sets/src/mage/cards/s/SavageAlliance.java index 0563c3cd9bc..1743fba75b4 100644 --- a/Mage.Sets/src/mage/cards/s/SavageAlliance.java +++ b/Mage.Sets/src/mage/cards/s/SavageAlliance.java @@ -61,14 +61,14 @@ public final class SavageAlliance extends CardImpl { Mode mode = new Mode(); Effect effect = new DamageTargetEffect(2); effect.setText("{this} deals 2 damage to target creature"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent(filterCreature)); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent(filterCreature)); this.getSpellAbility().addMode(mode); // Savage Alliance deals 1 damage to each creature target opponent controls. mode = new Mode(); - mode.getEffects().add(new SavageAllianceDamageEffect()); - mode.getTargets().add(new TargetPlayer(1, 1, false, filterOpponent)); + mode.addEffect(new SavageAllianceDamageEffect()); + mode.addTarget(new TargetPlayer(1, 1, false, filterOpponent)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SavageBeating.java b/Mage.Sets/src/mage/cards/s/SavageBeating.java index 2cf2654c6b4..43b482a8876 100644 --- a/Mage.Sets/src/mage/cards/s/SavageBeating.java +++ b/Mage.Sets/src/mage/cards/s/SavageBeating.java @@ -36,8 +36,8 @@ public final class SavageBeating extends CardImpl { // or untap all creatures you control and after this phase, there is an additional combat phase. Mode mode = new Mode(); - mode.getEffects().add(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), "untap all creatures you control")); - mode.getEffects().add(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase")); + mode.addEffect(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), "untap all creatures you control")); + mode.addEffect(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase")); this.getSpellAbility().getModes().addMode(mode); // Entwine {1}{R} diff --git a/Mage.Sets/src/mage/cards/s/SecondSight.java b/Mage.Sets/src/mage/cards/s/SecondSight.java index a25e08b2230..80b3cb43df7 100644 --- a/Mage.Sets/src/mage/cards/s/SecondSight.java +++ b/Mage.Sets/src/mage/cards/s/SecondSight.java @@ -39,7 +39,7 @@ public final class SecondSight extends CardImpl { //or look at the top five cards of your library, then put them back in any order. effect = new LookLibraryControllerEffect(5); Mode mode = new Mode(); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().getModes().addMode(mode); // Entwine {U} diff --git a/Mage.Sets/src/mage/cards/s/SeedlingCharm.java b/Mage.Sets/src/mage/cards/s/SeedlingCharm.java index 7b1c9ab29c4..0490c56ab52 100644 --- a/Mage.Sets/src/mage/cards/s/SeedlingCharm.java +++ b/Mage.Sets/src/mage/cards/s/SeedlingCharm.java @@ -44,13 +44,13 @@ public final class SeedlingCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetPermanent(filter1)); // or regenerate target green creature Mode mode = new Mode(); - mode.getEffects().add(new RegenerateTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter2)); + mode.addEffect(new RegenerateTargetEffect()); + mode.addTarget(new TargetPermanent(filter2)); this.getSpellAbility().addMode(mode); // or target creature gains trample until end of turn. mode = new Mode(); - mode.getEffects().add(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java b/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java index 62c2d93864b..9e983af1c38 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaCharm.java @@ -46,13 +46,13 @@ public final class SelesnyaCharm extends CardImpl { // or exile target creature with power 5 or greater; Mode mode = new Mode(); - mode.getEffects().add(new ExileTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new ExileTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); // or create a 2/2 white Knight creature token with vigilance. mode = new Mode(); - mode.getEffects().add(new CreateTokenEffect(new KnightToken())); + mode.addEffect(new CreateTokenEffect(new KnightToken())); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/ShivanSandMage.java b/Mage.Sets/src/mage/cards/s/ShivanSandMage.java index 23ab234be73..8b286bf275c 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanSandMage.java +++ b/Mage.Sets/src/mage/cards/s/ShivanSandMage.java @@ -40,8 +40,8 @@ public final class ShivanSandMage extends CardImpl { // Put two time counters on target permanent with a time counter on it or suspended card. Mode mode = new Mode(); - mode.getEffects().add(new ShivanSandMageEffect(true)); - mode.getTargets().add(new TargetPermanentOrSuspendedCard()); + mode.addEffect(new ShivanSandMageEffect(true)); + mode.addTarget(new TargetPermanentOrSuspendedCard()); ability.addMode(mode); ability.getModes().addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShrivelingRot.java b/Mage.Sets/src/mage/cards/s/ShrivelingRot.java index 57c8db95357..1457f6c36b2 100644 --- a/Mage.Sets/src/mage/cards/s/ShrivelingRot.java +++ b/Mage.Sets/src/mage/cards/s/ShrivelingRot.java @@ -37,7 +37,7 @@ public final class ShrivelingRot extends CardImpl { this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new ShrivelingRotDestroyTriggeredAbility())); // Until end of turn, whenever a creature dies, that creature's controller loses life equal to its toughness. Mode mode = new Mode(); - mode.getEffects().add(new CreateDelayedTriggeredAbilityEffect(new ShrivelingRotLoseLifeTriggeredAbility())); + mode.addEffect(new CreateDelayedTriggeredAbilityEffect(new ShrivelingRotLoseLifeTriggeredAbility())); this.getSpellAbility().getModes().addMode(mode); // Entwine {2}{B} diff --git a/Mage.Sets/src/mage/cards/s/SilumgarsCommand.java b/Mage.Sets/src/mage/cards/s/SilumgarsCommand.java index 68482edc932..b4c37bd9bc7 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarsCommand.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarsCommand.java @@ -46,20 +46,20 @@ public final class SilumgarsCommand extends CardImpl { // or Return target permanent to its owner's hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetPermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetPermanent()); this.getSpellAbility().getModes().addMode(mode); // or Target creature gets -3/-3 until end of turn; mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // or Destroy target planeswalker. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter2)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filter2)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SimicCharm.java b/Mage.Sets/src/mage/cards/s/SimicCharm.java index 2248e97e219..9daae89120f 100644 --- a/Mage.Sets/src/mage/cards/s/SimicCharm.java +++ b/Mage.Sets/src/mage/cards/s/SimicCharm.java @@ -28,12 +28,12 @@ public final class SimicCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); //permanents you control gain hexproof until end of turn Mode mode = new Mode(); - mode.getEffects().add(new GainAbilityAllEffect(HexproofAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent())); + mode.addEffect(new GainAbilityAllEffect(HexproofAbility.getInstance(), Duration.EndOfTurn, new FilterControlledPermanent())); this.getSpellAbility().addMode(mode); //return target creature to its owner's hand. Mode mode2 = new Mode(); - mode2.getEffects().add(new ReturnToHandTargetEffect()); - mode2.getTargets().add(new TargetCreaturePermanent()); + mode2.addEffect(new ReturnToHandTargetEffect()); + mode2.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode2); } diff --git a/Mage.Sets/src/mage/cards/s/Skinshifter.java b/Mage.Sets/src/mage/cards/s/Skinshifter.java index b43463ee856..4765cc305e6 100644 --- a/Mage.Sets/src/mage/cards/s/Skinshifter.java +++ b/Mage.Sets/src/mage/cards/s/Skinshifter.java @@ -38,11 +38,11 @@ public final class Skinshifter extends CardImpl { new ManaCostsImpl("{G}")); Mode mode = new Mode(); - mode.getEffects().add(new BecomesCreatureSourceEffect(new BirdToken(), "", Duration.EndOfTurn)); + mode.addEffect(new BecomesCreatureSourceEffect(new BirdToken(), "", Duration.EndOfTurn)); ability.addMode(mode); mode = new Mode(); - mode.getEffects().add(new BecomesCreatureSourceEffect(new PlantToken(), "", Duration.EndOfTurn)); + mode.addEffect(new BecomesCreatureSourceEffect(new PlantToken(), "", Duration.EndOfTurn)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Slagstorm.java b/Mage.Sets/src/mage/cards/s/Slagstorm.java index 885a1075c2b..88f321ef459 100644 --- a/Mage.Sets/src/mage/cards/s/Slagstorm.java +++ b/Mage.Sets/src/mage/cards/s/Slagstorm.java @@ -22,7 +22,7 @@ public final class Slagstorm extends CardImpl { this.getSpellAbility().addEffect(new DamageAllEffect(3, new FilterCreaturePermanent())); Mode mode = new Mode(); - mode.getEffects().add(new DamagePlayersEffect(3)); + mode.addEffect(new DamagePlayersEffect(3)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SolarTide.java b/Mage.Sets/src/mage/cards/s/SolarTide.java index 221a496cbe2..861aebdff76 100644 --- a/Mage.Sets/src/mage/cards/s/SolarTide.java +++ b/Mage.Sets/src/mage/cards/s/SolarTide.java @@ -37,7 +37,7 @@ public final class SolarTide extends CardImpl { // or destroy all creatures with power 3 or greater. Mode mode = new Mode(); - mode.getEffects().add(new DestroyAllEffect(filter2)); + mode.addEffect(new DestroyAllEffect(filter2)); this.getSpellAbility().getModes().addMode(mode); // Entwine-Sacrifice two lands. diff --git a/Mage.Sets/src/mage/cards/s/SoulManipulation.java b/Mage.Sets/src/mage/cards/s/SoulManipulation.java index c3e1201842d..fa0025b248a 100644 --- a/Mage.Sets/src/mage/cards/s/SoulManipulation.java +++ b/Mage.Sets/src/mage/cards/s/SoulManipulation.java @@ -31,8 +31,8 @@ public final class SoulManipulation extends CardImpl { // and/or return target creature card from your graveyard to your hand. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SplittingHeadache.java b/Mage.Sets/src/mage/cards/s/SplittingHeadache.java index 810a9ec5959..8f2b2e0cd9b 100644 --- a/Mage.Sets/src/mage/cards/s/SplittingHeadache.java +++ b/Mage.Sets/src/mage/cards/s/SplittingHeadache.java @@ -32,8 +32,8 @@ public final class SplittingHeadache extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); Mode mode = new Mode(); - mode.getEffects().add(new SplittingHeadacheEffect()); - mode.getTargets().add(new TargetPlayer()); + mode.addEffect(new SplittingHeadacheEffect()); + mode.addTarget(new TargetPlayer()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/SteelSabotage.java b/Mage.Sets/src/mage/cards/s/SteelSabotage.java index d8553c5e13a..83982a6d7c7 100644 --- a/Mage.Sets/src/mage/cards/s/SteelSabotage.java +++ b/Mage.Sets/src/mage/cards/s/SteelSabotage.java @@ -24,8 +24,8 @@ public final class SteelSabotage extends CardImpl { this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell(new FilterArtifactSpell())); Mode mode = new Mode(); - mode.getEffects().add(new ReturnToHandTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new ReturnToHandTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/StirThePride.java b/Mage.Sets/src/mage/cards/s/StirThePride.java index ef709d468c9..4232e3c1797 100644 --- a/Mage.Sets/src/mage/cards/s/StirThePride.java +++ b/Mage.Sets/src/mage/cards/s/StirThePride.java @@ -32,7 +32,7 @@ public final class StirThePride extends CardImpl { Mode mode = new Mode(); Effect effect = new GainAbilityControlledEffect(new DealsDamageGainLifeSourceTriggeredAbility(), Duration.EndOfTurn); effect.setText("until end of turn, creatures you control gain \"Whenever this creature deals damage, you gain that much life.\""); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().getModes().addMode(mode); // Entwine {1}{W} diff --git a/Mage.Sets/src/mage/cards/s/SubtleStrike.java b/Mage.Sets/src/mage/cards/s/SubtleStrike.java index 4709d7ad8b2..4001b19b15e 100644 --- a/Mage.Sets/src/mage/cards/s/SubtleStrike.java +++ b/Mage.Sets/src/mage/cards/s/SubtleStrike.java @@ -33,8 +33,8 @@ public final class SubtleStrike extends CardImpl { Mode mode1 = new Mode(); AddCountersTargetEffect plusOnePlusOneCounter = new AddCountersTargetEffect(CounterType.P1P1.createInstance()); plusOnePlusOneCounter.setText("Put a +1/+1 counter on target creature"); - mode1.getEffects().add(plusOnePlusOneCounter); - mode1.getTargets().add(new TargetCreaturePermanent()); + mode1.addEffect(plusOnePlusOneCounter); + mode1.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/s/SultaiCharm.java b/Mage.Sets/src/mage/cards/s/SultaiCharm.java index b645b15e998..2594e59fc19 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiCharm.java +++ b/Mage.Sets/src/mage/cards/s/SultaiCharm.java @@ -38,13 +38,13 @@ public final class SultaiCharm extends CardImpl { // * Destroy target artifact or enchantment. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.getSpellAbility().addMode(mode); // * Draw two cards, then discard a card. mode = new Mode(); - mode.getEffects().add(new DrawDiscardControllerEffect(2,1)); + mode.addEffect(new DrawDiscardControllerEffect(2,1)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/s/Suncleanser.java b/Mage.Sets/src/mage/cards/s/Suncleanser.java index 8575b71920b..a1ec53e4159 100644 --- a/Mage.Sets/src/mage/cards/s/Suncleanser.java +++ b/Mage.Sets/src/mage/cards/s/Suncleanser.java @@ -45,9 +45,9 @@ public final class Suncleanser extends CardImpl { // • Target opponent loses all counters. That player can't get counters for as long as Suncleanser remains on the battlefield. Mode mode = new Mode(); - mode.getEffects().add(new SuncleanserRemoveCountersEffect(true)); - mode.getEffects().add(new SuncleanserPreventCountersEffect(true)); - mode.getTargets().add(new TargetOpponent()); + mode.addEffect(new SuncleanserRemoveCountersEffect(true)); + mode.addEffect(new SuncleanserPreventCountersEffect(true)); + mode.addTarget(new TargetOpponent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SupremeWill.java b/Mage.Sets/src/mage/cards/s/SupremeWill.java index d2e6a25e696..3cf8a608f6a 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeWill.java +++ b/Mage.Sets/src/mage/cards/s/SupremeWill.java @@ -29,7 +29,7 @@ public final class SupremeWill extends CardImpl { // or Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order. Mode mode = new Mode(); - mode.getEffects().add(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), StaticFilters.FILTER_CARD, Zone.LIBRARY, false, false)); + mode.addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), StaticFilters.FILTER_CARD, Zone.LIBRARY, false, false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/TakeDown.java b/Mage.Sets/src/mage/cards/t/TakeDown.java index ead1cc694d2..527cc1fad0a 100644 --- a/Mage.Sets/src/mage/cards/t/TakeDown.java +++ b/Mage.Sets/src/mage/cards/t/TakeDown.java @@ -35,7 +35,7 @@ public final class TakeDown extends CardImpl { // • Take Down deals 1 damage to each creature with flying Mode mode = new Mode(); - mode.getEffects().add(new DamageAllEffect(1, filter)); + mode.addEffect(new DamageAllEffect(1, filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/TemporalCascade.java b/Mage.Sets/src/mage/cards/t/TemporalCascade.java index b25096b66e2..dc8e42bed9f 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalCascade.java +++ b/Mage.Sets/src/mage/cards/t/TemporalCascade.java @@ -28,7 +28,7 @@ public final class TemporalCascade extends CardImpl { // or each player draws seven cards. Mode mode = new Mode(); - mode.getEffects().add(new TemporalCascadeDrawEffect()); + mode.addEffect(new TemporalCascadeDrawEffect()); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} diff --git a/Mage.Sets/src/mage/cards/t/TemurCharm.java b/Mage.Sets/src/mage/cards/t/TemurCharm.java index b0189a94e89..8a004c1e0f8 100644 --- a/Mage.Sets/src/mage/cards/t/TemurCharm.java +++ b/Mage.Sets/src/mage/cards/t/TemurCharm.java @@ -53,13 +53,13 @@ public final class TemurCharm extends CardImpl { // � Counter target spell unless its controller pays {3}. Mode mode = new Mode(); - mode.getEffects().add(new CounterUnlessPaysEffect(new GenericManaCost(3))); - mode.getTargets().add(new TargetSpell()); + mode.addEffect(new CounterUnlessPaysEffect(new GenericManaCost(3))); + mode.addTarget(new TargetSpell()); this.getSpellAbility().addMode(mode); // � Creatures with power 3 or less can't block this turn. mode = new Mode(); - mode.getEffects().add(new CantBlockAllEffect(filterCantBlock, Duration.EndOfTurn)); + mode.addEffect(new CantBlockAllEffect(filterCantBlock, Duration.EndOfTurn)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/ThermalFlux.java b/Mage.Sets/src/mage/cards/t/ThermalFlux.java index 718cd1b4391..f9c1c8e3e55 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalFlux.java +++ b/Mage.Sets/src/mage/cards/t/ThermalFlux.java @@ -50,9 +50,9 @@ public final class ThermalFlux extends CardImpl { // Target snow permanent isn't snow until end of turn. // Draw a card at the beginning of the next turn's upkeep. Mode mode = new Mode(); - mode.getTargets().add(new TargetPermanent(filterSnow)); - mode.getEffects().add(new ThermalFluxEffect(false)); - mode.getEffects().add(new CreateDelayedTriggeredAbilityEffect( + mode.addTarget(new TargetPermanent(filterSnow)); + mode.addEffect(new ThermalFluxEffect(false)); + mode.addEffect(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false)); this.getSpellAbility().addMode(mode); diff --git a/Mage.Sets/src/mage/cards/t/Thunderbolt.java b/Mage.Sets/src/mage/cards/t/Thunderbolt.java index c1a09511915..29e4d37fe62 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderbolt.java +++ b/Mage.Sets/src/mage/cards/t/Thunderbolt.java @@ -32,8 +32,8 @@ public final class Thunderbolt extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker()); Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(4)); - mode.getTargets().add(new TargetCreaturePermanent(filter)); + mode.addEffect(new DamageTargetEffect(4)); + mode.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/Timebender.java b/Mage.Sets/src/mage/cards/t/Timebender.java index f1fe7608384..ec61a8517d4 100644 --- a/Mage.Sets/src/mage/cards/t/Timebender.java +++ b/Mage.Sets/src/mage/cards/t/Timebender.java @@ -43,8 +43,8 @@ public final class Timebender extends CardImpl { // Put two time counters on target permanent with a time counter on it or suspended card. Mode mode = new Mode(); - mode.getEffects().add(new TimebenderEffect(true)); - mode.getTargets().add(new TargetPermanentOrSuspendedCard()); + mode.addEffect(new TimebenderEffect(true)); + mode.addTarget(new TargetPermanentOrSuspendedCard()); ability.addMode(mode); ability.getModes().addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Timecrafting.java b/Mage.Sets/src/mage/cards/t/Timecrafting.java index ca3d0356215..ff24030202f 100644 --- a/Mage.Sets/src/mage/cards/t/Timecrafting.java +++ b/Mage.Sets/src/mage/cards/t/Timecrafting.java @@ -38,8 +38,8 @@ public final class Timecrafting extends CardImpl { // or put X time counters on target permanent with a time counter on it or suspended card. Mode mode = new Mode(); - mode.getEffects().add(new TimecraftingAddEffect()); - mode.getTargets().add(new TargetPermanentOrSuspendedCard(filter, false)); + mode.addEffect(new TimecraftingAddEffect()); + mode.addTarget(new TargetPermanentOrSuspendedCard(filter, false)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/ToothAndNail.java b/Mage.Sets/src/mage/cards/t/ToothAndNail.java index 445320af93b..9059f778c38 100644 --- a/Mage.Sets/src/mage/cards/t/ToothAndNail.java +++ b/Mage.Sets/src/mage/cards/t/ToothAndNail.java @@ -33,7 +33,7 @@ public final class ToothAndNail extends CardImpl { this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, new FilterCreatureCard()), true)); // or put up to two creature cards from your hand onto the battlefield. Mode mode = new Mode(); - mode.getEffects().add(new ToothAndNailPutCreatureOnBattlefieldEffect()); + mode.addEffect(new ToothAndNailPutCreatureOnBattlefieldEffect()); this.getSpellAbility().getModes().addMode(mode); // Entwine {2} diff --git a/Mage.Sets/src/mage/cards/t/TormentorExarch.java b/Mage.Sets/src/mage/cards/t/TormentorExarch.java index d7d36a1854c..968a8f742ea 100644 --- a/Mage.Sets/src/mage/cards/t/TormentorExarch.java +++ b/Mage.Sets/src/mage/cards/t/TormentorExarch.java @@ -30,8 +30,8 @@ public final class TormentorExarch extends CardImpl { Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(0, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(0, -2, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TrevasCharm.java b/Mage.Sets/src/mage/cards/t/TrevasCharm.java index 20a1418af06..d4ea792153a 100644 --- a/Mage.Sets/src/mage/cards/t/TrevasCharm.java +++ b/Mage.Sets/src/mage/cards/t/TrevasCharm.java @@ -27,13 +27,13 @@ public final class TrevasCharm extends CardImpl { // or exile target attacking creature; Mode mode = new Mode(); - mode.getEffects().add(new ExileTargetEffect()); - mode.getTargets().add(new TargetAttackingCreature()); + mode.addEffect(new ExileTargetEffect()); + mode.addTarget(new TargetAttackingCreature()); this.getSpellAbility().addMode(mode); // or draw a card, then discard a card. mode = new Mode(); - mode.getEffects().add(new DrawDiscardControllerEffect()); + mode.addEffect(new DrawDiscardControllerEffect()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/TriassicEgg.java b/Mage.Sets/src/mage/cards/t/TriassicEgg.java index 473393daf3a..cd4ff60832e 100644 --- a/Mage.Sets/src/mage/cards/t/TriassicEgg.java +++ b/Mage.Sets/src/mage/cards/t/TriassicEgg.java @@ -47,9 +47,9 @@ public final class TriassicEgg extends CardImpl { // or return target creature card from your graveyard to the battlefield. Activate this ability only if two or more hatchling counters are on Triassic Egg. Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect()); + mode.addEffect(new ReturnFromGraveyardToBattlefieldTargetEffect()); Target target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - mode.getTargets().add(target); + mode.addTarget(target); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TrickeryCharm.java b/Mage.Sets/src/mage/cards/t/TrickeryCharm.java index 610317ade89..9b46bd3d8d7 100644 --- a/Mage.Sets/src/mage/cards/t/TrickeryCharm.java +++ b/Mage.Sets/src/mage/cards/t/TrickeryCharm.java @@ -27,12 +27,12 @@ public final class TrickeryCharm extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or target creature becomes the creature type of your choice until end of turn Mode mode = new Mode(); - mode.getEffects().add(new BecomesChosenCreatureTypeTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BecomesChosenCreatureTypeTargetEffect()); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or look at the top four cards of your library, then put them back in any order. mode = new Mode(); - mode.getEffects().add(new LookLibraryControllerEffect(4)); + mode.addEffect(new LookLibraryControllerEffect(4)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/t/Triskaidekaphobia.java b/Mage.Sets/src/mage/cards/t/Triskaidekaphobia.java index 35fd5e92f8b..878f22d48b2 100644 --- a/Mage.Sets/src/mage/cards/t/Triskaidekaphobia.java +++ b/Mage.Sets/src/mage/cards/t/Triskaidekaphobia.java @@ -28,7 +28,7 @@ public final class Triskaidekaphobia extends CardImpl { // Each player with exactly 13 life loses the game, then each player loses 1 life. Ability ability = new BeginningOfUpkeepTriggeredAbility(new TriskaidekaphobiaGainLifeEffect(), TargetController.YOU, false); Mode mode = new Mode(); - mode.getEffects().add(new TriskaidekaphobiaLoseLifeEffect()); + mode.addEffect(new TriskaidekaphobiaLoseLifeEffect()); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java index 264ea4f936f..32ae265ad15 100644 --- a/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java +++ b/Mage.Sets/src/mage/cards/u/UlashtTheHateSeed.java @@ -57,7 +57,7 @@ public final class UlashtTheHateSeed extends CardImpl { Mode mode = new Mode(); Effect effect = new CreateTokenEffect(new SaprolingToken()); effect.setText("Create a 1/1 green Saproling creature token."); - mode.getEffects().add(effect); + mode.addEffect(effect); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java index 6e065b4bcae..a7b26b40caa 100644 --- a/Mage.Sets/src/mage/cards/u/UmezawasJitte.java +++ b/Mage.Sets/src/mage/cards/u/UmezawasJitte.java @@ -45,13 +45,13 @@ public final class UmezawasJitte extends CardImpl { // Target creature gets -1/-1 until end of turn. Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-1, -1, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); ability.addMode(mode); // You gain 2 life. mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(2)); + mode.addEffect(new GainLifeEffect(2)); ability.addMode(mode); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java index c5cda6e791d..cd333a0bec6 100644 --- a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java +++ b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java @@ -42,13 +42,13 @@ public final class UnityOfTheDroids extends CardImpl { // Look at the top four cards of your library. Put one of them into your hand and the rest into your graveyard. Mode mode = new Mode(); - mode.getEffects().add(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), new FilterCard(), Zone.GRAVEYARD, false, false)); + mode.addEffect(new LookLibraryAndPickControllerEffect(new StaticValue(4), false, new StaticValue(1), new FilterCard(), Zone.GRAVEYARD, false, false)); this.getSpellAbility().addMode(mode); // Destroy target nonartifact creature. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(nonArtifactCreatureFilter)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(nonArtifactCreatureFilter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/v/VadersCommand.java b/Mage.Sets/src/mage/cards/v/VadersCommand.java index d9facdc1ba9..69208f4bc30 100644 --- a/Mage.Sets/src/mage/cards/v/VadersCommand.java +++ b/Mage.Sets/src/mage/cards/v/VadersCommand.java @@ -47,19 +47,19 @@ public final class VadersCommand extends CardImpl { // Destroy target planeswalker. Mode mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetPermanent(filterPlaneswalker)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetPermanent(filterPlaneswalker)); this.getSpellAbility().addMode(mode); // Destroy target nonartifact creature. mode = new Mode(); - mode.getEffects().add(new DestroyTargetEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filterNonArtifact)); + mode.addEffect(new DestroyTargetEffect()); + mode.addTarget(new TargetCreaturePermanent(filterNonArtifact)); this.getSpellAbility().addMode(mode); // Gain 5 life. mode = new Mode(); - mode.getEffects().add(new GainLifeEffect(5).setText("Gain 5 life")); + mode.addEffect(new GainLifeEffect(5).setText("Gain 5 life")); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/v/ValorousStance.java b/Mage.Sets/src/mage/cards/v/ValorousStance.java index ddfdbb669b5..8dcc1cb28a4 100644 --- a/Mage.Sets/src/mage/cards/v/ValorousStance.java +++ b/Mage.Sets/src/mage/cards/v/ValorousStance.java @@ -36,8 +36,8 @@ public final class ValorousStance extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // or destroy target creature with toughness 4 or greater. Mode mode1 = new Mode(); - mode1.getEffects().add(new DestroyTargetEffect()); - mode1.getTargets().add(new TargetCreaturePermanent(filter)); + mode1.addEffect(new DestroyTargetEffect()); + mode1.addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/v/Vandalize.java b/Mage.Sets/src/mage/cards/v/Vandalize.java index 83c699fb8c0..473c5f5bcfa 100644 --- a/Mage.Sets/src/mage/cards/v/Vandalize.java +++ b/Mage.Sets/src/mage/cards/v/Vandalize.java @@ -27,8 +27,8 @@ public final class Vandalize extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); Mode mode1 = new Mode(); - mode1.getTargets().add(new TargetLandPermanent()); - mode1.getEffects().add(new DestroyTargetEffect()); + mode1.addTarget(new TargetLandPermanent()); + mode1.addEffect(new DestroyTargetEffect()); this.getSpellAbility().addMode(mode1); } diff --git a/Mage.Sets/src/mage/cards/v/VerdantConfluence.java b/Mage.Sets/src/mage/cards/v/VerdantConfluence.java index 3697552a796..d37e8797d31 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantConfluence.java +++ b/Mage.Sets/src/mage/cards/v/VerdantConfluence.java @@ -37,14 +37,14 @@ public final class VerdantConfluence extends CardImpl { // Return target permanent card from your graveyard to your hand; Mode mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(new FilterPermanentCard())); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(new FilterPermanentCard())); this.getSpellAbility().getModes().addMode(mode); // Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); mode = new Mode(); - mode.getEffects().add(new SearchLibraryPutInPlayEffect(target, true)); + mode.addEffect(new SearchLibraryPutInPlayEffect(target, true)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java index 10de4b9f8ee..08f15a6ac9d 100644 --- a/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java +++ b/Mage.Sets/src/mage/cards/v/VeryCrypticCommandD.java @@ -56,22 +56,22 @@ public final class VeryCrypticCommandD extends CardImpl { // Draw two cards, then discard a card. Mode mode = new Mode(); - mode.getEffects().add(new DrawCardSourceControllerEffect(2)); + mode.addEffect(new DrawCardSourceControllerEffect(2)); Effect effect = new DiscardControllerEffect(1); effect.setText(", then discard a card"); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().getModes().addMode(mode); // Change the target of target spell with a single target. mode = new Mode(); - mode.getEffects().add(new ChooseNewTargetsTargetEffect(true, true)); - mode.getTargets().add(new TargetStackObject(filter)); + mode.addEffect(new ChooseNewTargetsTargetEffect(true, true)); + mode.addTarget(new TargetStackObject(filter)); this.getSpellAbility().getModes().addMode(mode); // Turn over target nontoken creature. mode = new Mode(); - mode.getEffects().add(new TurnOverEffect()); - mode.getTargets().add(new TargetCreaturePermanent(filter2)); + mode.addEffect(new TurnOverEffect()); + mode.addTarget(new TargetCreaturePermanent(filter2)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/v/VindictiveLich.java b/Mage.Sets/src/mage/cards/v/VindictiveLich.java index 4d4ffeb4ba4..c6b32671fbc 100644 --- a/Mage.Sets/src/mage/cards/v/VindictiveLich.java +++ b/Mage.Sets/src/mage/cards/v/VindictiveLich.java @@ -48,22 +48,22 @@ public final class VindictiveLich extends CardImpl { // *Target opponent discards two cards. Mode mode = new Mode(); - mode.getEffects().add(new DiscardTargetEffect(2, false)); + mode.addEffect(new DiscardTargetEffect(2, false)); filter = new FilterOpponent("opponent (discard)"); filter.add(new AnotherTargetPredicate(2, true)); target = new TargetOpponent(filter, false); target.setTargetTag(2); - mode.getTargets().add(target); + mode.addTarget(target); ability.addMode(mode); // *Target opponent loses 5 life. mode = new Mode(); - mode.getEffects().add(new LoseLifeTargetEffect(5)); + mode.addEffect(new LoseLifeTargetEffect(5)); filter = new FilterOpponent("opponent (life loss)"); filter.add(new AnotherTargetPredicate(3, true)); target = new TargetOpponent(filter, false); target.setTargetTag(3); - mode.getTargets().add(target); + mode.addTarget(target); ability.addMode(mode); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VisionCharm.java b/Mage.Sets/src/mage/cards/v/VisionCharm.java index b59693f08e5..356ff7802af 100644 --- a/Mage.Sets/src/mage/cards/v/VisionCharm.java +++ b/Mage.Sets/src/mage/cards/v/VisionCharm.java @@ -44,13 +44,13 @@ public final class VisionCharm extends CardImpl { // or choose a land type and a basic land type. Each land of the first chosen type becomes the second chosen type until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new VisionCharmEffect()); + mode.addEffect(new VisionCharmEffect()); this.getSpellAbility().addMode(mode); // or target artifact phases out. mode = new Mode(); - mode.getEffects().add(new PhaseOutTargetEffect()); - mode.getTargets().add(new TargetArtifactPermanent()); + mode.addEffect(new PhaseOutTargetEffect()); + mode.addTarget(new TargetArtifactPermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/v/VitalityCharm.java b/Mage.Sets/src/mage/cards/v/VitalityCharm.java index adfce993fd6..a77e23ba674 100644 --- a/Mage.Sets/src/mage/cards/v/VitalityCharm.java +++ b/Mage.Sets/src/mage/cards/v/VitalityCharm.java @@ -41,16 +41,16 @@ public final class VitalityCharm extends CardImpl { Mode mode = new Mode(); Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn); effect.setText("target creature gets +1/+1"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(effect); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); // or regenerate target Beast. mode = new Mode(); - mode.getEffects().add(new RegenerateTargetEffect()); - mode.getTargets().add(new TargetPermanent(filter)); + mode.addEffect(new RegenerateTargetEffect()); + mode.addTarget(new TargetPermanent(filter)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/w/WailOfTheNim.java b/Mage.Sets/src/mage/cards/w/WailOfTheNim.java index 3b57263b08e..a1440a01bbe 100644 --- a/Mage.Sets/src/mage/cards/w/WailOfTheNim.java +++ b/Mage.Sets/src/mage/cards/w/WailOfTheNim.java @@ -25,7 +25,7 @@ public final class WailOfTheNim extends CardImpl { // or Wail of the Nim deals 1 damage to each creature and each player. Mode mode = new Mode(); - mode.getEffects().add(new DamageEverythingEffect(1)); + mode.addEffect(new DamageEverythingEffect(1)); this.getSpellAbility().getModes().addMode(mode); // Entwine {B} diff --git a/Mage.Sets/src/mage/cards/w/WarpingWail.java b/Mage.Sets/src/mage/cards/w/WarpingWail.java index 8b17bc27ee6..34be0129c0e 100644 --- a/Mage.Sets/src/mage/cards/w/WarpingWail.java +++ b/Mage.Sets/src/mage/cards/w/WarpingWail.java @@ -48,15 +48,15 @@ public final class WarpingWail extends CardImpl { // Counter target sorcery spell. Mode mode = new Mode(); - mode.getEffects().add(new CounterTargetEffect()); - mode.getTargets().add(new TargetSpell(filterSorcery)); + mode.addEffect(new CounterTargetEffect()); + mode.addTarget(new TargetSpell(filterSorcery)); this.getSpellAbility().addMode(mode); // Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." mode = new Mode(); effect = new CreateTokenEffect(new EldraziScionToken()); effect.setText("Create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C}.\""); - mode.getEffects().add(effect); + mode.addEffect(effect); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/w/Winterflame.java b/Mage.Sets/src/mage/cards/w/Winterflame.java index 30eee979e33..b287d97ac8c 100644 --- a/Mage.Sets/src/mage/cards/w/Winterflame.java +++ b/Mage.Sets/src/mage/cards/w/Winterflame.java @@ -28,8 +28,8 @@ public final class Winterflame extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // *Winterflame deals 2 damage to target creature Mode mode = new Mode(); - mode.getEffects().add(new DamageTargetEffect(2)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new DamageTargetEffect(2)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java b/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java index d1557d9ccdc..1fba8725be1 100644 --- a/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java +++ b/Mage.Sets/src/mage/cards/w/WisdomOfTheJedi.java @@ -40,17 +40,17 @@ public final class WisdomOfTheJedi extends CardImpl { Mode mode = new Mode(); Effect effect = new BoostTargetEffect(1, 1, Duration.EndOfTurn); effect.setText("Target creature you control gets +1/+1"); - mode.getEffects().add(effect); + mode.addEffect(effect); effect = new GainProtectionFromColorTargetEffect(Duration.EndOfTurn); effect.setText("and protection from the color of your choice until end of turn"); - mode.getEffects().add(effect); - mode.getTargets().add(new TargetControlledCreaturePermanent()); + mode.addEffect(effect); + mode.addTarget(new TargetControlledCreaturePermanent()); this.getSpellAbility().addMode(mode); // Counter target spell with converted mana cost of 3 or less. mode = new Mode(); - mode.getEffects().add(new CounterTargetEffect()); - mode.getTargets().add(new TargetSpell(filterSpell)); + mode.addEffect(new CounterTargetEffect()); + mode.addTarget(new TargetSpell(filterSpell)); this.getSpellAbility().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/w/WretchedConfluence.java b/Mage.Sets/src/mage/cards/w/WretchedConfluence.java index 6fc463b28a3..e8c979e5e88 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedConfluence.java +++ b/Mage.Sets/src/mage/cards/w/WretchedConfluence.java @@ -40,14 +40,14 @@ public final class WretchedConfluence extends CardImpl { // Target creature gets -2/-2 until end of turn; Mode mode = new Mode(); - mode.getEffects().add(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); - mode.getTargets().add(new TargetCreaturePermanent()); + mode.addEffect(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); + mode.addTarget(new TargetCreaturePermanent()); this.getSpellAbility().getModes().addMode(mode); // Return target creature card from your graveyard to your hand. mode = new Mode(); - mode.getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); - mode.getTargets().add(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); + mode.addEffect(new ReturnFromGraveyardToHandTargetEffect()); + mode.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.getSpellAbility().getModes().addMode(mode); }