diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare_.java b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java similarity index 100% rename from Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare_.java rename to Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare.java diff --git a/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar_.java b/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java similarity index 100% rename from Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar_.java rename to Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar.java diff --git a/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx_.java b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java similarity index 100% rename from Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx_.java rename to Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java diff --git a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java similarity index 86% rename from Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java rename to Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java index b47f607596..1aac141625 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java @@ -35,7 +35,6 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; @@ -58,7 +57,7 @@ public class NemesisOfReason extends CardImpl { this.color.setBlack(true); this.power = new MageInt(3); this.toughness = new MageInt(7); - this.addAbility(new NemesisofReasonTriggeredAbility()); + this.addAbility(new NemesisOfReasonTriggeredAbility()); } public NemesisOfReason (final NemesisOfReason card) { @@ -71,18 +70,18 @@ public class NemesisOfReason extends CardImpl { } } -class NemesisofReasonTriggeredAbility extends TriggeredAbilityImpl { - NemesisofReasonTriggeredAbility() { +class NemesisOfReasonTriggeredAbility extends TriggeredAbilityImpl { + NemesisOfReasonTriggeredAbility() { super(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(10)); } - NemesisofReasonTriggeredAbility(final NemesisofReasonTriggeredAbility ability) { + NemesisOfReasonTriggeredAbility(final NemesisOfReasonTriggeredAbility ability) { super(ability); } @Override - public NemesisofReasonTriggeredAbility copy() { - return new NemesisofReasonTriggeredAbility(this); + public NemesisOfReasonTriggeredAbility copy() { + return new NemesisOfReasonTriggeredAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind_.java b/Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind.java similarity index 100% rename from Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind_.java rename to Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind.java diff --git a/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial_.java b/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java similarity index 100% rename from Mage.Sets/src/mage/sets/alarareborn/WallOfDenial_.java rename to Mage.Sets/src/mage/sets/alarareborn/WallOfDenial.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger_.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java similarity index 100% rename from Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger_.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm_.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java similarity index 100% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm_.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed_.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java similarity index 100% rename from Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed_.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed.java diff --git a/Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java similarity index 83% rename from Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java rename to Mage.Sets/src/mage/sets/conflux/WallOfReverence.java index f359a63e70..6c28d99d77 100644 --- a/Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java +++ b/Mage.Sets/src/mage/sets/conflux/WallOfReverence.java @@ -30,9 +30,10 @@ package mage.sets.conflux; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; @@ -62,7 +63,7 @@ public class WallOfReverence extends CardImpl { this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new WallofReverenceTriggeredAbility()); + this.addAbility(new WallOfReverenceTriggeredAbility()); } public WallOfReverence (final WallOfReverence card) { @@ -75,19 +76,19 @@ public class WallOfReverence extends CardImpl { } } -class WallofReverenceTriggeredAbility extends TriggeredAbilityImpl { - WallofReverenceTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new WallofReverenceTriggeredEffect(), true); +class WallOfReverenceTriggeredAbility extends TriggeredAbilityImpl { + WallOfReverenceTriggeredAbility() { + super(Zone.BATTLEFIELD, new WallOfReverenceTriggeredEffect(), true); this.addTarget(new TargetControlledCreaturePermanent()); } - WallofReverenceTriggeredAbility(final WallofReverenceTriggeredAbility ability) { + WallOfReverenceTriggeredAbility(final WallOfReverenceTriggeredAbility ability) { super(ability); } @Override - public WallofReverenceTriggeredAbility copy() { - return new WallofReverenceTriggeredAbility(this); + public WallOfReverenceTriggeredAbility copy() { + return new WallOfReverenceTriggeredAbility(this); } @Override @@ -104,12 +105,12 @@ class WallofReverenceTriggeredAbility extends TriggeredAbilityImpl { - WallofReverenceTriggeredEffect() { - super(Constants.Outcome.GainLife); +class WallOfReverenceTriggeredEffect extends OneShotEffect { + WallOfReverenceTriggeredEffect() { + super(Outcome.GainLife); } - WallofReverenceTriggeredEffect(WallofReverenceTriggeredEffect effect) { + WallOfReverenceTriggeredEffect(WallOfReverenceTriggeredEffect effect) { super(effect); } @@ -125,8 +126,8 @@ class WallofReverenceTriggeredEffect extends OneShotEffect { - private static FilterCard filter = new FilterCard("red and from blue"); + private static final FilterCard filter = new FilterCard("red and from blue"); static { filter.setUseColor(true); @@ -70,10 +72,10 @@ public class SwordOfFireAndIce extends CardImpl { super(ownerId, 148, "Sword of Fire and Ice", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SwordofFireandIceAbility()); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT))); + this.addAbility(new SwordOfFireAndIceAbility()); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public SwordOfFireAndIce(final SwordOfFireAndIce card) { @@ -87,21 +89,21 @@ public class SwordOfFireAndIce extends CardImpl { } -class SwordofFireandIceAbility extends TriggeredAbilityImpl { +class SwordOfFireAndIceAbility extends TriggeredAbilityImpl { - public SwordofFireandIceAbility() { - super(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(2)); + public SwordOfFireAndIceAbility() { + super(Zone.BATTLEFIELD, new DamageTargetEffect(2)); this.addEffect(new DrawCardControllerEffect(1)); this.addTarget(new TargetCreatureOrPlayer()); } - public SwordofFireandIceAbility(final SwordofFireandIceAbility ability) { + public SwordOfFireAndIceAbility(final SwordOfFireAndIceAbility ability) { super(ability); } @Override - public SwordofFireandIceAbility copy() { - return new SwordofFireandIceAbility(this); + public SwordOfFireAndIceAbility copy() { + return new SwordOfFireAndIceAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java similarity index 77% rename from Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java rename to Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java index a2919ae603..6ab7f2cc9d 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java @@ -30,14 +30,14 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; +import mage.Constants.AttachmentType; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardControllerEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -52,16 +52,14 @@ import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetCreatureOrPlayer; /** * @author Loki */ public class SwordOfLightAndShadow extends CardImpl { - private static FilterCard filter = new FilterCard("white and from black"); + private static final FilterCard filter = new FilterCard("white and from black"); static { filter.setUseColor(true); @@ -74,10 +72,10 @@ public class SwordOfLightAndShadow extends CardImpl { super(ownerId, 149, "Sword of Light and Shadow", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SwordofLightandShadowAbility()); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT))); + this.addAbility(new SwordOfLightAndShadowAbility()); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } public SwordOfLightAndShadow(final SwordOfLightAndShadow card) { @@ -91,23 +89,23 @@ public class SwordOfLightAndShadow extends CardImpl { } -class SwordofLightandShadowAbility extends TriggeredAbilityImpl { +class SwordOfLightAndShadowAbility extends TriggeredAbilityImpl { private static FilterCreatureCard filter = new FilterCreatureCard("creature"); - public SwordofLightandShadowAbility() { - super(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect()); + public SwordOfLightAndShadowAbility() { + super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect()); this.addEffect(new GainLifeEffect(3)); this.addTarget(new TargetCardInYourGraveyard(filter)); } - public SwordofLightandShadowAbility(final SwordofLightandShadowAbility ability) { + public SwordOfLightAndShadowAbility(final SwordOfLightAndShadowAbility ability) { super(ability); } @Override - public SwordofLightandShadowAbility copy() { - return new SwordofLightandShadowAbility(this); + public SwordOfLightAndShadowAbility copy() { + return new SwordOfLightAndShadowAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java similarity index 85% rename from Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java rename to Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java index 8de8cde13a..4ab58a6a03 100644 --- a/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java +++ b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements.java @@ -30,9 +30,9 @@ package mage.sets.darksteel; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -61,10 +61,10 @@ public class WandOfTheElements extends CardImpl { public WandOfTheElements(UUID ownerId) { super(ownerId, 158, "Wand of the Elements", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "DST"; - Ability firstAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WandoftheElementsFirstToken()), new TapSourceCost()); + Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WandOfTheElementsFirstToken()), new TapSourceCost()); firstAbility.addCost(new SacrificeTargetCost(new TargetControlledPermanent(islandFilter))); this.addAbility(firstAbility); - Ability secondAbility = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new WandoftheElementsSecondToken()), new TapSourceCost()); + Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WandOfTheElementsSecondToken()), new TapSourceCost()); secondAbility.addCost(new SacrificeTargetCost(new TargetControlledPermanent(mountainFilter))); this.addAbility(secondAbility); @@ -80,8 +80,8 @@ public class WandOfTheElements extends CardImpl { } } -class WandoftheElementsFirstToken extends Token { - public WandoftheElementsFirstToken() { +class WandOfTheElementsFirstToken extends Token { + public WandOfTheElementsFirstToken() { super("", "2/2 blue Elemental creature token with flying"); cardType.add(CardType.CREATURE); this.subtype.add("Elemental"); @@ -93,8 +93,8 @@ class WandoftheElementsFirstToken extends Token { } -class WandoftheElementsSecondToken extends Token { - public WandoftheElementsSecondToken() { +class WandOfTheElementsSecondToken extends Token { + public WandOfTheElementsSecondToken() { super("", "3/3 red Elemental creature token"); cardType.add(CardType.CREATURE); this.subtype.add("Elemental"); diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality_.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java similarity index 100% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality_.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality.java diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere_.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java similarity index 100% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere_.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere.java diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm_.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java similarity index 100% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm_.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm.java diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod_.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java similarity index 100% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod_.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod.java diff --git a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java similarity index 83% rename from Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java rename to Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java index 6ca242c771..6f79d77e82 100644 --- a/Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java +++ b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride.java @@ -25,14 +25,14 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.sets.eventide; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Duration; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -51,7 +51,7 @@ import mage.players.Player; */ public class DivinityOfPride extends CardImpl { - public DivinityOfPride (UUID ownerId) { + public DivinityOfPride(UUID ownerId) { super(ownerId, 86, "Divinity of Pride", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W/B}{W/B}{W/B}{W/B}{W/B}"); this.expansionSetCode = "EVE"; this.subtype.add("Spirit"); @@ -62,10 +62,13 @@ public class DivinityOfPride extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); this.addAbility(LifelinkAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Constants.Duration.WhileOnBattlefield), new DivinityofPrideCondition(), "Divinity of Pride gets +4/+4 as long as you have 25 or more life"))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, + new ConditionalContinousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), + new DivinityOfPrideCondition(), + "Divinity of Pride gets +4/+4 as long as you have 25 or more life"))); } - public DivinityOfPride (final DivinityOfPride card) { + public DivinityOfPride(final DivinityOfPride card) { super(card); } @@ -73,10 +76,9 @@ public class DivinityOfPride extends CardImpl { public DivinityOfPride copy() { return new DivinityOfPride(this); } - } -class DivinityofPrideCondition implements Condition { +class DivinityOfPrideCondition implements Condition { @Override public boolean apply(Game game, Ability source) { diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java similarity index 75% rename from Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java rename to Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java index c486bb72b4..8bdaaf8d36 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova.java @@ -28,12 +28,12 @@ package mage.sets.guildpact; -import java.awt.font.TextHitInfo; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -66,10 +66,10 @@ public class GhostCouncilOfOrzhova extends CardImpl { this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - Ability ability = new EntersBattlefieldTriggeredAbility(new GhostCouncilofOrzhovaEffect()); + Ability ability = new EntersBattlefieldTriggeredAbility(new GhostCouncilOfOrzhovaEffect()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); - ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GhostCouncilofOrzhovaRemovingEffect(), new GenericManaCost(1)); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GhostCouncilOfOrzhovaRemovingEffect(), new GenericManaCost(1)); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent())); this.addAbility(ability); } @@ -85,12 +85,12 @@ public class GhostCouncilOfOrzhova extends CardImpl { } -class GhostCouncilofOrzhovaEffect extends OneShotEffect { - GhostCouncilofOrzhovaEffect() { - super(Constants.Outcome.Damage); +class GhostCouncilOfOrzhovaEffect extends OneShotEffect { + GhostCouncilOfOrzhovaEffect() { + super(Outcome.Damage); } - GhostCouncilofOrzhovaEffect(final GhostCouncilofOrzhovaEffect effect) { + GhostCouncilOfOrzhovaEffect(final GhostCouncilOfOrzhovaEffect effect) { super(effect); } @@ -106,8 +106,8 @@ class GhostCouncilofOrzhovaEffect extends OneShotEffect { +class GhostCouncilOfOrzhovaRemovingEffect extends OneShotEffect { private static final String effectText = "Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step"; - GhostCouncilofOrzhovaRemovingEffect () { - super(Constants.Outcome.Benefit); + GhostCouncilOfOrzhovaRemovingEffect () { + super(Outcome.Benefit); } - GhostCouncilofOrzhovaRemovingEffect(GhostCouncilofOrzhovaRemovingEffect effect) { + GhostCouncilOfOrzhovaRemovingEffect(GhostCouncilOfOrzhovaRemovingEffect effect) { super(effect); } @@ -134,7 +134,7 @@ class GhostCouncilofOrzhovaRemovingEffect extends OneShotEffect { +class GhostCouncilOfOrzhovaDelayedTriggeredAbility extends DelayedTriggeredAbility { - GhostCouncilofOrzhovaDelayedTriggeredAbility ( UUID exileId ) { - super(new ReturnFromExileEffect(exileId, Constants.Zone.BATTLEFIELD)); + GhostCouncilOfOrzhovaDelayedTriggeredAbility ( UUID exileId ) { + super(new ReturnFromExileEffect(exileId, Zone.BATTLEFIELD)); } - GhostCouncilofOrzhovaDelayedTriggeredAbility(GhostCouncilofOrzhovaDelayedTriggeredAbility ability) { + GhostCouncilOfOrzhovaDelayedTriggeredAbility(GhostCouncilOfOrzhovaDelayedTriggeredAbility ability) { super(ability); } @@ -173,7 +173,7 @@ class GhostCouncilofOrzhovaDelayedTriggeredAbility extends DelayedTriggeredAbili return false; } @Override - public GhostCouncilofOrzhovaDelayedTriggeredAbility copy() { - return new GhostCouncilofOrzhovaDelayedTriggeredAbility(this); + public GhostCouncilOfOrzhovaDelayedTriggeredAbility copy() { + return new GhostCouncilOfOrzhovaDelayedTriggeredAbility(this); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/magic2012/DragonsClaw_.java b/Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java similarity index 100% rename from Mage.Sets/src/mage/sets/magic2012/DragonsClaw_.java rename to Mage.Sets/src/mage/sets/magic2012/DragonsClaw.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm_.java b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm_.java rename to Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod_.java b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod_.java rename to Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions_.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions_.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons_.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/TowerOfEons_.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes_.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes_.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs_.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs_.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales_.java b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/TreeOfTales_.java rename to Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java diff --git a/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers_.java b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers_.java rename to Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java similarity index 88% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java index 228700de92..e7942fade4 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold.java @@ -30,8 +30,8 @@ package mage.sets.mirrodinbesieged; import java.util.UUID; -import mage.Constants; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.Ability; @@ -58,7 +58,7 @@ public class HeroOfBladehold extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(new BattleCryAbility()); - this.addAbility(new AttacksTriggeredAbility(new HeroofBladeholdEffect(), false)); + this.addAbility(new AttacksTriggeredAbility(new HeroOfBladeholdEffect(), false)); } public HeroOfBladehold(final HeroOfBladehold card) { @@ -72,12 +72,12 @@ public class HeroOfBladehold extends CardImpl { } -class HeroofBladeholdEffect extends OneShotEffect { - HeroofBladeholdEffect() { - super(Constants.Outcome.PutCreatureInPlay); +class HeroOfBladeholdEffect extends OneShotEffect { + HeroOfBladeholdEffect() { + super(Outcome.PutCreatureInPlay); } - HeroofBladeholdEffect(final HeroofBladeholdEffect effect) { + HeroOfBladeholdEffect(final HeroOfBladeholdEffect effect) { super(effect); } @@ -97,8 +97,8 @@ class HeroofBladeholdEffect extends OneShotEffect { } @Override - public HeroofBladeholdEffect copy() { - return new HeroofBladeholdEffect(this); + public HeroOfBladeholdEffect copy() { + return new HeroOfBladeholdEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll.java diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide_.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java similarity index 100% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide_.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide.java diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression_.java b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java similarity index 100% rename from Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression_.java rename to Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression.java diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage_.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java similarity index 100% rename from Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage_.java rename to Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage.java diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java similarity index 76% rename from Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java rename to Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java index e944495616..db3408b962 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java @@ -30,18 +30,18 @@ package mage.sets.newphyrexia; import java.util.UUID; -import mage.Constants; +import mage.Constants.AttachmentType; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; +import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.GainLifeEffect; -import mage.abilities.effects.common.UntapAllLandsControllerEffect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -61,7 +61,7 @@ import mage.target.TargetPlayer; * @author Loki */ public class SwordOfWarAndPeace extends CardImpl { - private static FilterCard filter = new FilterCard("red and from white"); + private static final FilterCard filter = new FilterCard("red and from white"); static { filter.setUseColor(true); @@ -74,10 +74,10 @@ public class SwordOfWarAndPeace extends CardImpl { super(ownerId, 161, "Sword of War and Peace", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "NPH"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SwordofWarandPeaceAbility()); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT))); + this.addAbility(new SwordOfWarAndPeaceAbility()); } public SwordOfWarAndPeace (final SwordOfWarAndPeace card) { @@ -91,21 +91,21 @@ public class SwordOfWarAndPeace extends CardImpl { } -class SwordofWarandPeaceAbility extends TriggeredAbilityImpl { +class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl { - public SwordofWarandPeaceAbility() { - super(Constants.Zone.BATTLEFIELD, new SwordofWarandPeaceDamageEffect()); + public SwordOfWarAndPeaceAbility() { + super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect()); this.addEffect(new GainLifeEffect(new CardsInControllerHandCount())); this.addTarget(new TargetPlayer()); } - public SwordofWarandPeaceAbility(final SwordofWarandPeaceAbility ability) { + public SwordOfWarAndPeaceAbility(final SwordOfWarAndPeaceAbility ability) { super(ability); } @Override - public SwordofWarandPeaceAbility copy() { - return new SwordofWarandPeaceAbility(this); + public SwordOfWarAndPeaceAbility copy() { + return new SwordOfWarAndPeaceAbility(this); } @Override @@ -127,12 +127,12 @@ class SwordofWarandPeaceAbility extends TriggeredAbilityImpl { - SwordofWarandPeaceDamageEffect() { - super(Constants.Outcome.Damage); +class SwordOfWarAndPeaceDamageEffect extends OneShotEffect { + SwordOfWarAndPeaceDamageEffect() { + super(Outcome.Damage); } - SwordofWarandPeaceDamageEffect(final SwordofWarandPeaceDamageEffect effect) { + SwordOfWarAndPeaceDamageEffect(final SwordOfWarAndPeaceDamageEffect effect) { super(effect); } @@ -146,8 +146,8 @@ class SwordofWarandPeaceDamageEffect extends OneShotEffect { this.subtype.add("Eldrazi"); this.power = new MageInt(12); this.toughness = new MageInt(12); - this.addAbility(new KozilekButcherofTruthOnCastAbility()); + this.addAbility(new KozilekButcherOfTruthOnCastAbility()); this.addAbility(new AnnihilatorAbility(4)); - this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new KozilekButcherofTruthEffect(), false)); + this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new KozilekButcherOfTruthEffect(), false)); } public KozilekButcherOfTruth (final KozilekButcherOfTruth card) { @@ -75,15 +76,15 @@ public class KozilekButcherOfTruth extends CardImpl { } -class KozilekButcherofTruthOnCastAbility extends TriggeredAbilityImpl { +class KozilekButcherOfTruthOnCastAbility extends TriggeredAbilityImpl { private static final String abilityText = "When you cast Kozilek, Butcher of Truth, draw four cards"; - KozilekButcherofTruthOnCastAbility() { - super(Constants.Zone.STACK, new DrawCardControllerEffect(4)); + KozilekButcherOfTruthOnCastAbility() { + super(Zone.STACK, new DrawCardControllerEffect(4)); } - KozilekButcherofTruthOnCastAbility(final KozilekButcherofTruthOnCastAbility ability) { + KozilekButcherOfTruthOnCastAbility(final KozilekButcherOfTruthOnCastAbility ability) { super(ability); } @@ -99,8 +100,8 @@ class KozilekButcherofTruthOnCastAbility extends TriggeredAbilityImpl { - KozilekButcherofTruthEffect() { - super(Constants.Outcome.Benefit); +class KozilekButcherOfTruthEffect extends OneShotEffect { + KozilekButcherOfTruthEffect() { + super(Outcome.Benefit); } - KozilekButcherofTruthEffect(final KozilekButcherofTruthEffect effect) { + KozilekButcherOfTruthEffect(final KozilekButcherOfTruthEffect effect) { super(effect); } @@ -133,8 +134,8 @@ class KozilekButcherofTruthEffect extends OneShotEffect { this.power = new MageInt(3); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LinvalaKeeperofSilenceEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LinvalaKeeperOfSilenceEffect())); } public LinvalaKeeperOfSilence (final LinvalaKeeperOfSilence card) { @@ -74,12 +74,12 @@ public class LinvalaKeeperOfSilence extends CardImpl { } } -class LinvalaKeeperofSilenceEffect extends ReplacementEffectImpl { - LinvalaKeeperofSilenceEffect() { - super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment); +class LinvalaKeeperOfSilenceEffect extends ReplacementEffectImpl { + LinvalaKeeperOfSilenceEffect() { + super(Duration.WhileOnBattlefield, Outcome.Detriment); } - LinvalaKeeperofSilenceEffect(final LinvalaKeeperofSilenceEffect effect) { + LinvalaKeeperOfSilenceEffect(final LinvalaKeeperOfSilenceEffect effect) { super(effect); } @@ -104,8 +104,8 @@ class LinvalaKeeperofSilenceEffect extends ReplacementEffectImpl { this.power = new MageInt(10); this.toughness = new MageInt(10); - this.addAbility(new UlamogtheInfiniteGyreDestroyOnCastAbility()); + this.addAbility(new UlamogTheInfiniteGyreDestroyOnCastAbility()); this.addAbility(new AnnihilatorAbility(4)); this.addAbility(IndestructibleAbility.getInstance()); - this.addAbility(new ZoneChangeTriggeredAbility(Zone.GRAVEYARD, new UlamogtheInfiniteGyreEnterGraveyardEffect(), effectText, false)); + this.addAbility(new ZoneChangeTriggeredAbility(Zone.GRAVEYARD, new UlamogTheInfiniteGyreEnterGraveyardEffect(), effectText, false)); } public UlamogTheInfiniteGyre(final UlamogTheInfiniteGyre card) { @@ -82,16 +81,16 @@ public class UlamogTheInfiniteGyre extends CardImpl { } } -class UlamogtheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl { +class UlamogTheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl { private static final String abilityText = "When you cast Ulamog, the Infinite Gyre, destroy target permanent"; - UlamogtheInfiniteGyreDestroyOnCastAbility ( ) { + UlamogTheInfiniteGyreDestroyOnCastAbility ( ) { super(Zone.STACK, new DestroyTargetEffect()); this.addTarget(new TargetPermanent()); } - UlamogtheInfiniteGyreDestroyOnCastAbility(UlamogtheInfiniteGyreDestroyOnCastAbility ability) { + UlamogTheInfiniteGyreDestroyOnCastAbility(UlamogTheInfiniteGyreDestroyOnCastAbility ability) { super(ability); } @@ -107,8 +106,8 @@ class UlamogtheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl { +class UlamogTheInfiniteGyreEnterGraveyardEffect extends OneShotEffect { - UlamogtheInfiniteGyreEnterGraveyardEffect ( ) { + UlamogTheInfiniteGyreEnterGraveyardEffect ( ) { super(Outcome.Benefit); } - UlamogtheInfiniteGyreEnterGraveyardEffect(UlamogtheInfiniteGyreEnterGraveyardEffect effect) { + UlamogTheInfiniteGyreEnterGraveyardEffect(UlamogTheInfiniteGyreEnterGraveyardEffect effect) { super(effect); } @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - /*Card permanent = (Card)game.getObject(source.getSourceId());*/ - if (player != null /* && permanent != null */) { - /*permanent.moveToZone(Zone.LIBRARY, source.getId(), game, true);*/ + if (player != null) { player.getLibrary().addAll(player.getGraveyard().getCards(game), game); player.getGraveyard().clear(); player.getLibrary().shuffle(); @@ -142,7 +139,7 @@ class UlamogtheInfiniteGyreEnterGraveyardEffect extends OneShotEffect { - private static FilterCard filter = new FilterCard("artifact or creature card"); + private static final FilterCard filter = new FilterCard("artifact or creature card"); static { filter.getCardType().add(CardType.CREATURE); @@ -76,8 +76,8 @@ public class GethLordOfTheVault extends CardImpl { this.toughness = new MageInt(5); this.addAbility(IntimidateAbility.getInstance()); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GethLordoftheVaultEffect(), new ManaCostsImpl("{X}{B}")); - ability.addTarget(new GethLordoftheVaultEffectTarget(filter)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GethLordOfTheVaultEffect(), new ManaCostsImpl("{X}{B}")); + ability.addTarget(new GethLordOfTheVaultEffectTarget(filter)); this.addAbility(ability); } @@ -106,13 +106,13 @@ public class GethLordOfTheVault extends CardImpl { } } -class GethLordoftheVaultEffect extends OneShotEffect { +class GethLordOfTheVaultEffect extends OneShotEffect { - public GethLordoftheVaultEffect() { - super(Constants.Outcome.Benefit); + public GethLordOfTheVaultEffect() { + super(Outcome.Benefit); } - public GethLordoftheVaultEffect(final GethLordoftheVaultEffect effect) { + public GethLordOfTheVaultEffect(final GethLordOfTheVaultEffect effect) { super(effect); } @@ -150,8 +150,8 @@ class GethLordoftheVaultEffect extends OneShotEffect { } @Override - public GethLordoftheVaultEffect copy() { - return new GethLordoftheVaultEffect(this); + public GethLordOfTheVaultEffect copy() { + return new GethLordOfTheVaultEffect(this); } @Override @@ -160,18 +160,18 @@ class GethLordoftheVaultEffect extends OneShotEffect { } } -class GethLordoftheVaultEffectTarget extends TargetCard { +class GethLordOfTheVaultEffectTarget extends TargetCard { - public GethLordoftheVaultEffectTarget(FilterCard filter) { + public GethLordOfTheVaultEffectTarget(FilterCard filter) { this(1, 1, filter); } - public GethLordoftheVaultEffectTarget(int minNumTargets, int maxNumTargets, FilterCard filter) { + public GethLordOfTheVaultEffectTarget(int minNumTargets, int maxNumTargets, FilterCard filter) { super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); this.targetName = filter.getMessage() + " from an opponent's graveyard"; } - public GethLordoftheVaultEffectTarget(final GethLordoftheVaultEffectTarget target) { + public GethLordOfTheVaultEffectTarget(final GethLordOfTheVaultEffectTarget target) { super(target); } @@ -192,7 +192,7 @@ class GethLordoftheVaultEffectTarget extends TargetCard { class LiegeOfTheTangleTriggeredAbility extends TriggeredAbilityImpl { LiegeOfTheTangleTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.AWAKENING.createInstance())); + super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.AWAKENING.createInstance())); this.addEffect(new LiegeOfTheTangleEffect()); // Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, // new ConditionalContinousEffect( @@ -196,7 +196,7 @@ class AwakeningLandToken extends Token { public AwakeningLandToken() { super("", "an 8/8 green Elemental creature"); - cardType.add(Constants.CardType.CREATURE); + cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Elemental"); power = new MageInt(8); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/SeizeTheInitiative.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java similarity index 93% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java index cdde35a092..f98289b708 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java @@ -30,8 +30,9 @@ package mage.sets.scarsofmirrodin; import java.util.UUID; -import mage.Constants; +import mage.Constants.AttachmentType; import mage.Constants.CardType; +import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.Zone; import mage.MageInt; @@ -75,9 +76,9 @@ public class SwordOfBodyAndMind extends CardImpl { super(ownerId, 208, "Sword of Body and Mind", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), AttachmentType.EQUIPMENT))); this.addAbility(new SwordOfBodyAndMindAbility()); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord_.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java similarity index 100% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord_.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima_.java b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima_.java rename to Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa_.java b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa_.java rename to Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant_.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant_.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper_.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper_.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis_.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis_.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund_.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund_.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya_.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya_.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess_.java b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess_.java rename to Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction_.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction_.java rename to Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction.java diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron_.java b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java similarity index 100% rename from Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron_.java rename to Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron.java diff --git a/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar_.java b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java similarity index 100% rename from Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar_.java rename to Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar.java diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut_.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java similarity index 100% rename from Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut_.java rename to Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut.java diff --git a/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin_.java b/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java similarity index 100% rename from Mage.Sets/src/mage/sets/worldwake/EyeOfUgin_.java rename to Mage.Sets/src/mage/sets/worldwake/EyeOfUgin.java diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin_.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java similarity index 100% rename from Mage.Sets/src/mage/sets/worldwake/HammerOfRuin_.java rename to Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java diff --git a/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks_.java b/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java similarity index 100% rename from Mage.Sets/src/mage/sets/worldwake/JoinTheRanks_.java rename to Mage.Sets/src/mage/sets/worldwake/JoinTheRanks.java diff --git a/Mage.Sets/src/mage/sets/zendikar/CallerOfGales_.java b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/CallerOfGales_.java rename to Mage.Sets/src/mage/sets/zendikar/CallerOfGales.java diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir_.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir_.java rename to Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir.java diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere_.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere_.java rename to Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny_.java b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny_.java rename to Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny.java diff --git a/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen_.java b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen_.java rename to Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen.java diff --git a/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost_.java b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java similarity index 100% rename from Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost_.java rename to Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost.java diff --git a/Mage/src/mage/game/permanent/token/Token.java b/Mage/src/mage/game/permanent/token/Token.java index ea18a88fdd..e545e93d3b 100644 --- a/Mage/src/mage/game/permanent/token/Token.java +++ b/Mage/src/mage/game/permanent/token/Token.java @@ -39,7 +39,6 @@ import mage.abilities.Ability; import mage.cards.Card; import mage.game.Game; import mage.game.events.ZoneChangeEvent; -import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; public class Token extends MageObjectImpl {