From 139ca1ebe18ca68aca55936310cffc5b345e857c Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:20:27 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (second line) --- Mage.Sets/src/mage/cards/a/AetherTunnel.java | 2 +- Mage.Sets/src/mage/cards/c/CavalryMaster.java | 2 +- Mage.Sets/src/mage/cards/d/DivineVisitation.java | 2 +- Mage.Sets/src/mage/cards/e/EnergyFlux.java | 2 +- Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java | 2 +- Mage.Sets/src/mage/cards/m/MarshalsAnthem.java | 2 +- Mage.Sets/src/mage/cards/m/MessengersSpeed.java | 2 +- Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java | 4 ++-- Mage.Sets/src/mage/cards/n/NullhideFerox.java | 2 +- Mage.Sets/src/mage/cards/o/OchranAssassin.java | 2 +- Mage.Sets/src/mage/cards/s/StudentOfElements.java | 2 +- Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java | 2 +- Mage.Sets/src/mage/cards/t/TangleweaveArmor.java | 2 +- .../main/java/mage/abilities/keyword/PrototypeAbility.java | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AetherTunnel.java b/Mage.Sets/src/mage/cards/a/AetherTunnel.java index 6ba80c20616..33e3c7128c6 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTunnel.java +++ b/Mage.Sets/src/mage/cards/a/AetherTunnel.java @@ -38,7 +38,7 @@ public final class AetherTunnel extends CardImpl { // Enchanted creature gets +1/+0 and can't be blocked. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield) + new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield) ); ability.addEffect( new CantBeBlockedAttachedEffect(AttachmentType.AURA) diff --git a/Mage.Sets/src/mage/cards/c/CavalryMaster.java b/Mage.Sets/src/mage/cards/c/CavalryMaster.java index 08b3d2a7442..de9357c052b 100644 --- a/Mage.Sets/src/mage/cards/c/CavalryMaster.java +++ b/Mage.Sets/src/mage/cards/c/CavalryMaster.java @@ -39,7 +39,7 @@ public final class CavalryMaster extends CardImpl { this.addAbility(new FlankingAbility()); // Other creatures you control with flanking have flanking. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true) + new GainAbilityAllEffect(new FlankingAbility(), Duration.WhileOnBattlefield, filter, true) .setText("Other creatures you control with flanking have flanking.") )); } diff --git a/Mage.Sets/src/mage/cards/d/DivineVisitation.java b/Mage.Sets/src/mage/cards/d/DivineVisitation.java index 66deef18de0..0d940501ecd 100644 --- a/Mage.Sets/src/mage/cards/d/DivineVisitation.java +++ b/Mage.Sets/src/mage/cards/d/DivineVisitation.java @@ -31,7 +31,7 @@ public final class DivineVisitation extends CardImpl { // that many 4/4 white Angel creature tokens with flying and // vigilance are created instead. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new DivineVisitationEffect() + new DivineVisitationEffect() )); } diff --git a/Mage.Sets/src/mage/cards/e/EnergyFlux.java b/Mage.Sets/src/mage/cards/e/EnergyFlux.java index 0e58be21c43..1c2d704afae 100644 --- a/Mage.Sets/src/mage/cards/e/EnergyFlux.java +++ b/Mage.Sets/src/mage/cards/e/EnergyFlux.java @@ -27,7 +27,7 @@ public final class EnergyFlux extends CardImpl { // All artifacts have "At the beginning of your upkeep, sacrifice this artifact unless you pay {2}." this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, + new GainAbilityAllEffect( new BeginningOfUpkeepTriggeredAbility( TargetController.YOU, new SacrificeSourceUnlessPaysEffect(new GenericManaCost(2)), diff --git a/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java b/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java index d303cc2ac85..1d396c143ad 100644 --- a/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java +++ b/Mage.Sets/src/mage/cards/e/EnhancedSurveillance.java @@ -28,7 +28,7 @@ public final class EnhancedSurveillance extends CardImpl { // You may look at an additional two cards each time you surveil. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new EnhancedSurveillanceReplacementEffect() + new EnhancedSurveillanceReplacementEffect() )); // Exile Enhanced Surveillance: Shuffle your graveyard into your library. diff --git a/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java b/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java index 5aae7525acd..14c935d55f4 100644 --- a/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java +++ b/Mage.Sets/src/mage/cards/m/MarshalsAnthem.java @@ -35,7 +35,7 @@ public final class MarshalsAnthem extends CardImpl { // Creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield) + new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield) )); // When Marshal's Anthem enters the battlefield, return up to X target creature cards from your graveyard to the battlefield, where X is the number of times Marshal's Anthem was kicked. diff --git a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java index 74f68e424b8..a4806e3defc 100644 --- a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java +++ b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java @@ -40,7 +40,7 @@ public final class MessengersSpeed extends CardImpl { this.addAbility(ability); // Enchanted creature has trample and haste. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); + new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield)); Effect effect = new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and haste"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java b/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java index 3079d86b7f4..5ad0d20bc74 100644 --- a/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java +++ b/Mage.Sets/src/mage/cards/n/NikyaOfTheOldWays.java @@ -32,7 +32,7 @@ public final class NikyaOfTheOldWays extends CardImpl { // You can't cast noncreature spells. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new NikyaOfTheOldWaysCantCastEffect() + new NikyaOfTheOldWaysCantCastEffect() )); // Whenever you tap a land for mana, add one mana of any type that land produced. @@ -85,4 +85,4 @@ class NikyaOfTheOldWaysCantCastEffect extends ContinuousRuleModifyingEffectImpl return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NullhideFerox.java b/Mage.Sets/src/mage/cards/n/NullhideFerox.java index 9437459f42f..2a2f0b8f806 100644 --- a/Mage.Sets/src/mage/cards/n/NullhideFerox.java +++ b/Mage.Sets/src/mage/cards/n/NullhideFerox.java @@ -44,7 +44,7 @@ public final class NullhideFerox extends CardImpl { // You can't cast noncreature spells. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new NullhideFeroxCantCastEffect() + new NullhideFeroxCantCastEffect() )); // {2}: Nullhide Ferox loses all abilities until end of turn. Any player may activate this ability. diff --git a/Mage.Sets/src/mage/cards/o/OchranAssassin.java b/Mage.Sets/src/mage/cards/o/OchranAssassin.java index 2a0ff9d4b20..111bbe1cde4 100644 --- a/Mage.Sets/src/mage/cards/o/OchranAssassin.java +++ b/Mage.Sets/src/mage/cards/o/OchranAssassin.java @@ -30,7 +30,7 @@ public final class OchranAssassin extends CardImpl { // All creatures able to block Ochran Assassin do so. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new MustBeBlockedByAllSourceEffect() + new MustBeBlockedByAllSourceEffect() )); } diff --git a/Mage.Sets/src/mage/cards/s/StudentOfElements.java b/Mage.Sets/src/mage/cards/s/StudentOfElements.java index 65cc00bd0fc..b8caf19a91a 100644 --- a/Mage.Sets/src/mage/cards/s/StudentOfElements.java +++ b/Mage.Sets/src/mage/cards/s/StudentOfElements.java @@ -96,7 +96,7 @@ class TobitaMasterOfWinds extends TokenImpl { // Creatures you control have flying. this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); + new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent()))); } private TobitaMasterOfWinds(final TobitaMasterOfWinds token) { super(token); diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java index 97837054184..96a3ae411c3 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java @@ -42,7 +42,7 @@ public final class TalonsOfWildwood extends CardImpl { // Enchanted creature gets +1/+1 and has trample. ability = new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield) + new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield) ); ability.addEffect(new GainAbilityAttachedEffect( TrampleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java b/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java index d3a494c7ebb..c1d5ffca94b 100644 --- a/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java +++ b/Mage.Sets/src/mage/cards/t/TangleweaveArmor.java @@ -29,7 +29,7 @@ public final class TangleweaveArmor extends CardImpl { // Equipped creature gets +X/+X, where X is the greatest mana value among your commanders this.addAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new BoostEquippedEffect(CommanderGreatestManaValue.instance, CommanderGreatestManaValue.instance) + new BoostEquippedEffect(CommanderGreatestManaValue.instance, CommanderGreatestManaValue.instance) )); // Equip {4} diff --git a/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java b/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java index 5b08d0e625e..643b93b0997 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PrototypeAbility.java @@ -27,7 +27,7 @@ public class PrototypeAbility extends SpellAbility { this.setSpellAbilityCastMode(SpellAbilityCastMode.PROTOTYPE); this.setTiming(TimingRule.SORCERY); this.addSubAbility(new SimpleStaticAbility( - Zone.BATTLEFIELD, new PrototypeEffect(power, toughness, manaString) + new PrototypeEffect(power, toughness, manaString) ).setRuleVisible(false)); this.rule = "Prototype " + manaString + " — " + power + "/" + toughness + " (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)"; @@ -116,4 +116,4 @@ class PrototypeEffect extends ContinuousEffectImpl { permanent.getToughness().setModifiedBaseValue(toughness); return true; } -} \ No newline at end of file +}