From 994c97e86ac005b9f6780714e65d63986d193838 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 16 Nov 2024 22:17:19 -0500 Subject: [PATCH] refactor: SimpleStaticAbility default zone (tokens, emblems, etc.) --- .../main/java/mage/abilities/effects/common/InfoEffect.java | 6 +++--- .../src/main/java/mage/abilities/keyword/BestowAbility.java | 2 +- .../java/mage/abilities/keyword/LevelerCardBuilder.java | 4 ++-- .../java/mage/game/command/emblems/LukeSkywalkerEmblem.java | 2 +- .../java/mage/game/permanent/token/DaxosSpiritToken.java | 2 +- .../mage/game/permanent/token/DokaiWeaverofLifeToken.java | 2 +- .../java/mage/game/permanent/token/GutterGrimeToken.java | 2 +- .../token/KalonianTwingroveTreefolkWarriorToken.java | 2 +- .../permanent/token/NahiriTheLithomancerEquipmentToken.java | 2 +- .../java/mage/game/permanent/token/SaprolingBurstToken.java | 2 +- .../main/java/mage/game/permanent/token/TetraviteToken.java | 2 +- .../mage/game/permanent/token/VoiceOfResurgenceToken.java | 2 +- .../game/permanent/token/WastelandSurvivalGuideToken.java | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java index c1b5ab78f8f..9e6af5d650a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/InfoEffect.java @@ -53,7 +53,7 @@ public class InfoEffect extends OneShotEffect { */ public static void addInfoToPermanent(Game game, Ability source, Permanent permanent, String info, Duration duration) { // add simple static info to permanent's rules - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect(info)); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect(info)); GainAbilityTargetEffect gainEffect = new GainAbilityTargetEffect(ability, duration); gainEffect.setTargetPointer(new FixedTarget(permanent, game)); @@ -70,7 +70,7 @@ public class InfoEffect extends OneShotEffect { * @param duration */ public static void addCardHintToPermanent(Game game, Ability source, Permanent permanent, Hint cardHint, Duration duration) { - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("hint")); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect("hint")); ability.setRuleVisible(false); ability.addHint(cardHint); @@ -91,7 +91,7 @@ public class InfoEffect extends OneShotEffect { * @param condition */ public static void addCardHintToPermanentConditional(Game game, Ability source, Permanent permanent, Hint cardHint, Duration duration, Condition condition) { - SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect("hint")); + SimpleStaticAbility ability = new SimpleStaticAbility(new InfoEffect("hint")); ability.setRuleVisible(false); ability.addHint(cardHint); diff --git a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java index d4e25afec89..611d3bb2703 100644 --- a/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/BestowAbility.java @@ -90,7 +90,7 @@ public class BestowAbility extends SpellAbility { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.addTarget(auraTarget); this.addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BestowEntersBattlefieldEffect()); + Ability ability = new SimpleStaticAbility(new BestowEntersBattlefieldEffect()); ability.setRuleVisible(false); addSubAbility(ability); } diff --git a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java index 933f6783a64..7c28881cfdf 100644 --- a/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java +++ b/Mage/src/main/java/mage/abilities/keyword/LevelerCardBuilder.java @@ -50,13 +50,13 @@ public class LevelerCardBuilder { for (Ability ability : abilities) { ContinuousEffect effect = new GainAbilitySourceEffect(ability); ConditionalContinuousEffect abEffect = new ConditionalContinuousEffect(effect, condition, ""); - Ability staticAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, abEffect); + Ability staticAbility = new SimpleStaticAbility(abEffect); staticAbility.setRuleVisible(false); constructed.add(staticAbility); } ContinuousEffect effect = new SetBasePowerToughnessSourceEffect(power, toughness, Duration.WhileOnBattlefield); ConditionalContinuousEffect ptEffect = new ConditionalContinuousEffect(effect, condition, rule); - constructed.add(new SimpleStaticAbility(Zone.BATTLEFIELD, ptEffect)); + constructed.add(new SimpleStaticAbility(ptEffect)); return constructed; } diff --git a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java index ad43f97d5b1..9b5b5787f37 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukeSkywalkerEmblem.java @@ -19,7 +19,7 @@ public final class LukeSkywalkerEmblem extends Emblem { // -6: You get an emblem with "Prevent all damage that would be dealt to you during combat." Exile Luke Skywalker, the Last Jedi. public LukeSkywalkerEmblem() { super("Emblem Luke Skywalker"); - this.getAbilities().add(new SimpleStaticAbility(Zone.BATTLEFIELD, new LukeSkywalkerEmblemEffect())); + this.getAbilities().add(new SimpleStaticAbility(new LukeSkywalkerEmblemEffect())); } private LukeSkywalkerEmblem(final LukeSkywalkerEmblem card) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index 1b17d54bcbf..ffe198aff1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -25,7 +25,7 @@ public final class DaxosSpiritToken extends TokenImpl { subtype.add(SubType.SPIRIT); power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DaxosSpiritSetPTEffect())); + this.addAbility(new SimpleStaticAbility(new DaxosSpiritSetPTEffect())); } private DaxosSpiritToken(final DaxosSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 9216beb749a..7758f33f322 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -27,7 +27,7 @@ public final class DokaiWeaverofLifeToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filterLands); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield))); + this.addAbility(new SimpleStaticAbility(new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield))); } private DokaiWeaverofLifeToken(final DokaiWeaverofLifeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java index f286e8dd9d8..eee240ce1df 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -33,7 +33,7 @@ public final class GutterGrimeToken extends TokenImpl { color.setGreen(true); power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new GutterGrimeCountersCount(sourceId)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new GutterGrimeCountersCount(sourceId)))); } private GutterGrimeToken(final GutterGrimeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index 6ac16b95374..b84f475ec3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -29,7 +29,7 @@ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filterLands)))); } private KalonianTwingroveTreefolkWarriorToken(final KalonianTwingroveTreefolkWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java index 2e91bb1c52b..34a5562a778 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java @@ -29,7 +29,7 @@ public final class NahiriTheLithomancerEquipmentToken extends TokenImpl { this.addAbility(IndestructibleAbility.getInstance()); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(5, 5)); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(5, 5)); ability.addEffect(new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield, "and has double strike")); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java index 6ca82ffc6a7..98a4cb519cc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java @@ -31,7 +31,7 @@ public final class SaprolingBurstToken extends TokenImpl { this.color.setGreen(true); this.subtype.add(SubType.SAPROLING); this.cardType.add(CardType.CREATURE); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect(new SaprolingBurstTokenDynamicValue(saprolingBurstMOR)))); + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect(new SaprolingBurstTokenDynamicValue(saprolingBurstMOR)))); } private SaprolingBurstToken(final SaprolingBurstToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index ee48e287d45..99c42765d00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -23,7 +23,7 @@ public final class TetraviteToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TetraviteTokenEffect())); + this.addAbility(new SimpleStaticAbility(new TetraviteTokenEffect())); } private TetraviteToken(final TetraviteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java index b11708a7fbd..875a723aa46 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java @@ -24,7 +24,7 @@ public final class VoiceOfResurgenceToken extends TokenImpl { toughness = new MageInt(0); // This creature's power and toughness are each equal to the number of creatures you control. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SetBasePowerToughnessSourceEffect( + this.addAbility(new SimpleStaticAbility(new SetBasePowerToughnessSourceEffect( CreaturesYouControlCount.instance))); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java b/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java index 8894a1c2bcf..7858aa8a1d9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WastelandSurvivalGuideToken.java @@ -27,7 +27,7 @@ public final class WastelandSurvivalGuideToken extends TokenImpl { this.cardType.add(CardType.ARTIFACT); this.subtype.add(SubType.EQUIPMENT); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(xValue, xValue)).addHint(hint)); + this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(xValue, xValue)).addHint(hint)); this.addAbility(new EquipAbility(1, false)); }