diff --git a/Mage.Sets/src/mage/cards/b/BladegriffPrototype.java b/Mage.Sets/src/mage/cards/b/BladegriffPrototype.java index dc514735788..a08f871db1a 100644 --- a/Mage.Sets/src/mage/cards/b/BladegriffPrototype.java +++ b/Mage.Sets/src/mage/cards/b/BladegriffPrototype.java @@ -25,8 +25,10 @@ import java.util.UUID; * @author TheElk801 */ public final class BladegriffPrototype extends CardImpl { - static FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent of that player's choice that one of your opponents controls"); - static{ + + private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent of that player's choice that one of your opponents controls"); + + static { filter.add(BladegriffSourceOpponentControlsPredicate.instance); } @@ -56,8 +58,10 @@ public final class BladegriffPrototype extends CardImpl { return new BladegriffPrototype(this); } } + enum BladegriffSourceOpponentControlsPredicate implements ObjectSourcePlayerPredicate { instance; + @Override public boolean apply(ObjectSourcePlayer input, Game game) { Controllable object = input.getObject(); diff --git a/Mage.Sets/src/mage/cards/d/DiseasedVermin.java b/Mage.Sets/src/mage/cards/d/DiseasedVermin.java index d77969afc86..49f364fc910 100644 --- a/Mage.Sets/src/mage/cards/d/DiseasedVermin.java +++ b/Mage.Sets/src/mage/cards/d/DiseasedVermin.java @@ -30,7 +30,8 @@ import java.util.UUID; * @author jeffwadsworth */ public final class DiseasedVermin extends CardImpl { - static final FilterOpponent filter = new FilterOpponent("player previously dealt damage by {this}"); + + private static final FilterOpponent filter = new FilterOpponent("player previously dealt damage by {this}"); static { filter.add(new DiseasedVerminPredicate()); diff --git a/Mage.Sets/src/mage/cards/h/HarnessTheStorm.java b/Mage.Sets/src/mage/cards/h/HarnessTheStorm.java index ca98ec48195..a6c20b27723 100644 --- a/Mage.Sets/src/mage/cards/h/HarnessTheStorm.java +++ b/Mage.Sets/src/mage/cards/h/HarnessTheStorm.java @@ -20,11 +20,11 @@ import mage.target.targetpointer.FirstTargetPointer; import java.util.UUID; /** - * * @author LevelX2 */ public final class HarnessTheStorm extends CardImpl { - static FilterCard filter = new FilterCard("card with the same name as that spell from your graveyard"); + + private static final FilterCard filter = new FilterCard("card with the same name as that spell from your graveyard"); public HarnessTheStorm(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); @@ -50,8 +50,10 @@ public final class HarnessTheStorm extends CardImpl { } } + enum HarnessTheStormAdjuster implements TargetAdjuster { instance; + @Override public void adjustTargets(Ability ability, Game game) { UUID spellId = ability.getEffects().get(0).getTargetPointer().getFirst(game, ability); @@ -59,10 +61,10 @@ enum HarnessTheStormAdjuster implements TargetAdjuster { ability.getAllEffects().setTargetPointer(new FirstTargetPointer()); Spell spell = game.getSpellOrLKIStack(spellId); - if (spell == null){ + if (spell == null) { return; } - FilterCard filter = new FilterCard("a card named " + spell.getName() + " in your graveyard"); + FilterCard filter = new FilterCard("a card named " + spell.getName() + " in your graveyard"); filter.add(new NamePredicate(spell.getName())); ability.addTarget(new TargetCardInYourGraveyard(filter)); } diff --git a/Mage.Sets/src/mage/cards/m/MageRingResponder.java b/Mage.Sets/src/mage/cards/m/MageRingResponder.java index 86ecf2dd52b..86bab2ed384 100644 --- a/Mage.Sets/src/mage/cards/m/MageRingResponder.java +++ b/Mage.Sets/src/mage/cards/m/MageRingResponder.java @@ -1,4 +1,3 @@ - package mage.cards.m; import mage.MageInt; @@ -17,20 +16,20 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.common.TargetCreaturePermanent; import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; /** - * * @author fireshoes */ public final class MageRingResponder extends CardImpl { + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls"); + public MageRingResponder(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{7}"); this.subtype.add(SubType.GOLEM); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java b/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java index b3a54890d0c..37b91a639c2 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java @@ -1,4 +1,3 @@ - package mage.cards.m; import mage.MageInt; @@ -22,14 +21,14 @@ import mage.target.targetpointer.FirstTargetPointer; import java.util.UUID; /** - * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ public final class MagusOfTheAbyss extends CardImpl { - static FilterPermanent filter = new FilterPermanent("nonartifact creature that player controls of their choice"); + + private static final FilterPermanent filter = new FilterPermanent("nonartifact creature that player controls of their choice"); public MagusOfTheAbyss(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.WIZARD); this.power = new MageInt(4); @@ -55,12 +54,15 @@ public final class MagusOfTheAbyss extends CardImpl { enum MagusOfTheAbyssTargetAdjuster implements TargetAdjuster { instance; + private static final FilterPermanent filter = new FilterPermanent("nonartifact creature that player controls of their choice"); + static { filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); filter.add(CardType.CREATURE.getPredicate()); } + @Override public void adjustTargets(Ability ability, Game game) { UUID opponentId = ability.getEffects().get(0).getTargetPointer().getFirst(game, ability); diff --git a/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java b/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java index ea41e0956cf..a5427501f26 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumTurnkey.java @@ -1,4 +1,3 @@ - package mage.cards.m; import mage.MageInt; @@ -21,11 +20,11 @@ import mage.target.targetadjustment.TargetAdjuster; import java.util.UUID; /** - * * @author LevelX2 */ public final class MausoleumTurnkey extends CardImpl { - static FilterCreatureCard filter = new FilterCreatureCard("creature card of an opponent's choice"); + + private static final FilterCreatureCard filter = new FilterCreatureCard("creature card of an opponent's choice"); public MausoleumTurnkey(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); diff --git a/Mage.Sets/src/mage/cards/n/Necrite.java b/Mage.Sets/src/mage/cards/n/Necrite.java index 56fc010bedf..0ce99f7ef0e 100644 --- a/Mage.Sets/src/mage/cards/n/Necrite.java +++ b/Mage.Sets/src/mage/cards/n/Necrite.java @@ -1,4 +1,3 @@ - package mage.cards.n; import mage.MageInt; @@ -20,14 +19,14 @@ import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; /** - * * @author MarcoMarin */ public final class Necrite extends CardImpl { - static FilterPermanent filter = new FilterCreaturePermanent("creature defending player controls"); + + private static final FilterPermanent filter = new FilterCreaturePermanent("creature defending player controls"); public Necrite(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{B}"); this.subtype.add(SubType.THRULL); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/n/NeyamShaiMurad.java b/Mage.Sets/src/mage/cards/n/NeyamShaiMurad.java index d84e530c140..94a351ee75a 100644 --- a/Mage.Sets/src/mage/cards/n/NeyamShaiMurad.java +++ b/Mage.Sets/src/mage/cards/n/NeyamShaiMurad.java @@ -24,7 +24,8 @@ import java.util.UUID; * @author Xanderhall */ public final class NeyamShaiMurad extends CardImpl { - FilterCard filter = new FilterPermanentCard("permanent card from their graveyard"); + + private static final FilterCard filter = new FilterPermanentCard("permanent card from their graveyard"); public NeyamShaiMurad(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{B}"); diff --git a/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java b/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java index 9afa9db5bf5..8fb3f30b2c9 100644 --- a/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java +++ b/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java @@ -29,7 +29,8 @@ import java.util.*; * @author TheElk801 */ public final class OKagachiVengefulKami extends CardImpl { - static FilterPermanent filter = new FilterNonlandPermanent("nonland permanent that player controls"); + + private static final FilterPermanent filter = new FilterNonlandPermanent("nonland permanent that player controls"); public OKagachiVengefulKami(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}{B}{R}{G}"); diff --git a/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java b/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java index 0455c5b46d8..4cf1149e302 100644 --- a/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java +++ b/Mage.Sets/src/mage/cards/o/OrahSkyclaveHierophant.java @@ -27,8 +27,9 @@ import java.util.UUID; * @author TheElk801 */ public final class OrahSkyclaveHierophant extends CardImpl { - static FilterPermanent filterTrigger = new FilterControlledPermanent("Cleric you control"); - static FilterCard filterTarget = new FilterCard("Cleric card with lesser mana value"); + + private static final FilterPermanent filterTrigger = new FilterControlledPermanent("Cleric you control"); + private static final FilterCard filterTarget = new FilterCard("Cleric card with lesser mana value"); static { filterTrigger.add(SubType.CLERIC.getPredicate()); filterTarget.add(SubType.CLERIC.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/r/RampagingWarMammoth.java b/Mage.Sets/src/mage/cards/r/RampagingWarMammoth.java index f9a6a8324b6..af293b7cbfc 100644 --- a/Mage.Sets/src/mage/cards/r/RampagingWarMammoth.java +++ b/Mage.Sets/src/mage/cards/r/RampagingWarMammoth.java @@ -23,7 +23,8 @@ import java.util.UUID; * @author Susucr */ public final class RampagingWarMammoth extends CardImpl { - static FilterPermanent filter = new FilterArtifactPermanent("up to X target artifacts"); + + private static final FilterPermanent filter = new FilterArtifactPermanent("up to X target artifacts"); public RampagingWarMammoth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index cc3fe4406b5..ff8fbef7956 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -25,8 +25,10 @@ import java.util.UUID; * @author LevelX2 */ public final class RelentlessDead extends CardImpl { - static FilterCard filter = new FilterCreatureCard("another target Zombie creature card with mana value X from your graveyard"); // This target defines X - static{ + + private static final FilterCard filter = new FilterCreatureCard("another target Zombie creature card with mana value X from your graveyard"); // This target defines X + + static { filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java index 5f588714be6..feba0f44bb2 100644 --- a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java +++ b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java @@ -23,8 +23,9 @@ import java.util.UUID; * @author spjspj */ public final class ScalelordReckoner extends CardImpl { - static FilterPermanent filterDragon = new FilterControlledPermanent(SubType.DRAGON, "a Dragon you control"); - static FilterPermanent filterTarget = new FilterNonlandPermanent("nonland permanent that player controls"); + + private static final FilterPermanent filterDragon = new FilterControlledPermanent(SubType.DRAGON, "a Dragon you control"); + private static final FilterPermanent filterTarget = new FilterNonlandPermanent("nonland permanent that player controls"); public ScalelordReckoner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); diff --git a/Mage.Sets/src/mage/cards/s/SkymarkRoc.java b/Mage.Sets/src/mage/cards/s/SkymarkRoc.java index 22fa0ad2d9c..fb5be177dff 100644 --- a/Mage.Sets/src/mage/cards/s/SkymarkRoc.java +++ b/Mage.Sets/src/mage/cards/s/SkymarkRoc.java @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class SkymarkRoc extends CardImpl { - static FilterPermanent filter = new FilterCreaturePermanent("creature defending player controls with toughness 2 or less"); + private static final FilterPermanent filter = new FilterCreaturePermanent("creature defending player controls with toughness 2 or less"); static { filter.add(new ToughnessPredicate(ComparisonType.OR_LESS, 2)); diff --git a/Mage.Sets/src/mage/cards/s/SoltariVisionary.java b/Mage.Sets/src/mage/cards/s/SoltariVisionary.java index 2bb908b3657..1571fe604f3 100644 --- a/Mage.Sets/src/mage/cards/s/SoltariVisionary.java +++ b/Mage.Sets/src/mage/cards/s/SoltariVisionary.java @@ -18,13 +18,14 @@ import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; /** - * * @author jeffwadsworth */ public final class SoltariVisionary extends CardImpl { - static FilterPermanent filter = new FilterEnchantmentPermanent("enchantment that player controls"); + + private static final FilterPermanent filter = new FilterEnchantmentPermanent("enchantment that player controls"); + public SoltariVisionary(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); this.subtype.add(SubType.SOLTARI); this.subtype.add(SubType.CLERIC); diff --git a/Mage.Sets/src/mage/cards/t/TheAbyss.java b/Mage.Sets/src/mage/cards/t/TheAbyss.java index 6ae2fc351e8..be31f6b28fa 100644 --- a/Mage.Sets/src/mage/cards/t/TheAbyss.java +++ b/Mage.Sets/src/mage/cards/t/TheAbyss.java @@ -1,4 +1,3 @@ - package mage.cards.t; import mage.abilities.Ability; @@ -22,14 +21,14 @@ import mage.target.targetpointer.FirstTargetPointer; import java.util.UUID; /** - * * @author emerald000 */ public final class TheAbyss extends CardImpl { - static FilterPermanent filter = new FilterPermanent("nonartifact creature that player controls of their choice"); + + private static final FilterPermanent filter = new FilterPermanent("nonartifact creature that player controls of their choice"); public TheAbyss(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.supertype.add(SuperType.WORLD); // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated. @@ -52,11 +51,13 @@ public final class TheAbyss extends CardImpl { enum TheAbyssTargetAdjuster implements TargetAdjuster { instance; + private static final FilterPermanent filter = new FilterCreaturePermanent("nonartifact creature that player controls of their choice"); static { filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); } + @Override public void adjustTargets(Ability ability, Game game) { UUID playerId = ability.getEffects().get(0).getTargetPointer().getFirst(game, ability); diff --git a/Mage.Sets/src/mage/cards/t/TheLordOfPain.java b/Mage.Sets/src/mage/cards/t/TheLordOfPain.java index e6bd1b89631..5b525ef20ad 100644 --- a/Mage.Sets/src/mage/cards/t/TheLordOfPain.java +++ b/Mage.Sets/src/mage/cards/t/TheLordOfPain.java @@ -32,6 +32,7 @@ import java.util.UUID; * @author Grath */ public final class TheLordOfPain extends CardImpl { + private static final FilterSpell filter = new FilterSpell("their first spell each turn"); static { diff --git a/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java b/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java index 6566864ddba..45782471e5b 100644 --- a/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java +++ b/Mage.Sets/src/mage/cards/v/VenerableWarsinger.java @@ -24,7 +24,8 @@ import java.util.UUID; * @author TheElk801 */ public final class VenerableWarsinger extends CardImpl { - FilterCard filter = new FilterCreatureCard("creature card with mana value X or less from your graveyard"); + + private static final FilterCard filter = new FilterCreatureCard("creature card with mana value X or less from your graveyard"); public VenerableWarsinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{W}"); diff --git a/Mage.Sets/src/mage/cards/w/WebstrikeElite.java b/Mage.Sets/src/mage/cards/w/WebstrikeElite.java index 99d18e79cc9..3a2995fc469 100644 --- a/Mage.Sets/src/mage/cards/w/WebstrikeElite.java +++ b/Mage.Sets/src/mage/cards/w/WebstrikeElite.java @@ -24,7 +24,8 @@ import java.util.UUID; * @author TheElk801 */ public final class WebstrikeElite extends CardImpl { - FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with mana value X"); + + private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment with mana value X"); public WebstrikeElite(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{G}"); diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/EffectKeyValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EffectKeyValue.java index 23001575e37..e3671c7aafb 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/EffectKeyValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/EffectKeyValue.java @@ -10,12 +10,12 @@ import mage.game.Game; * @author stravant */ public class EffectKeyValue implements DynamicValue { + private final String key; private final String description; public EffectKeyValue(String key) { - this.key = key; - this.description = key; + this(key, key); } public EffectKeyValue(String key, String description) { @@ -25,11 +25,11 @@ public class EffectKeyValue implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { - return (Integer)effect.getValue(key); + return (Integer) effect.getValue(key); } @Override - public EffectKeyValue copy(){ + public EffectKeyValue copy() { return new EffectKeyValue(this.key, this.description); } diff --git a/Mage/src/main/java/mage/target/targetadjustment/DefineByTriggerTargetAdjuster.java b/Mage/src/main/java/mage/target/targetadjustment/DefineByTriggerTargetAdjuster.java index 4617cb395d8..e0e9e741805 100644 --- a/Mage/src/main/java/mage/target/targetadjustment/DefineByTriggerTargetAdjuster.java +++ b/Mage/src/main/java/mage/target/targetadjustment/DefineByTriggerTargetAdjuster.java @@ -9,10 +9,11 @@ import mage.game.Game; * * @author notgreat */ -public enum DefineByTriggerTargetAdjuster implements TargetAdjuster{ +public enum DefineByTriggerTargetAdjuster implements TargetAdjuster { instance; + @Override - public void adjustTargets(Ability ability, Game game){ + public void adjustTargets(Ability ability, Game game) { //Do nothing } }