diff --git a/Mage.Sets/src/mage/cards/i/IceCage.java b/Mage.Sets/src/mage/cards/i/IceCage.java index 11a3d50b4d8..316d800eb84 100644 --- a/Mage.Sets/src/mage/cards/i/IceCage.java +++ b/Mage.Sets/src/mage/cards/i/IceCage.java @@ -33,7 +33,7 @@ public final class IceCage extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // When enchanted creature becomes the target of a spell or ability, destroy Ice Cage. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new DestroySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/i/IceOver.java b/Mage.Sets/src/mage/cards/i/IceOver.java index 5919fc5cc33..fbf3f3727e1 100644 --- a/Mage.Sets/src/mage/cards/i/IceOver.java +++ b/Mage.Sets/src/mage/cards/i/IceOver.java @@ -35,7 +35,7 @@ public final class IceOver extends CardImpl { this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); } diff --git a/Mage.Sets/src/mage/cards/i/IchorplateGolem.java b/Mage.Sets/src/mage/cards/i/IchorplateGolem.java index b696cc004d2..6d5ab494bc9 100644 --- a/Mage.Sets/src/mage/cards/i/IchorplateGolem.java +++ b/Mage.Sets/src/mage/cards/i/IchorplateGolem.java @@ -43,7 +43,7 @@ public final class IchorplateGolem extends CardImpl { this.addAbility(new IchorplateGolemTriggeredAbility()); // Creatures you control with oil counters on them get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false) + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false) .setText("Creatures you control with oil counters on them get +1/+1"))); } diff --git a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java index 5d798e221b5..b0aa5469f37 100644 --- a/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java +++ b/Mage.Sets/src/mage/cards/i/IllnessInTheRanks.java @@ -28,7 +28,7 @@ public final class IllnessInTheRanks extends CardImpl { // Creature tokens 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))); } private IllnessInTheRanks(final IllnessInTheRanks card) { diff --git a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java index b1f3aa18e53..cfa6cfb05f9 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java @@ -39,7 +39,7 @@ public final class IlluminatedWings extends CardImpl { Ability ability = new EnchantAbility(auraTarget); 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))); // {2}, Sacrifice Illuminated Wings: Draw a card. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java index d749d5f2f88..59126643e78 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java @@ -35,7 +35,7 @@ public final class IllusionaryArmor extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +4/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); // When enchanted creature becomes the target of a spell or ability, sacrifice Illusionary Armor. this.addAbility(new BecomesTargetAttachedTriggeredAbility(new SacrificeSourceEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java index bb68fb822e9..e23652c01bf 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryTerrain.java @@ -43,7 +43,7 @@ public final class IllusionaryTerrain extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseTwoBasicLandTypesEffect(Outcome.Neutral))); // Basic lands of the first chosen type are the second chosen type. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IllusionaryTerrainEffect())); + this.addAbility(new SimpleStaticAbility(new IllusionaryTerrainEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IllusoryGains.java b/Mage.Sets/src/mage/cards/i/IllusoryGains.java index 31f2cb32a60..212f5bee16b 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryGains.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryGains.java @@ -37,7 +37,7 @@ public final class IllusoryGains extends CardImpl { this.addAbility(ability); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // Whenever a creature enters the battlefield under an opponent's control, attach Illusory Gains to that creature. this.addAbility(new EntersBattlefieldOpponentTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java index 957969541b2..e39e7e9b80a 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java @@ -35,7 +35,7 @@ public final class IllusoryWrappings extends CardImpl { this.addAbility(ability); // Enchanted creature has base power and toughness 0/2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/ImiStatue.java b/Mage.Sets/src/mage/cards/i/ImiStatue.java index 17404222269..012349a7568 100644 --- a/Mage.Sets/src/mage/cards/i/ImiStatue.java +++ b/Mage.Sets/src/mage/cards/i/ImiStatue.java @@ -25,7 +25,7 @@ public final class ImiStatue extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); // Players can't untap more than one artifact during their untap steps. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ImiStatueEffect())); + this.addAbility(new SimpleStaticAbility(new ImiStatueEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java index 29a3fb6ee55..8ba5dc40e6f 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java @@ -43,15 +43,15 @@ public final class ImmobilizingInk extends CardImpl { this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityAttachedEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect()), + this.addAbility(new SimpleStaticAbility( + new GainAbilityAttachedEffect(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()), AttachmentType.AURA, Duration.WhileOnBattlefield,"Enchanted creature doesn't untap during its controller's untap step."))); // Enchanted creature has "{1}, Discard a card: Untap this creature." Ability untapAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{1}")); untapAbility.addCost(new DiscardTargetCost(new TargetCardInHand())); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new GainAbilityAttachedEffect(untapAbility, AttachmentType.AURA, Duration.WhileOnBattlefield, "Enchanted creature has \"{1}, Discard a card: Untap this creature.\""))); diff --git a/Mage.Sets/src/mage/cards/i/Immolation.java b/Mage.Sets/src/mage/cards/i/Immolation.java index f78a7160f11..c3dbafaa780 100644 --- a/Mage.Sets/src/mage/cards/i/Immolation.java +++ b/Mage.Sets/src/mage/cards/i/Immolation.java @@ -34,7 +34,7 @@ public final class Immolation extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/-2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -2))); } private Immolation(final Immolation card) { diff --git a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java index 42bb1a93a92..78a5687e66d 100644 --- a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java @@ -42,7 +42,7 @@ public final class ImpendingDoom extends CardImpl { // Enchanted creature gets +3/+3 and attacks each combat if able. Effect effect = new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+3"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and attacks each combat if able"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/ImperialMask.java b/Mage.Sets/src/mage/cards/i/ImperialMask.java index 2ee57b0feb0..fca7bfa7cce 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialMask.java +++ b/Mage.Sets/src/mage/cards/i/ImperialMask.java @@ -40,7 +40,7 @@ public final class ImperialMask extends CardImpl { )); // You have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(HexproofAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(HexproofAbility.getInstance()))); } private ImperialMask(final ImperialMask card) { diff --git a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java index 5fd55ee922c..23038a6f48a 100644 --- a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java @@ -34,7 +34,7 @@ public final class ImperiousPerfect extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - 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))); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ElfWarriorToken(), 1), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java index 5da684ea2d2..43942424f22 100644 --- a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java +++ b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java @@ -36,7 +36,7 @@ public final class ImprovisedArmor extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+5. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); // Cycling {3} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{3}"))); } diff --git a/Mage.Sets/src/mage/cards/i/InBolassClutches.java b/Mage.Sets/src/mage/cards/i/InBolassClutches.java index 8385e4634b8..38fb6b8ceb4 100644 --- a/Mage.Sets/src/mage/cards/i/InBolassClutches.java +++ b/Mage.Sets/src/mage/cards/i/InBolassClutches.java @@ -39,7 +39,7 @@ public final class InBolassClutches extends CardImpl { this.addAbility(ability); // You control enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect("permanent"))); // Enchanted permanent is legendary. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/i/IndenturedOaf.java b/Mage.Sets/src/mage/cards/i/IndenturedOaf.java index 285a4bc6fa9..fec1b34d518 100644 --- a/Mage.Sets/src/mage/cards/i/IndenturedOaf.java +++ b/Mage.Sets/src/mage/cards/i/IndenturedOaf.java @@ -31,7 +31,7 @@ public final class IndenturedOaf extends CardImpl { this.toughness = new MageInt(3); // Prevent all damage that Indentured Oaf would deal to red creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IndenturedOafPreventEffectEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new IndenturedOafPreventEffectEffect(Duration.WhileOnBattlefield))); } private IndenturedOaf(final IndenturedOaf card) { diff --git a/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java b/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java index a89daa819a9..e62354188c4 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableArchangel.java @@ -41,7 +41,7 @@ public final class IndomitableArchangel extends CardImpl { // Metalcraft — Artifacts you control have shroud as long as you control three or more artifacts. (An artifact with shroud can’t be the target of spells or abilities.) ContinuousEffect gainAbilityEffect = new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(gainAbilityEffect, MetalcraftCondition.instance, rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance) ); diff --git a/Mage.Sets/src/mage/cards/i/IndomitableWill.java b/Mage.Sets/src/mage/cards/i/IndomitableWill.java index a7a3621fc96..7cdbecea903 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableWill.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableWill.java @@ -32,7 +32,7 @@ public final class IndomitableWill extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } private IndomitableWill(final IndomitableWill card) { diff --git a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java index 4445c6c8051..0b3fc265ab7 100644 --- a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java +++ b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java @@ -40,7 +40,7 @@ public final class IndrikUmbra extends CardImpl { this.addAbility(ability); // Enchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA) .setText("and has first strike")); ability.addEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA) diff --git a/Mage.Sets/src/mage/cards/i/InertiaBubble.java b/Mage.Sets/src/mage/cards/i/InertiaBubble.java index a1886cff994..e7d17385d71 100644 --- a/Mage.Sets/src/mage/cards/i/InertiaBubble.java +++ b/Mage.Sets/src/mage/cards/i/InertiaBubble.java @@ -31,7 +31,7 @@ public final class InertiaBubble extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted artifact doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("artifact"))); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect("artifact"))); } private InertiaBubble(final InertiaBubble card) { diff --git a/Mage.Sets/src/mage/cards/i/InescapableBrute.java b/Mage.Sets/src/mage/cards/i/InescapableBrute.java index 71ae685cd55..79b7ada3d22 100644 --- a/Mage.Sets/src/mage/cards/i/InescapableBrute.java +++ b/Mage.Sets/src/mage/cards/i/InescapableBrute.java @@ -30,7 +30,7 @@ public final class InescapableBrute extends CardImpl { this.addAbility(WitherAbility.getInstance()); // Inescapable Brute must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java index ba90315de95..8df074292f5 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java @@ -41,7 +41,7 @@ public final class InfectiousCurse extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Spells you cast that target enchanted player cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfectiousCurseCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(new InfectiousCurseCostReductionEffect())); // At the beginning of enchanted player's upkeep, that player loses 1 life and you gain 1 life. Ability ability = new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/InfectiousRage.java b/Mage.Sets/src/mage/cards/i/InfectiousRage.java index 6bbc0044acc..7d07b642f06 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousRage.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousRage.java @@ -41,7 +41,7 @@ public final class InfectiousRage extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -1))); // When enchanted creature dies, choose a creature at random Infectious Rage can enchant. // Return Infectious Rage to the battlefield attached to that creature. diff --git a/Mage.Sets/src/mage/cards/i/InfernalScarring.java b/Mage.Sets/src/mage/cards/i/InfernalScarring.java index 44c8587ac91..a7724fb0af6 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalScarring.java +++ b/Mage.Sets/src/mage/cards/i/InfernalScarring.java @@ -42,7 +42,7 @@ public final class InfernalScarring extends CardImpl { // Enchanted creature gets +2/+0 and has "When this creature dies, draw a card." Effect effect = new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+0"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1)), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"When this creature dies, draw a card.\""); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/InfernalSovereign.java b/Mage.Sets/src/mage/cards/i/InfernalSovereign.java index 7289ae079f7..05615210eeb 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalSovereign.java +++ b/Mage.Sets/src/mage/cards/i/InfernalSovereign.java @@ -36,7 +36,7 @@ public final class InfernalSovereign extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Skip your draw step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); + this.addAbility(new SimpleStaticAbility(new SkipDrawStepEffect())); // Whenever you play a land or cast a spell, you draw a card and you lose 1 life. this.addAbility(new InfernalSovereignTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index 99eb03aedcb..35ff9854743 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -40,7 +40,7 @@ public final class InfernoFist extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 0))); // {R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to any target. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{R}")); diff --git a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java index 150a281669f..a03c2616bf1 100644 --- a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java @@ -45,7 +45,7 @@ public final class InfiltratorsMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and can't be blocked except by creatures with defender. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); Effect effect = new InfiltratorsMagemarkCantBeBlockedAllEffect(filter, Duration.WhileOnBattlefield); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java index ce1b22c79c6..8d44f0f8065 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java @@ -50,7 +50,7 @@ public final class InfiniteReflection extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new InfiniteReflectionTriggeredEffect())); // Nontoken creatures you control enter the battlefield as a copy of enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfiniteReflectionEntersBattlefieldEffect())); + this.addAbility(new SimpleStaticAbility(new InfiniteReflectionEntersBattlefieldEffect())); } private InfiniteReflection(final InfiniteReflection card) { diff --git a/Mage.Sets/src/mage/cards/i/InnerDemon.java b/Mage.Sets/src/mage/cards/i/InnerDemon.java index 6c1a98a9ce9..5cfa906d9ca 100644 --- a/Mage.Sets/src/mage/cards/i/InnerDemon.java +++ b/Mage.Sets/src/mage/cards/i/InnerDemon.java @@ -51,7 +51,7 @@ public final class InnerDemon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2, has flying, and is a Demon in addition to its other types. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, 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/i/InquisitorEisenhorn.java b/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java index 50798d98ac3..c97f1caa1a5 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorEisenhorn.java @@ -36,7 +36,7 @@ public final class InquisitorEisenhorn extends CardImpl { // You may reveal the first card you draw each turn as you draw it. Whenever you reveal an instant or // sorcery card this way, create Cherubael, a legendary 4/4 black Demon creature token with flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InquisitorEisenhornReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new InquisitorEisenhornReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); // Whenever Inquisitor Eisenhorn deals combat damage to a player, investigate that many times. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java index 330db31706e..03205bc4cf1 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorsFlail.java @@ -29,7 +29,7 @@ public final class InquisitorsFlail extends CardImpl { // If equipped creature would deal combat damage, it deals double that damage instead. // If another creature would deal combat damage to equipped creature, it deals double that damage to equipped creature instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InquisitorsFlailEffect())); + this.addAbility(new SimpleStaticAbility(new InquisitorsFlailEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/i/InquisitorsOx.java b/Mage.Sets/src/mage/cards/i/InquisitorsOx.java index 91b63256fa9..c568db0a6ec 100644 --- a/Mage.Sets/src/mage/cards/i/InquisitorsOx.java +++ b/Mage.Sets/src/mage/cards/i/InquisitorsOx.java @@ -32,7 +32,7 @@ public final class InquisitorsOx extends CardImpl { // Delirium — Inquisitor's Ox gets +1/+0 and has vigilance as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +1/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), DeliriumCondition.instance, "and has vigilance as long as there are four or more card types among cards in your graveyard.")); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InsidiousMist.java b/Mage.Sets/src/mage/cards/i/InsidiousMist.java index e4bd1287e9a..fee4e67eaf6 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousMist.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousMist.java @@ -44,7 +44,7 @@ public final class InsidiousMist extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Insideous Mist can't block and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new CantBlockSourceEffect(Duration.WhileOnBattlefield)); Effect effect = new CantBeBlockedSourceEffect(); effect.setText("and can't be blocked"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/InspiringStatuary.java b/Mage.Sets/src/mage/cards/i/InspiringStatuary.java index 30a631bb751..907b33130ac 100644 --- a/Mage.Sets/src/mage/cards/i/InspiringStatuary.java +++ b/Mage.Sets/src/mage/cards/i/InspiringStatuary.java @@ -31,7 +31,7 @@ public final class InspiringStatuary extends CardImpl { // Non-artifact spells you cast have improvise. ImproviseAbility improviseAbility = new ImproviseAbility(); improviseAbility.setRuleAtTheTop(false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledSpellsEffect(improviseAbility, filter))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledSpellsEffect(improviseAbility, filter))); } diff --git a/Mage.Sets/src/mage/cards/i/InstillEnergy.java b/Mage.Sets/src/mage/cards/i/InstillEnergy.java index adb8479a176..c64923b68e3 100644 --- a/Mage.Sets/src/mage/cards/i/InstillEnergy.java +++ b/Mage.Sets/src/mage/cards/i/InstillEnergy.java @@ -37,7 +37,7 @@ public final class InstillEnergy extends CardImpl { this.addAbility(ability); // Enchanted creature can attack as though it had haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CanAttackAsThoughItHadHasteEnchantedEffect(Duration.WhileOnBattlefield))); // {0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn. this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/i/InstillFuror.java b/Mage.Sets/src/mage/cards/i/InstillFuror.java index 8919d256f28..631468009da 100644 --- a/Mage.Sets/src/mage/cards/i/InstillFuror.java +++ b/Mage.Sets/src/mage/cards/i/InstillFuror.java @@ -48,7 +48,7 @@ public final class InstillFuror extends CardImpl { "sacrifice this creature unless it attacked this turn")); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"At the beginning of your end step, sacrifice this creature unless it attacked this turn.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/i/Intimidation.java b/Mage.Sets/src/mage/cards/i/Intimidation.java index a9ba1b749e8..b52d035c6db 100644 --- a/Mage.Sets/src/mage/cards/i/Intimidation.java +++ b/Mage.Sets/src/mage/cards/i/Intimidation.java @@ -22,7 +22,7 @@ public final class Intimidation extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}{B}"); // Creatures you control have fear. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FearAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); } private Intimidation(final Intimidation card) { diff --git a/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java b/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java index de4cabb6d40..33696029c1c 100644 --- a/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java +++ b/Mage.Sets/src/mage/cards/i/IntrepidPaleontologist.java @@ -50,7 +50,7 @@ public final class IntrepidPaleontologist extends CardImpl { this.addAbility(exileAbility); // You may cast Dinosaur creature spells from among cards you own exiled with Intrepid Paleontologist. If you cast a spell this way, that creature enters the battlefield with a finality counter on it. - Ability castAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new IntrepidPaleontologistPlayEffect()); + Ability castAbility = new SimpleStaticAbility(new IntrepidPaleontologistPlayEffect()); castAbility.setIdentifier(MageIdentifier.IntrepidPaleontologistWatcher); castAbility.addWatcher(new IntrepidPaleontologistWatcher()); this.addAbility(castAbility); diff --git a/Mage.Sets/src/mage/cards/i/InvasionPlans.java b/Mage.Sets/src/mage/cards/i/InvasionPlans.java index 0c003f6ce68..3fab1b60950 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionPlans.java +++ b/Mage.Sets/src/mage/cards/i/InvasionPlans.java @@ -24,9 +24,9 @@ public final class InvasionPlans extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); // All creatures block each turn if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); + this.addAbility(new SimpleStaticAbility(new BlocksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // The attacking player chooses how each creature blocks each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InvasionPlansEffect())); + this.addAbility(new SimpleStaticAbility(new InvasionPlansEffect())); } private InvasionPlans(final InvasionPlans card) { diff --git a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java index 2ae58fa14bd..d5742a4bff4 100644 --- a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java @@ -43,7 +43,7 @@ public final class InvocationOfSaintTraft extends CardImpl { // Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying tapped // and attacking. Exile that token at end of combat." Ability gainedAbility = new AttacksTriggeredAbility(new InvocationOfSaintTraftEffect(), false); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private InvocationOfSaintTraft(final InvocationOfSaintTraft card) { diff --git a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java index 72f2f333dd2..1d1c33005e3 100644 --- a/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java +++ b/Mage.Sets/src/mage/cards/i/IonaShieldOfEmeria.java @@ -39,7 +39,7 @@ public final class IonaShieldOfEmeria extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); // Your opponents can't cast spells of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IonaShieldOfEmeriaReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new IonaShieldOfEmeriaReplacementEffect())); } diff --git a/Mage.Sets/src/mage/cards/i/IonasBlessing.java b/Mage.Sets/src/mage/cards/i/IonasBlessing.java index 1008ea0aa41..a47321b36f6 100644 --- a/Mage.Sets/src/mage/cards/i/IonasBlessing.java +++ b/Mage.Sets/src/mage/cards/i/IonasBlessing.java @@ -44,7 +44,7 @@ public final class IonasBlessing extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2, has vigilance, and can block an additional creature. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText(", has vigilance"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java index ea7c5b26f76..38bf68dd02d 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java +++ b/Mage.Sets/src/mage/cards/i/IronclawBuzzardiers.java @@ -39,7 +39,7 @@ public final class IronclawBuzzardiers extends CardImpl { this.toughness = new MageInt(2); // Ironclaw Buzzardiers can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); // {R}: Ironclaw Buzzardiers gains flying until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); } diff --git a/Mage.Sets/src/mage/cards/i/IronclawCurse.java b/Mage.Sets/src/mage/cards/i/IronclawCurse.java index 3eb4618d7f1..ddfc59ee57c 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawCurse.java +++ b/Mage.Sets/src/mage/cards/i/IronclawCurse.java @@ -33,10 +33,10 @@ public final class IronclawCurse extends CardImpl { this.addAbility(ability); // Enchanted creature gets 0/-1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, -1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, -1, Duration.WhileOnBattlefield))); // Enchanted creature can't block creatures with power equal to or greater than the enchanted creature's toughness. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IronclawCurseEffect())); + this.addAbility(new SimpleStaticAbility(new IronclawCurseEffect())); } private IronclawCurse(final IronclawCurse card) { diff --git a/Mage.Sets/src/mage/cards/i/IronclawOrcs.java b/Mage.Sets/src/mage/cards/i/IronclawOrcs.java index ed9d3523c18..71800e9386f 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawOrcs.java +++ b/Mage.Sets/src/mage/cards/i/IronclawOrcs.java @@ -33,7 +33,7 @@ public final class IronclawOrcs extends CardImpl { this.toughness = new MageInt(2); // Ironclaw Orcs can't block creatures with power 2 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private IronclawOrcs(final IronclawOrcs card) { diff --git a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java index 38481b81afb..b74e217f13f 100644 --- a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java +++ b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java @@ -27,7 +27,7 @@ public final class IronfistCrusher extends CardImpl { this.toughness = new MageInt(4); // Ironfist Crusher can block any number of creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0))); // Morph {3}{W} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); diff --git a/Mage.Sets/src/mage/cards/i/IronhoofOx.java b/Mage.Sets/src/mage/cards/i/IronhoofOx.java index 26aa7e961ce..aed15525fce 100644 --- a/Mage.Sets/src/mage/cards/i/IronhoofOx.java +++ b/Mage.Sets/src/mage/cards/i/IronhoofOx.java @@ -24,7 +24,7 @@ public final class IronhoofOx extends CardImpl { this.toughness = new MageInt(4); // Ironhoof Ox can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private IronhoofOx(final IronhoofOx card) { diff --git a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java index 29626fbc283..bd0914f927b 100644 --- a/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java +++ b/Mage.Sets/src/mage/cards/i/IslandFishJasconius.java @@ -30,7 +30,7 @@ public final class IslandFishJasconius extends CardImpl { this.toughness = new MageInt(8); // Island Fish Jasconius doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Island Fish Jasconius. this.addAbility(new BeginningOfUpkeepTriggeredAbility( @@ -38,7 +38,7 @@ public final class IslandFishJasconius extends CardImpl { )); // Island Fish Jasconius 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 Island Fish Jasconius. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java index 77db45fdaa5..0cc35ad0316 100644 --- a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java +++ b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java @@ -32,7 +32,7 @@ public final class IslandSanctuary extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // If you would draw a card during your draw step, instead you may skip that draw. If you do, until your next turn, you can't be attacked except by creatures with flying and/or islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IslandSanctuaryEffect())); + this.addAbility(new SimpleStaticAbility(new IslandSanctuaryEffect())); } private IslandSanctuary(final IslandSanctuary card) { diff --git a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java index 8a45da86bd1..da1ff8b6163 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGuardians.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGuardians.java @@ -46,7 +46,7 @@ public final class IvoryGuardians extends CardImpl { // Protection from red this.addAbility(ProtectionAbility.from(ObjectColor.RED)); // Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, false), new OpponentControlsPermanentCondition(controlFilter), "Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a nontoken red permanent"))); diff --git a/Mage.Sets/src/mage/cards/i/IvoryMask.java b/Mage.Sets/src/mage/cards/i/IvoryMask.java index 2dc46fff944..1d8d3eb5d0c 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryMask.java +++ b/Mage.Sets/src/mage/cards/i/IvoryMask.java @@ -21,7 +21,7 @@ public final class IvoryMask extends CardImpl { // You have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControllerEffect(ShroudAbility.getInstance()))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControllerEffect(ShroudAbility.getInstance()))); } private IvoryMask(final IvoryMask card) { diff --git a/Mage.Sets/src/mage/cards/i/IxalansBinding.java b/Mage.Sets/src/mage/cards/i/IxalansBinding.java index 38138bc80e2..76da782b496 100644 --- a/Mage.Sets/src/mage/cards/i/IxalansBinding.java +++ b/Mage.Sets/src/mage/cards/i/IxalansBinding.java @@ -37,7 +37,7 @@ public final class IxalansBinding extends CardImpl { this.addAbility(ability); // Your opponents can't cast spells with the same name as the exiled card. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new IxalansBindingReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new IxalansBindingReplacementEffect())); } private IxalansBinding(final IxalansBinding card) { diff --git a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java index 2d8299314d3..ff6a51a4633 100644 --- a/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java +++ b/Mage.Sets/src/mage/cards/i/IxidorRealitySculptor.java @@ -40,7 +40,7 @@ public final class IxidorRealitySculptor extends CardImpl { this.toughness = new MageInt(4); // Face-down 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))); // {2}{U}: Turn target face-down creature face up. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TurnFaceUpTargetEffect(), new ManaCostsImpl<>("{2}{U}")); diff --git a/Mage.Sets/src/mage/cards/j/JacesSanctum.java b/Mage.Sets/src/mage/cards/j/JacesSanctum.java index e08a4647d82..7da00af8a48 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSanctum.java +++ b/Mage.Sets/src/mage/cards/j/JacesSanctum.java @@ -37,7 +37,7 @@ public final class JacesSanctum extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{U}"); // Instant and sorcery spells you cast cost {1} less. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filter, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filter, 1))); // Whenever you cast an instant or sorcery spell, scry 1. this.addAbility(new SpellCastControllerTriggeredAbility(new ScryEffect(1, false), filter2, false)); diff --git a/Mage.Sets/src/mage/cards/j/JacesSentinel.java b/Mage.Sets/src/mage/cards/j/JacesSentinel.java index 7f18fa59376..920e928a895 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JacesSentinel.java @@ -37,7 +37,7 @@ public final class JacesSentinel extends CardImpl { this.toughness = new MageInt(3); // As long as you control a Jace planeswalker, Jace's Sentinel gets +1/+0 and can't be blocked. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control a Jace planeswalker, {this} gets +1/+0")); diff --git a/Mage.Sets/src/mage/cards/j/Jackhammer.java b/Mage.Sets/src/mage/cards/j/Jackhammer.java index 13e6b59b089..5359a8d6373 100644 --- a/Mage.Sets/src/mage/cards/j/Jackhammer.java +++ b/Mage.Sets/src/mage/cards/j/Jackhammer.java @@ -29,7 +29,7 @@ public final class Jackhammer extends CardImpl { this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java index 79b603a505f..7c3fb304c77 100644 --- a/Mage.Sets/src/mage/cards/j/JacquesLeVert.java +++ b/Mage.Sets/src/mage/cards/j/JacquesLeVert.java @@ -37,7 +37,7 @@ public final class JacquesLeVert extends CardImpl { this.toughness = new MageInt(2); // Green creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0,2, Duration.WhileOnBattlefield, filter))); } private JacquesLeVert(final JacquesLeVert card) { diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index a20b6b6b9da..bb9254cd211 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -46,7 +46,7 @@ public final class JaradGolgariLichLord extends CardImpl { // Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard. DynamicValue amount = new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_CREATURE); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield)); this.addAbility(ability); // {1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power. diff --git a/Mage.Sets/src/mage/cards/j/JediTraining.java b/Mage.Sets/src/mage/cards/j/JediTraining.java index da472aee0b9..debaf748e3f 100644 --- a/Mage.Sets/src/mage/cards/j/JediTraining.java +++ b/Mage.Sets/src/mage/cards/j/JediTraining.java @@ -34,7 +34,7 @@ public final class JediTraining extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); // Meditate abilities you activate costs {1} less to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbilitiesCostReductionControllerEffect(MeditateAbility.class, "Meditate"))); + this.addAbility(new SimpleStaticAbility(new AbilitiesCostReductionControllerEffect(MeditateAbility.class, "Meditate"))); // Whenever a Jedi creature you control meditates, scry 1. this.addAbility(new JediTrainingTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java index 043f29fadce..5fac4f4ff9a 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiInfiltrator.java @@ -36,7 +36,7 @@ public final class JeskaiInfiltrator extends CardImpl { // Jeskai Infiltrator can't be blocked as long as you control no other creatures. Effect effect = new ConditionalRestrictionEffect(new CantBeBlockedSourceEffect(), new CreatureCountCondition(1, TargetController.YOU)); effect.setText("{this} can't be blocked as long as you control no other creatures"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // Whenever Jeskai Infiltrator deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new JeskaiInfiltratorEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java index 18d2266a205..71e0f2475ef 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java @@ -49,7 +49,7 @@ public final class JeskaiRunemark 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))); // Enchanted creature has flying as long as you control a red or white permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA), diff --git a/Mage.Sets/src/mage/cards/j/JetMedallion.java b/Mage.Sets/src/mage/cards/j/JetMedallion.java index 76d1a6d8331..9c9aff58a63 100644 --- a/Mage.Sets/src/mage/cards/j/JetMedallion.java +++ b/Mage.Sets/src/mage/cards/j/JetMedallion.java @@ -27,7 +27,7 @@ public final class JetMedallion extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Black 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 JetMedallion(final JetMedallion card) { diff --git a/Mage.Sets/src/mage/cards/j/Jihad.java b/Mage.Sets/src/mage/cards/j/Jihad.java index 3acf77a5c4e..8fcd1b3ff13 100644 --- a/Mage.Sets/src/mage/cards/j/Jihad.java +++ b/Mage.Sets/src/mage/cards/j/Jihad.java @@ -47,7 +47,7 @@ public final class Jihad extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment))); // White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(2, 1, Duration.WhileOnBattlefield, filter, false), new JihadOpponentCondition(), "White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color."))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostAllEffect(2, 1, Duration.WhileOnBattlefield, filter, false), new JihadOpponentCondition(), "White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color."))); // When the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad. this.addAbility(new JihadTriggeredAbility(new SacrificeSourceEffect())); @@ -99,4 +99,4 @@ class JihadOpponentCondition implements Condition { filter.add(TokenPredicate.FALSE); return game.getBattlefield().countAll(filter, chosenOpponent, game) > 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java index c9782a1f335..20cb39d8bca 100644 --- a/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java +++ b/Mage.Sets/src/mage/cards/j/JodahArchmageEternal.java @@ -29,7 +29,7 @@ public final class JodahArchmageEternal extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // You may pay WUBRG rather than pay the mana cost for spells that you cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WUBRGInsteadEffect())); + this.addAbility(new SimpleStaticAbility(new WUBRGInsteadEffect())); } private JodahArchmageEternal(final JodahArchmageEternal card) { diff --git a/Mage.Sets/src/mage/cards/j/JoinerAdept.java b/Mage.Sets/src/mage/cards/j/JoinerAdept.java index dcfbb2fdf69..2d924822e8e 100644 --- a/Mage.Sets/src/mage/cards/j/JoinerAdept.java +++ b/Mage.Sets/src/mage/cards/j/JoinerAdept.java @@ -27,7 +27,7 @@ public final class JoinerAdept extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_LANDS, false))); } private JoinerAdept(final JoinerAdept card) { diff --git a/Mage.Sets/src/mage/cards/j/Jokulmorder.java b/Mage.Sets/src/mage/cards/j/Jokulmorder.java index e216be516b3..47fe4caa8a6 100644 --- a/Mage.Sets/src/mage/cards/j/Jokulmorder.java +++ b/Mage.Sets/src/mage/cards/j/Jokulmorder.java @@ -50,7 +50,7 @@ public final class Jokulmorder extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false)); // Jokulmorder doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever you play an Island, you may untap Jokulmorder. this.addAbility(new JokulmorderTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java index abede3ec54b..408f5c819b5 100644 --- a/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java +++ b/Mage.Sets/src/mage/cards/j/JorKadeenThePrevailer.java @@ -36,7 +36,7 @@ public final class JorKadeenThePrevailer extends CardImpl { // Metalcraft — Creatures you control get +3/+0 as long as you control three or more artifacts. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostControlledEffect(3, 0, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false), MetalcraftCondition.instance, effectText); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect) + this.addAbility(new SimpleStaticAbility(effect) .setAbilityWord(AbilityWord.METALCRAFT) .addHint(MetalcraftHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index 27d71d108c7..e7bc1f28bd7 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -51,7 +51,7 @@ public final class JoragaWarcaller extends CardImpl { // Other Elf creatures you control get +1/+1 for each +1/+1 counter on Joraga Warcaller. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + this.addAbility(new SimpleStaticAbility( new BoostAllEffect( new CountersSourceCount(CounterType.P1P1), new CountersSourceCount(CounterType.P1P1), Duration.WhileOnBattlefield, filter, true, rule))); } @@ -64,4 +64,4 @@ public final class JoragaWarcaller extends CardImpl { public JoragaWarcaller copy() { return new JoragaWarcaller(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JoustingLance.java b/Mage.Sets/src/mage/cards/j/JoustingLance.java index e264682dd0f..3748d16456a 100644 --- a/Mage.Sets/src/mage/cards/j/JoustingLance.java +++ b/Mage.Sets/src/mage/cards/j/JoustingLance.java @@ -26,10 +26,10 @@ public final class JoustingLance extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(2, 0))); // As long as it's your turn, equipped creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, equipped creature has first strike.")) diff --git a/Mage.Sets/src/mage/cards/j/JundHackblade.java b/Mage.Sets/src/mage/cards/j/JundHackblade.java index c52fe1306a7..a12f92fea4b 100644 --- a/Mage.Sets/src/mage/cards/j/JundHackblade.java +++ b/Mage.Sets/src/mage/cards/j/JundHackblade.java @@ -45,7 +45,7 @@ public final class JundHackblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Jund Hackblade gets +1/+1 and has haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "As long as you control another multicolored permanent, {this} gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java index a11ea7f36bd..e533745a8bb 100644 --- a/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java +++ b/Mage.Sets/src/mage/cards/j/JuniperOrderAdvocate.java @@ -40,7 +40,7 @@ public final class JuniperOrderAdvocate extends CardImpl { this.toughness = new MageInt(2); // As long as Juniper Order Advocate is untapped, green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false), SourceTappedCondition.UNTAPPED, "As long as {this} is untapped, green creatures you control get +1/+1."))); diff --git a/Mage.Sets/src/mage/cards/k/KabiraVindicator.java b/Mage.Sets/src/mage/cards/k/KabiraVindicator.java index 6cf173ed873..77d96af0961 100644 --- a/Mage.Sets/src/mage/cards/k/KabiraVindicator.java +++ b/Mage.Sets/src/mage/cards/k/KabiraVindicator.java @@ -37,10 +37,10 @@ public final class KabiraVindicator extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl<>("{2}{W}"))); Abilities abilities1 = new AbilitiesImpl<>(); - abilities1.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); + abilities1.add(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); Abilities abilities2 = new AbilitiesImpl<>(); - abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); + abilities2.add(new SimpleStaticAbility(new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); this.addAbilities(LevelerCardBuilder.construct( new LevelerCardBuilder.LevelAbility(2, 4, abilities1, 3, 6), diff --git a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java index ab569040113..e90a6ef1026 100644 --- a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java +++ b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java @@ -43,7 +43,7 @@ public final class KagemarosClutch extends CardImpl { DynamicValue xMinusValue = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostEnchantedEffect(xMinusValue, xMinusValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets -X/-X, where X is the number of cards in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java b/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java index 7a9f1d8e5bb..5830ad878e6 100644 --- a/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java +++ b/Mage.Sets/src/mage/cards/k/KaghaShadowArchdruid.java @@ -54,7 +54,7 @@ public final class KaghaShadowArchdruid extends CardImpl { this.addAbility(ability); // Once during each of your turns, you may play a land or cast a permanent spell from among cards in your graveyard that were put there from your library this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KaghaShadowArchdruidEffect()) + this.addAbility(new SimpleStaticAbility(new KaghaShadowArchdruidEffect()) .setIdentifier(MageIdentifier.KaghaShadowArchdruidWatcher), new KaghaShadowArchdruidWatcher()); } diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index f1aeda522b9..f49c6eb3217 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -52,7 +52,7 @@ public final class KalitasTraitorOfGhet extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // If a nontoken creature an opponent controls would die, instead exile that card and create a 2/2 black Zombie creature token. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KalitasTraitorOfGhetEffect())); + this.addAbility(new SimpleStaticAbility(new KalitasTraitorOfGhetEffect())); // {2}{B}, Sacrifice another Vampire or Zombie: Put two +1/+1 counters on Kalitas, Traitor of Ghet. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ManaCostsImpl<>("{2}{B}")); diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index 9986f0c8163..f33970abf0a 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -53,7 +53,7 @@ public final class KangeeAerieKeeper extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, KickedCondition.ONCE, "When {this} enters, if it was kicked, put X feather counters on it.")); // Other Bird creatures get +1/+1 for each feather counter on Kangee, Aerie Keeper. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), new CountersSourceCount(CounterType.FEATHER), Duration.WhileOnBattlefield, filter, true, "Other Bird creatures get +1/+1 for each feather counter on {this}."))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(new CountersSourceCount(CounterType.FEATHER), new CountersSourceCount(CounterType.FEATHER), Duration.WhileOnBattlefield, filter, true, "Other Bird creatures get +1/+1 for each feather counter on {this}."))); } private KangeeAerieKeeper(final KangeeAerieKeeper card) { diff --git a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java index eefdd4bf9cc..0ab8fa3219e 100644 --- a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java +++ b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java @@ -46,7 +46,7 @@ public final class KarametrasFavor extends CardImpl { // Enchanted creature has "{T}: Add one mana of any color." Effect effect = new GainAbilityAttachedEffect(new AnyColorManaAbility(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"{T}: Add one mana of any color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java b/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java index 1166eef2bc7..337ac8c9f6d 100644 --- a/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java +++ b/Mage.Sets/src/mage/cards/k/KarlovWatchdog.java @@ -36,7 +36,7 @@ public final class KarlovWatchdog extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Permanents your opponents control can't be turned face up during your turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KarlovWatchdogEffect())); + this.addAbility(new SimpleStaticAbility(new KarlovWatchdogEffect())); // Whenever you attack with three or more creatures, creatures you control get +1/+1 until end of turn. this.addAbility(new AttacksWithCreaturesTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/k/KarplusanStrider.java b/Mage.Sets/src/mage/cards/k/KarplusanStrider.java index b4548e168be..dae5d89b9d0 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanStrider.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanStrider.java @@ -31,7 +31,7 @@ public final class KarplusanStrider extends CardImpl { this.toughness = new MageInt(4); // Karplusan Strider can't be the target of blue or black spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KarplusanStriderEffect())); + this.addAbility(new SimpleStaticAbility(new KarplusanStriderEffect())); } private KarplusanStrider(final KarplusanStrider card) { diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java index 71dd8341af0..458cd360a61 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java @@ -37,7 +37,7 @@ public final class KashiTribeElite extends CardImpl { this.toughness = new MageInt(3); // Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. Ability ability; @@ -55,4 +55,4 @@ public final class KashiTribeElite extends CardImpl { public KashiTribeElite copy() { return new KashiTribeElite(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KatabaticWinds.java b/Mage.Sets/src/mage/cards/k/KatabaticWinds.java index fb4ee538cea..c5a912bb0dc 100644 --- a/Mage.Sets/src/mage/cards/k/KatabaticWinds.java +++ b/Mage.Sets/src/mage/cards/k/KatabaticWinds.java @@ -34,7 +34,7 @@ public final class KatabaticWinds extends CardImpl { this.addAbility(PhasingAbility.getInstance()); // Creatures with flying can't attack or block, and their activated abilities with {tap} in their costs can't be activated. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new KatabaticWindsRestrictionEffect()); + Ability ability = new SimpleStaticAbility(new KatabaticWindsRestrictionEffect()); ability.addEffect(new KatabaticWindsRuleModifyingEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java index f4c61775508..427b847a0b6 100644 --- a/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java +++ b/Mage.Sets/src/mage/cards/k/KatakiWarsWage.java @@ -38,7 +38,7 @@ public final class KatakiWarsWage extends CardImpl { Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new GenericManaCost(1))); Effect effect = new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter, false); effect.setText("All artifacts have \"At the beginning of your upkeep, sacrifice this artifact unless you pay {1}.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KatakiWarsWage(final KatakiWarsWage card) { diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index 05a3a361124..b62f8b5a56f 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -40,7 +40,7 @@ public final class KavuMonarch extends CardImpl { this.toughness = new MageInt(3); // Kavu creatures have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(TrampleAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter1))); // Whenever another Kavu enters the battlefield, put a +1/+1 counter on Kavu Monarch. diff --git a/Mage.Sets/src/mage/cards/k/KavuScout.java b/Mage.Sets/src/mage/cards/k/KavuScout.java index 81778331d5a..b560c686a01 100644 --- a/Mage.Sets/src/mage/cards/k/KavuScout.java +++ b/Mage.Sets/src/mage/cards/k/KavuScout.java @@ -32,7 +32,7 @@ public final class KavuScout extends CardImpl { this.toughness = new MageInt(2); // Domain - Kavu Scout gets +1/+0 for each basic land type among lands you control. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(DomainValue.REGULAR, StaticValue.get(0), Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostSourceEffect(DomainValue.REGULAR, StaticValue.get(0), Duration.WhileOnBattlefield)); ability.setAbilityWord(AbilityWord.DOMAIN); this.addAbility(ability.addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/k/Kaysa.java b/Mage.Sets/src/mage/cards/k/Kaysa.java index be5a60c9b53..237f59bbdf0 100644 --- a/Mage.Sets/src/mage/cards/k/Kaysa.java +++ b/Mage.Sets/src/mage/cards/k/Kaysa.java @@ -38,7 +38,7 @@ public final class Kaysa extends CardImpl { this.toughness = new MageInt(3); // Green creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1, Duration.WhileOnBattlefield, filter))); } private Kaysa(final Kaysa card) { diff --git a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java index 4b34dbf84aa..69231633b92 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java +++ b/Mage.Sets/src/mage/cards/k/KefnetTheMindful.java @@ -41,7 +41,7 @@ public final class KefnetTheMindful extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // Kefnet the Mindful can't attack or block unless you have seven or more cards in your hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KefnetTheMindfulRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KefnetTheMindfulRestrictionEffect())); // {3}{U}: Draw a card, then you may return a land you control to its owner's hand. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KefnetTheMindfulEffect(), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java index 65b34413824..1350482e94f 100644 --- a/Mage.Sets/src/mage/cards/k/KefnetsMonument.java +++ b/Mage.Sets/src/mage/cards/k/KefnetsMonument.java @@ -40,7 +40,7 @@ public final class KefnetsMonument extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // Blue creature 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))); // Whenever you cast a creature spell, target creature an opponent controls doesn't untap during its controller's next untap step. Ability ability = new SpellCastControllerTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect(), filter2, false); diff --git a/Mage.Sets/src/mage/cards/k/KembasBanner.java b/Mage.Sets/src/mage/cards/k/KembasBanner.java index 90c545a4711..6852d13450a 100644 --- a/Mage.Sets/src/mage/cards/k/KembasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KembasBanner.java @@ -30,7 +30,7 @@ public final class KembasBanner extends CardImpl { // Equipped creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(value, value))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(value, value))); // Equip {2}{W} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}{W}"), false)); diff --git a/Mage.Sets/src/mage/cards/k/KembasLegion.java b/Mage.Sets/src/mage/cards/k/KembasLegion.java index acb27275693..f78395340d9 100644 --- a/Mage.Sets/src/mage/cards/k/KembasLegion.java +++ b/Mage.Sets/src/mage/cards/k/KembasLegion.java @@ -31,7 +31,7 @@ public final class KembasLegion extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KembasLegionEffect())); + this.addAbility(new SimpleStaticAbility(new KembasLegionEffect())); } private KembasLegion(final KembasLegion card) { diff --git a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java index 88bed33dcd9..6bdb30e3265 100644 --- a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java @@ -37,7 +37,7 @@ public final class KentaroTheSmilingCat extends CardImpl { this.addAbility(new BushidoAbility(1)); // You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KentaroTheSmilingCatCastingEffect())); + this.addAbility(new SimpleStaticAbility(new KentaroTheSmilingCatCastingEffect())); } @@ -115,4 +115,4 @@ class ColorlessManaValue implements DynamicCost { public String getText(Ability ability, Game game) { return "Pay " + getCost(ability, game).getText() + " rather than " + ability.getManaCosts().getText() + " for Samurai card?"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java b/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java index 94b3372d549..b7e34326fd2 100644 --- a/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java +++ b/Mage.Sets/src/mage/cards/k/KhenraCharioteer.java @@ -32,7 +32,7 @@ public final class KhenraCharioteer extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Other creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("creatures"), true))); } diff --git a/Mage.Sets/src/mage/cards/k/KheruMindEater.java b/Mage.Sets/src/mage/cards/k/KheruMindEater.java index 78e16f7c8ad..08e33f61fda 100644 --- a/Mage.Sets/src/mage/cards/k/KheruMindEater.java +++ b/Mage.Sets/src/mage/cards/k/KheruMindEater.java @@ -47,7 +47,7 @@ public final class KheruMindEater extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new KheruMindEaterExileEffect(), false, true)); // You may look at and play cards exiled with Kheru Mind-Eater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KheruMindEaterEffect())); + this.addAbility(new SimpleStaticAbility(new KheruMindEaterEffect())); this.addAbility(new SimpleStaticAbility(Zone.ALL, new KheruMindEaterLookAtCardEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java b/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java index 3cfc6779b77..ceb3a56466f 100644 --- a/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java +++ b/Mage.Sets/src/mage/cards/k/KhorvathBrightflame.java @@ -44,7 +44,7 @@ public final class KhorvathBrightflame extends CardImpl { this.addAbility(HasteAbility.getInstance()); // Knights your team controls have flying and haste. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter)); + Ability ability = new SimpleStaticAbility(new GainAbilityAllEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter)); ability.addEffect(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter).setText("and haste")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KindredBoon.java b/Mage.Sets/src/mage/cards/k/KindredBoon.java index 8fa63f19190..f3e5e783820 100644 --- a/Mage.Sets/src/mage/cards/k/KindredBoon.java +++ b/Mage.Sets/src/mage/cards/k/KindredBoon.java @@ -49,7 +49,7 @@ public final class KindredBoon extends CardImpl { // Each creature you control with a divinity counter on it has indestructible. Effect effect = new GainAbilityControlledEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filterDivinity); effect.setText("Each creature you control with a divinity counter on it has indestructible"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KindredBoon(final KindredBoon card) { diff --git a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java index 8ae2ed47008..a7ab89cdaee 100644 --- a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java +++ b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java @@ -33,7 +33,7 @@ public final class KinjallisCaller extends CardImpl { this.toughness = new MageInt(3); // Dinosaur 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 KinjallisCaller(final KinjallisCaller card) { diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java index 3ed23a06209..ed7c80a11a9 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java @@ -33,7 +33,7 @@ public final class KinsbaileCavalier extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); } private KinsbaileCavalier(final KinsbaileCavalier card) { diff --git a/Mage.Sets/src/mage/cards/k/KiteShield.java b/Mage.Sets/src/mage/cards/k/KiteShield.java index 11f52dadb7e..75b98f55dec 100644 --- a/Mage.Sets/src/mage/cards/k/KiteShield.java +++ b/Mage.Sets/src/mage/cards/k/KiteShield.java @@ -23,7 +23,7 @@ public final class KiteShield extends CardImpl { public KiteShield (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(0, 3))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java index e39d32c426a..39964514566 100644 --- a/Mage.Sets/src/mage/cards/k/KitesailCorsair.java +++ b/Mage.Sets/src/mage/cards/k/KitesailCorsair.java @@ -29,7 +29,7 @@ public final class KitesailCorsair extends CardImpl { // Kitesail Corsair has flying as long as it's attacking. ContinuousEffect gainEffect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect( gainEffect, SourceAttackingCondition.instance, "{this} has flying as long as it's attacking." @@ -44,4 +44,4 @@ public final class KitesailCorsair extends CardImpl { public KitesailCorsair copy() { return new KitesailCorsair(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KithkinArmor.java b/Mage.Sets/src/mage/cards/k/KithkinArmor.java index 2351ca64a24..b451c0d1d85 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinArmor.java +++ b/Mage.Sets/src/mage/cards/k/KithkinArmor.java @@ -44,7 +44,7 @@ public final class KithkinArmor extends CardImpl { this.addAbility(ability); // Enchanted creature can't be blocked by creatures with power 3 or greater. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KithkinArmorRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KithkinArmorRestrictionEffect())); // Sacrifice Kithkin Armor: The next time a source of your choice would deal damage to enchanted creature this turn, prevent that damage. Ability protectionAbility = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java index 700faeb48ef..302728cd3a3 100644 --- a/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java +++ b/Mage.Sets/src/mage/cards/k/KiyomaroFirstToStand.java @@ -47,7 +47,7 @@ public final class KiyomaroFirstToStand extends CardImpl { // As long as you have four or more cards in hand, Kiyomaro has vigilance. Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,3); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), condition, "As long as you have four or more cards in hand, {this} has vigilance")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java index 850b4029160..e952292516b 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java @@ -44,7 +44,7 @@ public final class KjeldoranPride extends CardImpl { this.addAbility(enchantAbility); // Enchanted creature gets +1/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2))); // 2U: Attach Kjeldoran Pride to target creature other than enchanted creature. Ability ability = new SimpleActivatedAbility(new AttachEffect(Outcome.Benefit, "attach {this} to target " + filter.getMessage()), new ManaCostsImpl<>("{2}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfGrace.java b/Mage.Sets/src/mage/cards/k/KnightOfGrace.java index 4ea69a91f6c..06a165bf25f 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfGrace.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfGrace.java @@ -38,7 +38,7 @@ public final class KnightOfGrace extends CardImpl { //Knight of Grace gets +1/+0 as long as any player controls a black permanent. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new AnyPlayerControlsCondition(filter), "{this} gets +1/+0 as long as any player controls a black permanent."))); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfMalice.java b/Mage.Sets/src/mage/cards/k/KnightOfMalice.java index a1d79f5e9aa..c0922965ded 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfMalice.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfMalice.java @@ -36,7 +36,7 @@ public final class KnightOfMalice extends CardImpl { addAbility(HexproofFromWhiteAbility.getInstance()); //Knight of Malice gets +1/+0 as long as any player controls a white permanent. - addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), new AnyPlayerControlsCondition(filter), "{this} gets +1/+0 as long as any player controls a white permanent."))); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java b/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java index 947eebaacbc..111a2c7b259 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfNewAlara.java @@ -37,7 +37,7 @@ public final class KnightOfNewAlara extends CardImpl { this.toughness = new MageInt(2); // Each other multicolored creature you control gets +1/+1 for each of its colors. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KnightOfNewAlaraEffect())); + this.addAbility(new SimpleStaticAbility(new KnightOfNewAlaraEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java index a869aa0b104..5771ee61306 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java @@ -43,7 +43,7 @@ public final class KnightOfTheReliquary extends CardImpl { // Knight of the Reliquary gets +1/+1 for each land card in your graveyard. CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(value, value, Duration.WhileOnBattlefield))); // {T}, Sacrifice a Forest or Plains: Search your library for a land card, put it onto the battlefield, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java index b2fbdd77409..2bd765c9242 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java @@ -32,7 +32,7 @@ public final class KnightOfTheStampede extends CardImpl { this.toughness = new MageInt(4); // Dinosaur 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 KnightOfTheStampede(final KnightOfTheStampede card) { diff --git a/Mage.Sets/src/mage/cards/k/Knighthood.java b/Mage.Sets/src/mage/cards/k/Knighthood.java index 5210add0e04..1988b19de56 100644 --- a/Mage.Sets/src/mage/cards/k/Knighthood.java +++ b/Mage.Sets/src/mage/cards/k/Knighthood.java @@ -22,7 +22,7 @@ public final class Knighthood extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } diff --git a/Mage.Sets/src/mage/cards/k/KnightlyValor.java b/Mage.Sets/src/mage/cards/k/KnightlyValor.java index ed9652d1d1b..01c191c6fc5 100644 --- a/Mage.Sets/src/mage/cards/k/KnightlyValor.java +++ b/Mage.Sets/src/mage/cards/k/KnightlyValor.java @@ -49,7 +49,7 @@ public final class KnightlyValor extends CardImpl { // Enchanted creature gets +2/+2 and has vigilance. Effect effect = new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+2"); - SimpleStaticAbility ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + SimpleStaticAbility ability2 = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA); effect.setText("and has vigilance"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/k/KnightsPledge.java b/Mage.Sets/src/mage/cards/k/KnightsPledge.java index 9bf195075e8..4def81ae326 100644 --- a/Mage.Sets/src/mage/cards/k/KnightsPledge.java +++ b/Mage.Sets/src/mage/cards/k/KnightsPledge.java @@ -35,7 +35,7 @@ public final class KnightsPledge extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2))); } private KnightsPledge(final KnightsPledge card) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java index 9eeffdef696..115f92d0886 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java +++ b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java @@ -37,7 +37,7 @@ public final class KoboldDrillSergeant extends CardImpl { this.toughness = new MageInt(2); // Other Kobold creatures you control get +0/+1 and have trample. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)); + Ability ability = new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true)); Effect effect = new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true); effect.setText("and have trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java index 59697efb0b0..90402b16fba 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java +++ b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java @@ -35,7 +35,7 @@ public final class KoboldOverlord extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Other Kobold creatures you control have first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); } private KoboldOverlord(final KoboldOverlord card) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java index 1f2d06f72bc..99ab0d94f73 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java +++ b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java @@ -30,7 +30,7 @@ public final class KoboldTaskmaster extends CardImpl { this.toughness = new MageInt(2); // Other Kobold creatures you control get +1/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filter, true))); } diff --git a/Mage.Sets/src/mage/cards/k/KondasBanner.java b/Mage.Sets/src/mage/cards/k/KondasBanner.java index c291ef7f33b..137f405895d 100644 --- a/Mage.Sets/src/mage/cards/k/KondasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KondasBanner.java @@ -39,10 +39,10 @@ public final class KondasBanner extends CardImpl { this.addAbility(new AttachableToRestrictedAbility(target)); // Creatures that share a color with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerColorBoostEffect())); + this.addAbility(new SimpleStaticAbility(new KondasBannerColorBoostEffect())); // Creatures that share a creature type with equipped creature get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerTypeBoostEffect())); + this.addAbility(new SimpleStaticAbility(new KondasBannerTypeBoostEffect())); // Equip {2} this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), target, false)); diff --git a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java index 813b73df08d..679fbc45080 100644 --- a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java +++ b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java @@ -40,9 +40,9 @@ public final class KondasHatamoto extends CardImpl { this.addAbility(new BushidoAbility(1)); ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(1, 2, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); + this.addAbility(new SimpleStaticAbility(effect1)); ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance()), new PermanentsOnTheBattlefieldCondition(filter), rule2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); + this.addAbility(new SimpleStaticAbility(effect2)); } diff --git a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java index 8e7dea0209b..6e7becd2893 100644 --- a/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java +++ b/Mage.Sets/src/mage/cards/k/KongmingSleepingDragon.java @@ -29,7 +29,7 @@ public final class KongmingSleepingDragon extends CardImpl { this.toughness = new MageInt(2); // Other creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1,1,Duration.WhileOnBattlefield, true))); } private KongmingSleepingDragon(final KongmingSleepingDragon card) { diff --git a/Mage.Sets/src/mage/cards/k/KorDuelist.java b/Mage.Sets/src/mage/cards/k/KorDuelist.java index 9542040e9bb..f35a918b5a2 100644 --- a/Mage.Sets/src/mage/cards/k/KorDuelist.java +++ b/Mage.Sets/src/mage/cards/k/KorDuelist.java @@ -35,7 +35,7 @@ public final class KorDuelist extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); GainAbilitySourceEffect effect = new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(effect, new SourceIsEquiped(), ruleText))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(effect, new SourceIsEquiped(), ruleText))); } private KorDuelist(final KorDuelist card) { diff --git a/Mage.Sets/src/mage/cards/k/KorScythemaster.java b/Mage.Sets/src/mage/cards/k/KorScythemaster.java index edd160929ae..02787479676 100644 --- a/Mage.Sets/src/mage/cards/k/KorScythemaster.java +++ b/Mage.Sets/src/mage/cards/k/KorScythemaster.java @@ -29,7 +29,7 @@ public final class KorScythemaster extends CardImpl { this.toughness = new MageInt(1); // Kor Scythemaster has first strike as long as its attacking. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), SourceAttackingCondition.instance, "{this} has first strike as long as it's attacking"))); } private KorScythemaster(final KorScythemaster card) { diff --git a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java index 37d010cefa5..21df2602136 100644 --- a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java @@ -38,7 +38,7 @@ public final class KorSpiritdancer extends CardImpl { // Kor Spiritdancer gets +2/+2 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Whenever you cast an Aura spell, you may draw a card. this.addAbility(new SpellCastControllerTriggeredAbility(new DrawCardSourceControllerEffect(1), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/k/KormusBell.java b/Mage.Sets/src/mage/cards/k/KormusBell.java index 56cf51079d0..84bbcf7abdc 100644 --- a/Mage.Sets/src/mage/cards/k/KormusBell.java +++ b/Mage.Sets/src/mage/cards/k/KormusBell.java @@ -32,7 +32,7 @@ public final class KormusBell extends CardImpl { effect.addDependedToType(DependencyType.BecomeForest); effect.addDependedToType(DependencyType.BecomeMountain); effect.addDependedToType(DependencyType.BecomePlains); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KormusBell(final KormusBell card) { diff --git a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java index 244c14ba996..b95e795088b 100644 --- a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java +++ b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java @@ -39,7 +39,7 @@ public final class KragmaWarcaller extends CardImpl { this.toughness = new MageInt(3); // Minotaur creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter1, false))); // Whenever a Minotaur you control attacks, it gets +2/+0 until end of turn. Effect effect = new BoostTargetEffect(2,0, Duration.EndOfTurn); diff --git a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java index 41e3aa17c5f..83c0f9713eb 100644 --- a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java +++ b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java @@ -31,7 +31,7 @@ public final class KrakenOfTheStraits extends CardImpl { this.toughness = new MageInt(6); // Creatures with power less than the number of Islands you control can't block Kraken of the Straits. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByCreaturesWithLessPowerEffect())); } private KrakenOfTheStraits(final KrakenOfTheStraits card) { diff --git a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java index f1aded7e177..f321fc3b281 100644 --- a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java +++ b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java @@ -39,7 +39,7 @@ public final class KrasisIncubation extends CardImpl { this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect())); // {1}{G}{U}, Return Krasis Incubation to its owner's hand: Put two +1/+1 counters on enchanted creature. ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(2), new ManaCostsImpl<>("{1}{G}{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KrosanDrover.java b/Mage.Sets/src/mage/cards/k/KrosanDrover.java index b6d3819f0c0..55a77a0b1c1 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanDrover.java +++ b/Mage.Sets/src/mage/cards/k/KrosanDrover.java @@ -36,7 +36,7 @@ public final class KrosanDrover extends CardImpl { // Creature spells you cast with converted mana cost 6 or greater cost {2} less to cast. Effect effect = new SpellsCostReductionControllerEffect(filter, 2); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KrosanDrover(final KrosanDrover card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanVorine.java b/Mage.Sets/src/mage/cards/k/KrosanVorine.java index 51c9e8f68f5..120e8bf263b 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanVorine.java +++ b/Mage.Sets/src/mage/cards/k/KrosanVorine.java @@ -29,7 +29,7 @@ public final class KrosanVorine extends CardImpl { // Provoke this.addAbility(new ProvokeAbility()); // Krosan Vorine can't be blocked by more than one creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByMoreThanOneSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByMoreThanOneSourceEffect())); } private KrosanVorine(final KrosanVorine card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java index 6e973aceb44..e5a256d19c2 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -40,7 +40,7 @@ public final class KrosanWarchief extends CardImpl { this.toughness = new MageInt(2); // Beast 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))); // {1}{G}: Regenerate target Beast. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), diff --git a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java index 4b0ab67c8e9..645b4872c03 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java @@ -44,7 +44,7 @@ public final class KrovikanFetish extends CardImpl { .setText("draw a card at the beginning of the next turn's upkeep"), false)); // 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))); } private KrovikanFetish(final KrovikanFetish card) { diff --git a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java index 23ab7e93a65..3b659687081 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java @@ -45,7 +45,7 @@ public final class KrovikanWhispers extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new OrCost("{U} or {B}", new ManaCostsImpl<>("{U}"), new ManaCostsImpl<>("{B}")))); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); // When Krovikan Whispers is put into a graveyard from the battlefield, you lose 2 life for each age counter on it. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new LoseLifeSourceControllerEffect(new MultipliedValue(new CountersSourceCount(CounterType.AGE), 2)) diff --git a/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java b/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java index 06b92392d0e..626bbdb561d 100644 --- a/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java +++ b/Mage.Sets/src/mage/cards/k/KrrikSonOfYawgmoth.java @@ -55,7 +55,7 @@ public final class KrrikSonOfYawgmoth extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // For each {B} in a cost, you may pay 2 life rather than pay that mana. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KrrikSonOfYawgmothPhyrexianEffect())); + this.addAbility(new SimpleStaticAbility(new KrrikSonOfYawgmothPhyrexianEffect())); // Whenever you cast a black spell, put a +1/+1 counter on K'rrik, Son of Yawgmoth. this.addAbility(new SpellCastControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filterSpell, false)); diff --git a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java index 85881e30bab..5dfa0f80147 100644 --- a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java @@ -42,7 +42,7 @@ public final class KukemssaSerpent extends CardImpl { this.toughness = new MageInt(3); // Kukemssa 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")))); // {U}, Sacrifice an Island: Target land an opponent controls becomes an Island until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.EndOfTurn, SubType.ISLAND), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/k/KulrathKnight.java b/Mage.Sets/src/mage/cards/k/KulrathKnight.java index e6955ecf72b..1572f9c31c3 100644 --- a/Mage.Sets/src/mage/cards/k/KulrathKnight.java +++ b/Mage.Sets/src/mage/cards/k/KulrathKnight.java @@ -35,7 +35,7 @@ public final class KulrathKnight extends CardImpl { this.addAbility(WitherAbility.getInstance()); // Creatures your opponents control with counters on them can't attack or block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KulrathKnightRestrictionEffect())); + this.addAbility(new SimpleStaticAbility(new KulrathKnightRestrictionEffect())); } diff --git a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java index 89910f0fe23..6415801d3a5 100644 --- a/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java +++ b/Mage.Sets/src/mage/cards/k/KumanoMasterYamabushi.java @@ -34,7 +34,7 @@ public final class KumanoMasterYamabushi extends CardImpl { ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); // If a creature dealt damage by Kumano this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } diff --git a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java index 05b21097209..4fc60abf1ae 100644 --- a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java +++ b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java @@ -43,7 +43,7 @@ public final class KumanosBlessing extends CardImpl { this.addAbility(ability); // If a creature dealt damage by enchanted creature this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KumanosBlessingEffect()), new DamagedByEnchantedWatcher()); + this.addAbility(new SimpleStaticAbility(new KumanosBlessingEffect()), new DamagedByEnchantedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/k/KumanosPupils.java b/Mage.Sets/src/mage/cards/k/KumanosPupils.java index 10a87ea9341..2172e2864dc 100644 --- a/Mage.Sets/src/mage/cards/k/KumanosPupils.java +++ b/Mage.Sets/src/mage/cards/k/KumanosPupils.java @@ -28,7 +28,7 @@ public final class KumanosPupils extends CardImpl { this.toughness = new MageInt(3); // If a creature dealt damage by Kumano's Pupils this turn would die, exile it instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); + this.addAbility(new SimpleStaticAbility(new DealtDamageToCreatureBySourceDies(this, Duration.WhileOnBattlefield)), new DamagedByWatcher(false)); } private KumanosPupils(final KumanosPupils card) { diff --git a/Mage.Sets/src/mage/cards/k/KusariGama.java b/Mage.Sets/src/mage/cards/k/KusariGama.java index 7453c9a7b4d..ec3b687b642 100644 --- a/Mage.Sets/src/mage/cards/k/KusariGama.java +++ b/Mage.Sets/src/mage/cards/k/KusariGama.java @@ -42,7 +42,7 @@ public final class KusariGama extends CardImpl { Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2)); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); effect.setText("Equipped creature has \"{2}: This creature gets +1/+0 until end of turn.\""); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Whenever equipped creature deals damage to a blocking creature, Kusari-Gama deals that much damage to each other creature defending player controls. this.addAbility(new KusariGamaAbility()); diff --git a/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java b/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java index f4e38730253..1c336b133ea 100644 --- a/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java +++ b/Mage.Sets/src/mage/cards/k/KwendePrideOfFemeref.java @@ -47,7 +47,7 @@ public final class KwendePrideOfFemeref extends CardImpl { ContinuousEffect effect = new GainAbilityAllEffect(DoubleStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, false); effect.setText("Creatures you control with first strike have double strike"); effect.setDependedToType(DependencyType.AddingAbility); // effects that add first strike need to be executed first - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private KwendePrideOfFemeref(final KwendePrideOfFemeref card) {