diff --git a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java index c84d4251505..d7d25f683cf 100644 --- a/Mage.Sets/src/mage/cards/g/GaddockTeeg.java +++ b/Mage.Sets/src/mage/cards/g/GaddockTeeg.java @@ -29,9 +29,9 @@ public final class GaddockTeeg extends CardImpl { this.toughness = new MageInt(2); // Noncreature spells with converted mana cost 4 or greater can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffect4())); + this.addAbility(new SimpleStaticAbility(new GaddockTeegReplacementEffect4())); // Noncreature spells with {X} in their mana costs can't be cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GaddockTeegReplacementEffectX())); + this.addAbility(new SimpleStaticAbility(new GaddockTeegReplacementEffectX())); } private GaddockTeeg(final GaddockTeeg card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java index ad133730d03..030ac72c1c7 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java @@ -35,7 +35,7 @@ public final class GaeasEmbrace extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has trample. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, 3)); Effect effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GaeasHerald.java b/Mage.Sets/src/mage/cards/g/GaeasHerald.java index 23ee5e5ab64..c34728c3bb0 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasHerald.java +++ b/Mage.Sets/src/mage/cards/g/GaeasHerald.java @@ -31,7 +31,7 @@ public final class GaeasHerald extends CardImpl { this.toughness = new MageInt(1); // Creature spells can't be countered. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCounterEffect())); + this.addAbility(new SimpleStaticAbility(new CantCounterEffect())); } private GaeasHerald(final GaeasHerald card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasProtector.java b/Mage.Sets/src/mage/cards/g/GaeasProtector.java index fd8c86e988e..a448f5bd6dc 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasProtector.java +++ b/Mage.Sets/src/mage/cards/g/GaeasProtector.java @@ -27,7 +27,7 @@ public final class GaeasProtector extends CardImpl { this.toughness = new MageInt(2); // Gaea's Protector must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); } private GaeasProtector(final GaeasProtector card) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java index f57fcbc0a54..83b3115ec78 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasRevenge.java +++ b/Mage.Sets/src/mage/cards/g/GaeasRevenge.java @@ -40,7 +40,7 @@ public final class GaeasRevenge extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantBeCounteredSourceEffect())); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedSourceEffect(filter, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedSourceEffect(filter, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/g/GallowsWarden.java b/Mage.Sets/src/mage/cards/g/GallowsWarden.java index 3d6a0978a6e..d98d8c6619b 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsWarden.java +++ b/Mage.Sets/src/mage/cards/g/GallowsWarden.java @@ -35,7 +35,7 @@ public final class GallowsWarden extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other Spirit creatures you control get +0/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, filter, true))); } private GallowsWarden(final GallowsWarden card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java index 3a6938dfd2a..64685afe7ff 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicAlchemist.java @@ -36,7 +36,7 @@ public final class GalvanicAlchemist extends CardImpl { // As long as Galvanic Alchemist is paired with another creature, each of those creatures has "{2}{U}: Untap this creature." Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapSourceEffect(), new ManaCostsImpl<>("{2}{U}")); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ability, ruleText))); } private GalvanicAlchemist(final GalvanicAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index 0b1f71c3528..fe8772167c4 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -43,7 +43,7 @@ public final class GalvanicArc extends CardImpl { triggeredAbility.addTarget(new TargetAnyTarget()); this.addAbility(triggeredAbility); // Enchanted creature has first strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); } private GalvanicArc(final GalvanicArc card) { diff --git a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java index cc6c4b61df5..defe4963b40 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicJuggernaut.java @@ -30,7 +30,7 @@ public final class GalvanicJuggernaut extends CardImpl { // Galvanic Juggernaut attacks each turn if able. this.addAbility(new AttacksEachCombatStaticAbility()); // Galvanic Juggernaut doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever another creature dies, untap Galvanic Juggernaut. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false, true)); } diff --git a/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java b/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java index 54a959b1ed7..14154184692 100644 --- a/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java +++ b/Mage.Sets/src/mage/cards/g/GandalfTheWhite.java @@ -48,7 +48,7 @@ public final class GandalfTheWhite extends CardImpl { new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter) )); // If a legendary permanent or an artifact entering or leaving the battlefield causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GandalfTheWhiteDoublingEffect())); + this.addAbility(new SimpleStaticAbility(new GandalfTheWhiteDoublingEffect())); } private GandalfTheWhite(final GandalfTheWhite card) { diff --git a/Mage.Sets/src/mage/cards/g/GaseousForm.java b/Mage.Sets/src/mage/cards/g/GaseousForm.java index 61d1f00ebcb..c8c8fe1bef2 100644 --- a/Mage.Sets/src/mage/cards/g/GaseousForm.java +++ b/Mage.Sets/src/mage/cards/g/GaseousForm.java @@ -29,7 +29,7 @@ public final class GaseousForm extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // Prevent all combat damage that would be dealt to and dealt by enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private GaseousForm(final GaseousForm card) { diff --git a/Mage.Sets/src/mage/cards/g/GateSmasher.java b/Mage.Sets/src/mage/cards/g/GateSmasher.java index c644bf05a62..add5d33975e 100644 --- a/Mage.Sets/src/mage/cards/g/GateSmasher.java +++ b/Mage.Sets/src/mage/cards/g/GateSmasher.java @@ -47,7 +47,7 @@ public final class GateSmasher extends CardImpl { // Equipped creature gets +3/+0 and has trample. Effect effect = new BoostEquippedEffect(3, 0); effect.setText("Equipped creature gets +3/+0"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); effect.setText("and has trample"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GathanRaiders.java b/Mage.Sets/src/mage/cards/g/GathanRaiders.java index c5e1678b598..32f8179179e 100644 --- a/Mage.Sets/src/mage/cards/g/GathanRaiders.java +++ b/Mage.Sets/src/mage/cards/g/GathanRaiders.java @@ -31,7 +31,7 @@ public final class GathanRaiders extends CardImpl { this.toughness = new MageInt(3); // Hellbent - Gathan Raiders gets +2/+2 as long as you have no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+2 as long as you have no cards in hand"))); // Morph-Discard a card. diff --git a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java index 7d1a1890ada..01557edbd57 100644 --- a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java +++ b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java @@ -39,7 +39,7 @@ public final class GathererOfGraces extends CardImpl { // Gatherer of Graces gets +1/+1 for each Aura attached to it. AuraAttachedCount count = new AuraAttachedCount(1); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(count, count, Duration.WhileOnBattlefield))); // Sacrifice an Aura: Regenerate Gatherer of Graces this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new SacrificeTargetCost(filter))); diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java index 179cf1f3087..7e3754aa1a7 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java +++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java @@ -34,7 +34,7 @@ public final class GauntletOfMight extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Red 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))); // Whenever a Mountain is tapped for mana, its controller adds {R}. ManaEffect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "their"); diff --git a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java index 42e153eb044..ef65d908d85 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyIronwright.java +++ b/Mage.Sets/src/mage/cards/g/GavonyIronwright.java @@ -28,7 +28,7 @@ public final class GavonyIronwright extends CardImpl { this.toughness = new MageInt(4); // Fateful hour - As long as you have 5 or less life, other creatures you control get +1/+4. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, true), + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostControlledEffect(1, 4, Duration.WhileOnBattlefield, true), FatefulHourCondition.instance, "
Fateful hour — As long as you have 5 or less life, other creatures you control get +1/+4"))); } diff --git a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java index 5a9ad60fe05..bc4bbf53e9e 100644 --- a/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java +++ b/Mage.Sets/src/mage/cards/g/GeistOfTheLonelyVigil.java @@ -40,7 +40,7 @@ public final class GeistOfTheLonelyVigil extends CardImpl { new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.WhileOnBattlefield), DeliriumCondition.instance); effect.setText("Delirium — {this} can attack as though it didn't have defender as long as there are four or more card types among cards in your graveyard"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect).addHint(CardTypesInGraveyardHint.YOU)); + this.addAbility(new SimpleStaticAbility(effect).addHint(CardTypesInGraveyardHint.YOU)); } private GeistOfTheLonelyVigil(final GeistOfTheLonelyVigil card) { diff --git a/Mage.Sets/src/mage/cards/g/GeistTrappers.java b/Mage.Sets/src/mage/cards/g/GeistTrappers.java index 8d63ae62d02..291c891b5ed 100644 --- a/Mage.Sets/src/mage/cards/g/GeistTrappers.java +++ b/Mage.Sets/src/mage/cards/g/GeistTrappers.java @@ -32,7 +32,7 @@ public final class GeistTrappers extends CardImpl { this.addAbility(new SoulbondAbility()); // As long as Geist Trappers is paired with another creature, both creatures have reach. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); + this.addAbility(new SimpleStaticAbility(new GainAbilityPairedEffect(ReachAbility.getInstance(), ruleText))); } private GeistTrappers(final GeistTrappers card) { diff --git a/Mage.Sets/src/mage/cards/g/GelidShackles.java b/Mage.Sets/src/mage/cards/g/GelidShackles.java index 7737421e0d9..aa62c4a9859 100644 --- a/Mage.Sets/src/mage/cards/g/GelidShackles.java +++ b/Mage.Sets/src/mage/cards/g/GelidShackles.java @@ -36,7 +36,7 @@ public final class GelidShackles extends CardImpl { this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockActivateAttachedEffect())); + this.addAbility(new SimpleStaticAbility(new CantBlockActivateAttachedEffect())); // {snow}: Enchanted creature gains defender until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java index fc0c560209d..6b7ea4b9c94 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java +++ b/Mage.Sets/src/mage/cards/g/GeneralsKabuto.java @@ -23,10 +23,10 @@ public final class GeneralsKabuto extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has shroud. (It can't be the target of spells or abilities.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT))); // Prevent all combat damage that would be dealt to equipped creature - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, true))); + this.addAbility(new SimpleStaticAbility(new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, true))); // Equip {2} this.addAbility(new EquipAbility(Outcome.PreventDamage, new GenericManaCost(2))); diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java index b4599142241..8a9f2d34e33 100644 --- a/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java +++ b/Mage.Sets/src/mage/cards/g/GeralfsMasterpiece.java @@ -45,7 +45,7 @@ public final class GeralfsMasterpiece extends CardImpl { DynamicValue count = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield); effect.setText("{this} gets -1/-1 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {3}{U}, Discard three cards: Return Geralf's Masterpiece from your graveyard to the battlefield tapped. Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new ManaCostsImpl<>("{3}{U}")); diff --git a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java index b38ebfa6516..d2942bfb719 100644 --- a/Mage.Sets/src/mage/cards/g/GhalmasWarden.java +++ b/Mage.Sets/src/mage/cards/g/GhalmasWarden.java @@ -30,7 +30,7 @@ public final class GhalmasWarden extends CardImpl { // Metalcraft — Ghalma’s Warden gets +2/+2 as long as you control three or more artifacts. ContinuousEffect boostSource = new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield); ConditionalContinuousEffect effect = new ConditionalContinuousEffect(boostSource, 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/g/GhastbarkTwins.java b/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java index bd7df72623b..5ff8a1154d5 100644 --- a/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java +++ b/Mage.Sets/src/mage/cards/g/GhastbarkTwins.java @@ -28,7 +28,7 @@ public final class GhastbarkTwins extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Ghastbark Twins can block an additional creature each combat. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect())); + this.addAbility(new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect())); } private GhastbarkTwins(final GhastbarkTwins card) { diff --git a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java index cda6355d838..75e1bcf6701 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java @@ -33,7 +33,7 @@ public final class GhastlyHaunting extends CardImpl { this.addAbility(new EnchantAbility(auraTarget)); // You control enchanted creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new ControlEnchantedEffect())); } private GhastlyHaunting(final GhastlyHaunting card) { diff --git a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java index bd933f125b8..6236d92407c 100644 --- a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java +++ b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java @@ -28,7 +28,7 @@ public final class GhirapurOrrery extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Each player may play an additional land on each of their turns. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect())); + this.addAbility(new SimpleStaticAbility(new PlayAdditionalLandsAllEffect())); // At the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java index 2acdd08b7eb..9e80dccbd41 100644 --- a/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java +++ b/Mage.Sets/src/mage/cards/g/GhostbladeEidolon.java @@ -36,7 +36,7 @@ public final class GhostbladeEidolon extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Enchanted creature gets +1/+1 and has double strike. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1)); Effect effect = new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has double strike"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java index 4a6ff714b6f..d4d0aa7f557 100644 --- a/Mage.Sets/src/mage/cards/g/GhostflameSliver.java +++ b/Mage.Sets/src/mage/cards/g/GhostflameSliver.java @@ -27,7 +27,7 @@ public final class GhostflameSliver extends CardImpl { this.toughness = new MageInt(2); // All Slivers are colorless. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostflameSliverEffect())); + this.addAbility(new SimpleStaticAbility(new GhostflameSliverEffect())); } private GhostflameSliver(final GhostflameSliver card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java index 854dc8e92e5..3ad0d6b6c61 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java @@ -32,10 +32,10 @@ public final class GhostlyPossession extends CardImpl { this.addAbility(ability); //Enchanted creature has flying - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); //Prevent all combat damage that would be dealt to and dealt by enchanted creature - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); + this.addAbility(new SimpleStaticAbility(new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); } private GhostlyPossession(final GhostlyPossession card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java index 61848e91677..624412a7f70 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java @@ -41,7 +41,7 @@ public final class GhostlyTouch extends CardImpl { // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent." Ability gainedAbility = new AttacksTriggeredAbility(new MayTapOrUntapTargetEffect(), true); gainedAbility.addTarget(new TargetPermanent()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA))); } private GhostlyTouch(final GhostlyTouch card) { diff --git a/Mage.Sets/src/mage/cards/g/GhostlyWings.java b/Mage.Sets/src/mage/cards/g/GhostlyWings.java index 053427be8d3..b82e436c75f 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyWings.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyWings.java @@ -42,7 +42,7 @@ public final class GhostlyWings extends CardImpl { // Enchanted creature gets +1/+1 and has flying. Effect effect = new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +1/+1"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java b/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java index 9aaf07603ab..559b6f928cb 100644 --- a/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java +++ b/Mage.Sets/src/mage/cards/g/GhostsOfTheInnocent.java @@ -30,7 +30,7 @@ public final class GhostsOfTheInnocent extends CardImpl { this.toughness = new MageInt(5); // If a source would deal damage to a creature or player, it deals half that damage, rounded down, to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GhostsOfTheInnocentPreventDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GhostsOfTheInnocentPreventDamageEffect())); } private GhostsOfTheInnocent(final GhostsOfTheInnocent card) { diff --git a/Mage.Sets/src/mage/cards/g/GiantShark.java b/Mage.Sets/src/mage/cards/g/GiantShark.java index 5d28dd48549..cba00276579 100644 --- a/Mage.Sets/src/mage/cards/g/GiantShark.java +++ b/Mage.Sets/src/mage/cards/g/GiantShark.java @@ -40,7 +40,7 @@ public final class GiantShark extends CardImpl { this.toughness = new MageInt(4); // Giant Shark can't attack unless defending player controls an Island. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); // Whenever Giant Shark blocks or becomes blocked by a creature that has been dealt damage this turn, Giant Shark gets +2/+0 and gains trample until end of turn. Ability ability = new BlocksOrBlockedByCreatureSourceTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn).setText("{this} gets +2/+0"), filter2); diff --git a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java index 530e4dfe0fd..4a33f5ae340 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java +++ b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java @@ -38,7 +38,7 @@ public final class GiantSpectacle extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 1)); Effect effect = new GainAbilityAttachedEffect(new MenaceAbility(), AttachmentType.AURA); effect.setText("and has menace"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GiantStrength.java b/Mage.Sets/src/mage/cards/g/GiantStrength.java index 8a6e390f325..c883916fc5d 100644 --- a/Mage.Sets/src/mage/cards/g/GiantStrength.java +++ b/Mage.Sets/src/mage/cards/g/GiantStrength.java @@ -34,7 +34,7 @@ public final class GiantStrength extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); } private GiantStrength(final GiantStrength card) { diff --git a/Mage.Sets/src/mage/cards/g/GiantTortoise.java b/Mage.Sets/src/mage/cards/g/GiantTortoise.java index 4fc00c04bd2..41de6bdbac4 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTortoise.java +++ b/Mage.Sets/src/mage/cards/g/GiantTortoise.java @@ -29,7 +29,7 @@ public final class GiantTortoise extends CardImpl { this.toughness = new MageInt(1); // Giant Tortoise gets +0/+3 as long as it's untapped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(0,3, Duration.WhileOnBattlefield), SourceTappedCondition.UNTAPPED, "{this} gets +0/+3 as long as it's untapped"))); diff --git a/Mage.Sets/src/mage/cards/g/GiantTurtle.java b/Mage.Sets/src/mage/cards/g/GiantTurtle.java index 697769e49c5..fadc5f0adf7 100644 --- a/Mage.Sets/src/mage/cards/g/GiantTurtle.java +++ b/Mage.Sets/src/mage/cards/g/GiantTurtle.java @@ -31,7 +31,7 @@ public final class GiantTurtle extends CardImpl { this.toughness = new MageInt(4); // Giant Turtle can't attack if it attacked during your last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackIfAttackedLastTurnEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new CantAttackIfAttackedLastTurnEffect()), new AttackedLastTurnWatcher()); } private GiantTurtle(final GiantTurtle card) { diff --git a/Mage.Sets/src/mage/cards/g/GibberingHyenas.java b/Mage.Sets/src/mage/cards/g/GibberingHyenas.java index 76ffec15c1b..b79e5186ccb 100644 --- a/Mage.Sets/src/mage/cards/g/GibberingHyenas.java +++ b/Mage.Sets/src/mage/cards/g/GibberingHyenas.java @@ -34,7 +34,7 @@ public final class GibberingHyenas extends CardImpl { this.toughness = new MageInt(2); // Gibbering Hyenas can't block black creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter))); + this.addAbility(new SimpleStaticAbility(new CantBlockCreaturesSourceEffect(filter))); } private GibberingHyenas(final GibberingHyenas card) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsIntervention.java b/Mage.Sets/src/mage/cards/g/GideonsIntervention.java index 0cf188ec79e..c0e02db3487 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsIntervention.java +++ b/Mage.Sets/src/mage/cards/g/GideonsIntervention.java @@ -41,10 +41,10 @@ public final class GideonsIntervention extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(effect)); // Your opponents can't cast spells with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GideonsInterventionCantCastEffect())); + this.addAbility(new SimpleStaticAbility(new GideonsInterventionCantCastEffect())); // Prevent all damage that would be dealt to you and permanents you control by sources with the chosen name. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GideonsInterventionPreventAllDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GideonsInterventionPreventAllDamageEffect())); } private GideonsIntervention(final GideonsIntervention card) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsResolve.java b/Mage.Sets/src/mage/cards/g/GideonsResolve.java index 9e883141a1b..e1055ac11a7 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsResolve.java +++ b/Mage.Sets/src/mage/cards/g/GideonsResolve.java @@ -34,7 +34,7 @@ public final class GideonsResolve extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryGraveyardPutInHandEffect(filter), true)); // Creature you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield))); } private GideonsResolve(final GideonsResolve card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java index 9cf67416120..9b60291adaf 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java @@ -40,7 +40,7 @@ public final class GiftOfGranite extends CardImpl { this.addAbility(ability); // Enchanted creature gets +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); } private GiftOfGranite(final GiftOfGranite card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java index 65bed1e8405..9ec63fb50ba 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java @@ -34,7 +34,7 @@ public final class GiftOfOrzhova extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying and lifelink. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1,1, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield) .setText("and has flying")); ability.addEffect(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield) diff --git a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java index 7491937806f..57c0f164091 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java @@ -48,7 +48,7 @@ public final class GiftOfParadise extends CardImpl { Ability gainedAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(2), new TapSourceCost()); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color.\""); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GiftOfParadise(final GiftOfParadise card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java index 1eaa8ff7de4..f78a48aed5a 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java @@ -43,12 +43,12 @@ public final class GiftOfTheDeity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has deathtouch. - SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); + SimpleStaticAbility blackAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); blackAbility.addEffect(new ConditionalContinuousEffect(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "and has deathtouch")); this.addAbility(blackAbility); // As long as enchanted creature is green, it gets +1/+1 and all creatures able to block it do so. SimpleStaticAbility greenAbility; - greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), + greenAbility = new SimpleStaticAbility(new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); Effect effect = new ConditionalRequirementEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA), new EnchantedCreatureColorCondition(ObjectColor.GREEN)); effect.setText("and all creatures able to block it do so"); diff --git a/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java b/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java index 44990dd8848..8ad1f100229 100644 --- a/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java +++ b/Mage.Sets/src/mage/cards/g/GimlisRecklessMight.java @@ -34,7 +34,7 @@ public final class GimlisRecklessMight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // Creatures you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // Formidable -- Whenever you attack, if creatures you control have total power 8 or greater, target attacking creature you control fights up to one target creature you don't control. TriggeredAbility ability = new AttacksWithCreaturesTriggeredAbility(new FightTargetsEffect(),1); diff --git a/Mage.Sets/src/mage/cards/g/GiveNoGround.java b/Mage.Sets/src/mage/cards/g/GiveNoGround.java index bc201e60a43..9afd170af58 100644 --- a/Mage.Sets/src/mage/cards/g/GiveNoGround.java +++ b/Mage.Sets/src/mage/cards/g/GiveNoGround.java @@ -27,7 +27,7 @@ public final class GiveNoGround extends CardImpl { // Target creature gets +2/+6 until end of turn and can block any number of creatures this turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new BoostTargetEffect(2, 6, Duration.EndOfTurn)); - Ability gainedAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0)); + Ability gainedAbility = new SimpleStaticAbility(new CanBlockAdditionalCreatureEffect(0)); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); effect.setText("and can block any number of creatures this turn"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GlacialChasm.java b/Mage.Sets/src/mage/cards/g/GlacialChasm.java index d3790bb7f58..169ffe5bf5a 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialChasm.java +++ b/Mage.Sets/src/mage/cards/g/GlacialChasm.java @@ -34,9 +34,9 @@ public final class GlacialChasm extends CardImpl { // Creatures you control can't attack. FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control"); filter.add(TargetController.YOU.getControllerPredicate()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackAllEffect(Duration.WhileOnBattlefield, filter))); // Prevent all damage that would be dealt to you. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventDamageToControllerEffect(Duration.WhileOnBattlefield))); } private GlacialChasm(final GlacialChasm card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java index 4922f74565e..017dacae9ac 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java @@ -32,7 +32,7 @@ public final class GlacialCrasher extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Glacial Crasher can't attack unless there is a Mountain on the battlefield. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlacialCrasherEffect())); + this.addAbility(new SimpleStaticAbility(new GlacialCrasherEffect())); } private GlacialCrasher(final GlacialCrasher card) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialPlating.java b/Mage.Sets/src/mage/cards/g/GlacialPlating.java index f174d187ef0..be0238f8383 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialPlating.java +++ b/Mage.Sets/src/mage/cards/g/GlacialPlating.java @@ -51,7 +51,7 @@ public final class GlacialPlating extends CardImpl { DynamicValue boostValue = new MultipliedValue(new CountersSourceCount(CounterType.AGE), 3); Effect effect = new BoostEnchantedEffect(boostValue, boostValue, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +3/+3 for each age counter on {this}"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GlacialPlating(final GlacialPlating card) { diff --git a/Mage.Sets/src/mage/cards/g/Glaciers.java b/Mage.Sets/src/mage/cards/g/Glaciers.java index 5f47206f52a..d13f9efb471 100644 --- a/Mage.Sets/src/mage/cards/g/Glaciers.java +++ b/Mage.Sets/src/mage/cards/g/Glaciers.java @@ -34,7 +34,7 @@ public final class Glaciers extends CardImpl { new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{W}{U}")))); // All Mountains are Plains. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlaciersEffect())); + this.addAbility(new SimpleStaticAbility(new GlaciersEffect())); } private Glaciers(final Glaciers card) { diff --git a/Mage.Sets/src/mage/cards/g/Glamdring.java b/Mage.Sets/src/mage/cards/g/Glamdring.java index aba45ab7283..e79ed818a5c 100644 --- a/Mage.Sets/src/mage/cards/g/Glamdring.java +++ b/Mage.Sets/src/mage/cards/g/Glamdring.java @@ -43,7 +43,7 @@ public final class Glamdring extends CardImpl { new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY), StaticValue.get(0)) .setText(" and gets +1/+0 for each instant and sorcery card in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, firstStrike); + Ability ability = new SimpleStaticAbility(firstStrike); ability.addEffect(boost); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GlaringAegis.java b/Mage.Sets/src/mage/cards/g/GlaringAegis.java index dbd03e8673c..8fb0ab81b99 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringAegis.java +++ b/Mage.Sets/src/mage/cards/g/GlaringAegis.java @@ -39,7 +39,7 @@ public final class GlaringAegis extends CardImpl { this.addAbility(ability2); // Enchanted creature gets +1/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); } private GlaringAegis(final GlaringAegis card) { diff --git a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java index dbebfae7724..38368767456 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java +++ b/Mage.Sets/src/mage/cards/g/GlaringSpotlight.java @@ -35,7 +35,7 @@ public final class GlaringSpotlight extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Creatures your opponents control with hexproof can be the targets of spells and abilities you control as though they didn't have hexproof. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GlaringSpotlightEffect())); + this.addAbility(new SimpleStaticAbility(new GlaringSpotlightEffect())); // {3}, Sacrifice Glaring Spotlight: Creatures you control gain hexproof until end of turn and can't be blocked this turn. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index d73aab1c354..68ac91aeb9e 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -48,7 +48,7 @@ public final class GleamOfAuthority extends CardImpl { )); // Enchanted creature has vigilance and "{W}, {T}: Bloster 1." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); + ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BolsterEffect(1), new ManaCostsImpl<>("{W}")); gainedAbility.addCost(new TapSourceCost()); ability.addEffect(new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA).setText("and \"{W}, {T}: Bolster 1.\"")); diff --git a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java index 5b29e683e63..52320d91eb7 100644 --- a/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java +++ b/Mage.Sets/src/mage/cards/g/GlenElendraLiege.java @@ -40,9 +40,9 @@ public final class GlenElendraLiege extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlue, true))); // Other black creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterBlack, true))); } private GlenElendraLiege(final GlenElendraLiege card) { diff --git a/Mage.Sets/src/mage/cards/g/GlidingLicid.java b/Mage.Sets/src/mage/cards/g/GlidingLicid.java index e3e90c77bc7..e922a220206 100644 --- a/Mage.Sets/src/mage/cards/g/GlidingLicid.java +++ b/Mage.Sets/src/mage/cards/g/GlidingLicid.java @@ -32,7 +32,7 @@ public final class GlidingLicid extends CardImpl { this.addAbility(new LicidAbility(new ColoredManaCost(ColoredManaSymbol.U), new ColoredManaCost(ColoredManaSymbol.U))); // 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))); } private GlidingLicid(final GlidingLicid card) { diff --git a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java index 9f43455a1e5..6291db3c059 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java @@ -40,7 +40,7 @@ public final class GlimmerdustNap extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepEnchantedEffect())); } private GlimmerdustNap(final GlimmerdustNap card) { diff --git a/Mage.Sets/src/mage/cards/g/GlisteningOil.java b/Mage.Sets/src/mage/cards/g/GlisteningOil.java index 2b401bb33da..0d35d107f50 100644 --- a/Mage.Sets/src/mage/cards/g/GlisteningOil.java +++ b/Mage.Sets/src/mage/cards/g/GlisteningOil.java @@ -40,7 +40,7 @@ public final class GlisteningOil extends CardImpl { this.addAbility(ability); // Enchanted creature has infect. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); // At the beginning of your upkeep, put a -1/-1 counter on enchanted creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect())); diff --git a/Mage.Sets/src/mage/cards/g/Gloom.java b/Mage.Sets/src/mage/cards/g/Gloom.java index b6935077e76..c2034666ddd 100644 --- a/Mage.Sets/src/mage/cards/g/Gloom.java +++ b/Mage.Sets/src/mage/cards/g/Gloom.java @@ -31,10 +31,10 @@ public final class Gloom extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); // White spells cost {3} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(3, filter, TargetController.ANY))); // Activated abilities of white enchantments cost {3} more to activate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GloomCostIncreaseEffect())); + this.addAbility(new SimpleStaticAbility(new GloomCostIncreaseEffect())); } private Gloom(final Gloom card) { @@ -77,4 +77,4 @@ class GloomCostIncreaseEffect extends CostModificationEffectImpl { public GloomCostIncreaseEffect copy() { return new GloomCostIncreaseEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java index f1c97d116ed..656c0b82069 100644 --- a/Mage.Sets/src/mage/cards/g/GloomSurgeon.java +++ b/Mage.Sets/src/mage/cards/g/GloomSurgeon.java @@ -26,7 +26,7 @@ public final class GloomSurgeon extends CardImpl { this.toughness = new MageInt(1); // If combat damage would be dealt to Gloom Surgeon, prevent that damage and exile that many cards from the top of your library. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GloomSurgeonEffect())); + this.addAbility(new SimpleStaticAbility(new GloomSurgeonEffect())); } private GloomSurgeon(final GloomSurgeon card) { diff --git a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java index bbc6c85a15c..334d6afecb6 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java +++ b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java @@ -21,7 +21,7 @@ public final class GloriousAnthem extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } private GloriousAnthem(final GloriousAnthem card) { diff --git a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java index d643191a444..60d840e1745 100644 --- a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java @@ -23,14 +23,14 @@ public final class GloryOfWarfare extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); // As long as it’s your turn, creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, "During your turn, creatures you control get +2/+0")) .addHint(MyTurnHint.instance)); // As long as it’s not your turn, creatures you control get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, "During turns other than yours, creatures you control get +0/+2"))); diff --git a/Mage.Sets/src/mage/cards/g/Glowrider.java b/Mage.Sets/src/mage/cards/g/Glowrider.java index e67a1c98b10..c84e65b1ec2 100644 --- a/Mage.Sets/src/mage/cards/g/Glowrider.java +++ b/Mage.Sets/src/mage/cards/g/Glowrider.java @@ -33,7 +33,7 @@ public final class Glowrider extends CardImpl { this.toughness = new MageInt(1); // Noncreature spells cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, filter, TargetController.ANY))); } private Glowrider(final Glowrider card) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java index 4c05165af52..431d0f82bec 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java @@ -128,7 +128,7 @@ class GlyphOfDelusionEffect extends OneShotEffect { if (targetPermanent != null) { targetPermanent.addCounters(CounterType.GLYPH.createInstance(targetPermanent.getPower().getValue()), source.getControllerId(), source, game); - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(), + SimpleStaticAbility ability = new SimpleStaticAbility(new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersUntapStepSourceEffect(), new SourceHasCounterCondition(CounterType.GLYPH)).setText("This creature doesn't untap during your untap step if it has a glyph counter on it")); GainAbilityTargetEffect effect = new GainAbilityTargetEffect(ability, Duration.Custom); effect.setTargetPointer(new FixedTarget(targetPermanent.getId(), game)); diff --git a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java index f304e941252..e87126648c9 100644 --- a/Mage.Sets/src/mage/cards/g/GnarledScarhide.java +++ b/Mage.Sets/src/mage/cards/g/GnarledScarhide.java @@ -36,7 +36,7 @@ public final class GnarledScarhide extends CardImpl { // Gnarled Scarhide can't block. this.addAbility(new CantBlockAbility()); // Enchanted creature gets +2/+1 and can't block. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,1, Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2,1, Duration.WhileOnBattlefield)); Effect effect = new CantBlockAttachedEffect(AttachmentType.AURA); effect.setText("and can't block"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java index 7cc5a5050b5..0e28f5fbc9f 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java +++ b/Mage.Sets/src/mage/cards/g/GnarlwoodDryad.java @@ -36,7 +36,7 @@ public final class GnarlwoodDryad extends CardImpl { ConditionalContinuousEffect effect = new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), DeliriumCondition.instance, "Delirium — {this} gets +2/+2 as long as there are four or more card types among cards in your graveyard."); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java index 91ac8002e5d..dec3d9ceae0 100644 --- a/Mage.Sets/src/mage/cards/g/GobhobblerRats.java +++ b/Mage.Sets/src/mage/cards/g/GobhobblerRats.java @@ -33,7 +33,7 @@ public final class GobhobblerRats extends CardImpl { this.toughness = new MageInt(2); // Hellbent - As long as you have no cards in hand, Gobhobbler Rats gets +1/+0 and has "{B}: Regenerate Gobhobbler Rats." - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1,0, Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — As long as you have no cards in hand, {this} gets +1/+0")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java b/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java index 03fda6715bc..292260c1b12 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBowlingTeam.java @@ -33,7 +33,7 @@ public final class GoblinBowlingTeam extends CardImpl { this.toughness = new MageInt(1); // If Goblin Bowling Team would deal damage to a permanent or player, it deals that much damage plus the result of a six-sided die roll to that permanent or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinBowlingTeamEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinBowlingTeamEffect())); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java index 6b676b3ef12..2313f13fa40 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBrawler.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBrawler.java @@ -35,7 +35,7 @@ public final class GoblinBrawler extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Goblin Brawler can't be equipped. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeEquippedSourceEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeEquippedSourceEffect())); } private GoblinBrawler(final GoblinBrawler card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinCaves.java b/Mage.Sets/src/mage/cards/g/GoblinCaves.java index 144aed21f25..806e3b433f9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCaves.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCaves.java @@ -35,7 +35,7 @@ public final class GoblinCaves extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted land is a basic Mountain, Goblin creatures get +0/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false), new AttachedToBasicMountainCondition(), "As long as enchanted land is a basic Mountain, Goblin creatures get +0/+2" diff --git a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java index 26b4aa76e98..3cd57a8cbba 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinChieftain.java +++ b/Mage.Sets/src/mage/cards/g/GoblinChieftain.java @@ -36,7 +36,7 @@ public final class GoblinChieftain extends CardImpl { // Other Goblin creatures you control get +1/+1 and have haste. Effect effect = new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("Other Goblin creatures you control get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("and have haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GoblinCohort.java b/Mage.Sets/src/mage/cards/g/GoblinCohort.java index fcd8afb0999..e10a804c5c0 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCohort.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCohort.java @@ -30,7 +30,7 @@ public final class GoblinCohort extends CardImpl { this.toughness = new MageInt(2); // Goblin Cohort can't attack unless you've cast a creature spell this turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinCohortEffect()), new PlayerCastCreatureWatcher()); + this.addAbility(new SimpleStaticAbility(new GoblinCohortEffect()), new PlayerCastCreatureWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java index c0f611d2d2a..07235b2eb4c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDirigible.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDirigible.java @@ -31,7 +31,7 @@ public final class GoblinDirigible extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Goblin Dirigible 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 {4}. If you do, untap Goblin Dirigible. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid( new UntapSourceEffect(), new ManaCostsImpl<>("{4}")))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java index 1d388d9d95b..f10765f98ad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFireFiend.java @@ -34,7 +34,7 @@ public final class GoblinFireFiend extends CardImpl { this.addAbility(HasteAbility.getInstance()); //Goblin Fire Fiend must be blocked if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield))); //{R}: Goblin Fire Fiend gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinFurrier.java b/Mage.Sets/src/mage/cards/g/GoblinFurrier.java index 4f476b1df12..0aef1377fb7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinFurrier.java +++ b/Mage.Sets/src/mage/cards/g/GoblinFurrier.java @@ -30,7 +30,7 @@ public final class GoblinFurrier extends CardImpl { this.toughness = new MageInt(2); // Prevent all damage that Goblin Furrier would deal to snow creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinFurrierPreventEffectEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GoblinFurrierPreventEffectEffect(Duration.WhileOnBattlefield))); } private GoblinFurrier(final GoblinFurrier card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java index c160c40e7ca..ec3d1a01ccd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGaveleer.java @@ -32,7 +32,7 @@ public final class GoblinGaveleer extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Goblin Gaveleer gets +2/+0 for each Equipment attached to it. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(new EquipmentAttachedCount(2), + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(new EquipmentAttachedCount(2), StaticValue.get(0), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java index 7fd4f6de771..0f965af1b8d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGloryChaser.java @@ -40,7 +40,7 @@ public final class GoblinGloryChaser extends CardImpl { RenownedSourceCondition.instance, "As long as {this} is renowned, it has menace. " + "(It can't be blocked except by two or more creatures.)"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGoon.java b/Mage.Sets/src/mage/cards/g/GoblinGoon.java index 13bbf8f28d6..d2276041ed6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGoon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGoon.java @@ -30,10 +30,10 @@ public final class GoblinGoon extends CardImpl { this.toughness = new MageInt(6); // Goblin Goon can't attack unless you control more creatures than defending player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinGoonCantAttackEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinGoonCantAttackEffect())); // Goblin Goon can't block unless you control more creatures than attacking player. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoblinGoonCantBlockEffect())); + this.addAbility(new SimpleStaticAbility(new GoblinGoonCantBlockEffect())); } private GoblinGoon(final GoblinGoon card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinKing.java b/Mage.Sets/src/mage/cards/g/GoblinKing.java index 32fa90921b8..5d6a06ecef2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinKing.java +++ b/Mage.Sets/src/mage/cards/g/GoblinKing.java @@ -32,7 +32,7 @@ public final class GoblinKing extends CardImpl { // Other Goblin creatures get +1/+1 and have mountainwalk. Effect effect = new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("Other Goblins get +1/+1"); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + Ability ability = new SimpleStaticAbility(effect); effect = new GainAbilityAllEffect(new MountainwalkAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, true); effect.setText("and have mountainwalk"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GoblinMutant.java b/Mage.Sets/src/mage/cards/g/GoblinMutant.java index 9aeb0f48f24..180e051e2ab 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMutant.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMutant.java @@ -48,12 +48,12 @@ public final class GoblinMutant extends CardImpl { // Goblin Mutant can't attack if defending player controls an untapped creature with power 3 or greater. Effect effect = new CantAttackIfDefenderControlsPermanent(filter); effect.setText("{this} can't attack if defending player controls an untapped creature with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); //Goblin Mutant can't block creatures with power 3 or greater. Effect effectBlock = new CantBlockCreaturesSourceEffect(filter2); effectBlock.setText("{this} can't block creatures with power 3 or greater."); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effectBlock)); + this.addAbility(new SimpleStaticAbility(effectBlock)); } private GoblinMutant(final GoblinMutant card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java index 5010fa2af9c..2c1158a20c6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java @@ -47,10 +47,10 @@ public final class GoblinRockSled extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Goblin Rock Sled doesn't untap during your untap step if it attacked during your last turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapIfAttackedLastTurnSourceEffect()), new AttackedLastTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new DontUntapIfAttackedLastTurnSourceEffect()), new AttackedLastTurnWatcher()); // Goblin Rock Sled can't attack unless defending player controls a Mountain. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } private GoblinRockSled(final GoblinRockSled card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java index ceb7c3576f6..ff9f1bb48d4 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSharpshooter.java @@ -32,7 +32,7 @@ public final class GoblinSharpshooter extends CardImpl { this.toughness = new MageInt(1); // Goblin Sharpshooter doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // Whenever a creature dies, untap Goblin Sharpshooter. this.addAbility(new DiesCreatureTriggeredAbility(new UntapSourceEffect(), false)); // {T}: Goblin Sharpshooter deals 1 damage to any target. diff --git a/Mage.Sets/src/mage/cards/g/GoblinShrine.java b/Mage.Sets/src/mage/cards/g/GoblinShrine.java index ffac8e9b6e6..84db3600af8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinShrine.java +++ b/Mage.Sets/src/mage/cards/g/GoblinShrine.java @@ -52,7 +52,7 @@ public final class GoblinShrine extends CardImpl { // As long as enchanted land is a basic Mountain, Goblin creatures get +1/+0. ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostAllEffect(1, 0, Duration.WhileOnBattlefield, filterGoblin, false), new EnchantedPermanentSubtypeCondition(SubType.MOUNTAIN), rule); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // When Goblin Shrine leaves the battlefield, it deals 1 damage to each Goblin creature. this.addAbility(new LeavesBattlefieldTriggeredAbility(new DamageAllEffect(1, "it", filterGoblin), false)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpy.java b/Mage.Sets/src/mage/cards/g/GoblinSpy.java index 35a5a8e4a03..c6b26efeee5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpy.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpy.java @@ -25,7 +25,7 @@ public final class GoblinSpy extends CardImpl { this.toughness = new MageInt(1); // Play with the top card of your library revealed. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect())); + this.addAbility(new SimpleStaticAbility(new PlayWithTheTopCardRevealedEffect())); } private GoblinSpy(final GoblinSpy card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java index 3fc5992740e..0185aeac64f 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarDrums.java @@ -29,7 +29,7 @@ import mage.filter.common.FilterCreaturePermanent; // Creatures you control have menace. (They can't be blocked except by two or more creatures.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter) + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter) .setText("creatures you control have menace. (They can't be blocked except by two or more creatures.)"))); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java index 9a519c6e557..a109087c94e 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java @@ -41,7 +41,7 @@ public final class GoblinWarPaint extends CardImpl { // Enchanted creature gets +2/+2 and has haste. Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java index 30fa11f592a..cacd4bd1d4a 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarWagon.java @@ -28,7 +28,7 @@ public final class GoblinWarWagon extends CardImpl { this.toughness = new MageInt(3); // Goblin War Wagon 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 {2}. If you do, untap Goblin War Wagon. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DoIfCostPaid( new UntapSourceEffect(), new ManaCostsImpl<>("{2}")))); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java index 50ec2253307..603cf8910e9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java @@ -36,10 +36,10 @@ public final class GoblinWarchief extends CardImpl { this.toughness = new MageInt(2); // Goblin spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterSpells, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterSpells, 1))); // Goblins you control have haste. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(HasteAbility.getInstance(), + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent(SubType.GOBLIN, "Goblins"), false))); } diff --git a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java index 7b8b0e37fce..7eab64b0195 100644 --- a/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java +++ b/Mage.Sets/src/mage/cards/g/GodEternalKefnet.java @@ -39,7 +39,7 @@ public final class GodEternalKefnet 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, // copy that card and you may cast the copy. That copy costs {2} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GodEternalKefnetDrawCardReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); + this.addAbility(new SimpleStaticAbility(new GodEternalKefnetDrawCardReplacementEffect()), new CardsAmountDrawnThisTurnWatcher()); // When God-Eternal Kefnet dies or is put into exile from the battlefield, you may put it into its owner’s library third from the top. this.addAbility(new GodEternalDiesTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java index c60288fe591..ffc75cc8ab4 100644 --- a/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java +++ b/Mage.Sets/src/mage/cards/g/GodheadOfAwe.java @@ -41,7 +41,7 @@ public final class GodheadOfAwe extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Other creatures have base power and toughness 1/1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessAllEffect(1, 1, Duration.WhileOnBattlefield, filter))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessAllEffect(1, 1, Duration.WhileOnBattlefield, filter))); } private GodheadOfAwe(final GodheadOfAwe card) { diff --git a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java index 9c593c46b00..54534638d96 100644 --- a/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java +++ b/Mage.Sets/src/mage/cards/g/GodhunterOctopus.java @@ -36,7 +36,7 @@ public final class GodhunterOctopus extends CardImpl { this.toughness = new MageInt(5); // Godhunter Octopus can't attack unless defending player controls an enchantment or an enchanted permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(filter))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(filter))); } private GodhunterOctopus(final GodhunterOctopus card) { diff --git a/Mage.Sets/src/mage/cards/g/Godsend.java b/Mage.Sets/src/mage/cards/g/Godsend.java index a14a9993897..7f07da8d55c 100644 --- a/Mage.Sets/src/mage/cards/g/Godsend.java +++ b/Mage.Sets/src/mage/cards/g/Godsend.java @@ -40,11 +40,11 @@ public final class Godsend extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+3. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 3, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 3, Duration.WhileOnBattlefield))); // Whenever equipped creature blocks or becomes blocked by one or more creatures, you may exile one of those creatures. this.addAbility(new GodsendTriggeredAbility()); // Opponents can't cast cards with the same name as cards exiled with Godsend. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GodsendRuleModifyingEffect())); + this.addAbility(new SimpleStaticAbility(new GodsendRuleModifyingEffect())); // Equip {3} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java index acf5ceef9f7..6c8373d9a9f 100644 --- a/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java +++ b/Mage.Sets/src/mage/cards/g/GoldnightCastigator.java @@ -40,7 +40,7 @@ public final class GoldnightCastigator extends CardImpl { // If a source would deal damage to you, it deals double that damage to you instead. // If a source would deal damage to Goldnight Castigator, it deals double that damage to Goldkight Castigator instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GoldnightCastigatorDoubleDamageEffect())); + this.addAbility(new SimpleStaticAbility(new GoldnightCastigatorDoubleDamageEffect())); } private GoldnightCastigator(final GoldnightCastigator card) { diff --git a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java index f47d2fc4c78..a61526367c8 100644 --- a/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java +++ b/Mage.Sets/src/mage/cards/g/GolemSkinGauntlets.java @@ -30,7 +30,7 @@ public final class GolemSkinGauntlets extends CardImpl { // Equipped creature gets +1/+0 for each Equipment attached to it. // Equip 2 (2: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.) - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(new GolemSkinGauntletsAttachedCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(new GolemSkinGauntletsAttachedCount(), StaticValue.get(0), Duration.WhileOnBattlefield))); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); } @@ -88,4 +88,4 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue { public String getMessage() { return "Equipment attached to it"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java index d0154889d87..cf538a74c36 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariDecoy.java +++ b/Mage.Sets/src/mage/cards/g/GolgariDecoy.java @@ -28,7 +28,7 @@ public final class GolgariDecoy extends CardImpl { this.toughness = new MageInt(2); // All creatures able to block Golgari Decoy do so. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect())); + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); // Scavenge {3}{G}{G} ({3}{G}{G}, Exile this card from your graveyard: Put a number of +1/+1 counters equal to this card's power on target creature. Scavenge only as a sorcery.) this.addAbility(new ScavengeAbility(new ManaCostsImpl<>("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/g/GorgonsHead.java b/Mage.Sets/src/mage/cards/g/GorgonsHead.java index 8a4a00c69cc..3cde22af691 100644 --- a/Mage.Sets/src/mage/cards/g/GorgonsHead.java +++ b/Mage.Sets/src/mage/cards/g/GorgonsHead.java @@ -28,7 +28,7 @@ public final class GorgonsHead extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has deathtouch. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT))); // Equip {2} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false)); } diff --git a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java index d6131dfb503..ac6a5674c6b 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java +++ b/Mage.Sets/src/mage/cards/g/GorillaBerserkers.java @@ -31,7 +31,7 @@ public final class GorillaBerserkers extends CardImpl { // Rampage 2 this.addAbility(new RampageAbility(2)); // Gorilla Berserkers can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); } private GorillaBerserkers(final GorillaBerserkers card) { diff --git a/Mage.Sets/src/mage/cards/g/GorillaPack.java b/Mage.Sets/src/mage/cards/g/GorillaPack.java index 01cc638c3cb..cb11c877520 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaPack.java +++ b/Mage.Sets/src/mage/cards/g/GorillaPack.java @@ -28,7 +28,7 @@ public final class GorillaPack extends CardImpl { this.toughness = new MageInt(3); // Gorilla Pack can't attack unless defending player controls a Forest. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.FOREST, "a Forest")))); + this.addAbility(new SimpleStaticAbility(new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.FOREST, "a Forest")))); // When you control no Forests, sacrifice Gorilla Pack. this.addAbility(new ControlsPermanentsControllerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GorillaTitan.java b/Mage.Sets/src/mage/cards/g/GorillaTitan.java index 53b67c4ed9c..5392eeae2ae 100644 --- a/Mage.Sets/src/mage/cards/g/GorillaTitan.java +++ b/Mage.Sets/src/mage/cards/g/GorillaTitan.java @@ -34,7 +34,7 @@ public final class GorillaTitan extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Gorilla Titan gets +4/+4 as long as there are no cards in your graveyard. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(4,4, Duration.WhileInGraveyard), new GorillaTitanCondition(), "{this} gets +4/+4 as long as there are no cards in your graveyard" diff --git a/Mage.Sets/src/mage/cards/g/GormTheGreat.java b/Mage.Sets/src/mage/cards/g/GormTheGreat.java index 6a097d7d70a..7e658a3f594 100644 --- a/Mage.Sets/src/mage/cards/g/GormTheGreat.java +++ b/Mage.Sets/src/mage/cards/g/GormTheGreat.java @@ -37,7 +37,7 @@ public final class GormTheGreat extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Gorm the Great must be blocked if able, and Gorm must be blocked by two or more creatures if able. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield, 2) + this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect(Duration.WhileOnBattlefield, 2) .setText("{this} must be blocked if able, and {this} must be blocked by two or more creatures if able"))); } diff --git a/Mage.Sets/src/mage/cards/g/GostaDirk.java b/Mage.Sets/src/mage/cards/g/GostaDirk.java index 2f100f7626b..33435949c34 100644 --- a/Mage.Sets/src/mage/cards/g/GostaDirk.java +++ b/Mage.Sets/src/mage/cards/g/GostaDirk.java @@ -30,7 +30,7 @@ public final class GostaDirk extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Creatures with islandwalk can be blocked as though they didn't have islandwalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GostaDirkEffect())); + this.addAbility(new SimpleStaticAbility(new GostaDirkEffect())); } private GostaDirk(final GostaDirk card) { diff --git a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java index 910296d6c37..11499f8a1fb 100644 --- a/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java +++ b/Mage.Sets/src/mage/cards/g/GracebladeArtisan.java @@ -28,7 +28,7 @@ public final class GracebladeArtisan extends CardImpl { // Graceblade Artisan 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))); } private GracebladeArtisan(final GracebladeArtisan card) { diff --git a/Mage.Sets/src/mage/cards/g/GracefulAdept.java b/Mage.Sets/src/mage/cards/g/GracefulAdept.java index a132a578340..456ca90a163 100644 --- a/Mage.Sets/src/mage/cards/g/GracefulAdept.java +++ b/Mage.Sets/src/mage/cards/g/GracefulAdept.java @@ -30,7 +30,7 @@ public final class GracefulAdept extends CardImpl { // You have no maximum hand size. Effect effect = new MaximumHandSizeControllerEffect(Integer.MAX_VALUE, Duration.WhileOnBattlefield, HandSizeModification.SET); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } private GracefulAdept(final GracefulAdept card) { diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 2b75e728052..5b0d75b5ada 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -40,7 +40,7 @@ public final class GrafHarvest extends CardImpl { // Zombies you control have menace. Effect effect = new GainAbilityAllEffect(new MenaceAbility(), Duration.WhileOnBattlefield, filter); effect.setText("Zombies you control have menace. (They can't be blocked except by two or more creatures.)"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); // {3}{B}, Exile a creature card from your graveyard: Create a 2/2 black Zombie creature token. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{3}{B}")); diff --git a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java index 1c7266f9249..bbae33a01d3 100644 --- a/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java +++ b/Mage.Sets/src/mage/cards/g/GrafdiggersCage.java @@ -27,10 +27,10 @@ public final class GrafdiggersCage extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}"); // Creature cards can't enter the battlefield from graveyards or libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrafdiggersCageEffect())); + this.addAbility(new SimpleStaticAbility(new GrafdiggersCageEffect())); // Players can't cast cards in graveyards or libraries. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrafdiggersCageEffect2())); + this.addAbility(new SimpleStaticAbility(new GrafdiggersCageEffect2())); } private GrafdiggersCage(final GrafdiggersCage card) { diff --git a/Mage.Sets/src/mage/cards/g/GraftedWargear.java b/Mage.Sets/src/mage/cards/g/GraftedWargear.java index 416b68cf710..3c98cae4c4d 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedWargear.java +++ b/Mage.Sets/src/mage/cards/g/GraftedWargear.java @@ -26,7 +26,7 @@ public final class GraftedWargear extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +3/+2. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 2))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 2))); // Whenever Grafted Wargear becomes unattached from a permanent, sacrifice that permanent. this.addAbility(new UnattachedTriggeredAbility(new SacrificeTargetEffect().setText("sacrifice that permanent"), false)); diff --git a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java index f9f155ce496..0ab0d118571 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java +++ b/Mage.Sets/src/mage/cards/g/GrandArbiterAugustinIV.java @@ -36,13 +36,13 @@ public final class GrandArbiterAugustinIV extends CardImpl { this.toughness = new MageInt(3); // White spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterWhite, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterWhite, 1))); // Blue spells you cast cost {1} less to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostReductionControllerEffect(filterBlue, 1))); + this.addAbility(new SimpleStaticAbility(new SpellsCostReductionControllerEffect(filterBlue, 1))); // Spells your opponents cast cost {1} more to cast. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.OPPONENT))); + this.addAbility(new SimpleStaticAbility(new SpellsCostIncreasingAllEffect(1, new FilterCard("Spells"), TargetController.OPPONENT))); } private GrandArbiterAugustinIV(final GrandArbiterAugustinIV card) { diff --git a/Mage.Sets/src/mage/cards/g/GrandArchitect.java b/Mage.Sets/src/mage/cards/g/GrandArchitect.java index a998ee5781c..a504b443aca 100644 --- a/Mage.Sets/src/mage/cards/g/GrandArchitect.java +++ b/Mage.Sets/src/mage/cards/g/GrandArchitect.java @@ -50,7 +50,7 @@ public final class GrandArchitect extends CardImpl { this.toughness = new MageInt(3); // Other blue creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, boostFilter, true))); // {U}: Target artifact creature becomes blue until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrandArchitectEffect(), new ManaCostsImpl<>("{U}")); diff --git a/Mage.Sets/src/mage/cards/g/GrandMelee.java b/Mage.Sets/src/mage/cards/g/GrandMelee.java index 423518d9c63..4f4a8a02a1d 100644 --- a/Mage.Sets/src/mage/cards/g/GrandMelee.java +++ b/Mage.Sets/src/mage/cards/g/GrandMelee.java @@ -21,11 +21,11 @@ public final class GrandMelee extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // All creatures attack each turn if able. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES)); + Ability ability = new SimpleStaticAbility(new AttacksIfAbleAllEffect(StaticFilters.FILTER_PERMANENT_ALL_CREATURES)); this.addAbility(ability); // 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))); } private GrandMelee(final GrandMelee card) { diff --git a/Mage.Sets/src/mage/cards/g/GrapplingHook.java b/Mage.Sets/src/mage/cards/g/GrapplingHook.java index 3aeba388bed..27094c795d4 100644 --- a/Mage.Sets/src/mage/cards/g/GrapplingHook.java +++ b/Mage.Sets/src/mage/cards/g/GrapplingHook.java @@ -28,7 +28,7 @@ public final class GrapplingHook extends CardImpl { this.subtype.add(SubType.EQUIPMENT); // Equipped creature has double strike. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT))); // Whenever equipped creature attacks, you may have target creature block it this turn if able. Ability ability = new AttacksAttachedTriggeredAbility(new GrapplingHookEffect(), true); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java index 9e0b73fcb46..13ce22155bc 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java @@ -44,7 +44,7 @@ public final class GraspOfTheHieromancer extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls." - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield)); Ability gainedAbility = new GraspOfTheHieromancerTriggeredAbility(new TapTargetEffect(), false); gainedAbility.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls"))); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); diff --git a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java index 1b346553738..bddff4d71dd 100644 --- a/Mage.Sets/src/mage/cards/g/GratuitousViolence.java +++ b/Mage.Sets/src/mage/cards/g/GratuitousViolence.java @@ -26,7 +26,7 @@ public final class GratuitousViolence extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}{R}"); // If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GratuitousViolenceReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new GratuitousViolenceReplacementEffect())); } private GratuitousViolence(final GratuitousViolence card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveServitude.java b/Mage.Sets/src/mage/cards/g/GraveServitude.java index b11f85a0f9d..a17edb76e26 100644 --- a/Mage.Sets/src/mage/cards/g/GraveServitude.java +++ b/Mage.Sets/src/mage/cards/g/GraveServitude.java @@ -38,7 +38,7 @@ public final class GraveServitude extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/-1 and is black. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield)); Effect effect = new SetCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText("and is black"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java index 87778c66025..2d95c6fc306 100644 --- a/Mage.Sets/src/mage/cards/g/GravebaneZombie.java +++ b/Mage.Sets/src/mage/cards/g/GravebaneZombie.java @@ -34,7 +34,7 @@ public final class GravebaneZombie extends CardImpl { this.toughness = new MageInt(2); // If Gravebane Zombie would die, put Gravebane Zombie on top of its owner's library instead. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GravebaneZombieEffect())); + this.addAbility(new SimpleStaticAbility(new GravebaneZombieEffect())); } private GravebaneZombie(final GravebaneZombie card) { @@ -82,4 +82,4 @@ class GravebaneZombieEffect extends ReplacementEffectImpl { public GravebaneZombieEffect copy() { return new GravebaneZombieEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GravitationalShift.java b/Mage.Sets/src/mage/cards/g/GravitationalShift.java index b8ef5cdf5e3..d91be72cccb 100644 --- a/Mage.Sets/src/mage/cards/g/GravitationalShift.java +++ b/Mage.Sets/src/mage/cards/g/GravitationalShift.java @@ -33,10 +33,10 @@ public final class GravitationalShift extends CardImpl { // Creatures with flying get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter1, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(2, 0, Duration.WhileOnBattlefield, filter1, false))); // Creatures without flying get -2/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter2, false))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(-2, 0, Duration.WhileOnBattlefield, filter2, false))); } private GravitationalShift(final GravitationalShift card) { diff --git a/Mage.Sets/src/mage/cards/g/GreatWall.java b/Mage.Sets/src/mage/cards/g/GreatWall.java index 31c715fb652..43b962a571b 100644 --- a/Mage.Sets/src/mage/cards/g/GreatWall.java +++ b/Mage.Sets/src/mage/cards/g/GreatWall.java @@ -24,7 +24,7 @@ public final class GreatWall extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); // Creatures with plainswalk can be blocked as though they didn't have plainswalk. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GreatWallEffect())); + this.addAbility(new SimpleStaticAbility(new GreatWallEffect())); } private GreatWall(final GreatWall card) { diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index df3ae5979cf..c91268b4b94 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -38,7 +38,7 @@ public final class GreatbowDoyen extends CardImpl { this.toughness = new MageInt(4); // Other Archer creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // Whenever an Archer you control deals damage to a creature, that Archer deals that much damage to that creature's controller. this.addAbility(new GreatbowDoyenTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java index 8d1b108f695..fb607a3e791 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java +++ b/Mage.Sets/src/mage/cards/g/GreaterAuramancy.java @@ -37,10 +37,10 @@ public final class GreaterAuramancy extends CardImpl { // Other enchantments you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter, true))); // Enchanted creatures you control have shroud. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(ShroudAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); } diff --git a/Mage.Sets/src/mage/cards/g/Greatsword.java b/Mage.Sets/src/mage/cards/g/Greatsword.java index 0f65a52cce1..49cb4adfaa3 100644 --- a/Mage.Sets/src/mage/cards/g/Greatsword.java +++ b/Mage.Sets/src/mage/cards/g/Greatsword.java @@ -22,7 +22,7 @@ public final class Greatsword extends CardImpl { public Greatsword(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(3, 0))); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/g/GreelsCaress.java b/Mage.Sets/src/mage/cards/g/GreelsCaress.java index 9e87d8b2f61..40cdd7402d8 100644 --- a/Mage.Sets/src/mage/cards/g/GreelsCaress.java +++ b/Mage.Sets/src/mage/cards/g/GreelsCaress.java @@ -37,7 +37,7 @@ public final class GreelsCaress extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } private GreelsCaress(final GreelsCaress card) { diff --git a/Mage.Sets/src/mage/cards/g/GreenScarab.java b/Mage.Sets/src/mage/cards/g/GreenScarab.java index af034eb068a..1d5a29031d8 100644 --- a/Mage.Sets/src/mage/cards/g/GreenScarab.java +++ b/Mage.Sets/src/mage/cards/g/GreenScarab.java @@ -48,11 +48,11 @@ public final class GreenScarab extends CardImpl { // Enchanted creature can't be blocked by green creatures. Effect effect = new CantBeBlockedByCreaturesAttachedEffect(Duration.WhileOnBattlefield, filter, AttachmentType.AURA); - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + ability = new SimpleStaticAbility(effect); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as an opponent controls a white permanent. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield), new OpponentControlsPermanentCondition(filter2), "Enchanted creature gets +2/+2 as long as an opponent controls a green permanent"))); diff --git a/Mage.Sets/src/mage/cards/g/GridMonitor.java b/Mage.Sets/src/mage/cards/g/GridMonitor.java index dfafadc1aba..3593ac67dbb 100644 --- a/Mage.Sets/src/mage/cards/g/GridMonitor.java +++ b/Mage.Sets/src/mage/cards/g/GridMonitor.java @@ -30,7 +30,7 @@ public final class GridMonitor extends CardImpl { this.toughness = new MageInt(6); // You can't cast creature spells. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GridMonitorEffect())); + this.addAbility(new SimpleStaticAbility(new GridMonitorEffect())); } private GridMonitor(final GridMonitor card) { @@ -74,4 +74,4 @@ class GridMonitorEffect extends ContinuousRuleModifyingEffectImpl { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GriffinGuide.java b/Mage.Sets/src/mage/cards/g/GriffinGuide.java index fc4d04ac44b..2b30424257c 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GriffinGuide.java @@ -35,7 +35,7 @@ public final class GriffinGuide extends CardImpl { this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, "and has flying")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GriftersBlade.java b/Mage.Sets/src/mage/cards/g/GriftersBlade.java index bffea85ed59..88e4e56da78 100644 --- a/Mage.Sets/src/mage/cards/g/GriftersBlade.java +++ b/Mage.Sets/src/mage/cards/g/GriftersBlade.java @@ -40,7 +40,7 @@ public final class GriftersBlade extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new GriftersBladeChooseCreatureEffect(Outcome.BoostCreature))); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(1, 1))); // Equip {1} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1), new TargetControlledCreaturePermanent(), false)); diff --git a/Mage.Sets/src/mage/cards/g/GrimMonolith.java b/Mage.Sets/src/mage/cards/g/GrimMonolith.java index 0c8094854c0..6992bdc77e7 100644 --- a/Mage.Sets/src/mage/cards/g/GrimMonolith.java +++ b/Mage.Sets/src/mage/cards/g/GrimMonolith.java @@ -25,7 +25,7 @@ public final class GrimMonolith extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); // Grim Monolith doesn't untap during your untap step. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepSourceEffect())); + this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect())); // {tap}: Add {C}{C}{C}. this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(3), new TapSourceCost())); // {4}: Untap Grim Monolith. diff --git a/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java b/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java index 8fe754c317d..987de512f41 100644 --- a/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java +++ b/Mage.Sets/src/mage/cards/g/GrimReapersSprint.java @@ -65,7 +65,7 @@ public final class GrimReapersSprint extends CardImpl { // Enchanted creature gets +2/+2 and has haste. Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA); effect.setText("and has haste"); - Ability staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); + Ability staticAbility = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); staticAbility.addEffect(effect); this.addAbility(staticAbility); } diff --git a/Mage.Sets/src/mage/cards/g/GrimStrider.java b/Mage.Sets/src/mage/cards/g/GrimStrider.java index 8826297d603..d1bea4bd1ee 100644 --- a/Mage.Sets/src/mage/cards/g/GrimStrider.java +++ b/Mage.Sets/src/mage/cards/g/GrimStrider.java @@ -32,7 +32,7 @@ public final class GrimStrider extends CardImpl { DynamicValue count = new SignInversionDynamicValue(CardsInControllerHandCount.instance); Effect effect = new BoostSourceEffect(count, count, Duration.WhileOnBattlefield); effect.setText("{this} gets -1/-1 for each card in your hand"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); + this.addAbility(new SimpleStaticAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java index e1132c810ff..16c49734305 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -50,8 +50,8 @@ public final class GrimlockDinobotLeader extends CardImpl{ this.secondSideCardClazz = mage.cards.g.GrimlockFerociousKing.class; // Dinosaurs, Vehicles and other Transformers creatures you control get +2/+0. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter2, true))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter, false))); + this.addAbility(new SimpleStaticAbility(new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield, filter2, true))); // {2}: Grimlock, Dinobot Leader becomes Grimlock, Ferocious King. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java index 99beeebbcac..a039880f5ca 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java +++ b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java @@ -36,7 +36,7 @@ public final class GrislyTransformation extends CardImpl { // When Grisly Transformation enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); // Enchanted creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); } private GrislyTransformation(final GrislyTransformation card) { diff --git a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java index 3592ce751b9..352535407dd 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java +++ b/Mage.Sets/src/mage/cards/g/GrixisGrimblade.java @@ -45,7 +45,7 @@ public final class GrixisGrimblade extends CardImpl { this.toughness = new MageInt(1); // As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch. - 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/g/GrothamaAllDevouring.java b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java index 79dcf407b79..76598f8f73e 100644 --- a/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java +++ b/Mage.Sets/src/mage/cards/g/GrothamaAllDevouring.java @@ -43,7 +43,7 @@ public final class GrothamaAllDevouring extends CardImpl { this.toughness = new MageInt(8); // Other creatures have "Whenever this creature attacks, you may have it fight Grothama, All-Devouring." - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GrothamaAllDevouringGainAbilityEffect())); + this.addAbility(new SimpleStaticAbility(new GrothamaAllDevouringGainAbilityEffect())); // When Grothama leaves the battlefield, each player draws cards equal to the amount of damage dealt to Grothama this turn by sources they controlled. this.addAbility(new LeavesBattlefieldTriggeredAbility(new GrothamaAllDevouringDrawCardsEffect(), false), new GrothamaAllDevouringWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GroundSeal.java b/Mage.Sets/src/mage/cards/g/GroundSeal.java index 1a3282db155..5da46328a80 100644 --- a/Mage.Sets/src/mage/cards/g/GroundSeal.java +++ b/Mage.Sets/src/mage/cards/g/GroundSeal.java @@ -23,7 +23,7 @@ public final class GroundSeal extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Cards in graveyards can't be the targets of spells or abilities. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); + this.addAbility(new SimpleStaticAbility(new CantBeTargetedCardsGraveyardsEffect())); } private GroundSeal(final GroundSeal card) { diff --git a/Mage.Sets/src/mage/cards/g/Grounded.java b/Mage.Sets/src/mage/cards/g/Grounded.java index ef140d8d470..d90311e72ed 100644 --- a/Mage.Sets/src/mage/cards/g/Grounded.java +++ b/Mage.Sets/src/mage/cards/g/Grounded.java @@ -36,7 +36,7 @@ public final class Grounded extends CardImpl { this.addAbility(ability); // Enchanted creature loses flying. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new LoseAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); } private Grounded(final Grounded card) { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java index 952b8959774..82d3fb49742 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java @@ -36,7 +36,7 @@ public final class GruesomeDeformity extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has intimidate. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); } private GruesomeDeformity(final GruesomeDeformity card) { diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index 0dd5bc94603..9a3f83eae89 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -27,7 +27,7 @@ public final class GruulWarPlow extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); // Creatures you control have trample. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); + this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES))); // {1}{R}{G}: Gruul War Plow becomes a 4/4 Juggernaut artifact creature until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GruulWarPlowToken(), CardType.ARTIFACT, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}{G}"))); diff --git a/Mage.Sets/src/mage/cards/g/GryffsBoon.java b/Mage.Sets/src/mage/cards/g/GryffsBoon.java index a059dcd3b2a..5f56a7ade08 100644 --- a/Mage.Sets/src/mage/cards/g/GryffsBoon.java +++ b/Mage.Sets/src/mage/cards/g/GryffsBoon.java @@ -40,7 +40,7 @@ public final class GryffsBoon extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/+0 and has flying. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText("and has flying"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GuardDuty.java b/Mage.Sets/src/mage/cards/g/GuardDuty.java index 321dc2cef9d..1874e039cbf 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDuty.java +++ b/Mage.Sets/src/mage/cards/g/GuardDuty.java @@ -36,7 +36,7 @@ public final class GuardDuty extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); } private GuardDuty(final GuardDuty card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java index 6b0d722e9c6..6684282d323 100644 --- a/Mage.Sets/src/mage/cards/g/GuardGomazoa.java +++ b/Mage.Sets/src/mage/cards/g/GuardGomazoa.java @@ -31,7 +31,7 @@ public final class GuardGomazoa extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Prevent all combat damage that would be dealt to Guard Gomazoa. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield))); } private GuardGomazoa(final GuardGomazoa card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java index bfac2d65281..685014104df 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java @@ -43,7 +43,7 @@ public final class GuardianOfTheGreatConduit extends CardImpl { this.addAbility(ReachAbility.getInstance()); // As long as you control a Nissa planeswalker, Guardian of the Great Conduit gets +2/+0 and has vigilance. ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), rule); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield), new PermanentsOnTheBattlefieldCondition(filter), "and has vigilance")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java index 341a445debc..e8204bd1a69 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianSeraph.java +++ b/Mage.Sets/src/mage/cards/g/GuardianSeraph.java @@ -32,7 +32,7 @@ public final class GuardianSeraph extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // If a source an opponent controls would deal damage to you, prevent 1 of that damage. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GuardianSeraphEffect())); + this.addAbility(new SimpleStaticAbility(new GuardianSeraphEffect())); } private GuardianSeraph(final GuardianSeraph card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java index 9664c3998f9..2cf68154ce9 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java +++ b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java @@ -43,7 +43,7 @@ public final class GuardianZendikon extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( + Ability ability2 = new SimpleStaticAbility(new BecomesCreatureAttachedEffect( new GuardianZendikonWallToken(), "Enchanted land is a 2/6 white Wall creature with defender. It's still a land", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.COLOR)); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java index 3e3cfce06c2..bd3374c1d02 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java @@ -41,7 +41,7 @@ public final class GuardiansMagemark extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); + ability = new SimpleStaticAbility(new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GuildscornWard.java b/Mage.Sets/src/mage/cards/g/GuildscornWard.java index 6770f8f7d0c..6164c22f938 100644 --- a/Mage.Sets/src/mage/cards/g/GuildscornWard.java +++ b/Mage.Sets/src/mage/cards/g/GuildscornWard.java @@ -40,7 +40,7 @@ public final class GuildscornWard extends CardImpl { this.addAbility(ability); // Enchanted creature has protection from multicolored. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.AURA, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.AURA, Duration.WhileOnBattlefield))); } private GuildscornWard(final GuildscornWard card) { diff --git a/Mage.Sets/src/mage/cards/g/Guile.java b/Mage.Sets/src/mage/cards/g/Guile.java index 2f5ff32feb5..8e00050f0e8 100644 --- a/Mage.Sets/src/mage/cards/g/Guile.java +++ b/Mage.Sets/src/mage/cards/g/Guile.java @@ -33,11 +33,11 @@ public final class Guile extends CardImpl { this.toughness = new MageInt(6); // Guile can't be blocked except by three or more creatures. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(3))); + this.addAbility(new SimpleStaticAbility(new CantBeBlockedByOneEffect(3))); // If a spell or ability you control would counter a spell, instead exile that // spell and you may play that card without paying its mana cost. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GuileReplacementEffect())); + this.addAbility(new SimpleStaticAbility(new GuileReplacementEffect())); // When Guile is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java index 6cd72c40031..9d8b008c0e7 100644 --- a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java +++ b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java @@ -32,7 +32,7 @@ public final class GuiseOfFire extends CardImpl { this.addAbility(ability); // Enchanted creature gets +1/-1 and attacks each turn if able. - ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield)); + ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield)); 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/g/GuulDrazSpecter.java b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java index 43a277ba1d9..0836506f024 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazSpecter.java @@ -37,7 +37,7 @@ public final class GuulDrazSpecter extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Guul Draz Specter gets +3/+3 as long as an opponent has no cards in hand. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( + this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), GuulDrazSpecterCondition.instance, ruleText))); @@ -70,4 +70,4 @@ enum GuulDrazSpecterCondition implements Condition { return result; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java index 95ec36c27c4..b8e7f138e48 100644 --- a/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/cards/g/GuulDrazVampire.java @@ -36,7 +36,7 @@ public final class GuulDrazVampire extends CardImpl { // As long as an opponent has 10 or less life, Guul Draz Vampire gets +2/+1 and has intimidate. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.) ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1); + Ability ability = new SimpleStaticAbility(effect1); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2)); this.addAbility(ability);