From 6bc5cf538ba81197d9f768bb7e8a783c6021360a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 1 Apr 2014 13:39:42 +0200 Subject: [PATCH] Renamed DrawCardController to DrawCardSourceController. --- Mage.Sets/src/mage/sets/apocalypse/FireIce.java | 4 ++-- .../src/mage/sets/apocalypse/JungleBarrier.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/LastCaress.java | 4 ++-- .../src/mage/sets/apocalypse/PhyrexianArena.java | 4 ++-- .../src/mage/sets/apocalypse/PhyrexianGargantua.java | 4 ++-- .../src/mage/sets/apocalypse/QuicksilverDagger.java | 4 ++-- .../src/mage/sets/apocalypse/SavageGorilla.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/Smash.java | 4 ++-- Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java | 4 ++-- Mage.Sets/src/mage/sets/commander/Mulldrifter.java | 4 ++-- .../src/mage/sets/commander2013/ArcaneDenial.java | 4 ++-- .../src/mage/sets/commander2013/BalefulForce.java | 4 ++-- .../sets/commander2013/Borrowing100000Arrows.java | 4 ++-- .../src/mage/sets/commander2013/BrilliantPlan.java | 4 ++-- Mage.Sets/src/mage/sets/commander2013/Greed.java | 4 ++-- .../mage/sets/commander2013/LuXunScholarGeneral.java | 4 ++-- .../mage/sets/commander2013/OloroAgelessAscetic.java | 4 ++-- Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java | 4 ++-- .../src/mage/sets/darkascension/DrogskolReaver.java | 4 ++-- .../src/mage/sets/darkascension/Gravepurge.java | 4 ++-- .../src/mage/sets/darkascension/GrimBackwoods.java | 4 ++-- .../src/mage/sets/darkascension/GrimFlowering.java | 4 ++-- .../mage/sets/darkascension/SecretsOfTheDead.java | 4 ++-- .../mage/sets/darkascension/SilverpeltWerewolf.java | 4 ++-- .../src/mage/sets/darkascension/ThoughtScour.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/DreamThief.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/IdleThoughts.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/InsideOut.java | 4 ++-- .../src/mage/sets/eventide/OverbeingOfMyth.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/RegalForce.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/Scarecrone.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/Snakeform.java | 4 ++-- Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Cremate.java | 4 ++-- .../src/mage/sets/guildpact/DrownedRusalka.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Electrolyze.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java | 4 ++-- .../src/mage/sets/guildpact/InvokeTheFiremind.java | 4 ++-- .../mage/sets/guildpact/NivMizzetTheFiremind.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Quicken.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Repeal.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Runeboggle.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Wildsize.java | 4 ++-- Mage.Sets/src/mage/sets/guildpact/Withstand.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/Annihilate.java | 4 ++-- .../src/mage/sets/invasion/BenalishHeralds.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/Repulse.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/TaintedWell.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/TsabosWeb.java | 4 ++-- Mage.Sets/src/mage/sets/invasion/Zap.java | 4 ++-- .../src/mage/sets/magic2010/MesaEnchantress.java | 4 ++-- Mage.Sets/src/mage/sets/magic2010/Ponder.java | 4 ++-- .../src/mage/sets/mirrodin/ChromaticSphere.java | 4 ++-- .../src/mage/sets/mirrodin/LifesparkSpellbomb.java | 4 ++-- Mage.Sets/src/mage/sets/mirrodin/MindsEye.java | 4 ++-- .../src/mage/sets/mirrodin/NecrogenSpellbomb.java | 4 ++-- .../src/mage/sets/mirrodin/PsychicMembrane.java | 4 ++-- .../src/mage/sets/mirrodin/PyriteSpellbomb.java | 4 ++-- Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java | 4 ++-- .../src/mage/sets/mirrodin/SunbeamSpellbomb.java | 4 ++-- .../src/mage/sets/mirrodin/TowerOfFortunes.java | 4 ++-- .../sets/mirrodinbesieged/ConsecratedSphinx.java | 4 ++-- .../mage/sets/mirrodinbesieged/FranticSalvage.java | 4 ++-- .../mage/sets/mirrodinbesieged/IchorWellspring.java | 6 +++--- .../mage/sets/mirrodinbesieged/NeurokCommando.java | 4 ++-- Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java | 4 ++-- .../src/mage/sets/mirrodinbesieged/RotWolf.java | 4 ++-- .../src/mage/sets/mirrodinbesieged/Vivisection.java | 4 ++-- .../src/mage/sets/modernmasters/LatchkeyFaerie.java | 4 ++-- .../src/mage/sets/modernmasters/MaskedAdmirers.java | 4 ++-- .../src/mage/sets/modernmasters/Peppersmoke.java | 4 ++-- .../src/mage/sets/morningtide/DivinersWand.java | 4 ++-- .../src/mage/sets/morningtide/GiltLeafArchdruid.java | 4 ++-- .../src/mage/sets/newphyrexia/ArgentMutation.java | 4 ++-- Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java | 4 ++-- .../src/mage/sets/newphyrexia/GitaxianProbe.java | 4 ++-- .../src/mage/sets/newphyrexia/ImpalerShrike.java | 4 ++-- .../mage/sets/newphyrexia/JinGitaxiasCoreAugur.java | 4 ++-- Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java | 4 ++-- .../src/mage/sets/newphyrexia/PuresteelPaladin.java | 4 ++-- .../src/mage/sets/newphyrexia/TezzeretsGambit.java | 4 ++-- Mage.Sets/src/mage/sets/ninthedition/Execute.java | 4 ++-- Mage.Sets/src/mage/sets/ninthedition/Slay.java | 4 ++-- .../src/mage/sets/ninthedition/ThievingMagpie.java | 4 ++-- .../src/mage/sets/ninthedition/TreasureTrove.java | 4 ++-- Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java | 4 ++-- .../src/mage/sets/planechase/ThirstForKnowledge.java | 4 ++-- .../src/mage/sets/planechase2012/BalefulStrix.java | 4 ++-- .../mage/sets/seventhedition/InfernalContract.java | 4 ++-- .../sets/seventhedition/VerduranEnchantress.java | 4 ++-- Mage.Sets/src/mage/sets/theros/BidentOfThassa.java | 4 ++-- Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java | 4 ++-- Mage.Sets/src/mage/sets/theros/DragonMantle.java | 4 ++-- Mage.Sets/src/mage/sets/theros/FateForetold.java | 6 +++--- Mage.Sets/src/mage/sets/theros/NyleasPresence.java | 4 ++-- Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java | 4 ++-- Mage.Sets/src/mage/sets/theros/ReadTheBones.java | 4 ++-- Mage.Sets/src/mage/sets/theros/Scourgemark.java | 4 ++-- Mage.Sets/src/mage/sets/theros/ThassasBounty.java | 4 ++-- Mage.Sets/src/mage/sets/theros/ThassasEmissary.java | 4 ++-- .../src/mage/sets/theros/TritonFortuneHunter.java | 4 ++-- Mage.Sets/src/mage/sets/theros/WarriorsLesson.java | 4 ++-- .../src/mage/sets/urzasdestiny/BrassSecretary.java | 4 ++-- Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java | 4 ++-- .../src/mage/sets/urzaslegacy/MultanisAcolyte.java | 4 ++-- .../src/mage/sets/urzaslegacy/UrzasBlueprints.java | 4 ++-- ...fect.java => DrawCardSourceControllerEffect.java} | 12 ++++++------ Mage/src/mage/abilities/keyword/CyclingAbility.java | 4 ++-- 108 files changed, 222 insertions(+), 222 deletions(-) rename Mage/src/mage/abilities/effects/common/{DrawCardControllerEffect.java => DrawCardSourceControllerEffect.java} (88%) diff --git a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java index 91787fb463a..3c71dfcf598 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java +++ b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TapTargetEffect; import mage.cards.SplitCard; import mage.target.TargetPermanent; @@ -68,7 +68,7 @@ public class FireIce extends SplitCard { getRightHalfCard().getColor().setBlue(true); getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent(true)); - getRightHalfCard().getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java index bf3debc92c6..8e568b8e237 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java +++ b/Mage.Sets/src/mage/sets/apocalypse/JungleBarrier.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -52,7 +52,7 @@ public class JungleBarrier extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public JungleBarrier(final JungleBarrier card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java index 402723b5838..2013d9882db 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java +++ b/Mage.Sets/src/mage/sets/apocalypse/LastCaress.java @@ -30,7 +30,7 @@ package mage.sets.apocalypse; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; @@ -49,7 +49,7 @@ public class LastCaress extends CardImpl { this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1)); this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new GainLifeEffect(1)); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public LastCaress(final LastCaress card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java index 308241ef158..73e1ab5c4cf 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianArena.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.TargetController; @@ -48,7 +48,7 @@ public class PhyrexianArena extends CardImpl { super(ownerId, 47, "Phyrexian Arena", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}"); this.expansionSetCode = "APC"; this.color.setBlack(true); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), TargetController.YOU, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false); ability.addEffect(new LoseLifeSourceControllerEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java index 8e32afba079..3ee2140782c 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java +++ b/Mage.Sets/src/mage/sets/apocalypse/PhyrexianGargantua.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; @@ -51,7 +51,7 @@ public class PhyrexianGargantua extends CardImpl { this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(2), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2), false); ability.addEffect(new LoseLifeSourceControllerEffect(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java b/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java index 172498ba19e..5ed64809675 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -71,7 +71,7 @@ public class QuicksilverDagger extends CardImpl { // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); gainAbility.addTarget(new TargetPlayer()); - gainAbility.addEffect(new DrawCardControllerEffect(1)); + gainAbility.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java index f621b787511..2776fe5e54a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java +++ b/Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java @@ -37,7 +37,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -60,7 +60,7 @@ public class SavageGorilla extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-3, -3, Duration.EndOfTurn), new ManaCostsImpl("{U}{B}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addEffect(new DrawCardControllerEffect(1)); + ability.addEffect(new DrawCardSourceControllerEffect(1)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/apocalypse/Smash.java b/Mage.Sets/src/mage/sets/apocalypse/Smash.java index 320a68cb55e..bdbe242b5bc 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/Smash.java +++ b/Mage.Sets/src/mage/sets/apocalypse/Smash.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,7 +55,7 @@ public class Smash extends CardImpl { this.color.setRed(true); this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Smash(final Smash card) { diff --git a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java index 0e4247cdf91..7d7061dbd2a 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java +++ b/Mage.Sets/src/mage/sets/apocalypse/TranquilPath.java @@ -33,7 +33,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -54,7 +54,7 @@ public class TranquilPath extends CardImpl { // Destroy all enchantments. this.getSpellAbility().addEffect(new TranquilPathEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public TranquilPath(final TranquilPath card) { diff --git a/Mage.Sets/src/mage/sets/commander/Mulldrifter.java b/Mage.Sets/src/mage/sets/commander/Mulldrifter.java index bef0877836c..60b9f228b87 100644 --- a/Mage.Sets/src/mage/sets/commander/Mulldrifter.java +++ b/Mage.Sets/src/mage/sets/commander/Mulldrifter.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class Mulldrifter extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Mulldrifter enters the battlefield, draw two cards. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(2))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2))); // Evoke {2}{U} this.addAbility(new EvokeAbility(this, "{2}{U}")); } diff --git a/Mage.Sets/src/mage/sets/commander2013/ArcaneDenial.java b/Mage.Sets/src/mage/sets/commander2013/ArcaneDenial.java index d9930911079..27b807a53a1 100644 --- a/Mage.Sets/src/mage/sets/commander2013/ArcaneDenial.java +++ b/Mage.Sets/src/mage/sets/commander2013/ArcaneDenial.java @@ -35,7 +35,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -63,7 +63,7 @@ public class ArcaneDenial extends CardImpl { this.getSpellAbility().addEffect(new ArcaneDenialEffect()); this.getSpellAbility().addTarget(new TargetSpell()); // You draw a card at the beginning of the next turn's upkeep. - this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardControllerEffect(1)),false)); + this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)),false)); } public ArcaneDenial(final ArcaneDenial card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/BalefulForce.java b/Mage.Sets/src/mage/sets/commander2013/BalefulForce.java index 2312c1da013..d76cff6b74e 100644 --- a/Mage.Sets/src/mage/sets/commander2013/BalefulForce.java +++ b/Mage.Sets/src/mage/sets/commander2013/BalefulForce.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -55,7 +55,7 @@ public class BalefulForce extends CardImpl { this.toughness = new MageInt(7); // At the beginning of each upkeep, you draw a card and you lose 1 life. - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(1), TargetController.ANY, false); + Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.ANY, false); Effect effect = new LoseLifeSourceControllerEffect(1); effect.setText("and you lose 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java b/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java index 85f5d794824..4f477d1f078 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java +++ b/Mage.Sets/src/mage/sets/commander2013/Borrowing100000Arrows.java @@ -30,7 +30,7 @@ package mage.sets.commander2013; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Outcome; @@ -92,7 +92,7 @@ class Borrowing100000ArrowsEffect extends OneShotEffect { this.color.setBlue(true); // Draw three cards. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); } public BrilliantPlan(final BrilliantPlan card) { diff --git a/Mage.Sets/src/mage/sets/commander2013/Greed.java b/Mage.Sets/src/mage/sets/commander2013/Greed.java index 5731439cace..310e89cab6d 100644 --- a/Mage.Sets/src/mage/sets/commander2013/Greed.java +++ b/Mage.Sets/src/mage/sets/commander2013/Greed.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -51,7 +51,7 @@ public class Greed extends CardImpl { this.color.setBlack(true); // {B}, Pay 2 life: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")); ability.addCost(new PayLifeCost(2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/commander2013/LuXunScholarGeneral.java b/Mage.Sets/src/mage/sets/commander2013/LuXunScholarGeneral.java index 0ae06bcdfa1..f82da20a5ef 100644 --- a/Mage.Sets/src/mage/sets/commander2013/LuXunScholarGeneral.java +++ b/Mage.Sets/src/mage/sets/commander2013/LuXunScholarGeneral.java @@ -30,7 +30,7 @@ package mage.sets.commander2013; import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -56,7 +56,7 @@ public class LuXunScholarGeneral extends CardImpl { // Horsemanship this.addAbility(HorsemanshipAbility.getInstance()); // Whenever Lu Xun, Scholar General deals damage to an opponent, you may draw a card. - this.addAbility(new DealsDamageToOpponentTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DealsDamageToOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } diff --git a/Mage.Sets/src/mage/sets/commander2013/OloroAgelessAscetic.java b/Mage.Sets/src/mage/sets/commander2013/OloroAgelessAscetic.java index 61a52371a8b..f16f5fa2a13 100644 --- a/Mage.Sets/src/mage/sets/commander2013/OloroAgelessAscetic.java +++ b/Mage.Sets/src/mage/sets/commander2013/OloroAgelessAscetic.java @@ -37,7 +37,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -103,7 +103,7 @@ class OloroAgelessAsceticEffect extends OneShotEffect @Override public boolean apply(Game game, Ability source) { - new DrawCardControllerEffect(1).apply(game, source); + new DrawCardSourceControllerEffect(1).apply(game, source); new DamagePlayersEffect(1, TargetController.OPPONENT).apply(game, source); return false; } diff --git a/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java b/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java index 7fcbbc507b3..580884066d2 100644 --- a/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java +++ b/Mage.Sets/src/mage/sets/darkascension/BoneToAsh.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.CounterTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +59,7 @@ public class BoneToAsh extends CardImpl { this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterTargetEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public BoneToAsh(final BoneToAsh card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java index 272a731c071..8afc7532d3a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java +++ b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java @@ -30,7 +30,7 @@ package mage.sets.darkascension; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; @@ -77,7 +77,7 @@ public class DrogskolReaver extends CardImpl { class DrogskolReaverAbility extends TriggeredAbilityImpl { public DrogskolReaverAbility() { - super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), false); + super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), false); } public DrogskolReaverAbility(final DrogskolReaverAbility ability) { diff --git a/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java b/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java index 4eac11ae3f1..52c487a9f9e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java +++ b/Mage.Sets/src/mage/sets/darkascension/Gravepurge.java @@ -30,7 +30,7 @@ package mage.sets.darkascension; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; @@ -52,7 +52,7 @@ public class Gravepurge extends CardImpl { this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterCreatureCard("creature cards from your graveyard"))); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Gravepurge(final Gravepurge card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java index 6e0ed121c1a..e9d39400694 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrimBackwoods.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; @@ -54,7 +54,7 @@ public class GrimBackwoods extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // {2}{B}{G}, {tap}, Sacrifice a creature: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{B}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{B}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java b/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java index 6504cadf09e..f41dd16a5fa 100644 --- a/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java +++ b/Mage.Sets/src/mage/sets/darkascension/GrimFlowering.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreatureCard; @@ -48,7 +48,7 @@ public class GrimFlowering extends CardImpl { this.color.setGreen(true); // Draw a card for each creature card in your graveyard. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(new CardsInControllerGraveyardCount(new FilterCreatureCard()))); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new CardsInControllerGraveyardCount(new FilterCreatureCard()))); } public GrimFlowering(final GrimFlowering card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java index 111e9001a56..8fcbc0beb4e 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java +++ b/Mage.Sets/src/mage/sets/darkascension/SecretsOfTheDead.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.Predicate; @@ -58,7 +58,7 @@ public class SecretsOfTheDead extends CardImpl { this.color.setBlue(true); // Whenever you cast a spell from your graveyard, draw a card. - this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, false)); } public SecretsOfTheDead(final SecretsOfTheDead card) { diff --git a/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java b/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java index 3b5a54377e0..55344d275aa 100644 --- a/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java +++ b/Mage.Sets/src/mage/sets/darkascension/SilverpeltWerewolf.java @@ -37,7 +37,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.condition.common.TwoOrMoreSpellsWereCastLastTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; @@ -61,7 +61,7 @@ public class SilverpeltWerewolf extends CardImpl { this.nightCard = true; // Whenever Silverpelt Werewolf deals combat damage to a player, draw a card. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Silverpelt Werewolf. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(false), TargetController.ANY, false); diff --git a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java index f18f7b47bf1..859839b1b61 100644 --- a/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java +++ b/Mage.Sets/src/mage/sets/darkascension/ThoughtScour.java @@ -30,7 +30,7 @@ package mage.sets.darkascension; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPlayer; @@ -51,7 +51,7 @@ public class ThoughtScour extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(2)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public ThoughtScour(final ThoughtScour card) { diff --git a/Mage.Sets/src/mage/sets/eventide/DreamThief.java b/Mage.Sets/src/mage/sets/eventide/DreamThief.java index fa5c6be01e4..4d81934dffe 100644 --- a/Mage.Sets/src/mage/sets/eventide/DreamThief.java +++ b/Mage.Sets/src/mage/sets/eventide/DreamThief.java @@ -34,7 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -70,7 +70,7 @@ public class DreamThief extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Dream Thief enters the battlefield, draw a card if you've cast another blue spell this turn. - this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DrawCardControllerEffect(1), new CastBlueSpellThisTurnCondition(), rule))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new CastBlueSpellThisTurnCondition(), rule))); this.addWatcher(new DreamThiefWatcher(this.getId())); } diff --git a/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java b/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java index eda7a28f917..91f540ac11e 100644 --- a/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java +++ b/Mage.Sets/src/mage/sets/eventide/IdleThoughts.java @@ -32,7 +32,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CardsInHandCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -52,7 +52,7 @@ public class IdleThoughts extends CardImpl { // {2}: Draw a card if you have no cards in hand. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ConditionalOneShotEffect( - new DrawCardControllerEffect(2), new CardsInHandCondition(), "Draw a card if you have no cards in hand"), new ManaCostsImpl("{2}"))); + new DrawCardSourceControllerEffect(2), new CardsInHandCondition(), "Draw a card if you have no cards in hand"), new ManaCostsImpl("{2}"))); } public IdleThoughts(final IdleThoughts card) { diff --git a/Mage.Sets/src/mage/sets/eventide/InsideOut.java b/Mage.Sets/src/mage/sets/eventide/InsideOut.java index 234c3fe70ac..40ac1b0d682 100644 --- a/Mage.Sets/src/mage/sets/eventide/InsideOut.java +++ b/Mage.Sets/src/mage/sets/eventide/InsideOut.java @@ -28,7 +28,7 @@ package mage.sets.eventide; import java.util.UUID; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.SwitchPowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -55,7 +55,7 @@ public class InsideOut extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java b/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java index 100faf10474..7df73084fc8 100644 --- a/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java +++ b/Mage.Sets/src/mage/sets/eventide/OverbeingOfMyth.java @@ -33,7 +33,7 @@ import mage.abilities.common.BeginningOfDrawTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -65,7 +65,7 @@ public class OverbeingOfMyth extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetPowerToughnessSourceEffect(number, Duration.WhileOnBattlefield))); // At the beginning of your draw step, draw an additional card. - this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardControllerEffect(1), TargetController.YOU, false)); + this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/sets/eventide/RegalForce.java b/Mage.Sets/src/mage/sets/eventide/RegalForce.java index fb8d7d972c2..5f65f499c99 100644 --- a/Mage.Sets/src/mage/sets/eventide/RegalForce.java +++ b/Mage.Sets/src/mage/sets/eventide/RegalForce.java @@ -34,7 +34,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -61,7 +61,7 @@ public class RegalForce extends CardImpl { this.toughness = new MageInt(5); // When Regal Force enters the battlefield, draw a card for each green creature you control. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)))); } public RegalForce(final RegalForce card) { diff --git a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java index 660fdefa2ab..969b1a40079 100644 --- a/Mage.Sets/src/mage/sets/eventide/Scarecrone.java +++ b/Mage.Sets/src/mage/sets/eventide/Scarecrone.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -68,7 +68,7 @@ public class Scarecrone extends CardImpl { this.toughness = new MageInt(2); // {1}, Sacrifice a Scarecrow: Draw a card. - Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); firstAbility.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, filterScarecrow, false, true))); this.addAbility(firstAbility); diff --git a/Mage.Sets/src/mage/sets/eventide/Snakeform.java b/Mage.Sets/src/mage/sets/eventide/Snakeform.java index 0f2aa0e1c95..fdcf1017b37 100644 --- a/Mage.Sets/src/mage/sets/eventide/Snakeform.java +++ b/Mage.Sets/src/mage/sets/eventide/Snakeform.java @@ -29,7 +29,7 @@ package mage.sets.eventide; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect; import mage.cards.CardImpl; @@ -59,7 +59,7 @@ public class Snakeform extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Draw a card. - Effect effect = new DrawCardControllerEffect(1); + Effect effect = new DrawCardSourceControllerEffect(1); effect.setText("Draw a card."); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java index 7564cb69ab7..9fdfa041293 100644 --- a/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java +++ b/Mage.Sets/src/mage/sets/eventide/WistfulSelkie.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; /** @@ -51,7 +51,7 @@ public class WistfulSelkie extends CardImpl { this.color.setBlue(true); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); } public WistfulSelkie (final WistfulSelkie card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Cremate.java b/Mage.Sets/src/mage/sets/guildpact/Cremate.java index 4f76d62f96a..5d973650d02 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Cremate.java +++ b/Mage.Sets/src/mage/sets/guildpact/Cremate.java @@ -30,7 +30,7 @@ package mage.sets.guildpact; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCardInGraveyard; @@ -47,7 +47,7 @@ public class Cremate extends CardImpl { this.color.setBlack(true); this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCardInGraveyard()); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Cremate(final Cremate card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java index 1b1dd8b1b13..7f81ddcdd6a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java +++ b/Mage.Sets/src/mage/sets/guildpact/DrownedRusalka.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DiscardControllerEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -60,7 +60,7 @@ public class DrownedRusalka extends CardImpl { // {U}, Sacrifice a creature: Discard a card, then draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardControllerEffect(1), new ManaCostsImpl("{U}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true, true))); - ability.addEffect(new DrawCardControllerEffect(1)); + ability.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java index cba8165e577..295bcf10ac7 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java +++ b/Mage.Sets/src/mage/sets/guildpact/Electrolyze.java @@ -30,7 +30,7 @@ package mage.sets.guildpact; import java.util.UUID; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageMultiEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -55,7 +55,7 @@ public class Electrolyze extends CardImpl { this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCreatureOrPlayerAmount(2)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Electrolyze(final Electrolyze card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java index ac464621499..3bb84a8e19d 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java +++ b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; /** @@ -45,7 +45,7 @@ public class HatchingPlans extends CardImpl { super(ownerId, 27, "Hatching Plans", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "GPT"; this.color.setBlue(true); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(3))); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(3))); } public HatchingPlans (final HatchingPlans card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java index 12c6dc9f05a..cb41301d6b0 100644 --- a/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/InvokeTheFiremind.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.abilities.Mode; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +50,7 @@ public class InvokeTheFiremind extends CardImpl { this.color.setRed(true); this.color.setBlue(true); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(new ManacostVariableValue())); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(new ManacostVariableValue())); Mode mode = new Mode(); mode.getEffects().add(new DamageTargetEffect(new ManacostVariableValue())); mode.getTargets().add(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java index 2164a44e72b..365e246a690 100644 --- a/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java +++ b/Mage.Sets/src/mage/sets/guildpact/NivMizzetTheFiremind.java @@ -37,7 +37,7 @@ import mage.abilities.common.DrawCardControllerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.Zone; @@ -63,7 +63,7 @@ public class NivMizzetTheFiremind extends CardImpl { Ability ability = new DrawCardControllerTriggeredAbility(new DamageTargetEffect(1), false); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); } public NivMizzetTheFiremind(final NivMizzetTheFiremind card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Quicken.java b/Mage.Sets/src/mage/sets/guildpact/Quicken.java index eef4a042bad..c91db77387c 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Quicken.java +++ b/Mage.Sets/src/mage/sets/guildpact/Quicken.java @@ -38,7 +38,7 @@ import mage.constants.Rarity; import mage.constants.WatcherScope; import mage.abilities.Ability; import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.game.Game; @@ -64,7 +64,7 @@ public class Quicken extends CardImpl { this.addWatcher(new QuickenWatcher()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Quicken(final Quicken card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Repeal.java b/Mage.Sets/src/mage/sets/guildpact/Repeal.java index 74027af3dab..33254025e38 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Repeal.java +++ b/Mage.Sets/src/mage/sets/guildpact/Repeal.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.SpellAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.filter.Filter; @@ -60,7 +60,7 @@ public class Repeal extends CardImpl { // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } @Override diff --git a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java index 886a0d09c6f..c20b49f131a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java +++ b/Mage.Sets/src/mage/sets/guildpact/Runeboggle.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.TargetSpell; @@ -48,7 +48,7 @@ public class Runeboggle extends CardImpl { this.color.setBlue(true); this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(1))); this.getSpellAbility().addTarget(new TargetSpell()); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Runeboggle(final Runeboggle card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java index ae63cae0b0e..75f20c21df8 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Wildsize.java +++ b/Mage.Sets/src/mage/sets/guildpact/Wildsize.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.TrampleAbility; @@ -52,7 +52,7 @@ public class Wildsize extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn)); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Wildsize(final Wildsize card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/Withstand.java b/Mage.Sets/src/mage/sets/guildpact/Withstand.java index fc3d828a5e6..769042298e1 100644 --- a/Mage.Sets/src/mage/sets/guildpact/Withstand.java +++ b/Mage.Sets/src/mage/sets/guildpact/Withstand.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PreventDamageTargetEffect; import mage.cards.CardImpl; import mage.constants.Duration; @@ -49,7 +49,7 @@ public class Withstand extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new PreventDamageTargetEffect(Duration.EndOfTurn, 3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); // Prevent the next 3 damage that would be dealt to target creature or player this turn. // Draw a card. } diff --git a/Mage.Sets/src/mage/sets/invasion/Annihilate.java b/Mage.Sets/src/mage/sets/invasion/Annihilate.java index c2e3e27e779..51fd748f980 100644 --- a/Mage.Sets/src/mage/sets/invasion/Annihilate.java +++ b/Mage.Sets/src/mage/sets/invasion/Annihilate.java @@ -30,7 +30,7 @@ package mage.sets.invasion; import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -60,7 +60,7 @@ public class Annihilate extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Annihilate(final Annihilate card) { diff --git a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java index 28d744d78ad..8c17858ad48 100644 --- a/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java +++ b/Mage.Sets/src/mage/sets/invasion/BenalishHeralds.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -57,7 +57,7 @@ public class BenalishHeralds extends CardImpl { this.toughness = new MageInt(4); // {3}{U}, {tap}: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{3}{U}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/invasion/Repulse.java b/Mage.Sets/src/mage/sets/invasion/Repulse.java index 3d8dd603b67..cc95d924f93 100644 --- a/Mage.Sets/src/mage/sets/invasion/Repulse.java +++ b/Mage.Sets/src/mage/sets/invasion/Repulse.java @@ -30,7 +30,7 @@ package mage.sets.invasion; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreaturePermanent; @@ -51,7 +51,7 @@ public class Repulse extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Repulse(final Repulse card) { diff --git a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java index 74740502b40..352ab1214cc 100644 --- a/Mage.Sets/src/mage/sets/invasion/TaintedWell.java +++ b/Mage.Sets/src/mage/sets/invasion/TaintedWell.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BecomesBasicLandEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class TaintedWell extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Tainted Well enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted land is a Swamp. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect("Swamp"))); } diff --git a/Mage.Sets/src/mage/sets/invasion/TsabosWeb.java b/Mage.Sets/src/mage/sets/invasion/TsabosWeb.java index e97ff0c931f..711d593a57e 100644 --- a/Mage.Sets/src/mage/sets/invasion/TsabosWeb.java +++ b/Mage.Sets/src/mage/sets/invasion/TsabosWeb.java @@ -34,7 +34,7 @@ import mage.abilities.PlayLandAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.mana.ManaAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -58,7 +58,7 @@ public class TsabosWeb extends CardImpl { this.expansionSetCode = "INV"; // When Tsabo's Web enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Each land with an activated ability that isn't a mana ability doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TsabosWebPreventUntapEffect())); diff --git a/Mage.Sets/src/mage/sets/invasion/Zap.java b/Mage.Sets/src/mage/sets/invasion/Zap.java index 3ed6a940673..d71279caacd 100644 --- a/Mage.Sets/src/mage/sets/invasion/Zap.java +++ b/Mage.Sets/src/mage/sets/invasion/Zap.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.common.TargetCreatureOrPlayer; @@ -51,7 +51,7 @@ public class Zap extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(1)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Zap(final Zap card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java index 2ca098d7255..509e15c2614 100644 --- a/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java +++ b/Mage.Sets/src/mage/sets/magic2010/MesaEnchantress.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +59,7 @@ public class MesaEnchantress extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(2); - this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, true)); } public MesaEnchantress(final MesaEnchantress card) { diff --git a/Mage.Sets/src/mage/sets/magic2010/Ponder.java b/Mage.Sets/src/mage/sets/magic2010/Ponder.java index fe0c54f3d6b..a8c06eba930 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Ponder.java +++ b/Mage.Sets/src/mage/sets/magic2010/Ponder.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; @@ -49,7 +49,7 @@ public class Ponder extends CardImpl { // Look at the top three cards of your library, then put them back in any order. You may shuffle your library. this.getSpellAbility().addEffect(new LookLibraryControllerEffect(3, true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Ponder(final Ponder card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java b/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java index 94d3cf090b8..ff7bcd4b475 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java +++ b/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; @@ -51,7 +51,7 @@ public class ChromaticSphere extends CardImpl { Ability ability = new AnyColorManaAbility(new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); - ability.addEffect(new DrawCardControllerEffect(1)); + ability.addEffect(new DrawCardSourceControllerEffect(1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java index 3a69de723fa..1bf695f5c49 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.cards.CardImpl; import mage.game.permanent.token.Token; @@ -55,7 +55,7 @@ public class LifesparkSpellbomb extends CardImpl { firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetLandPermanent()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java index 182da49255d..57ac8a9bceb 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java +++ b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.common.DrawCardOpponentTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; @@ -47,7 +47,7 @@ public class MindsEye extends CardImpl { this.expansionSetCode = "MRD"; // Whenever an opponent draws a card, you may pay {1}. If you do, draw a card. - this.addAbility(new DrawCardOpponentTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new GenericManaCost(1)), false, false)); + this.addAbility(new DrawCardOpponentTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new GenericManaCost(1)), false, false)); } public MindsEye(final MindsEye card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java index 79b52a0ab35..f545fe1a329 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java @@ -37,7 +37,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DiscardTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; @@ -56,7 +56,7 @@ public class NecrogenSpellbomb extends CardImpl { firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java index df435d81cc2..596eb24147a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BlocksTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -52,7 +52,7 @@ public class PsychicMembrane extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // Whenever Psychic Membrane blocks, you may draw a card. - this.addAbility(new BlocksTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new BlocksTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public PsychicMembrane(final PsychicMembrane card) { diff --git a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java index 70563ed1cd8..aaa617f1dc9 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java @@ -37,7 +37,7 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; @@ -56,7 +56,7 @@ public class PyriteSpellbomb extends CardImpl { firstAbility.addCost(new SacrificeSourceCost()); firstAbility.addTarget(new TargetCreatureOrPlayer()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java index 341c702f1a7..b289a2587b3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java @@ -33,7 +33,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.BecomesBlockedTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -51,7 +51,7 @@ public class SlithStrider extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java index 0b0c1c12c9c..20ef0df05e6 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java @@ -36,7 +36,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.constants.ColoredManaSymbol; @@ -54,7 +54,7 @@ public class SunbeamSpellbomb extends CardImpl { Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ColoredManaCost(ColoredManaSymbol.W)); firstAbility.addCost(new SacrificeSourceCost()); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(1)); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(1)); secondAbility.addCost(new SacrificeSourceCost()); this.addAbility(secondAbility); } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java index 8014908a3f6..9b01274ef7c 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -49,7 +49,7 @@ public class TowerOfFortunes extends CardImpl { public TowerOfFortunes (UUID ownerId) { super(ownerId, 267, "Tower of Fortunes", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new GenericManaCost(8)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java index 34f2ce9d4f4..5c84b4003f4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java @@ -34,7 +34,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.constants.Zone; @@ -71,7 +71,7 @@ public class ConsecratedSphinx extends CardImpl { class ConsecratedSphinxTriggeredAbility extends TriggeredAbilityImpl { ConsecratedSphinxTriggeredAbility() { - super(Zone.BATTLEFIELD, new DrawCardControllerEffect(2), true); + super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), true); } ConsecratedSphinxTriggeredAbility(final ConsecratedSphinxTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java index 4509b636f29..dc9df6d9664 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FranticSalvage.java @@ -29,7 +29,7 @@ package mage.sets.mirrodinbesieged; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterArtifactCard; @@ -50,7 +50,7 @@ public class FranticSalvage extends CardImpl { this.color.setWhite(true); this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, new FilterArtifactCard("artifact cards from your graveyard"))); } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java index 267f69df340..c6f9fb65a92 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import java.util.UUID; @@ -45,8 +45,8 @@ public class IchorWellspring extends CardImpl { public IchorWellspring(UUID ownerId) { super(ownerId, 110, "Ichor Wellspring", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "MBS"; - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); - this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); + this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1))); } public IchorWellspring(final IchorWellspring card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java index 7f38fa6a774..9e5f15e7092 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NeurokCommando.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; @@ -53,7 +53,7 @@ public class NeurokCommando extends CardImpl { this.toughness = new MageInt(1); this.addAbility(ShroudAbility.getInstance()); - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public NeurokCommando(final NeurokCommando card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java index 26d548536db..ce4684dd517 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; /** @@ -49,7 +49,7 @@ public class Oculus extends CardImpl { this.color.setBlue(true); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public Oculus (final Oculus card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java index 89f8981dfb3..7a85b94f7de 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RotWolf.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.DiesAndDealtDamageThisTurnTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -53,7 +53,7 @@ public class RotWolf extends CardImpl { this.addAbility(InfectAbility.getInstance()); // Whenever a creature dealt damage by Rot Wolf this turn dies, you may draw a card. - this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new DrawCardControllerEffect(1), true)); + this.addAbility(new DiesAndDealtDamageThisTurnTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public RotWolf(final RotWolf card) { diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java index d165655d13d..f77a19d7e17 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Vivisection.java @@ -32,7 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.costs.common.SacrificeTargetCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.common.TargetControlledCreaturePermanent; @@ -46,7 +46,7 @@ public class Vivisection extends CardImpl { super(ownerId, 38, "Vivisection", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); this.expansionSetCode = "MBS"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); } diff --git a/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java b/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java index 14dd89fc3ff..269c3197fa5 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java +++ b/Mage.Sets/src/mage/sets/modernmasters/LatchkeyFaerie.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ProwlCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ProwlAbility; import mage.cards.CardImpl; @@ -60,7 +60,7 @@ public class LatchkeyFaerie extends CardImpl { // Prowl {2}{U} this.addAbility(new ProwlAbility(this, "{2}{U}")); // When Latchkey Faerie enters the battlefield, if its prowl cost was paid, draw a card. - EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false); + EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false); this.addAbility(new ConditionalTriggeredAbility(ability, ProwlCondition.getInstance(), "When {this} enters the battlefield, if its prowl cost was paid, draw a card.")); diff --git a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java index a3ae25aa651..27b5e2dec61 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java +++ b/Mage.Sets/src/mage/sets/modernmasters/MaskedAdmirers.java @@ -34,7 +34,7 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -65,7 +65,7 @@ public class MaskedAdmirers extends CardImpl { this.toughness = new MageInt(2); // When Masked Admirers enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Whenever you cast a creature spell, you may pay {G}{G}. If you do, return Masked Admirers from your graveyard to your hand. OneShotEffect effect = new ReturnToHandSourceEffect(); effect.setText("return {this} from your graveyard to your hand"); diff --git a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java index b0fbbfba1bc..81e50b914e1 100644 --- a/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java +++ b/Mage.Sets/src/mage/sets/modernmasters/Peppersmoke.java @@ -33,7 +33,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.abilities.condition.common.ControlsPermanentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; @@ -63,7 +63,7 @@ public class Peppersmoke extends CardImpl { this.getSpellAbility().addEffect(new BoostTargetEffect(-1,-1,Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); this.getSpellAbility().addEffect( - new ConditionalOneShotEffect(new DrawCardControllerEffect(1), + new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new ControlsPermanentCondition(filter, ControlsPermanentCondition.CountType.MORE_THAN, 0), "If you control a Faerie, draw a card")); } diff --git a/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java index 8d44ea00498..0b5bc2dd6c3 100644 --- a/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java +++ b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java @@ -42,7 +42,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; @@ -78,7 +78,7 @@ public class DivinersWand extends CardImpl { effect.setText("Equipped creature has \"Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn\""); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); effect = new GainAbilityAttachedEffect( - new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(4)), AttachmentType.EQUIPMENT); + new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(4)), AttachmentType.EQUIPMENT); effect.setText("and \"{4}: Draw a card.\""); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java index d4bec41ad06..7ffcef893f2 100644 --- a/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/sets/morningtide/GiltLeafArchdruid.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -76,7 +76,7 @@ public class GiltLeafArchdruid extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Druid spell, you may draw a card. - this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filterSpell, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filterSpell, true)); // Tap seven untapped Druids you control: Gain control of all lands target player controls. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlAllLandsEffect(Duration.EndOfGame), new TapTargetCost(new TargetControlledCreaturePermanent(7, 7, new FilterControlledCreaturePermanent("Druid", "Druids you control"), true))); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java index 56c6c5c8ed9..f4af8eba0c2 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ArgentMutation.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.AddCardTypeTargetEffect; import mage.cards.CardImpl; import mage.target.TargetPermanent; @@ -50,7 +50,7 @@ public class ArgentMutation extends CardImpl { this.getSpellAbility().addEffect(new AddCardTypeTargetEffect(CardType.ARTIFACT, Duration.EndOfTurn)); this.getSpellAbility().addTarget(new TargetPermanent()); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public ArgentMutation(final ArgentMutation card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java index bba14b1f9b0..7e56d0674f7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/DueRespect.java @@ -34,7 +34,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.ReplacementEffectImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,7 +55,7 @@ public class DueRespect extends CardImpl { // Permanents enter the battlefield tapped this turn. this.getSpellAbility().addEffect(new DueRespectEffect()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public DueRespect(final DueRespect card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java index 60e92bff5b0..966b150a5c6 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GitaxianProbe.java @@ -34,7 +34,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.players.Player; @@ -55,7 +55,7 @@ public class GitaxianProbe extends CardImpl { this.getSpellAbility().addEffect(new GitaxianProbeEffect()); this.getSpellAbility().addTarget(new TargetPlayer()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java index 775ec0e33a4..6cb04bff3c1 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ImpalerShrike.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -56,7 +56,7 @@ public class ImpalerShrike extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new SacrificeSourceEffect(), true); - ability.addEffect(new DrawCardControllerEffect(3)); + ability.addEffect(new DrawCardSourceControllerEffect(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java index 4e228a5f8fa..cef5a70ea49 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/JinGitaxiasCoreAugur.java @@ -33,7 +33,7 @@ import mage.constants.*; import mage.MageInt; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect; import mage.abilities.effects.common.continious.MaximumHandSizeControllerEffect.HandSizeModification; import mage.abilities.keyword.FlashAbility; @@ -59,7 +59,7 @@ public class JinGitaxiasCoreAugur extends CardImpl { this.addAbility(FlashAbility.getInstance()); // At the beginning of your end step, draw seven cards. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardControllerEffect(7), false)); + this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardSourceControllerEffect(7), false)); // Each opponent's maximum hand size is reduced by seven. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java index c80c0b6f22a..51984bb9018 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindculling.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.effects.common.DiscardTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.target.common.TargetOpponent; @@ -47,7 +47,7 @@ public class Mindculling extends CardImpl { this.color.setBlue(true); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(2)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); this.getSpellAbility().addTarget(new TargetOpponent()); this.getSpellAbility().addEffect(new DiscardTargetEffect(2)); } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java index 4f7aa616d1a..65a368c18fa 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PuresteelPaladin.java @@ -40,7 +40,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MetalcraftCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.decorator.ConditionalContinousEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; @@ -68,7 +68,7 @@ public class PuresteelPaladin extends CardImpl { this.toughness = new MageInt(2); // Whenever an Equipment enters the battlefield under your control, you may draw a card. - this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), filter, true)); // Metalcraft - Equipment you control have equip {0} as long as you control three or more artifacts this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( new GainAbilityControlledEffect(new EquipAbility(Outcome.AddAbility, new GenericManaCost(0)), Duration.WhileOnBattlefield, filter), diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java index bf3ad243498..09f8258dc1a 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TezzeretsGambit.java @@ -30,7 +30,7 @@ package mage.sets.newphyrexia; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; @@ -45,7 +45,7 @@ public class TezzeretsGambit extends CardImpl { this.expansionSetCode = "NPH"; this.color.setBlue(true); - this.getSpellAbility().addEffect(new DrawCardControllerEffect(2)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); this.getSpellAbility().addEffect(new ProliferateEffect()); } diff --git a/Mage.Sets/src/mage/sets/ninthedition/Execute.java b/Mage.Sets/src/mage/sets/ninthedition/Execute.java index 690f8ef4101..dc1736e9ecd 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Execute.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Execute.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -59,7 +59,7 @@ public class Execute extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Execute(final Execute card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/Slay.java b/Mage.Sets/src/mage/sets/ninthedition/Slay.java index 315b8261a80..b99538f2279 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/Slay.java +++ b/Mage.Sets/src/mage/sets/ninthedition/Slay.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.ObjectColor; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -59,7 +59,7 @@ public class Slay extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); this.getSpellAbility().addEffect(new DestroyTargetEffect(true)); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); } public Slay(final Slay card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java index 54c8f9e5fff..e78d71c7b6c 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java +++ b/Mage.Sets/src/mage/sets/ninthedition/ThievingMagpie.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.effects.common.DealsDamageToOpponentTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -55,7 +55,7 @@ public class ThievingMagpie extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Thieving Magpie deals damage to an opponent, draw a card. - this.addAbility(new DealsDamageToOpponentTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new DealsDamageToOpponentTriggeredAbility(new DrawCardSourceControllerEffect(1))); } public ThievingMagpie(final ThievingMagpie card) { diff --git a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java index 733933e09e6..57018cba5fb 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java +++ b/Mage.Sets/src/mage/sets/ninthedition/TreasureTrove.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -50,7 +50,7 @@ public class TreasureTrove extends CardImpl { this.color.setBlue(true); // {2}{U}{U}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new ManaCostsImpl("{2}{U}{U}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{U}{U}"))); } public TreasureTrove(final TreasureTrove card) { diff --git a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java index 82f03210b72..5506a884691 100644 --- a/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java +++ b/Mage.Sets/src/mage/sets/planechase/SarcomiteMyr.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class SarcomiteMyr extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2))); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java index 58307e8acb9..141b2ec74fd 100644 --- a/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java +++ b/Mage.Sets/src/mage/sets/planechase/ThirstForKnowledge.java @@ -35,7 +35,7 @@ import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Outcome; import mage.filter.FilterCard; @@ -57,7 +57,7 @@ public class ThirstForKnowledge extends CardImpl { this.color.setBlue(true); // Draw three cards. Then discard two cards unless you discard an artifact card. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); this.getSpellAbility().addEffect(new ThirstforKnowledgeEffect()); } diff --git a/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java index 9730fd82889..ebd8f259fbc 100644 --- a/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java +++ b/Mage.Sets/src/mage/sets/planechase2012/BalefulStrix.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -57,7 +57,7 @@ public class BalefulStrix extends CardImpl { // vigilance this.addAbility(DeathtouchAbility.getInstance()); // When Baleful Strix enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java index a664e957a0b..6bb85511e68 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java +++ b/Mage.Sets/src/mage/sets/seventhedition/InfernalContract.java @@ -33,7 +33,7 @@ import mage.constants.Outcome; import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.players.Player; @@ -51,7 +51,7 @@ public class InfernalContract extends CardImpl { this.color.setBlack(true); // Draw four cards. You lose half your life, rounded up. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(4)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); this.getSpellAbility().addEffect(new InfernalContractLoseLifeEffect()); } diff --git a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java index 63350f467af..9886d2001b8 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java +++ b/Mage.Sets/src/mage/sets/seventhedition/VerduranEnchantress.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -60,7 +60,7 @@ public class VerduranEnchantress extends CardImpl { this.toughness = new MageInt(2); // Whenever you cast an enchantment spell, you may draw a card. - this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, true)); } public VerduranEnchantress(final VerduranEnchantress card) { diff --git a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java index 699f3af9791..0f2359dcbe3 100644 --- a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java +++ b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java @@ -35,7 +35,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.RequirementEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -80,7 +80,7 @@ public class BidentOfThassa extends CardImpl { class BidentOfThassaTriggeredAbility extends TriggeredAbilityImpl { public BidentOfThassaTriggeredAbility() { - super(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), true); + super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true); } public BidentOfThassaTriggeredAbility(final BidentOfThassaTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java index c19905c27ca..5c6952a3b46 100644 --- a/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/sets/theros/ChosenByHeliod.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -65,7 +65,7 @@ public class ChosenByHeliod extends CardImpl { this.addAbility(ability); // When Chosen by Heliod enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0,2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/sets/theros/DragonMantle.java b/Mage.Sets/src/mage/sets/theros/DragonMantle.java index 693eea9bb1a..c7d1b0e02a1 100644 --- a/Mage.Sets/src/mage/sets/theros/DragonMantle.java +++ b/Mage.Sets/src/mage/sets/theros/DragonMantle.java @@ -34,7 +34,7 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; @@ -68,7 +68,7 @@ public class DragonMantle extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Dragon Mantle enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted creature has "{R}: This creature gets +1/+0 until end of turn." Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); diff --git a/Mage.Sets/src/mage/sets/theros/FateForetold.java b/Mage.Sets/src/mage/sets/theros/FateForetold.java index 7cd339c7d66..bdcd3e18750 100644 --- a/Mage.Sets/src/mage/sets/theros/FateForetold.java +++ b/Mage.Sets/src/mage/sets/theros/FateForetold.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -61,9 +61,9 @@ public class FateForetold extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Fate Foretold enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1),false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1),false)); // When enchanted creature dies, its controller draws a card. - this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardControllerEffect(1),"enchanted creature", false)); + this.addAbility(new DiesAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1),"enchanted creature", false)); } public FateForetold(final FateForetold card) { diff --git a/Mage.Sets/src/mage/sets/theros/NyleasPresence.java b/Mage.Sets/src/mage/sets/theros/NyleasPresence.java index 63626ec0a92..de1b68ca193 100644 --- a/Mage.Sets/src/mage/sets/theros/NyleasPresence.java +++ b/Mage.Sets/src/mage/sets/theros/NyleasPresence.java @@ -36,7 +36,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.mana.BasicManaAbility; import mage.abilities.mana.BlackManaAbility; @@ -77,7 +77,7 @@ public class NyleasPresence extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Nylea's Presence enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Enchanted land is every basic land type in addition to its other types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NyleasPresenceLandTypeEffect("Swamp", "Mountain", "Forest", "Island", "Plains"))); diff --git a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java index 41bcdf77f1f..8dfe94d4e82 100644 --- a/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java +++ b/Mage.Sets/src/mage/sets/theros/OrdealOfThassa.java @@ -34,7 +34,7 @@ import mage.abilities.common.SacrificeSourceTriggeredAbility; import mage.abilities.condition.common.AttachedToCounterCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.counter.AddCountersAttachedEffect; import mage.abilities.keyword.EnchantAbility; @@ -72,7 +72,7 @@ public class OrdealOfThassa extends CardImpl { "Then if it has three or more +1/+1 counters on it, sacrifice {this}")); this.addAbility(ability); // When you sacrifice Ordeal of Thassa, draw two cards. - this.addAbility(new SacrificeSourceTriggeredAbility(new DrawCardControllerEffect(2), false)); + this.addAbility(new SacrificeSourceTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); } diff --git a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java index aaa4327c439..d11c9040803 100644 --- a/Mage.Sets/src/mage/sets/theros/ReadTheBones.java +++ b/Mage.Sets/src/mage/sets/theros/ReadTheBones.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.ScryEffect; import mage.cards.CardImpl; @@ -50,7 +50,7 @@ public class ReadTheBones extends CardImpl { // Scry 2, then draw two cards. You lose 2 life. this.getSpellAbility().addEffect(new ScryEffect(2)); - Effect effect = new DrawCardControllerEffect(2); + Effect effect = new DrawCardSourceControllerEffect(2); effect.setText("then draw two cards"); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/theros/Scourgemark.java b/Mage.Sets/src/mage/sets/theros/Scourgemark.java index 46a0d1bcb86..19410f8f646 100644 --- a/Mage.Sets/src/mage/sets/theros/Scourgemark.java +++ b/Mage.Sets/src/mage/sets/theros/Scourgemark.java @@ -32,7 +32,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; @@ -64,7 +64,7 @@ public class Scourgemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); // When Scourgemark enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +1/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,0, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java index 3b1badc4388..f968bd6d43d 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassasBounty.java +++ b/Mage.Sets/src/mage/sets/theros/ThassasBounty.java @@ -28,7 +28,7 @@ package mage.sets.theros; import java.util.UUID; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -48,7 +48,7 @@ public class ThassasBounty extends CardImpl { this.color.setBlue(true); // Draw three cards. Target player puts the top three cards of his or her library into his or her graveyard. - this.getSpellAbility().addEffect(new DrawCardControllerEffect(3)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3)); this.getSpellAbility().addTarget(new TargetPlayer(true)); } diff --git a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java index 28165da47b8..988bbf48af5 100644 --- a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java +++ b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java @@ -32,7 +32,7 @@ import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.BestowAbility; import mage.cards.CardImpl; @@ -63,7 +63,7 @@ public class ThassasEmissary extends CardImpl { // Bestow {5}{U} (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached to a creature.) this.addAbility(new BestowAbility(this, "{5}{U}")); // Whenever Thassa's Emissary or enchanted creature deals combat damage to a player, draw a card. - this.addAbility(new ThassasEmissaryTriggeredAbility(new DrawCardControllerEffect(1), false)); + this.addAbility(new ThassasEmissaryTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3,3))); } diff --git a/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java b/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java index 297821293e5..46ffcc2b4f0 100644 --- a/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java +++ b/Mage.Sets/src/mage/sets/theros/TritonFortuneHunter.java @@ -29,7 +29,7 @@ package mage.sets.theros; import java.util.UUID; import mage.MageInt; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.constants.CardType; @@ -52,7 +52,7 @@ public class TritonFortuneHunter extends CardImpl { this.toughness = new MageInt(2); // Heroic - Whenever you cast a spell that targets Triton Fortune Hunter, draw a card. - this.addAbility(new HeroicAbility(new DrawCardControllerEffect(1))); + this.addAbility(new HeroicAbility(new DrawCardSourceControllerEffect(1))); } public TritonFortuneHunter(final TritonFortuneHunter card) { diff --git a/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java b/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java index f4e1e7fc457..eca9f104768 100644 --- a/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java +++ b/Mage.Sets/src/mage/sets/theros/WarriorsLesson.java @@ -31,7 +31,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToAPlayerTriggeredAbility; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -52,7 +52,7 @@ public class WarriorsLesson extends CardImpl { this.color.setGreen(true); // Until end of turn, up to two target creatures you control each gain "Whenever this creature deals combat damage to a player, draw a card." - Ability ability = new DealsDamageToAPlayerTriggeredAbility(new DrawCardControllerEffect(1),false); + Ability ability = new DealsDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1),false); Effect effect = new GainAbilityTargetEffect(ability, Duration.EndOfTurn); effect.setText("Until end of turn, up to two target creatures you control each gain \"Whenever this creature deals combat damage to a player, draw a card.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java b/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java index c8e75187aa0..280ca562ae5 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/BrassSecretary.java @@ -36,7 +36,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -54,7 +54,7 @@ public class BrassSecretary extends CardImpl { this.toughness = new MageInt(1); // {2}, Sacrifice Brass Secretary: Draw a card. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java index a44734acd2d..b16407e5991 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Archivist.java @@ -34,7 +34,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.constants.Zone; @@ -54,7 +54,7 @@ public class Archivist extends CardImpl { this.toughness = new MageInt(1); //{T}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); } public Archivist(final Archivist card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java index d1c82c6aded..e0c694c3639 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/MultanisAcolyte.java @@ -32,7 +32,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; @@ -54,7 +54,7 @@ public class MultanisAcolyte extends CardImpl { // Echo {G}{G} this.addAbility(new EchoAbility("{G}{G}")); // When Multani's Acolyte enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); } public MultanisAcolyte(final MultanisAcolyte card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java b/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java index edc76df337d..b73a3d81796 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/UrzasBlueprints.java @@ -33,7 +33,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.constants.Zone; @@ -51,7 +51,7 @@ public class UrzasBlueprints extends CardImpl { // Echo {6} this.addAbility(new EchoAbility("{6}")); // {tap}: Draw a card. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost())); } public UrzasBlueprints(final UrzasBlueprints card) { diff --git a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java similarity index 88% rename from Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java rename to Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java index 25265f7b901..69fb181c367 100644 --- a/Mage/src/mage/abilities/effects/common/DrawCardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawCardSourceControllerEffect.java @@ -41,28 +41,28 @@ import mage.util.CardUtil; /** * @author BetaSteward_at_googlemail.com */ -public class DrawCardControllerEffect extends OneShotEffect { +public class DrawCardSourceControllerEffect extends OneShotEffect { protected DynamicValue amount; - public DrawCardControllerEffect(int amount) { + public DrawCardSourceControllerEffect(int amount) { this(new StaticValue(amount)); } - public DrawCardControllerEffect(DynamicValue amount) { + public DrawCardSourceControllerEffect(DynamicValue amount) { super(Outcome.DrawCard); this.amount = amount.copy(); setText(); } - public DrawCardControllerEffect(final DrawCardControllerEffect effect) { + public DrawCardSourceControllerEffect(final DrawCardSourceControllerEffect effect) { super(effect); this.amount = effect.amount.copy(); } @Override - public DrawCardControllerEffect copy() { - return new DrawCardControllerEffect(this); + public DrawCardSourceControllerEffect copy() { + return new DrawCardSourceControllerEffect(this); } @Override diff --git a/Mage/src/mage/abilities/keyword/CyclingAbility.java b/Mage/src/mage/abilities/keyword/CyclingAbility.java index 697de3defe7..85d53b4d865 100644 --- a/Mage/src/mage/abilities/keyword/CyclingAbility.java +++ b/Mage/src/mage/abilities/keyword/CyclingAbility.java @@ -33,7 +33,7 @@ import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.Cost; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCosts; -import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.filter.FilterCard; import mage.target.common.TargetCardInLibrary; @@ -49,7 +49,7 @@ public class CyclingAbility extends ActivatedAbilityImpl { private final String text; public CyclingAbility(Cost cost) { - super(Zone.HAND, new DrawCardControllerEffect(1), cost); + super(Zone.HAND, new DrawCardSourceControllerEffect(1), cost); this.addCost(new DiscardSourceCost()); this.cost = cost; this.text = "Cycling";