From ec01e50edd65597fe2a64d571b4822fa12c001ce Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:11:26 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (cards D) --- Mage.Sets/src/mage/cards/d/DagobahMawSlug.java | 2 +- Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java | 2 +- Mage.Sets/src/mage/cards/d/DampingField.java | 2 +- Mage.Sets/src/mage/cards/d/DampingMatrix.java | 2 +- Mage.Sets/src/mage/cards/d/Dandan.java | 2 +- Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java | 2 +- Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java | 2 +- Mage.Sets/src/mage/cards/d/DarkFavor.java | 2 +- Mage.Sets/src/mage/cards/d/DarkPrivilege.java | 2 +- Mage.Sets/src/mage/cards/d/DarkestHour.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelAxe.java | 2 +- Mage.Sets/src/mage/cards/d/DarksteelGarrison.java | 2 +- Mage.Sets/src/mage/cards/d/DaruWarchief.java | 4 ++-- Mage.Sets/src/mage/cards/d/DauntingDefender.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessDourbark.java | 2 +- Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java | 2 +- Mage.Sets/src/mage/cards/d/DawnElemental.java | 2 +- Mage.Sets/src/mage/cards/d/DayOfDestiny.java | 2 +- Mage.Sets/src/mage/cards/d/DeadWeight.java | 2 +- Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java | 2 +- Mage.Sets/src/mage/cards/d/Deadfall.java | 2 +- Mage.Sets/src/mage/cards/d/DeadlyWanderings.java | 2 +- Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DeathPitOffering.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathTrooper.java | 2 +- Mage.Sets/src/mage/cards/d/DeathbringerLiege.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java | 2 +- Mage.Sets/src/mage/cards/d/Deathrender.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsApproach.java | 2 +- Mage.Sets/src/mage/cards/d/DeathsShadow.java | 2 +- Mage.Sets/src/mage/cards/d/DebilitatingInjury.java | 2 +- Mage.Sets/src/mage/cards/d/DebtorsPulpit.java | 2 +- Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java | 2 +- Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java | 2 +- Mage.Sets/src/mage/cards/d/DeepchannelMentor.java | 2 +- Mage.Sets/src/mage/cards/d/Defang.java | 2 +- Mage.Sets/src/mage/cards/d/DefenseGrid.java | 2 +- Mage.Sets/src/mage/cards/d/DefensiveStance.java | 2 +- Mage.Sets/src/mage/cards/d/Dehydration.java | 2 +- Mage.Sets/src/mage/cards/d/DelayingShield.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicAppetite.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicEmbrace.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicRuckus.java | 2 +- Mage.Sets/src/mage/cards/d/DemonicTorment.java | 4 ++-- Mage.Sets/src/mage/cards/d/DemonicVigor.java | 2 +- Mage.Sets/src/mage/cards/d/DemonmailHauberk.java | 2 +- Mage.Sets/src/mage/cards/d/DemonsJester.java | 2 +- Mage.Sets/src/mage/cards/d/Demotion.java | 2 +- Mage.Sets/src/mage/cards/d/DenProtector.java | 2 +- Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java | 2 +- Mage.Sets/src/mage/cards/d/DenseCanopy.java | 2 +- Mage.Sets/src/mage/cards/d/DenseFoliage.java | 2 +- Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java | 4 ++-- Mage.Sets/src/mage/cards/d/DerangedHermit.java | 2 +- Mage.Sets/src/mage/cards/d/Derelor.java | 2 +- Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java | 2 +- Mage.Sets/src/mage/cards/d/DesperateCastaways.java | 2 +- Mage.Sets/src/mage/cards/d/DesperateSentry.java | 2 +- Mage.Sets/src/mage/cards/d/Despondency.java | 2 +- Mage.Sets/src/mage/cards/d/DetainmentSpell.java | 2 +- Mage.Sets/src/mage/cards/d/DeviantGlee.java | 2 +- Mage.Sets/src/mage/cards/d/DhundOperative.java | 2 +- Mage.Sets/src/mage/cards/d/DictateOfHeliod.java | 2 +- Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java | 2 +- Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java | 2 +- Mage.Sets/src/mage/cards/d/DiregrafCaptain.java | 4 ++-- Mage.Sets/src/mage/cards/d/DiregrafEscort.java | 2 +- Mage.Sets/src/mage/cards/d/DismissIntoDream.java | 2 +- Mage.Sets/src/mage/cards/d/DisruptionAura.java | 2 +- Mage.Sets/src/mage/cards/d/DivineFavor.java | 2 +- Mage.Sets/src/mage/cards/d/DivinePresence.java | 2 +- Mage.Sets/src/mage/cards/d/DivineTransformation.java | 2 +- Mage.Sets/src/mage/cards/d/DivinersWand.java | 2 +- Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java | 2 +- Mage.Sets/src/mage/cards/d/DolmenGate.java | 2 +- Mage.Sets/src/mage/cards/d/Domestication.java | 2 +- Mage.Sets/src/mage/cards/d/DominatingLicid.java | 2 +- Mage.Sets/src/mage/cards/d/Domineer.java | 2 +- Mage.Sets/src/mage/cards/d/DoorOfDestinies.java | 2 +- Mage.Sets/src/mage/cards/d/DormantGomazoa.java | 2 +- Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java | 2 +- Mage.Sets/src/mage/cards/d/DowsingDagger.java | 4 ++-- Mage.Sets/src/mage/cards/d/DraconicDestiny.java | 2 +- Mage.Sets/src/mage/cards/d/DragonAppeasement.java | 2 +- Mage.Sets/src/mage/cards/d/DragonBreath.java | 2 +- Mage.Sets/src/mage/cards/d/DragonFangs.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonGrip.java | 2 +- Mage.Sets/src/mage/cards/d/DragonHunter.java | 2 +- Mage.Sets/src/mage/cards/d/DragonMantle.java | 2 +- Mage.Sets/src/mage/cards/d/DragonScales.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonShadow.java | 4 ++-- Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java | 2 +- Mage.Sets/src/mage/cards/d/DragonWings.java | 2 +- Mage.Sets/src/mage/cards/d/DragonloftIdol.java | 2 +- Mage.Sets/src/mage/cards/d/DragonlordsServant.java | 2 +- Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java | 2 +- Mage.Sets/src/mage/cards/d/DralnusCrusade.java | 4 ++-- Mage.Sets/src/mage/cards/d/DreadOfNight.java | 2 +- Mage.Sets/src/mage/cards/d/DreadSlag.java | 2 +- Mage.Sets/src/mage/cards/d/DreamChisel.java | 2 +- Mage.Sets/src/mage/cards/d/DreamDevourer.java | 2 +- Mage.Sets/src/mage/cards/d/DreamHalls.java | 2 +- Mage.Sets/src/mage/cards/d/Drought.java | 4 ++-- Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java | 2 +- Mage.Sets/src/mage/cards/d/DruidsFamiliar.java | 2 +- Mage.Sets/src/mage/cards/d/DualCasting.java | 2 +- Mage.Sets/src/mage/cards/d/Dub.java | 2 +- Mage.Sets/src/mage/cards/d/Duplicant.java | 2 +- Mage.Sets/src/mage/cards/d/DuskCharger.java | 2 +- Mage.Sets/src/mage/cards/d/DustCorona.java | 2 +- Mage.Sets/src/mage/cards/d/DwarvenPatrol.java | 2 +- Mage.Sets/src/mage/cards/d/Dwindle.java | 2 +- Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java | 2 +- Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java | 2 +- 114 files changed, 126 insertions(+), 126 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java index 66221798f5f..bdc5c10b844 100644 --- a/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java +++ b/Mage.Sets/src/mage/cards/d/DagobahMawSlug.java @@ -31,7 +31,7 @@ public final class DagobahMawSlug extends CardImpl { this.addAbility(new MonstrosityAbility("{3}{R}{G}{W}", 2)); // As long as Dagobah Maw Slug is monstrous it has swampwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new SwampwalkAbility()), MonstrousCondition.instance, "As long as Dagobah Maw Slug is monstrous it has swampwalk") diff --git a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java index 34a6cc5f232..e689e8989a8 100644 --- a/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java +++ b/Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java @@ -40,7 +40,7 @@ public final class DamiaSageOfStone extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // At the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference. this.addAbility(new DamiaSageOfStoneTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DampingField.java b/Mage.Sets/src/mage/cards/d/DampingField.java index 54a3da79ba9..bb0688da254 100644 --- a/Mage.Sets/src/mage/cards/d/DampingField.java +++ b/Mage.Sets/src/mage/cards/d/DampingField.java @@ -26,7 +26,7 @@ public final class DampingField extends CardImpl { // Players can't untap more than one artifact during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DampingFieldEffect())); + this.addAbility(new SimpleStaticAbility(new DampingFieldEffect())); } private DampingField(final DampingField card) { diff --git a/Mage.Sets/src/mage/cards/d/DampingMatrix.java b/Mage.Sets/src/mage/cards/d/DampingMatrix.java index 25ac2ff31da..beaa0109ee2 100644 --- a/Mage.Sets/src/mage/cards/d/DampingMatrix.java +++ b/Mage.Sets/src/mage/cards/d/DampingMatrix.java @@ -29,7 +29,7 @@ public final class DampingMatrix extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // Activated abilities of artifacts and creatures can't be activated unless they're mana abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DampingMatrixEffect())); + this.addAbility(new SimpleStaticAbility(new DampingMatrixEffect())); } private DampingMatrix(final DampingMatrix card) { diff --git a/Mage.Sets/src/mage/cards/d/Dandan.java b/Mage.Sets/src/mage/cards/d/Dandan.java index 15be04bb225..b702063bd6c 100644 --- a/Mage.Sets/src/mage/cards/d/Dandan.java +++ b/Mage.Sets/src/mage/cards/d/Dandan.java @@ -28,7 +28,7 @@ public final class Dandan extends CardImpl { this.toughness = new MageInt(1); // Dandan can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island")))); // When you control no Islands, sacrifice Dandan. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java index 6cc1a77137a..870f340fae5 100644 --- a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java +++ b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java @@ -50,7 +50,7 @@ public final class DanithaCapashenParagon extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Aura and Equipment spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private DanithaCapashenParagon(final DanithaCapashenParagon card) { diff --git a/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java b/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java index 40d23c4106e..5a05b6caaee 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazReincarnated.java @@ -49,7 +49,7 @@ public final class DarigaazReincarnated extends CardImpl { this.addAbility(HasteAbility.getInstance()); // If Darigaaz Reincarnated would die, instead exile it with three egg counters on it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarigaazReincarnatedDiesEffect())); + this.addAbility(new SimpleStaticAbility(new DarigaazReincarnatedDiesEffect())); // At the beginning of your upkeep, if Darigaaz is exiled with an egg counter on it, remove an egg counter from it. Then if Darigaaz has no egg counters on it, return it to the battlefield. this.addAbility(new DarigaazReincarnatedInterveningIfTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DarkFavor.java b/Mage.Sets/src/mage/cards/d/DarkFavor.java index 6442332b0e7..ad1c9fd26e0 100644 --- a/Mage.Sets/src/mage/cards/d/DarkFavor.java +++ b/Mage.Sets/src/mage/cards/d/DarkFavor.java @@ -35,7 +35,7 @@ public final class DarkFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(1), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); } private DarkFavor(final DarkFavor card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java index 901f4d206e9..21304bb3b65 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java +++ b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java @@ -42,7 +42,7 @@ public final class DarkPrivilege extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // Sacrifice a creature: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/d/DarkestHour.java b/Mage.Sets/src/mage/cards/d/DarkestHour.java index 6430ed367d0..297069926a9 100644 --- a/Mage.Sets/src/mage/cards/d/DarkestHour.java +++ b/Mage.Sets/src/mage/cards/d/DarkestHour.java @@ -23,7 +23,7 @@ public final class DarkestHour extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // All creatures are black. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DarkestHourEffect())); + this.addAbility(new SimpleStaticAbility(new DarkestHourEffect())); } private DarkestHour(final DarkestHour card) { diff --git a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java index 7f009e0e898..c50e0444146 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelAxe.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelAxe.java @@ -29,7 +29,7 @@ public final class DarksteelAxe extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), false)); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java b/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java index f7b0998015d..32f2614745e 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelGarrison.java @@ -34,7 +34,7 @@ public final class DarksteelGarrison extends CardImpl { Ability gainedAbility = IndestructibleAbility.getInstance(); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Fortified land has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever fortified land becomes tapped, target creature gets +1/+1 until end of turn. Ability ability = new BecomesTappedAttachedTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), "fortified land"); diff --git a/Mage.Sets/src/mage/cards/d/DaruWarchief.java b/Mage.Sets/src/mage/cards/d/DaruWarchief.java index bb6eb56aab9..75ad2af7c5e 100644 --- a/Mage.Sets/src/mage/cards/d/DaruWarchief.java +++ b/Mage.Sets/src/mage/cards/d/DaruWarchief.java @@ -37,10 +37,10 @@ public final class DaruWarchief extends CardImpl { this.toughness = new MageInt(1); // Soldier spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Soldier creatures you control get +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 2, Duration.WhileOnBattlefield, filterCreatures, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 2, Duration.WhileOnBattlefield, filterCreatures, false))); } private DaruWarchief(final DaruWarchief card) { diff --git a/Mage.Sets/src/mage/cards/d/DauntingDefender.java b/Mage.Sets/src/mage/cards/d/DauntingDefender.java index 148dcc9915a..c887e1e7601 100644 --- a/Mage.Sets/src/mage/cards/d/DauntingDefender.java +++ b/Mage.Sets/src/mage/cards/d/DauntingDefender.java @@ -32,7 +32,7 @@ public final class DauntingDefender extends CardImpl { this.toughness = new MageInt(3); // If a source would deal damage to a Cleric creature you control, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DauntingDefenderEffect(1))); + this.addAbility(new SimpleStaticAbility(new DauntingDefenderEffect(1))); } private DauntingDefender(final DauntingDefender card) { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index 2c6dff4dce2..2cbf9c4bf09 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -54,7 +54,7 @@ public final class DauntlessDourbark extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(amount))); // Dauntless Dourbark has trample as long as you control another Treefolk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter2), rule))); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 07fe1b4bc56..f898a711b32 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -39,7 +39,7 @@ public final class DauntlessRiverMarshal extends CardImpl { this.toughness = new MageInt(1); // Dauntless River Marshal gets +1/+1 as long as you control an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 1, 1))); // {3}{U}: Tap target creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/d/DawnElemental.java b/Mage.Sets/src/mage/cards/d/DawnElemental.java index ba6ccfd3c52..9f4e4301b50 100644 --- a/Mage.Sets/src/mage/cards/d/DawnElemental.java +++ b/Mage.Sets/src/mage/cards/d/DawnElemental.java @@ -33,7 +33,7 @@ public final class DawnElemental extends CardImpl { // Prevent all damage that would be dealt to Dawn Elemental. Effect effect = new PreventAllDamageToSourceEffect(Duration.WhileOnBattlefield); effect.setText("Prevent all damage that would be dealt to {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DawnElemental(final DawnElemental card) { diff --git a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java index 6d29e25f9c0..c28e3092c8f 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java @@ -29,7 +29,7 @@ public final class DayOfDestiny extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Legendary creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, filter, false))); } private DayOfDestiny(final DayOfDestiny card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadWeight.java b/Mage.Sets/src/mage/cards/d/DeadWeight.java index a4198a02117..0f7e6378f6f 100644 --- a/Mage.Sets/src/mage/cards/d/DeadWeight.java +++ b/Mage.Sets/src/mage/cards/d/DeadWeight.java @@ -35,7 +35,7 @@ public final class DeadWeight extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } private DeadWeight(final DeadWeight card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java index 89794e69400..67ca2b63b70 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeNavigator.java @@ -37,7 +37,7 @@ public final class DeadeyeNavigator extends CardImpl { // As long as Deadeye Navigator is paired with another creature, each of those creatures has "{1}{U}: Exile this creature, then return it to the battlefield under your control." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(true), new ManaCostsImpl<>("{1}{U}")); ability.addEffect(new ReturnToBattlefieldUnderYourControlSourceEffect()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private DeadeyeNavigator(final DeadeyeNavigator card) { diff --git a/Mage.Sets/src/mage/cards/d/Deadfall.java b/Mage.Sets/src/mage/cards/d/Deadfall.java index 9b172a1af1b..c2a80a1ae8b 100644 --- a/Mage.Sets/src/mage/cards/d/Deadfall.java +++ b/Mage.Sets/src/mage/cards/d/Deadfall.java @@ -24,7 +24,7 @@ public final class Deadfall extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); // Creatures with forestwalk can be blocked as though they didn't have forestwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DeadfallEffect())); + this.addAbility(new SimpleStaticAbility(new DeadfallEffect())); } private Deadfall(final Deadfall card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java index 552b8f28f67..3c04592fdc5 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyWanderings.java @@ -32,7 +32,7 @@ public final class DeadlyWanderings extends CardImpl { ContinuousEffect boostEffect = new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield); Effect effect = new ConditionalContinuousEffect(boostEffect, new CreatureCountCondition(1, TargetController.YOU), "As long as you control exactly one creature, that creature gets +2/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ContinuousEffect deathtouchEffect = new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE); effect = new ConditionalContinuousEffect(deathtouchEffect, new CreatureCountCondition(1, TargetController.YOU), "and has deathtouch"); diff --git a/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java b/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java index 19e6824e411..bc7eb7d2280 100644 --- a/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java +++ b/Mage.Sets/src/mage/cards/d/DeathMaskDuplicant.java @@ -57,7 +57,7 @@ public final class DeathMaskDuplicant extends CardImpl { this.addAbility(ability); // As long as a card exiled with Death-Mask Duplicant has flying, Death-Mask Duplicant has flying. The same is true for fear, first strike, double strike, haste, landwalk, protection, and trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DeathMaskDuplicantEffect())); + this.addAbility(new SimpleStaticAbility(new DeathMaskDuplicantEffect())); } private DeathMaskDuplicant(final DeathMaskDuplicant card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java index 3a13b82a18c..c4c2f5665fe 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPitOffering.java +++ b/Mage.Sets/src/mage/cards/d/DeathPitOffering.java @@ -24,7 +24,7 @@ public final class DeathPitOffering extends CardImpl { // When Death Pit Offering enters the battlefield, sacrifice all creatures you control. this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeAllControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURES))); // Creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES, false))); } private DeathPitOffering(final DeathPitOffering card) { @@ -35,4 +35,4 @@ public final class DeathPitOffering extends CardImpl { public DeathPitOffering copy() { return new DeathPitOffering(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DeathTrooper.java b/Mage.Sets/src/mage/cards/d/DeathTrooper.java index fa5933e5449..976497f6fa8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathTrooper.java +++ b/Mage.Sets/src/mage/cards/d/DeathTrooper.java @@ -34,7 +34,7 @@ public final class DeathTrooper extends CardImpl { this.toughness = new MageInt(1); // Trooper creatures you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java index 44bf071a318..dfc6fb45df6 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java +++ b/Mage.Sets/src/mage/cards/d/DeathbringerLiege.java @@ -49,8 +49,8 @@ public final class DeathbringerLiege extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterWhite, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); Ability ability = new SpellCastControllerTriggeredAbility(new TapTargetEffect(), filterWhiteSpellCard, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java index 267085dea95..46a2e7112d8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java +++ b/Mage.Sets/src/mage/cards/d/DeathmaskNezumi.java @@ -35,7 +35,7 @@ public final class DeathmaskNezumi extends CardImpl { // As long as you have seven or more cards in hand, Deathmask Nezumi gets +2/+1 and has fear. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield), condition, "and has fear")); diff --git a/Mage.Sets/src/mage/cards/d/Deathrender.java b/Mage.Sets/src/mage/cards/d/Deathrender.java index e5a86500000..503576da976 100644 --- a/Mage.Sets/src/mage/cards/d/Deathrender.java +++ b/Mage.Sets/src/mage/cards/d/Deathrender.java @@ -32,7 +32,7 @@ public final class Deathrender extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 2))); // Whenever equipped creature dies, you may put a creature card from your hand onto the battlefield and attach Deathrender to it. this.addAbility(new DiesAttachedTriggeredAbility(new DeathrenderEffect(), "equipped creature")); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index 9543a3d5f5d..27d79664fc3 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -43,7 +43,7 @@ public final class DeathsApproach extends CardImpl { // Enchanted Creature gets -X/-X, where X is the number of creature cards in its controller's graveyard. DynamicValue unboost = new SignInversionDynamicValue( new CardsInEnchantedCreaturesControllerGraveyardCount(new FilterCreatureCard("the number of creature cards in its controller's graveyard"))); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(unboost,unboost, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(unboost,unboost, Duration.WhileOnBattlefield)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeathsShadow.java b/Mage.Sets/src/mage/cards/d/DeathsShadow.java index 9059bd9834f..c56e39eb0dd 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsShadow.java +++ b/Mage.Sets/src/mage/cards/d/DeathsShadow.java @@ -29,7 +29,7 @@ public final class DeathsShadow extends CardImpl { // Death's Shadow gets -X/-X, where X is your life total. SignInversionDynamicValue x = new SignInversionDynamicValue(ControllerLifeCount.instance, false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(x, x, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(x, x, Duration.WhileOnBattlefield))); } private DeathsShadow(final DeathsShadow card) { diff --git a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java index 7febccb5786..01d8111ee52 100644 --- a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java +++ b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java @@ -36,7 +36,7 @@ public final class DebilitatingInjury extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-2 - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-2,-2, Duration.WhileOnBattlefield))); } private DebilitatingInjury(final DebilitatingInjury card) { diff --git a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java index cfbbf2f8b7a..5344a120d3f 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java @@ -39,7 +39,7 @@ public final class DebtorsPulpit extends CardImpl { // Enchanted land has "{T}: Tap target creature." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost()); gainAbility.addTarget(new TargetCreaturePermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted land has \"{T}: Tap target creature.\""))); } diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java index a35260a56df..20a18a4af03 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaSerpent.java @@ -25,7 +25,7 @@ public final class DeepSeaSerpent extends CardImpl { this.toughness = new MageInt(5); // Deep-Sea Serpent can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); } private DeepSeaSerpent(final DeepSeaSerpent card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java index c45342bc9bf..7dfef31f535 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java +++ b/Mage.Sets/src/mage/cards/d/DeepSlumberTitan.java @@ -33,7 +33,7 @@ public final class DeepSlumberTitan extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Deep-Slumber Titan doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever Deep-Slumber Titan is dealt damage, untap it. this.addAbility(new DealtDamageToSourceTriggeredAbility(new UntapSourceEffect().setText("untap it"), false)); diff --git a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java index 0856936789f..5b9f788df12 100644 --- a/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java +++ b/Mage.Sets/src/mage/cards/d/DeepchannelMentor.java @@ -36,7 +36,7 @@ public final class DeepchannelMentor extends CardImpl { this.toughness = new MageInt(2); // Blue creatures you control can't be blocked. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield))); } private DeepchannelMentor(final DeepchannelMentor card) { diff --git a/Mage.Sets/src/mage/cards/d/Defang.java b/Mage.Sets/src/mage/cards/d/Defang.java index 980908683ed..f037ba144a8 100644 --- a/Mage.Sets/src/mage/cards/d/Defang.java +++ b/Mage.Sets/src/mage/cards/d/Defang.java @@ -35,7 +35,7 @@ public final class Defang extends CardImpl { this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); } private Defang(final Defang card) { diff --git a/Mage.Sets/src/mage/cards/d/DefenseGrid.java b/Mage.Sets/src/mage/cards/d/DefenseGrid.java index f8f55298195..57dd6ef513c 100644 --- a/Mage.Sets/src/mage/cards/d/DefenseGrid.java +++ b/Mage.Sets/src/mage/cards/d/DefenseGrid.java @@ -22,7 +22,7 @@ public final class DefenseGrid extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Each spell costs {3} more to cast except during its controller's turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DefenseGridCostModificationEffect())); + this.addAbility(new SimpleStaticAbility(new DefenseGridCostModificationEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DefensiveStance.java b/Mage.Sets/src/mage/cards/d/DefensiveStance.java index 0d61c6f79de..18c4b33d086 100644 --- a/Mage.Sets/src/mage/cards/d/DefensiveStance.java +++ b/Mage.Sets/src/mage/cards/d/DefensiveStance.java @@ -31,7 +31,7 @@ public final class DefensiveStance extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-1, 1, Duration.WhileOnBattlefield))); } private DefensiveStance(final DefensiveStance card) { diff --git a/Mage.Sets/src/mage/cards/d/Dehydration.java b/Mage.Sets/src/mage/cards/d/Dehydration.java index 7f3376d4216..894a153c490 100644 --- a/Mage.Sets/src/mage/cards/d/Dehydration.java +++ b/Mage.Sets/src/mage/cards/d/Dehydration.java @@ -32,7 +32,7 @@ public final class Dehydration extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private Dehydration(final Dehydration card) { diff --git a/Mage.Sets/src/mage/cards/d/DelayingShield.java b/Mage.Sets/src/mage/cards/d/DelayingShield.java index a2daebff08d..f4b9191873b 100644 --- a/Mage.Sets/src/mage/cards/d/DelayingShield.java +++ b/Mage.Sets/src/mage/cards/d/DelayingShield.java @@ -31,7 +31,7 @@ public final class DelayingShield extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // If damage would be dealt to you, put that many delay counters on Delaying Shield instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DelayingShieldReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new DelayingShieldReplacementEffect())); // At the beginning of your upkeep, remove all delay counters from Delaying Shield. For each delay counter removed this way, you lose 1 life unless you pay {1}{W}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DelayingShieldUpkeepEffect())); diff --git a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java index 1041cb6bf07..fdf7702a653 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java +++ b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java @@ -34,7 +34,7 @@ public final class DemonicAppetite extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // At the beginning of your upkeep, sacrifice a creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "") diff --git a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java index 6a06eb34c49..4742ab35130 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java +++ b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java @@ -45,7 +45,7 @@ public final class DemonicEmbrace extends CardImpl { this.addAbility(ability); // Enchanted creature gets +3/+1, has flying, and is a Demon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DemonicRuckus.java b/Mage.Sets/src/mage/cards/d/DemonicRuckus.java index 8a6523f099f..f50a91eed80 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicRuckus.java +++ b/Mage.Sets/src/mage/cards/d/DemonicRuckus.java @@ -36,7 +36,7 @@ public final class DemonicRuckus extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 and has menace and trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); ability.addEffect(new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.AURA).setText("and has menace")); ability.addEffect(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA).setText("and trample")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonicTorment.java b/Mage.Sets/src/mage/cards/d/DemonicTorment.java index 543c929f584..452677b55ea 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTorment.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTorment.java @@ -32,9 +32,9 @@ public final class DemonicTorment extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new CantAttackAttachedEffect(AttachmentType.AURA))); // Prevent all combat damage that would be dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private DemonicTorment(final DemonicTorment card) { diff --git a/Mage.Sets/src/mage/cards/d/DemonicVigor.java b/Mage.Sets/src/mage/cards/d/DemonicVigor.java index 53c5c27bbe1..1fd11281def 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicVigor.java +++ b/Mage.Sets/src/mage/cards/d/DemonicVigor.java @@ -38,7 +38,7 @@ public final class DemonicVigor extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); // When enchanted creature dies, return that card to its owner's hand. this.addAbility(new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java index bc7c4f8b10f..57dd4b7b12c 100644 --- a/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java +++ b/Mage.Sets/src/mage/cards/d/DemonmailHauberk.java @@ -26,7 +26,7 @@ public final class DemonmailHauberk extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +4/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 2))); // Equip - Sacrifice a creature. this.addAbility(new EquipAbility( diff --git a/Mage.Sets/src/mage/cards/d/DemonsJester.java b/Mage.Sets/src/mage/cards/d/DemonsJester.java index c2a73b9fcfb..f07aa228ecc 100644 --- a/Mage.Sets/src/mage/cards/d/DemonsJester.java +++ b/Mage.Sets/src/mage/cards/d/DemonsJester.java @@ -31,7 +31,7 @@ public final class DemonsJester extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Hellbent - Demon's Jester gets +2/+1 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,1,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+1 as long as you have no cards in hand"))); } diff --git a/Mage.Sets/src/mage/cards/d/Demotion.java b/Mage.Sets/src/mage/cards/d/Demotion.java index 590fa55984d..e964c4dc0bf 100644 --- a/Mage.Sets/src/mage/cards/d/Demotion.java +++ b/Mage.Sets/src/mage/cards/d/Demotion.java @@ -32,7 +32,7 @@ public final class Demotion extends CardImpl { this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockActivateAttachedEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index 943c41c0ff1..4e489e89299 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/Mage.Sets/src/mage/cards/d/DenProtector.java @@ -31,7 +31,7 @@ public final class DenProtector extends CardImpl { this.toughness = new MageInt(1); // Creatures with power less than Den Protector's power can't block it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); // Megamorph {1}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"), true)); diff --git a/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java b/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java index e590cce7a81..55885247a4a 100644 --- a/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java +++ b/Mage.Sets/src/mage/cards/d/DennickPiousApprentice.java @@ -34,7 +34,7 @@ public final class DennickPiousApprentice extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); // Disturb {2}{W}{U} this.addAbility(new DisturbAbility(this, "{2}{W}{U}")); diff --git a/Mage.Sets/src/mage/cards/d/DenseCanopy.java b/Mage.Sets/src/mage/cards/d/DenseCanopy.java index 62d967e9b36..4d8256b8eee 100644 --- a/Mage.Sets/src/mage/cards/d/DenseCanopy.java +++ b/Mage.Sets/src/mage/cards/d/DenseCanopy.java @@ -26,7 +26,7 @@ public final class DenseCanopy extends CardImpl { // Creatures with flying can block only creatures with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DenseCanopyCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new DenseCanopyCantBlockEffect())); } private DenseCanopy(final DenseCanopy card) { diff --git a/Mage.Sets/src/mage/cards/d/DenseFoliage.java b/Mage.Sets/src/mage/cards/d/DenseFoliage.java index 95d6fb52e83..f9bce7f005a 100644 --- a/Mage.Sets/src/mage/cards/d/DenseFoliage.java +++ b/Mage.Sets/src/mage/cards/d/DenseFoliage.java @@ -24,7 +24,7 @@ public final class DenseFoliage extends CardImpl { // Creatures can't be the targets of spells. CantBeTargetedAllEffect cantTargetEffect = new CantBeTargetedAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, new FilterSpell("spells"), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect)); + this.addAbility(new SimpleStaticAbility(cantTargetEffect)); } private DenseFoliage(final DenseFoliage card) { diff --git a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java index e281ace2cbc..126338d0e63 100644 --- a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java +++ b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java @@ -38,12 +38,12 @@ public final class DepalaPilotExemplar extends CardImpl { this.toughness = new MageInt(3); // Other Dwarves you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.DWARF, "Dwarves"), true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.DWARF, "Dwarves"), true))); // Each Vehicle you control gets +1/+1 as long as it's a creature. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.VEHICLE, "Vehicle")); effect.setText("Each Vehicle you control gets +1/+1 as long as it's a creature"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever Depala, Pilot Exemplar becomes tapped, you may pay {X}. If you do, reveal the top X cards of your library, put all Dwarf and Vehicle cards from among them into your hand, then put the rest on the bottom of your library in a random order. this.addAbility(new BecomesTappedSourceTriggeredAbility(new DepalaPilotExemplarEffect(), true)); diff --git a/Mage.Sets/src/mage/cards/d/DerangedHermit.java b/Mage.Sets/src/mage/cards/d/DerangedHermit.java index 84fcb18453e..7a45e61924a 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedHermit.java +++ b/Mage.Sets/src/mage/cards/d/DerangedHermit.java @@ -41,7 +41,7 @@ public final class DerangedHermit extends CardImpl { // When Deranged Hermit enters the battlefield, create four 1/1 green Squirrel creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SquirrelToken(), 4))); // Squirrel creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); } diff --git a/Mage.Sets/src/mage/cards/d/Derelor.java b/Mage.Sets/src/mage/cards/d/Derelor.java index 5d1ff13d712..1c9107f5918 100644 --- a/Mage.Sets/src/mage/cards/d/Derelor.java +++ b/Mage.Sets/src/mage/cards/d/Derelor.java @@ -35,7 +35,7 @@ public final class Derelor extends CardImpl { this.toughness = new MageInt(4); // Black spells you cast cost {B} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(new ManaCostsImpl<>("{B}"), filter, TargetController.YOU))); } private Derelor(final Derelor card) { diff --git a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java index 6542a29050d..ab84c6d5de5 100644 --- a/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java +++ b/Mage.Sets/src/mage/cards/d/DescendantOfKiyomaro.java @@ -33,7 +33,7 @@ public final class DescendantOfKiyomaro extends CardImpl { this.toughness = new MageInt(3); // As long as you have more cards in hand than each opponent, Descendant of Kiyomaro gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,2, Duration.WhileOnBattlefield), MoreCardsInHandThanOpponentsCondition.instance, "As long as you have more cards in hand than each opponent, {this} gets +1/+2")); diff --git a/Mage.Sets/src/mage/cards/d/DesperateCastaways.java b/Mage.Sets/src/mage/cards/d/DesperateCastaways.java index e8b45c8215b..dbe011022b0 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateCastaways.java +++ b/Mage.Sets/src/mage/cards/d/DesperateCastaways.java @@ -30,7 +30,7 @@ public final class DesperateCastaways extends CardImpl { this.toughness = new MageInt(3); // Desperate Castaways can't attack unless you control an artifact. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DesperateCastawaysEffect())); + this.addAbility(new SimpleStaticAbility(new DesperateCastawaysEffect())); } private DesperateCastaways(final DesperateCastaways card) { diff --git a/Mage.Sets/src/mage/cards/d/DesperateSentry.java b/Mage.Sets/src/mage/cards/d/DesperateSentry.java index f86be64b859..1035a151ee7 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateSentry.java +++ b/Mage.Sets/src/mage/cards/d/DesperateSentry.java @@ -38,7 +38,7 @@ public final class DesperateSentry extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +3/+0 as long as there are four or more card types among cards in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/Despondency.java b/Mage.Sets/src/mage/cards/d/Despondency.java index 1c64c029276..16ef621859a 100644 --- a/Mage.Sets/src/mage/cards/d/Despondency.java +++ b/Mage.Sets/src/mage/cards/d/Despondency.java @@ -36,7 +36,7 @@ public final class Despondency extends CardImpl { this.addAbility(ability); // Enchanted creature gets -2/-0. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(-2, 0)); this.addAbility(ability); // When Despondency is put into a graveyard from the battlefield, return Despondency to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java index 0dcd4bc8711..538f62585e8 100644 --- a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java +++ b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java @@ -37,7 +37,7 @@ public final class DetainmentSpell extends CardImpl { this.addAbility(ability); // Enchanted creature's activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantActivateAbilitiesAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantActivateAbilitiesAttachedEffect())); // {1}{W}: Attach Detainment Spell to target creature. ability = new SimpleActivatedAbility(new AttachEffect(Outcome.BoostCreature, "Attach {this} to target creature"), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index 88da6d180c3..e9802ae78d0 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -40,7 +40,7 @@ public final class DeviantGlee extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has "{R}: This creature gains trample until end of turn." - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); + SimpleStaticAbility ability2 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(),Duration.EndOfTurn),new ManaCostsImpl<>("{R}")); ability2.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, rule)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/d/DhundOperative.java b/Mage.Sets/src/mage/cards/d/DhundOperative.java index 9b36aad2756..70545c501c1 100644 --- a/Mage.Sets/src/mage/cards/d/DhundOperative.java +++ b/Mage.Sets/src/mage/cards/d/DhundOperative.java @@ -41,7 +41,7 @@ public final class DhundOperative extends CardImpl { new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT), "and has deathtouch"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); + Ability ability = new SimpleStaticAbility(boostEffect); ability.addEffect(gainAbilityEffect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java index 85261780cdf..96d344f6f77 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfHeliod.java @@ -24,7 +24,7 @@ public final class DictateOfHeliod extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // Creatures you control get +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2,2,Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2,2,Duration.WhileOnBattlefield))); } private DictateOfHeliod(final DictateOfHeliod card) { diff --git a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java index b4006a5d982..0f20c7f0940 100644 --- a/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java +++ b/Mage.Sets/src/mage/cards/d/DictateOfTheTwinGods.java @@ -31,7 +31,7 @@ public final class DictateOfTheTwinGods extends CardImpl { // Flash this.addAbility(FlashAbility.getInstance()); // If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DictateOfTheTwinGodsEffect())); + this.addAbility(new SimpleStaticAbility(new DictateOfTheTwinGodsEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java index 48767027a5c..4bdaf42965e 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java @@ -39,7 +39,7 @@ public final class DiplomaticImmunity extends CardImpl { this.addAbility(ShroudAbility.getInstance()); // Enchanted creature has shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); } private DiplomaticImmunity(final DiplomaticImmunity card) { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java index 74e6ee240a7..0e35ac6c7bb 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java @@ -40,7 +40,7 @@ public final class DiregrafCaptain extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Other Zombie creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever another Zombie you control dies, target opponent loses 1 life. this.addAbility(new DiregrafCaptainTriggeredAbility()); @@ -99,4 +99,4 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever another Zombie you control dies, target opponent loses 1 life."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java index 4f2b77d80df..3db913288a8 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java @@ -40,7 +40,7 @@ public final class DiregrafEscort extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Diregraf Escort is paired with another creature, both creatures have protection from Zombies. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(new ProtectionAbility(filter), ruleText))); } private DiregrafEscort(final DiregrafEscort card) { diff --git a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java index b43d6514179..c504fd86cd4 100644 --- a/Mage.Sets/src/mage/cards/d/DismissIntoDream.java +++ b/Mage.Sets/src/mage/cards/d/DismissIntoDream.java @@ -31,7 +31,7 @@ public final class DismissIntoDream extends CardImpl { // Each creature your opponents control is an Illusion in addition to its other types // and has "When this creature becomes the target of a spell or ability, sacrifice it." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DismissIntoDreamEffect(filter))); + this.addAbility(new SimpleStaticAbility(new DismissIntoDreamEffect(filter))); } private DismissIntoDream(final DismissIntoDream card) { diff --git a/Mage.Sets/src/mage/cards/d/DisruptionAura.java b/Mage.Sets/src/mage/cards/d/DisruptionAura.java index 10653f75037..f722c6bd301 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptionAura.java +++ b/Mage.Sets/src/mage/cards/d/DisruptionAura.java @@ -41,7 +41,7 @@ public final class DisruptionAura extends CardImpl { ability = new BeginningOfUpkeepTriggeredAbility(new DisruptionAuraEffect()); Effect effect = new GainAbilityAttachedEffect(ability, AttachmentType.AURA); effect.setText("Enchanted artifact has \"At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DisruptionAura(final DisruptionAura card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineFavor.java b/Mage.Sets/src/mage/cards/d/DivineFavor.java index 7f25ae6ab7e..9e2ec4c9fa3 100644 --- a/Mage.Sets/src/mage/cards/d/DivineFavor.java +++ b/Mage.Sets/src/mage/cards/d/DivineFavor.java @@ -35,7 +35,7 @@ public final class DivineFavor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3), false)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/DivinePresence.java b/Mage.Sets/src/mage/cards/d/DivinePresence.java index c6e1612ede3..1bad685fde0 100644 --- a/Mage.Sets/src/mage/cards/d/DivinePresence.java +++ b/Mage.Sets/src/mage/cards/d/DivinePresence.java @@ -24,7 +24,7 @@ public final class DivinePresence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DivinePresenceEffect())); + this.addAbility(new SimpleStaticAbility(new DivinePresenceEffect())); } private DivinePresence(final DivinePresence card) { diff --git a/Mage.Sets/src/mage/cards/d/DivineTransformation.java b/Mage.Sets/src/mage/cards/d/DivineTransformation.java index f384e1a8068..43ba9008699 100644 --- a/Mage.Sets/src/mage/cards/d/DivineTransformation.java +++ b/Mage.Sets/src/mage/cards/d/DivineTransformation.java @@ -35,7 +35,7 @@ public final class DivineTransformation extends CardImpl { // Enchanted creature gets +3/+3. Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); } private DivineTransformation(final DivineTransformation card) { diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index d31f9ac204a..789c266a3b7 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -45,7 +45,7 @@ public final class DivinersWand extends CardImpl { Effect effectDraw = new GainAbilityAttachedEffect(newDraw, AttachmentType.EQUIPMENT) .setText("\"{4}: Draw a card.\""); // total ability - Ability totalAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effectBoost); + Ability totalAbility = new SimpleStaticAbility(effectBoost); totalAbility.addEffect(effectDraw.concatBy("and")); this.addAbility(totalAbility); diff --git a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java index 672bb8c7256..7149a0ca5d6 100644 --- a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java +++ b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java @@ -53,7 +53,7 @@ public final class DjeruWithEyesOpen extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); // If a source would deal damage to a planeswalker you control, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DjeruWithEyesOpenPreventEffect())); + this.addAbility(new SimpleStaticAbility(new DjeruWithEyesOpenPreventEffect())); } private DjeruWithEyesOpen(final DjeruWithEyesOpen card) { diff --git a/Mage.Sets/src/mage/cards/d/DolmenGate.java b/Mage.Sets/src/mage/cards/d/DolmenGate.java index d0b126bf1e3..9b708e557f9 100644 --- a/Mage.Sets/src/mage/cards/d/DolmenGate.java +++ b/Mage.Sets/src/mage/cards/d/DolmenGate.java @@ -27,7 +27,7 @@ public final class DolmenGate extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Prevent all combat damage that would be dealt to attacking creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAllEffect(Duration.WhileOnBattlefield, filter, true))); } private DolmenGate(final DolmenGate card) { diff --git a/Mage.Sets/src/mage/cards/d/Domestication.java b/Mage.Sets/src/mage/cards/d/Domestication.java index a83bb7f4bec..c3cf849cf4e 100644 --- a/Mage.Sets/src/mage/cards/d/Domestication.java +++ b/Mage.Sets/src/mage/cards/d/Domestication.java @@ -42,7 +42,7 @@ public final class Domestication extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // At the beginning of your end step, if enchanted creature's power is 4 or greater, sacrifice Domestication. TriggeredAbility ability2 = new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DominatingLicid.java b/Mage.Sets/src/mage/cards/d/DominatingLicid.java index adf90bfdf9b..09ed27f0b32 100644 --- a/Mage.Sets/src/mage/cards/d/DominatingLicid.java +++ b/Mage.Sets/src/mage/cards/d/DominatingLicid.java @@ -31,7 +31,7 @@ public final class DominatingLicid extends CardImpl { this.addAbility(new LicidAbility(new ManaCostsImpl<>("{1}{U}{U}"), new ColoredManaCost(ColoredManaSymbol.U))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private DominatingLicid(final DominatingLicid card) { diff --git a/Mage.Sets/src/mage/cards/d/Domineer.java b/Mage.Sets/src/mage/cards/d/Domineer.java index ff847f390f4..e41877951dc 100644 --- a/Mage.Sets/src/mage/cards/d/Domineer.java +++ b/Mage.Sets/src/mage/cards/d/Domineer.java @@ -40,7 +40,7 @@ public final class Domineer extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted artifact creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("artifact creature"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("artifact creature"))); } private Domineer(final Domineer card) { diff --git a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java index d3103fc9718..22fcd5cfdf0 100644 --- a/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java +++ b/Mage.Sets/src/mage/cards/d/DoorOfDestinies.java @@ -36,7 +36,7 @@ public final class DoorOfDestinies extends CardImpl { this.addAbility(new AddCounterAbility()); // Creatures you control of the chosen type get +1/+1 for each charge counter on Door of Destinies. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostCreatureEffectEffect())); + this.addAbility(new SimpleStaticAbility(new BoostCreatureEffectEffect())); } private DoorOfDestinies(final DoorOfDestinies card) { diff --git a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java index f1a3d32dbcb..b52f1096d8f 100644 --- a/Mage.Sets/src/mage/cards/d/DormantGomazoa.java +++ b/Mage.Sets/src/mage/cards/d/DormantGomazoa.java @@ -35,7 +35,7 @@ public final class DormantGomazoa extends CardImpl { this.addAbility(new EntersBattlefieldTappedAbility()); // Dormant Gomazoa doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you become the target of a spell, you may untap Dormant Gomazoa. this.addAbility(new BecomesTargetControllerTriggeredAbility(new UntapSourceEffect(), diff --git a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java index eb4301f0d4d..740878c830a 100644 --- a/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java +++ b/Mage.Sets/src/mage/cards/d/DosanTheFallingLeaf.java @@ -28,7 +28,7 @@ public final class DosanTheFallingLeaf extends CardImpl { this.toughness = new MageInt(2); // Players can cast spells only during their own turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DosanTheFallingLeafEffect())); + this.addAbility(new SimpleStaticAbility(new DosanTheFallingLeafEffect())); } private DosanTheFallingLeaf(final DosanTheFallingLeaf card) { diff --git a/Mage.Sets/src/mage/cards/d/DowsingDagger.java b/Mage.Sets/src/mage/cards/d/DowsingDagger.java index 7c1dcf9256c..8a2f5db3934 100644 --- a/Mage.Sets/src/mage/cards/d/DowsingDagger.java +++ b/Mage.Sets/src/mage/cards/d/DowsingDagger.java @@ -42,7 +42,7 @@ public final class DowsingDagger extends CardImpl { this.addAbility(ability); // Equipped creature gets +2/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 1))); // Whenever equipped creature deals combat damage to a player, you may transform Dowsing Dagger. this.addAbility(new TransformAbility()); @@ -60,4 +60,4 @@ public final class DowsingDagger extends CardImpl { public DowsingDagger copy() { return new DowsingDagger(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DraconicDestiny.java b/Mage.Sets/src/mage/cards/d/DraconicDestiny.java index e377cbf651b..e0bef7a7145 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DraconicDestiny.java @@ -39,7 +39,7 @@ public final class DraconicDestiny extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying, haste, and "{1}: This creature gets +1/+0 until end of turn." It's a Dragon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA).setText(", haste")); ability.addEffect(new GainAbilityAttachedEffect(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java index f2ed52d82f5..8453ffa881b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonAppeasement.java +++ b/Mage.Sets/src/mage/cards/d/DragonAppeasement.java @@ -24,7 +24,7 @@ public final class DragonAppeasement extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{R}{G}"); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you sacrifice a creature, you may draw a card. this.addAbility(new SacrificePermanentTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index 3964d3b2349..2fe3a6ca27c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -48,7 +48,7 @@ public final class DragonBreath extends CardImpl { this.addAbility(ability); // Enchanted creature has haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // {R}: Enchanted creature gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R))); diff --git a/Mage.Sets/src/mage/cards/d/DragonFangs.java b/Mage.Sets/src/mage/cards/d/DragonFangs.java index 5aed726aa94..96de2ba40cf 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFangs.java +++ b/Mage.Sets/src/mage/cards/d/DragonFangs.java @@ -46,8 +46,8 @@ public final class DragonFangs extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Fangs from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonFangsEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonGrip.java b/Mage.Sets/src/mage/cards/d/DragonGrip.java index 5c77069f020..3cf21d87ea0 100644 --- a/Mage.Sets/src/mage/cards/d/DragonGrip.java +++ b/Mage.Sets/src/mage/cards/d/DragonGrip.java @@ -47,7 +47,7 @@ public final class DragonGrip extends CardImpl { // Enchanted creature gets +2/+0 and has first strike. Effect effect2 = new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield); effect2.setText("Enchanted creature gets +2/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect2); + ability = new SimpleStaticAbility(effect2); effect2 = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect2.setText("and has first strike"); ability.addEffect(effect2); diff --git a/Mage.Sets/src/mage/cards/d/DragonHunter.java b/Mage.Sets/src/mage/cards/d/DragonHunter.java index 758de2dc73d..0171eeaaa6d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonHunter.java +++ b/Mage.Sets/src/mage/cards/d/DragonHunter.java @@ -30,7 +30,7 @@ public final class DragonHunter extends CardImpl { this.addAbility(new ProtectionAbility(new FilterPermanent(SubType.DRAGON, "Dragons"))); // Dragon Hunter can block Dragons as though it had reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockDragonsAsThoughtIthadReachEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanBlockDragonsAsThoughtIthadReachEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index 79f5c81c72a..d92616e4e90 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -39,7 +39,7 @@ public final class DragonMantle extends CardImpl { 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.\""))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability2, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{R}: This creature gets +1/+0 until end of turn.\""))); } private DragonMantle(final DragonMantle card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonScales.java b/Mage.Sets/src/mage/cards/d/DragonScales.java index 4a90cddd5c3..d8bc4a54e0f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScales.java +++ b/Mage.Sets/src/mage/cards/d/DragonScales.java @@ -46,8 +46,8 @@ public final class DragonScales extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+2 and has vigilance. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Scales from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonScalesEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonShadow.java b/Mage.Sets/src/mage/cards/d/DragonShadow.java index 7f344cb81c4..6b7dc1b3c38 100644 --- a/Mage.Sets/src/mage/cards/d/DragonShadow.java +++ b/Mage.Sets/src/mage/cards/d/DragonShadow.java @@ -46,8 +46,8 @@ public final class DragonShadow extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0 and has fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); // When a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature. this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.GRAVEYARD, new DragonShadowEffect(), filter, true, SetTargetPointer.PERMANENT)); diff --git a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java index a44ca1aa7ec..4eb644b2ef6 100644 --- a/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java +++ b/Mage.Sets/src/mage/cards/d/DragonThroneOfTarkir.java @@ -32,7 +32,7 @@ public final class DragonThroneOfTarkir extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has defender and "{2}, {T}: Other creatures you control gain trample and get +X/+X until end of turn, where X is this creature's power." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); + Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, true); effect.setText("Other creatures you control gain trample"); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index a41c58ccf14..b92be8c4d6f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -47,7 +47,7 @@ public final class DragonWings extends CardImpl { this.addAbility(ability); // Enchanted creature has flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); // Cycling {1}{U} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{U}"))); diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 18ed9bd68cc..805fe54d118 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java @@ -41,7 +41,7 @@ public final class DragonloftIdol extends CardImpl { Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Dragon, Dragonloft Idol gets +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), "and has flying"); diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java index ed764c1d016..690818e3a9b 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java @@ -32,7 +32,7 @@ public final class DragonlordsServant extends CardImpl { this.toughness = new MageInt(3); // Dragon spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); } private DragonlordsServant(final DragonlordsServant card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java index b059404da4b..1d5b7ff197d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java +++ b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java @@ -34,7 +34,7 @@ public final class DragonspeakerShaman extends CardImpl { this.toughness = new MageInt(2); // Dragon spells you cast cost {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 2))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 2))); } private DragonspeakerShaman(final DragonspeakerShaman card) { diff --git a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java index 2f3a59c1e92..f4d07d47e29 100755 --- a/Mage.Sets/src/mage/cards/d/DralnusCrusade.java +++ b/Mage.Sets/src/mage/cards/d/DralnusCrusade.java @@ -24,10 +24,10 @@ public final class DralnusCrusade extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{R}"); // Goblin creatures get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false))); // All Goblins are black and are Zombies in addition to their other creature types. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DralnusCrusadeEffect())); + this.addAbility(new SimpleStaticAbility(new DralnusCrusadeEffect())); } private DralnusCrusade(final DralnusCrusade card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadOfNight.java b/Mage.Sets/src/mage/cards/d/DreadOfNight.java index 1c95310b9ee..c94b8c40602 100644 --- a/Mage.Sets/src/mage/cards/d/DreadOfNight.java +++ b/Mage.Sets/src/mage/cards/d/DreadOfNight.java @@ -28,7 +28,7 @@ public final class DreadOfNight extends CardImpl { public DreadOfNight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false))); } private DreadOfNight(final DreadOfNight card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadSlag.java b/Mage.Sets/src/mage/cards/d/DreadSlag.java index e839ff7a2f6..ac89d84771f 100644 --- a/Mage.Sets/src/mage/cards/d/DreadSlag.java +++ b/Mage.Sets/src/mage/cards/d/DreadSlag.java @@ -35,7 +35,7 @@ public final class DreadSlag extends CardImpl { DynamicValue amount = new MultipliedValue(CardsInControllerHandCount.instance, -4); Effect effect = new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield); effect.setText("{this} gets -4/-4 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private DreadSlag(final DreadSlag card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamChisel.java b/Mage.Sets/src/mage/cards/d/DreamChisel.java index 1c384389294..688f99f8f41 100644 --- a/Mage.Sets/src/mage/cards/d/DreamChisel.java +++ b/Mage.Sets/src/mage/cards/d/DreamChisel.java @@ -17,7 +17,7 @@ public final class DreamChisel extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); // Face-down creature spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FaceDownSpellsCostReductionControllerEffect(1))); + this.addAbility(new SimpleStaticAbility(new FaceDownSpellsCostReductionControllerEffect(1))); } private DreamChisel(final DreamChisel card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamDevourer.java b/Mage.Sets/src/mage/cards/d/DreamDevourer.java index dfa6dde851e..e9a00346504 100644 --- a/Mage.Sets/src/mage/cards/d/DreamDevourer.java +++ b/Mage.Sets/src/mage/cards/d/DreamDevourer.java @@ -38,7 +38,7 @@ public final class DreamDevourer extends CardImpl { this.toughness = new MageInt(3); // Each nonland card in your hand without foretell has foretell. Its foretell cost is equal to its mana cost reduced by 2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DreamDevourerAddAbilityEffect())); + this.addAbility(new SimpleStaticAbility(new DreamDevourerAddAbilityEffect())); // Whenever you foretell a card, Dream Devourer gets +2/+0 until end of turn. this.addAbility(new ForetellSourceControllerTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn))); diff --git a/Mage.Sets/src/mage/cards/d/DreamHalls.java b/Mage.Sets/src/mage/cards/d/DreamHalls.java index 85e73f171fc..94b9a4783fb 100644 --- a/Mage.Sets/src/mage/cards/d/DreamHalls.java +++ b/Mage.Sets/src/mage/cards/d/DreamHalls.java @@ -27,7 +27,7 @@ public final class DreamHalls extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}{U}"); // Rather than pay the mana cost for a spell, its controller may discard a card that shares a color with that spell. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DreamHallsEffect())); + this.addAbility(new SimpleStaticAbility(new DreamHallsEffect())); } private DreamHalls(final DreamHalls card) { diff --git a/Mage.Sets/src/mage/cards/d/Drought.java b/Mage.Sets/src/mage/cards/d/Drought.java index a68cf5850ef..79b3203a79b 100644 --- a/Mage.Sets/src/mage/cards/d/Drought.java +++ b/Mage.Sets/src/mage/cards/d/Drought.java @@ -27,10 +27,10 @@ public final class Drought extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{W}")))); // Spells cost an additional "Sacrifice a Swamp" to cast for each black mana symbol in their mana costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DroughtAdditionalCostEffect(true))); + this.addAbility(new SimpleStaticAbility(new DroughtAdditionalCostEffect(true))); // Activated abilities cost an additional "Sacrifice a Swamp" to activate for each black mana symbol in their activation costs. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DroughtAdditionalCostEffect(false))); + this.addAbility(new SimpleStaticAbility(new DroughtAdditionalCostEffect(false))); } private Drought(final Drought card) { diff --git a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java index 692cbfc3ed5..91abf980e6a 100644 --- a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java @@ -34,7 +34,7 @@ public final class DroverOfTheMighty extends CardImpl { this.toughness = new MageInt(1); // Drover of the Mighty gets +2/+2 as long as you control a Dinosaur. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceWhileControlsEffect(filter, 2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostSourceWhileControlsEffect(filter, 2, 2))); // {T}: Add one mana of any color. this.addAbility(new AnyColorManaAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java index 7cc21cbf6bc..d022f738b62 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java +++ b/Mage.Sets/src/mage/cards/d/DruidsFamiliar.java @@ -32,7 +32,7 @@ public final class DruidsFamiliar extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Druid's Familiar is paired with another creature, each of those creatures gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostPairedEffect(2, 2, ruleText))); + this.addAbility(new SimpleStaticAbility(new BoostPairedEffect(2, 2, ruleText))); } private DruidsFamiliar(final DruidsFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index 8c0092a0d5c..7556af2b090 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -49,7 +49,7 @@ public final class DualCasting extends CardImpl { ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetStackObjectEffect(), new ColoredManaCost(ColoredManaSymbol.R)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetSpell(filter)); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ability, AttachmentType.AURA))); } private DualCasting(final DualCasting card) { diff --git a/Mage.Sets/src/mage/cards/d/Dub.java b/Mage.Sets/src/mage/cards/d/Dub.java index 01b19d5522c..272fc3aeefe 100644 --- a/Mage.Sets/src/mage/cards/d/Dub.java +++ b/Mage.Sets/src/mage/cards/d/Dub.java @@ -40,7 +40,7 @@ public final class Dub extends CardImpl { // Enchanted creature gets +2/+2, has first strike, and is a Knight in addition to its other types. Effect effect = new BoostEnchantedEffect(2, 2); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText(", has first strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/Duplicant.java b/Mage.Sets/src/mage/cards/d/Duplicant.java index a49eca838fa..c1a1ebd8a9b 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicant.java +++ b/Mage.Sets/src/mage/cards/d/Duplicant.java @@ -45,7 +45,7 @@ public final class Duplicant extends CardImpl { ability.setAbilityWord(AbilityWord.IMPRINT); this.addAbility(ability); // As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DuplicantContinuousEffect())); + this.addAbility(new SimpleStaticAbility(new DuplicantContinuousEffect())); } private Duplicant(final Duplicant card) { diff --git a/Mage.Sets/src/mage/cards/d/DuskCharger.java b/Mage.Sets/src/mage/cards/d/DuskCharger.java index d41e7bb1c14..496439fb19d 100644 --- a/Mage.Sets/src/mage/cards/d/DuskCharger.java +++ b/Mage.Sets/src/mage/cards/d/DuskCharger.java @@ -37,7 +37,7 @@ public final class DuskCharger extends CardImpl { ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, CitysBlessingCondition.instance, "{this} gets +2/+2 as long as you have the city's blessing"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CitysBlessingHint.instance); + Ability ability = new SimpleStaticAbility(effect).addHint(CitysBlessingHint.instance); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DustCorona.java b/Mage.Sets/src/mage/cards/d/DustCorona.java index 967c23c7092..a9e0f06c6d8 100644 --- a/Mage.Sets/src/mage/cards/d/DustCorona.java +++ b/Mage.Sets/src/mage/cards/d/DustCorona.java @@ -41,7 +41,7 @@ public final class DustCorona extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0 and can't be blocked by creatures with flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 0)); Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); effect.setText("and can't be blocked by creatures with flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java index ca891cea5fc..afa0a340db8 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPatrol.java @@ -37,7 +37,7 @@ public final class DwarvenPatrol extends CardImpl { this.toughness = new MageInt(2); // Dwarven Patrol doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you cast a nonred spell, untap Dwarven Patrol. this.addAbility(new SpellCastControllerTriggeredAbility(new UntapSourceEffect(), filter, false)); } diff --git a/Mage.Sets/src/mage/cards/d/Dwindle.java b/Mage.Sets/src/mage/cards/d/Dwindle.java index ad646d3e556..cbada33aac9 100644 --- a/Mage.Sets/src/mage/cards/d/Dwindle.java +++ b/Mage.Sets/src/mage/cards/d/Dwindle.java @@ -37,7 +37,7 @@ public final class Dwindle extends CardImpl { this.addAbility(ability); // Enchanted creature gets -6/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-6, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-6, 0))); // When enchanted creature blocks, destroy it. this.addAbility(new DwindleTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java index 0049638e0d6..575f7904963 100644 --- a/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java +++ b/Mage.Sets/src/mage/cards/d/DwynenGiltLeafDaen.java @@ -39,7 +39,7 @@ public final class DwynenGiltLeafDaen extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Other Elf creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.ELF, "Elf creatures"), true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.ELF, "Elf creatures"), true))); // Whenever Dwynen, Gilt-Leaf Daen attacks, you gain 1 life for each attacking Elf you control. this.addAbility(new AttacksTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter)).setText("you gain 1 life for each attacking Elf you control"), false)); diff --git a/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java b/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java index a12ff4e143b..84870e5d52c 100644 --- a/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java +++ b/Mage.Sets/src/mage/cards/d/DynaheirInvokerAdept.java @@ -40,7 +40,7 @@ public final class DynaheirInvokerAdept extends CardImpl { this.addAbility(HasteAbility.getInstance()); // You may activate abilities of other creatures you control as though those creatures had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DynaheirInvokerAdeptHasteEffect())); + this.addAbility(new SimpleStaticAbility(new DynaheirInvokerAdeptHasteEffect())); // {T}: When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy. this.addAbility(new SimpleActivatedAbility(new CreateDelayedTriggeredAbilityEffect(new DynaheirInvokerAdeptTriggeredAbility()), new TapSourceCost()));