From d976d730403baddf0f20406ecbbb34b54625f942 Mon Sep 17 00:00:00 2001 From: North Date: Sat, 16 Jul 2011 00:23:12 +0300 Subject: [PATCH] Refactoring: CamelCase name for classes. (part 1) --- ...oryofWarfare.java => GloryOfWarfare_.java} | 10 ++-- ...AsuraofWar.java => JenaraAsuraOfWar_.java} | 10 ++-- ...LichLordofUnx.java => LichLordOfUnx_.java} | 10 ++-- ...sisofReason.java => NemesisOfReason_.java} | 10 ++-- ...elWind.java => SphinxOfTheSteelWind_.java} | 10 ++-- .../{WallofDenial.java => WallOfDenial_.java} | 10 ++-- ...indwithAnger.java => BlindWithAnger_.java} | 10 ++-- ...reoftheStorm.java => SireOfTheStorm_.java} | 10 ++-- .../{TimeofNeed.java => TimeOfNeed_.java} | 10 ++-- ...ofReverence.java => WallOfReverence_.java} | 10 ++-- ...ireandIce.java => SwordOfFireAndIce_.java} | 10 ++-- ...hadow.java => SwordOfLightAndShadow_.java} | 10 ++-- ...eElements.java => WandOfTheElements_.java} | 10 ++-- ...rtality.java => ElixirOfImmortality_.java} | 10 ++-- ...ytoNowhere.java => JourneyToNowhere_.java} | 10 ++-- ...RaisetheAlarm.java => RaiseTheAlarm_.java} | 10 ++-- ...atoftheSynod.java => SeatOfTheSynod_.java} | 13 ++---- ...nityofPride.java => DivinityOfPride_.java} | 10 ++-- ...zhova.java => GhostCouncilOfOrzhova_.java} | 10 ++-- .../{DragonSClaw.java => DragonsClaw_.java} | 10 ++-- ...RaisetheAlarm.java => RaiseTheAlarm_.java} | 10 ++-- ...atoftheSynod.java => SeatOfTheSynod_.java} | 10 ++-- ...fChampions.java => TowerOfChampions_.java} | 10 ++-- .../{TowerofEons.java => TowerOfEons_.java} | 10 ++-- ...rofFortunes.java => TowerOfFortunes_.java} | 10 ++-- ...werofMurmurs.java => TowerOfMurmurs_.java} | 10 ++-- .../{TreeofTales.java => TreeOfTales_.java} | 10 ++-- ...tofWhispers.java => VaultOfWhispers_.java} | 10 ++-- ...fortheCause.java => FuelForTheCause_.java} | 10 ++-- ...theTraitor.java => GlissaTheTraitor_.java} | 24 +++++----- ...fortheThroat.java => GoForTheThroat_.java} | 10 ++-- ...ofBladehold.java => HeroOfBladehold_.java} | 10 ++-- ...llytheForces.java => RallyTheForces_.java} | 10 ++-- ...eSickness.java => SpreadTheSickness_.java} | 10 ++-- ...LastTroll.java => ThrunTheLastTroll_.java} | 10 ++-- .../{TurntheTide.java => TurnTheTide_.java} | 10 ++-- ...fAggression.java => ActOfAggression_.java} | 10 ++-- ...ingRage.java => ShrineOfBurningRage_.java} | 10 ++-- ...andPeace.java => SwordOfWarAndPeace_.java} | 10 ++-- ...oryofWarfare.java => GloryOfWarfare_.java} | 10 ++-- ...atoftheSynod.java => SeatOfTheSynod_.java} | 10 ++-- .../{TreeofTales.java => TreeOfTales_.java} | 10 ++-- ...tofWhispers.java => VaultOfWhispers_.java} | 10 ++-- ...onclave.java => VotaryOfTheConclave_.java} | 10 ++-- ...nofKozilek.java => ArtisanOfKozilek_.java} | 10 ++-- ...Truth.java => KozilekButcherOfTruth_.java} | 10 ++-- ...ence.java => LinvalaKeeperOfSilence_.java} | 10 ++-- ...SarkhantheMad.java => SarkhanTheMad_.java} | 46 +++++++++---------- ...hinxofMagosi.java => SphinxOfMagosi_.java} | 10 ++-- ...tofWarfare.java => StudentOfWarfare_.java} | 10 ++-- ...eExplorer.java => TuktukTheExplorer_.java} | 16 +++---- ...eGyre.java => UlamogTheInfiniteGyre_.java} | 10 ++-- ...ttheAssault.java => BluntTheAssault_.java} | 10 ++-- ...cksilver.java => BondsOfQuicksilver_.java} | 10 ++-- ...theVault.java => GethLordOfTheVault_.java} | 10 ++-- ...pofDarkness.java => GraspOfDarkness_.java} | 10 ++-- ...oftheHammer.java => KothOfTheHammer_.java} | 36 +++++++-------- ...ftheTangle.java => LiegeOfTheTangle_.java} | 44 +++++++----------- ...itiative.java => SeizeTheInitiative_.java} | 10 ++-- ...on.java => SkithiryxTheBlightDragon_.java} | 10 ++-- ...yandMind.java => SwordOfBodyAndMind_.java} | 24 +++++----- ...alamities.java => TowerOfCalamities_.java} | 10 ++-- ...rruption.java => TrigonOfCorruption_.java} | 10 ++-- ...station.java => TrigonOfInfestation_.java} | 10 ++-- ...onofMending.java => TrigonOfMending_.java} | 10 ++-- .../{TrigonofRage.java => TrigonOfRage_.java} | 10 ++-- ...onofThought.java => TrigonOfThought_.java} | 10 ++-- .../{TumbleMagnet.java => TumbleMagnet_.java} | 2 +- .../{TurntoSlag.java => TurnToSlag_.java} | 25 +++++----- ...lfortheLost.java => VigilForTheLost_.java} | 37 +++++++-------- ...Tanglecord.java => WallOfTanglecord_.java} | 10 ++-- ...doftheAnima.java => DruidOfTheAnima_.java} | 12 ++--- ...sofAkrasa.java => GuardiansOfAkrasa_.java} | 10 ++-- ...ObeliskofBant.java => ObeliskOfBant_.java} | 10 ++-- ...eliskofEsper.java => ObeliskOfEsper_.java} | 10 ++-- ...iskofGrixis.java => ObeliskOfGrixis_.java} | 10 ++-- ...ObeliskofJund.java => ObeliskOfJund_.java} | 10 ++-- ...ObeliskofNaya.java => ObeliskOfNaya_.java} | 10 ++-- ...iderofJhess.java => OutriderOfJhess_.java} | 10 ++-- ...tinction.java => SigilOfDistinction_.java} | 29 ++++++------ ...dofValeron.java => StewardOfValeron_.java} | 10 ++-- ...fZendikar.java => AvengerOfZendikar_.java} | 10 ++-- ...awsofValakut.java => ClawsOfValakut_.java} | 10 ++-- .../{EyeofUgin.java => EyeOfUgin_.java} | 22 ++++----- .../{HammerofRuin.java => HammerOfRuin_.java} | 33 +++++++------ .../{JointheRanks.java => JoinTheRanks_.java} | 10 ++-- ...CallerofGales.java => CallerOfGales_.java} | 10 ++-- ...Malakir.java => GatekeeperOfMalakir_.java} | 10 ++-- ...ytoNowhere.java => JourneyToNowhere_.java} | 10 ++-- .../{MarkofMutiny.java => MarkOfMutiny_.java} | 10 ++-- ...heFallen.java => ObNixilisTheFallen_.java} | 10 ++-- ...oftheLost.java => ShepherdOfTheLost_.java} | 10 ++-- 92 files changed, 560 insertions(+), 583 deletions(-) rename Mage.Sets/src/mage/sets/alarareborn/{GloryofWarfare.java => GloryOfWarfare_.java} (90%) rename Mage.Sets/src/mage/sets/alarareborn/{JenaraAsuraofWar.java => JenaraAsuraOfWar_.java} (89%) rename Mage.Sets/src/mage/sets/alarareborn/{LichLordofUnx.java => LichLordOfUnx_.java} (92%) rename Mage.Sets/src/mage/sets/alarareborn/{NemesisofReason.java => NemesisOfReason_.java} (91%) rename Mage.Sets/src/mage/sets/alarareborn/{SphinxoftheSteelWind.java => SphinxOfTheSteelWind_.java} (89%) rename Mage.Sets/src/mage/sets/alarareborn/{WallofDenial.java => WallOfDenial_.java} (89%) rename Mage.Sets/src/mage/sets/championsofkamigawa/{BlindwithAnger.java => BlindWithAnger_.java} (91%) rename Mage.Sets/src/mage/sets/championsofkamigawa/{SireoftheStorm.java => SireOfTheStorm_.java} (90%) rename Mage.Sets/src/mage/sets/championsofkamigawa/{TimeofNeed.java => TimeOfNeed_.java} (90%) rename Mage.Sets/src/mage/sets/conflux/{WallofReverence.java => WallOfReverence_.java} (95%) rename Mage.Sets/src/mage/sets/darksteel/{SwordofFireandIce.java => SwordOfFireAndIce_.java} (92%) rename Mage.Sets/src/mage/sets/darksteel/{SwordofLightandShadow.java => SwordOfLightAndShadow_.java} (92%) rename Mage.Sets/src/mage/sets/darksteel/{WandoftheElements.java => WandOfTheElements_.java} (92%) rename Mage.Sets/src/mage/sets/elspethvstezzeret/{ElixirofImmortality.java => ElixirOfImmortality_.java} (88%) rename Mage.Sets/src/mage/sets/elspethvstezzeret/{JourneytoNowhere.java => JourneyToNowhere_.java} (85%) rename Mage.Sets/src/mage/sets/elspethvstezzeret/{RaisetheAlarm.java => RaiseTheAlarm_.java} (89%) rename Mage.Sets/src/mage/sets/elspethvstezzeret/{SeatoftheSynod.java => SeatOfTheSynod_.java} (85%) rename Mage.Sets/src/mage/sets/eventide/{DivinityofPride.java => DivinityOfPride_.java} (91%) rename Mage.Sets/src/mage/sets/guildpact/{GhostCouncilofOrzhova.java => GhostCouncilOfOrzhova_.java} (93%) rename Mage.Sets/src/mage/sets/magic2012/{DragonSClaw.java => DragonsClaw_.java} (87%) rename Mage.Sets/src/mage/sets/mirrodin/{RaisetheAlarm.java => RaiseTheAlarm_.java} (90%) rename Mage.Sets/src/mage/sets/mirrodin/{SeatoftheSynod.java => SeatOfTheSynod_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodin/{TowerofChampions.java => TowerOfChampions_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodin/{TowerofEons.java => TowerOfEons_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodin/{TowerofFortunes.java => TowerOfFortunes_.java} (88%) rename Mage.Sets/src/mage/sets/mirrodin/{TowerofMurmurs.java => TowerOfMurmurs_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodin/{TreeofTales.java => TreeOfTales_.java} (88%) rename Mage.Sets/src/mage/sets/mirrodin/{VaultofWhispers.java => VaultOfWhispers_.java} (87%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{FuelfortheCause.java => FuelForTheCause_.java} (88%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{GlissatheTraitor.java => GlissaTheTraitor_.java} (83%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{GofortheThroat.java => GoForTheThroat_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{HeroofBladehold.java => HeroOfBladehold_.java} (91%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{RallytheForces.java => RallyTheForces_.java} (89%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{SpreadtheSickness.java => SpreadTheSickness_.java} (90%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{ThruntheLastTroll.java => ThrunTheLastTroll_.java} (90%) rename Mage.Sets/src/mage/sets/mirrodinbesieged/{TurntheTide.java => TurnTheTide_.java} (89%) rename Mage.Sets/src/mage/sets/newphyrexia/{ActofAggression.java => ActOfAggression_.java} (89%) rename Mage.Sets/src/mage/sets/newphyrexia/{ShrineofBurningRage.java => ShrineOfBurningRage_.java} (91%) rename Mage.Sets/src/mage/sets/newphyrexia/{SwordofWarandPeace.java => SwordOfWarAndPeace_.java} (93%) rename Mage.Sets/src/mage/sets/planechase/{GloryofWarfare.java => GloryOfWarfare_.java} (86%) rename Mage.Sets/src/mage/sets/planechase/{SeatoftheSynod.java => SeatOfTheSynod_.java} (88%) rename Mage.Sets/src/mage/sets/planechase/{TreeofTales.java => TreeOfTales_.java} (87%) rename Mage.Sets/src/mage/sets/planechase/{VaultofWhispers.java => VaultOfWhispers_.java} (86%) rename Mage.Sets/src/mage/sets/ravnika/{VotaryoftheConclave.java => VotaryOfTheConclave_.java} (88%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{ArtisanofKozilek.java => ArtisanOfKozilek_.java} (89%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{KozilekButcherofTruth.java => KozilekButcherOfTruth_.java} (92%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{LinvalaKeeperofSilence.java => LinvalaKeeperOfSilence_.java} (91%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{SarkhantheMad.java => SarkhanTheMad_.java} (80%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{SphinxofMagosi.java => SphinxOfMagosi_.java} (90%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{StudentofWarfare.java => StudentOfWarfare_.java} (90%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{TuktuktheExplorer.java => TuktukTheExplorer_.java} (86%) rename Mage.Sets/src/mage/sets/riseoftheeldrazi/{UlamogtheInfiniteGyre.java => UlamogTheInfiniteGyre_.java} (92%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{BlunttheAssault.java => BluntTheAssault_.java} (89%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{BondsofQuicksilver.java => BondsOfQuicksilver_.java} (89%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{GethLordoftheVault.java => GethLordOfTheVault_.java} (93%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{GraspofDarkness.java => GraspOfDarkness_.java} (88%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{KothoftheHammer.java => KothOfTheHammer_.java} (84%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{LiegeoftheTangle.java => LiegeOfTheTangle_.java} (79%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{SeizetheInitiative.java => SeizeTheInitiative_.java} (89%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{SkithiryxtheBlightDragon.java => SkithiryxTheBlightDragon_.java} (89%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{SwordofBodyandMind.java => SwordOfBodyAndMind_.java} (85%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TowerofCalamities.java => TowerOfCalamities_.java} (89%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TrigonofCorruption.java => TrigonOfCorruption_.java} (91%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TrigonofInfestation.java => TrigonOfInfestation_.java} (91%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TrigonofMending.java => TrigonOfMending_.java} (91%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TrigonofRage.java => TrigonOfRage_.java} (92%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TrigonofThought.java => TrigonOfThought_.java} (91%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TumbleMagnet.java => TumbleMagnet_.java} (95%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{TurntoSlag.java => TurnToSlag_.java} (82%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{VigilfortheLost.java => VigilForTheLost_.java} (77%) rename Mage.Sets/src/mage/sets/scarsofmirrodin/{WallofTanglecord.java => WallOfTanglecord_.java} (89%) rename Mage.Sets/src/mage/sets/shardsofalara/{DruidoftheAnima.java => DruidOfTheAnima_.java} (87%) rename Mage.Sets/src/mage/sets/shardsofalara/{GuardiansofAkrasa.java => GuardiansOfAkrasa_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{ObeliskofBant.java => ObeliskOfBant_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{ObeliskofEsper.java => ObeliskOfEsper_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{ObeliskofGrixis.java => ObeliskOfGrixis_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{ObeliskofJund.java => ObeliskOfJund_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{ObeliskofNaya.java => ObeliskOfNaya_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{OutriderofJhess.java => OutriderOfJhess_.java} (88%) rename Mage.Sets/src/mage/sets/shardsofalara/{SigilofDistinction.java => SigilOfDistinction_.java} (77%) rename Mage.Sets/src/mage/sets/shardsofalara/{StewardofValeron.java => StewardOfValeron_.java} (88%) rename Mage.Sets/src/mage/sets/worldwake/{AvengerofZendikar.java => AvengerOfZendikar_.java} (90%) rename Mage.Sets/src/mage/sets/worldwake/{ClawsofValakut.java => ClawsOfValakut_.java} (91%) rename Mage.Sets/src/mage/sets/worldwake/{EyeofUgin.java => EyeOfUgin_.java} (86%) rename Mage.Sets/src/mage/sets/worldwake/{HammerofRuin.java => HammerOfRuin_.java} (77%) rename Mage.Sets/src/mage/sets/worldwake/{JointheRanks.java => JoinTheRanks_.java} (88%) rename Mage.Sets/src/mage/sets/zendikar/{CallerofGales.java => CallerOfGales_.java} (90%) rename Mage.Sets/src/mage/sets/zendikar/{GatekeeperofMalakir.java => GatekeeperOfMalakir_.java} (90%) rename Mage.Sets/src/mage/sets/zendikar/{JourneytoNowhere.java => JourneyToNowhere_.java} (92%) rename Mage.Sets/src/mage/sets/zendikar/{MarkofMutiny.java => MarkOfMutiny_.java} (90%) rename Mage.Sets/src/mage/sets/zendikar/{ObNixilistheFallen.java => ObNixilisTheFallen_.java} (89%) rename Mage.Sets/src/mage/sets/zendikar/{ShepherdoftheLost.java => ShepherdOfTheLost_.java} (88%) diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare_.java similarity index 90% rename from Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java rename to Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare_.java index bd74daf0d91..2345775b56b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/GloryofWarfare.java +++ b/Mage.Sets/src/mage/sets/alarareborn/GloryOfWarfare_.java @@ -45,9 +45,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class GloryofWarfare extends CardImpl { +public class GloryOfWarfare extends CardImpl { - public GloryofWarfare (UUID ownerId) { + public GloryOfWarfare (UUID ownerId) { super(ownerId, 98, "Glory of Warfare", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{W}"); this.expansionSetCode = "ARB"; this.color.setRed(true); @@ -56,12 +56,12 @@ public class GloryofWarfare extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new BoostControlledEffect(0, 2, Duration.EndOfTurn), NotMyTurn.getInstance(), "As long as it's not your turn, creatures you control get +0/+2"))); } - public GloryofWarfare (final GloryofWarfare card) { + public GloryOfWarfare (final GloryOfWarfare card) { super(card); } @Override - public GloryofWarfare copy() { - return new GloryofWarfare(this); + public GloryOfWarfare copy() { + return new GloryOfWarfare(this); } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraofWar.java b/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar_.java similarity index 89% rename from Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraofWar.java rename to Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar_.java index 7f4225aa164..d890ec30a6b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraofWar.java +++ b/Mage.Sets/src/mage/sets/alarareborn/JenaraAsuraOfWar_.java @@ -44,9 +44,9 @@ import mage.counters.CounterType; * * @author Loki */ -public class JenaraAsuraofWar extends CardImpl { +public class JenaraAsuraOfWar extends CardImpl { - public JenaraAsuraofWar (UUID ownerId) { + public JenaraAsuraOfWar (UUID ownerId) { super(ownerId, 128, "Jenara, Asura of War", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{G}{W}{U}"); this.expansionSetCode = "ARB"; this.subtype.add("Angel"); @@ -60,13 +60,13 @@ public class JenaraAsuraofWar extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl("{1}{W}"))); } - public JenaraAsuraofWar (final JenaraAsuraofWar card) { + public JenaraAsuraOfWar (final JenaraAsuraOfWar card) { super(card); } @Override - public JenaraAsuraofWar copy() { - return new JenaraAsuraofWar(this); + public JenaraAsuraOfWar copy() { + return new JenaraAsuraOfWar(this); } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/LichLordofUnx.java b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx_.java similarity index 92% rename from Mage.Sets/src/mage/sets/alarareborn/LichLordofUnx.java rename to Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx_.java index eb9cb023776..526d9032a5f 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/LichLordofUnx.java +++ b/Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx_.java @@ -52,7 +52,7 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class LichLordofUnx extends CardImpl { +public class LichLordOfUnx extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control"); static { @@ -60,7 +60,7 @@ public class LichLordofUnx extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public LichLordofUnx (UUID ownerId) { + public LichLordOfUnx (UUID ownerId) { super(ownerId, 24, "Lich Lord of Unx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{B}"); this.expansionSetCode = "ARB"; this.subtype.add("Zombie"); @@ -80,13 +80,13 @@ public class LichLordofUnx extends CardImpl { this.addAbility(ability); } - public LichLordofUnx (final LichLordofUnx card) { + public LichLordOfUnx (final LichLordOfUnx card) { super(card); } @Override - public LichLordofUnx copy() { - return new LichLordofUnx(this); + public LichLordOfUnx copy() { + return new LichLordOfUnx(this); } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/NemesisofReason.java b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java similarity index 91% rename from Mage.Sets/src/mage/sets/alarareborn/NemesisofReason.java rename to Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java index 6cdab0064c9..b47f6075964 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/NemesisofReason.java +++ b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason_.java @@ -47,9 +47,9 @@ import mage.target.targetpointer.FixedTarget; * * @author Loki */ -public class NemesisofReason extends CardImpl { +public class NemesisOfReason extends CardImpl { - public NemesisofReason (UUID ownerId) { + public NemesisOfReason (UUID ownerId) { super(ownerId, 28, "Nemesis of Reason", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{B}"); this.expansionSetCode = "ARB"; this.subtype.add("Leviathan"); @@ -61,13 +61,13 @@ public class NemesisofReason extends CardImpl { this.addAbility(new NemesisofReasonTriggeredAbility()); } - public NemesisofReason (final NemesisofReason card) { + public NemesisOfReason (final NemesisOfReason card) { super(card); } @Override - public NemesisofReason copy() { - return new NemesisofReason(this); + public NemesisOfReason copy() { + return new NemesisOfReason(this); } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/SphinxoftheSteelWind.java b/Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind_.java similarity index 89% rename from Mage.Sets/src/mage/sets/alarareborn/SphinxoftheSteelWind.java rename to Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind_.java index 3983210979d..87ef7db325b 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/SphinxoftheSteelWind.java +++ b/Mage.Sets/src/mage/sets/alarareborn/SphinxOfTheSteelWind_.java @@ -43,7 +43,7 @@ import mage.filter.FilterCard; * * @author Loki */ -public class SphinxoftheSteelWind extends CardImpl { +public class SphinxOfTheSteelWind extends CardImpl { private static FilterCard filter = new FilterCard("red and from green"); static { @@ -53,7 +53,7 @@ public class SphinxoftheSteelWind extends CardImpl { filter.setScopeColor(Filter.ComparisonScope.Any); } - public SphinxoftheSteelWind (UUID ownerId) { + public SphinxOfTheSteelWind (UUID ownerId) { super(ownerId, 110, "Sphinx of the Steel Wind", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}{W}{U}{B}"); this.expansionSetCode = "ARB"; this.subtype.add("Sphinx"); @@ -69,13 +69,13 @@ public class SphinxoftheSteelWind extends CardImpl { this.addAbility(new ProtectionAbility(filter)); } - public SphinxoftheSteelWind (final SphinxoftheSteelWind card) { + public SphinxOfTheSteelWind (final SphinxOfTheSteelWind card) { super(card); } @Override - public SphinxoftheSteelWind copy() { - return new SphinxoftheSteelWind(this); + public SphinxOfTheSteelWind copy() { + return new SphinxOfTheSteelWind(this); } } diff --git a/Mage.Sets/src/mage/sets/alarareborn/WallofDenial.java b/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial_.java similarity index 89% rename from Mage.Sets/src/mage/sets/alarareborn/WallofDenial.java rename to Mage.Sets/src/mage/sets/alarareborn/WallOfDenial_.java index 070b03b8702..59c10ed56cf 100644 --- a/Mage.Sets/src/mage/sets/alarareborn/WallofDenial.java +++ b/Mage.Sets/src/mage/sets/alarareborn/WallOfDenial_.java @@ -43,9 +43,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class WallofDenial extends CardImpl { +public class WallOfDenial extends CardImpl { - public WallofDenial (UUID ownerId) { + public WallOfDenial (UUID ownerId) { super(ownerId, 16, "Wall of Denial", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{W}{U}"); this.expansionSetCode = "ARB"; this.subtype.add("Wall"); @@ -58,13 +58,13 @@ public class WallofDenial extends CardImpl { this.addAbility(ShroudAbility.getInstance()); } - public WallofDenial (final WallofDenial card) { + public WallOfDenial (final WallOfDenial card) { super(card); } @Override - public WallofDenial copy() { - return new WallofDenial(this); + public WallOfDenial copy() { + return new WallOfDenial(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindwithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger_.java similarity index 91% rename from Mage.Sets/src/mage/sets/championsofkamigawa/BlindwithAnger.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger_.java index a3f8b95932b..d0a614f4091 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindwithAnger.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger_.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class BlindwithAnger extends CardImpl { +public class BlindWithAnger extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); @@ -56,7 +56,7 @@ public class BlindwithAnger extends CardImpl { filter.setScopeSupertype(Filter.ComparisonScope.Any); } - public BlindwithAnger(UUID ownerId) { + public BlindWithAnger(UUID ownerId) { super(ownerId, 158, "Blind with Anger", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); @@ -68,13 +68,13 @@ public class BlindwithAnger extends CardImpl { this.getSpellAbility().addTarget(target); } - public BlindwithAnger(final BlindwithAnger card) { + public BlindWithAnger(final BlindWithAnger card) { super(card); } @Override - public BlindwithAnger copy() { - return new BlindwithAnger(this); + public BlindWithAnger copy() { + return new BlindWithAnger(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SireoftheStorm.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm_.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SireoftheStorm.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm_.java index af07e3e367e..143fa1b7dd3 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SireoftheStorm.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SireOfTheStorm_.java @@ -43,7 +43,7 @@ import mage.filter.FilterCard; /** * @author Loki */ -public class SireoftheStorm extends CardImpl { +public class SireOfTheStorm extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -53,7 +53,7 @@ public class SireoftheStorm extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public SireoftheStorm(UUID ownerId) { + public SireOfTheStorm(UUID ownerId) { super(ownerId, 85, "Sire of the Storm", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -65,13 +65,13 @@ public class SireoftheStorm extends CardImpl { this.addAbility(new SpellCastTriggeredAbility(new DrawCardControllerEffect(1), filter, true)); } - public SireoftheStorm(final SireoftheStorm card) { + public SireOfTheStorm(final SireOfTheStorm card) { super(card); } @Override - public SireoftheStorm copy() { - return new SireoftheStorm(this); + public SireOfTheStorm copy() { + return new SireOfTheStorm(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeofNeed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed_.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/TimeofNeed.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed_.java index cb371c0597f..a5de20ec183 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/TimeofNeed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TimeOfNeed_.java @@ -41,7 +41,7 @@ import mage.target.common.TargetCardInLibrary; /** * @author Loki */ -public class TimeofNeed extends CardImpl { +public class TimeOfNeed extends CardImpl { private final static FilterCard filter = new FilterCard("legendary creature card"); @@ -52,7 +52,7 @@ public class TimeofNeed extends CardImpl { filter.setScopeSupertype(Filter.ComparisonScope.Any); } - public TimeofNeed(UUID ownerId) { + public TimeOfNeed(UUID ownerId) { super(ownerId, 247, "Time of Need", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{G}"); this.expansionSetCode = "CHK"; this.color.setGreen(true); @@ -60,13 +60,13 @@ public class TimeofNeed extends CardImpl { this.getSpellAbility().addEffect(new SearchLibraryRevealPutInHandEffect(target)); } - public TimeofNeed(final TimeofNeed card) { + public TimeOfNeed(final TimeOfNeed card) { super(card); } @Override - public TimeofNeed copy() { - return new TimeofNeed(this); + public TimeOfNeed copy() { + return new TimeOfNeed(this); } } diff --git a/Mage.Sets/src/mage/sets/conflux/WallofReverence.java b/Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java similarity index 95% rename from Mage.Sets/src/mage/sets/conflux/WallofReverence.java rename to Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java index a23385cc524..f359a63e705 100644 --- a/Mage.Sets/src/mage/sets/conflux/WallofReverence.java +++ b/Mage.Sets/src/mage/sets/conflux/WallOfReverence_.java @@ -50,9 +50,9 @@ import mage.target.common.TargetControlledCreaturePermanent; * * @author Loki */ -public class WallofReverence extends CardImpl { +public class WallOfReverence extends CardImpl { - public WallofReverence (UUID ownerId) { + public WallOfReverence (UUID ownerId) { super(ownerId, 20, "Wall of Reverence", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "CON"; this.subtype.add("Spirit"); @@ -65,13 +65,13 @@ public class WallofReverence extends CardImpl { this.addAbility(new WallofReverenceTriggeredAbility()); } - public WallofReverence (final WallofReverence card) { + public WallOfReverence (final WallOfReverence card) { super(card); } @Override - public WallofReverence copy() { - return new WallofReverence(this); + public WallOfReverence copy() { + return new WallOfReverence(this); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordofFireandIce.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce_.java similarity index 92% rename from Mage.Sets/src/mage/sets/darksteel/SwordofFireandIce.java rename to Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce_.java index 15fd1eedac2..fdb558c9604 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordofFireandIce.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce_.java @@ -54,7 +54,7 @@ import mage.target.common.TargetCreatureOrPlayer; /** * @author Loki */ -public class SwordofFireandIce extends CardImpl { +public class SwordOfFireAndIce extends CardImpl { private static FilterCard filter = new FilterCard("red and from blue"); @@ -66,7 +66,7 @@ public class SwordofFireandIce extends CardImpl { } - public SwordofFireandIce(UUID ownerId) { + public SwordOfFireAndIce(UUID ownerId) { super(ownerId, 148, "Sword of Fire and Ice", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.subtype.add("Equipment"); @@ -76,13 +76,13 @@ public class SwordofFireandIce extends CardImpl { this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); } - public SwordofFireandIce(final SwordofFireandIce card) { + public SwordOfFireAndIce(final SwordOfFireAndIce card) { super(card); } @Override - public SwordofFireandIce copy() { - return new SwordofFireandIce(this); + public SwordOfFireAndIce copy() { + return new SwordOfFireAndIce(this); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordofLightandShadow.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java similarity index 92% rename from Mage.Sets/src/mage/sets/darksteel/SwordofLightandShadow.java rename to Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java index 2989f26f7f3..a2919ae6037 100644 --- a/Mage.Sets/src/mage/sets/darksteel/SwordofLightandShadow.java +++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow_.java @@ -59,7 +59,7 @@ import mage.target.common.TargetCreatureOrPlayer; /** * @author Loki */ -public class SwordofLightandShadow extends CardImpl { +public class SwordOfLightAndShadow extends CardImpl { private static FilterCard filter = new FilterCard("white and from black"); @@ -70,7 +70,7 @@ public class SwordofLightandShadow extends CardImpl { filter.setScopeColor(Filter.ComparisonScope.Any); } - public SwordofLightandShadow(UUID ownerId) { + public SwordOfLightAndShadow(UUID ownerId) { super(ownerId, 149, "Sword of Light and Shadow", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "DST"; this.subtype.add("Equipment"); @@ -80,13 +80,13 @@ public class SwordofLightandShadow extends CardImpl { this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); } - public SwordofLightandShadow(final SwordofLightandShadow card) { + public SwordOfLightAndShadow(final SwordOfLightAndShadow card) { super(card); } @Override - public SwordofLightandShadow copy() { - return new SwordofLightandShadow(this); + public SwordOfLightAndShadow copy() { + return new SwordOfLightAndShadow(this); } } diff --git a/Mage.Sets/src/mage/sets/darksteel/WandoftheElements.java b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java similarity index 92% rename from Mage.Sets/src/mage/sets/darksteel/WandoftheElements.java rename to Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java index dd0067e3cd0..8de8cde13ac 100644 --- a/Mage.Sets/src/mage/sets/darksteel/WandoftheElements.java +++ b/Mage.Sets/src/mage/sets/darksteel/WandOfTheElements_.java @@ -48,7 +48,7 @@ import mage.target.common.TargetControlledPermanent; /** * @author Loki */ -public class WandoftheElements extends CardImpl { +public class WandOfTheElements extends CardImpl { private static final FilterControlledPermanent islandFilter = new FilterControlledPermanent("an Island"); private static final FilterControlledPermanent mountainFilter = new FilterControlledPermanent("a Mountain"); @@ -58,7 +58,7 @@ public class WandoftheElements extends CardImpl { mountainFilter.getName().add("Mountain"); } - public WandoftheElements(UUID ownerId) { + 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()); @@ -70,13 +70,13 @@ public class WandoftheElements extends CardImpl { } - public WandoftheElements(final WandoftheElements card) { + public WandOfTheElements(final WandOfTheElements card) { super(card); } @Override - public WandoftheElements copy() { - return new WandoftheElements(this); + public WandOfTheElements copy() { + return new WandOfTheElements(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirofImmortality.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality_.java similarity index 88% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirofImmortality.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality_.java index 94c4c18c31d..c906ae9b53d 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirofImmortality.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/ElixirOfImmortality_.java @@ -34,9 +34,9 @@ import java.util.UUID; * * @author Loki */ -public class ElixirofImmortality extends mage.sets.magic2011.ElixirOfImmortality { +public class ElixirOfImmortality extends mage.sets.magic2011.ElixirOfImmortality { - public ElixirofImmortality (UUID ownerId) { + public ElixirOfImmortality (UUID ownerId) { super(ownerId); this.cardNumber = 62; this.expansionSetCode = "DDF"; @@ -44,13 +44,13 @@ public class ElixirofImmortality extends mage.sets.magic2011.ElixirOfImmortality } - public ElixirofImmortality (final ElixirofImmortality card) { + public ElixirOfImmortality (final ElixirOfImmortality card) { super(card); } @Override - public ElixirofImmortality copy() { - return new ElixirofImmortality(this); + public ElixirOfImmortality copy() { + return new ElixirOfImmortality(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneytoNowhere.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere_.java similarity index 85% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/JourneytoNowhere.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere_.java index 84e5ac449a1..a09e3e1b43e 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneytoNowhere.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/JourneyToNowhere_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class JourneytoNowhere extends mage.sets.zendikar.JourneytoNowhere { +public class JourneyToNowhere extends mage.sets.zendikar.JourneyToNowhere { - public JourneytoNowhere (UUID ownerId) { + public JourneyToNowhere (UUID ownerId) { super(ownerId); this.cardNumber = 23; this.expansionSetCode = "DDF"; } - public JourneytoNowhere (final JourneytoNowhere card) { + public JourneyToNowhere (final JourneyToNowhere card) { super(card); } @Override - public JourneytoNowhere copy() { - return new JourneytoNowhere(this); + public JourneyToNowhere copy() { + return new JourneyToNowhere(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/RaisetheAlarm.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm_.java similarity index 89% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/RaisetheAlarm.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm_.java index 358ffca18a5..c5cda65bba5 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/RaisetheAlarm.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/RaiseTheAlarm_.java @@ -37,21 +37,21 @@ import mage.cards.CardImpl; * * @author Loki */ -public class RaisetheAlarm extends mage.sets.mirrodin.RaisetheAlarm { +public class RaiseTheAlarm extends mage.sets.mirrodin.RaiseTheAlarm { - public RaisetheAlarm (UUID ownerId) { + public RaiseTheAlarm (UUID ownerId) { super(ownerId); this.expansionSetCode = "DDF"; this.cardNumber = 25; } - public RaisetheAlarm (final RaisetheAlarm card) { + public RaiseTheAlarm (final RaiseTheAlarm card) { super(card); } @Override - public RaisetheAlarm copy() { - return new RaisetheAlarm(this); + public RaiseTheAlarm copy() { + return new RaiseTheAlarm(this); } } diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatoftheSynod.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod_.java similarity index 85% rename from Mage.Sets/src/mage/sets/elspethvstezzeret/SeatoftheSynod.java rename to Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod_.java index c8ef880b127..d5459988c90 100644 --- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatoftheSynod.java +++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SeatOfTheSynod_.java @@ -29,29 +29,26 @@ package mage.sets.elspethvstezzeret; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.cards.CardImpl; /** * * @author Loki */ -public class SeatoftheSynod extends mage.sets.mirrodin.SeatoftheSynod { +public class SeatOfTheSynod extends mage.sets.mirrodin.SeatOfTheSynod { - public SeatoftheSynod (UUID ownerId) { + public SeatOfTheSynod (UUID ownerId) { super(ownerId); this.cardNumber = 74; this.expansionSetCode = "DDF"; } - public SeatoftheSynod (final SeatoftheSynod card) { + public SeatOfTheSynod (final SeatOfTheSynod card) { super(card); } @Override - public SeatoftheSynod copy() { - return new SeatoftheSynod(this); + public SeatOfTheSynod copy() { + return new SeatOfTheSynod(this); } } diff --git a/Mage.Sets/src/mage/sets/eventide/DivinityofPride.java b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java similarity index 91% rename from Mage.Sets/src/mage/sets/eventide/DivinityofPride.java rename to Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java index 87b26fcf739..6ca242c771b 100644 --- a/Mage.Sets/src/mage/sets/eventide/DivinityofPride.java +++ b/Mage.Sets/src/mage/sets/eventide/DivinityOfPride_.java @@ -49,9 +49,9 @@ import mage.players.Player; * * @author Loki */ -public class DivinityofPride extends CardImpl { +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"); @@ -65,13 +65,13 @@ public class DivinityofPride extends CardImpl { 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"))); } - public DivinityofPride (final DivinityofPride card) { + public DivinityOfPride (final DivinityOfPride card) { super(card); } @Override - public DivinityofPride copy() { - return new DivinityofPride(this); + public DivinityOfPride copy() { + return new DivinityOfPride(this); } } diff --git a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilofOrzhova.java b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java similarity index 93% rename from Mage.Sets/src/mage/sets/guildpact/GhostCouncilofOrzhova.java rename to Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java index 551e3675425..c486bb72b4a 100644 --- a/Mage.Sets/src/mage/sets/guildpact/GhostCouncilofOrzhova.java +++ b/Mage.Sets/src/mage/sets/guildpact/GhostCouncilOfOrzhova_.java @@ -55,9 +55,9 @@ import mage.target.common.TargetOpponent; * * @author Loki */ -public class GhostCouncilofOrzhova extends CardImpl { +public class GhostCouncilOfOrzhova extends CardImpl { - public GhostCouncilofOrzhova (UUID ownerId) { + public GhostCouncilOfOrzhova (UUID ownerId) { super(ownerId, 114, "Ghost Council of Orzhova", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}{W}{B}{B}"); this.expansionSetCode = "GPT"; this.supertype.add("Legendary"); @@ -74,13 +74,13 @@ public class GhostCouncilofOrzhova extends CardImpl { this.addAbility(ability); } - public GhostCouncilofOrzhova (final GhostCouncilofOrzhova card) { + public GhostCouncilOfOrzhova (final GhostCouncilOfOrzhova card) { super(card); } @Override - public GhostCouncilofOrzhova copy() { - return new GhostCouncilofOrzhova(this); + public GhostCouncilOfOrzhova copy() { + return new GhostCouncilOfOrzhova(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2012/DragonSClaw.java b/Mage.Sets/src/mage/sets/magic2012/DragonsClaw_.java similarity index 87% rename from Mage.Sets/src/mage/sets/magic2012/DragonSClaw.java rename to Mage.Sets/src/mage/sets/magic2012/DragonsClaw_.java index 685317d47e0..a0ce4d5a649 100644 --- a/Mage.Sets/src/mage/sets/magic2012/DragonSClaw.java +++ b/Mage.Sets/src/mage/sets/magic2012/DragonsClaw_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class DragonSClaw extends mage.sets.tenth.DragonsClaw { +public class DragonsClaw extends mage.sets.tenth.DragonsClaw { - public DragonSClaw (UUID ownerId) { + public DragonsClaw (UUID ownerId) { super(ownerId); this.cardNumber = 206; this.expansionSetCode = "M12"; } - public DragonSClaw (final DragonSClaw card) { + public DragonsClaw (final DragonsClaw card) { super(card); } @Override - public DragonSClaw copy() { - return new DragonSClaw(this); + public DragonsClaw copy() { + return new DragonsClaw(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/RaisetheAlarm.java b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm_.java similarity index 90% rename from Mage.Sets/src/mage/sets/mirrodin/RaisetheAlarm.java rename to Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm_.java index 6de51ba4898..ea7092d2fec 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/RaisetheAlarm.java +++ b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm_.java @@ -39,22 +39,22 @@ import mage.game.permanent.token.SoldierToken; * * @author Loki */ -public class RaisetheAlarm extends CardImpl { +public class RaiseTheAlarm extends CardImpl { - public RaisetheAlarm (UUID ownerId) { + public RaiseTheAlarm (UUID ownerId) { super(ownerId, 16, "Raise the Alarm", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "MRD"; this.color.setWhite(true); this.getSpellAbility().addEffect(new CreateTokenEffect(new SoldierToken(), 2)); } - public RaisetheAlarm (final RaisetheAlarm card) { + public RaiseTheAlarm (final RaiseTheAlarm card) { super(card); } @Override - public RaisetheAlarm copy() { - return new RaisetheAlarm(this); + public RaiseTheAlarm copy() { + return new RaiseTheAlarm(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeatoftheSynod.java b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodin/SeatoftheSynod.java rename to Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod_.java index c5c633405f8..089cc79f4b8 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/SeatoftheSynod.java +++ b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod_.java @@ -38,21 +38,21 @@ import mage.cards.CardImpl; * * @author Loki */ -public class SeatoftheSynod extends CardImpl { +public class SeatOfTheSynod extends CardImpl { - public SeatoftheSynod (UUID ownerId) { + public SeatOfTheSynod (UUID ownerId) { super(ownerId, 283, "Seat of the Synod", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.LAND}, null); this.expansionSetCode = "MRD"; this.addAbility(new BlueManaAbility()); } - public SeatoftheSynod (final SeatoftheSynod card) { + public SeatOfTheSynod (final SeatOfTheSynod card) { super(card); } @Override - public SeatoftheSynod copy() { - return new SeatoftheSynod(this); + public SeatOfTheSynod copy() { + return new SeatOfTheSynod(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerofChampions.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodin/TowerofChampions.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions_.java index c6299fb2505..9e4d63e5104 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerofChampions.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions_.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class TowerofChampions extends CardImpl { +public class TowerOfChampions extends CardImpl { - public TowerofChampions (UUID ownerId) { + public TowerOfChampions (UUID ownerId) { super(ownerId, 265, "Tower of Champions", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new BoostTargetEffect(6, 6, Constants.Duration.EndOfTurn), new GenericManaCost(8)); @@ -56,13 +56,13 @@ public class TowerofChampions extends CardImpl { this.addAbility(ability); } - public TowerofChampions (final TowerofChampions card) { + public TowerOfChampions (final TowerOfChampions card) { super(card); } @Override - public TowerofChampions copy() { - return new TowerofChampions(this); + public TowerOfChampions copy() { + return new TowerOfChampions(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerofEons.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodin/TowerofEons.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfEons_.java index ce535b2202f..bcfb3d91865 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerofEons.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons_.java @@ -44,9 +44,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class TowerofEons extends CardImpl { +public class TowerOfEons extends CardImpl { - public TowerofEons (UUID ownerId) { + public TowerOfEons (UUID ownerId) { super(ownerId, 266, "Tower of Eons", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new GainLifeEffect(10), new GenericManaCost(8)); @@ -54,13 +54,13 @@ public class TowerofEons extends CardImpl { this.addAbility(ability); } - public TowerofEons (final TowerofEons card) { + public TowerOfEons (final TowerOfEons card) { super(card); } @Override - public TowerofEons copy() { - return new TowerofEons(this); + public TowerOfEons copy() { + return new TowerOfEons(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerofFortunes.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes_.java similarity index 88% rename from Mage.Sets/src/mage/sets/mirrodin/TowerofFortunes.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes_.java index 81cb0b9236e..39d85157de3 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerofFortunes.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes_.java @@ -44,9 +44,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class TowerofFortunes extends CardImpl { +public class TowerOfFortunes extends CardImpl { - public TowerofFortunes (UUID ownerId) { + public TowerOfFortunes (UUID ownerId) { super(ownerId, 267, "Tower of Fortunes", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(4), new GenericManaCost(8)); @@ -54,13 +54,13 @@ public class TowerofFortunes extends CardImpl { this.addAbility(ability); } - public TowerofFortunes (final TowerofFortunes card) { + public TowerOfFortunes (final TowerOfFortunes card) { super(card); } @Override - public TowerofFortunes copy() { - return new TowerofFortunes(this); + public TowerOfFortunes copy() { + return new TowerOfFortunes(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerofMurmurs.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodin/TowerofMurmurs.java rename to Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs_.java index 0a8a5c61f8f..3d154b76775 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TowerofMurmurs.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs_.java @@ -45,9 +45,9 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class TowerofMurmurs extends CardImpl { +public class TowerOfMurmurs extends CardImpl { - public TowerofMurmurs (UUID ownerId) { + public TowerOfMurmurs (UUID ownerId) { super(ownerId, 268, "Tower of Murmurs", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "MRD"; Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(8), new GenericManaCost(8)); @@ -56,13 +56,13 @@ public class TowerofMurmurs extends CardImpl { this.addAbility(ability); } - public TowerofMurmurs (final TowerofMurmurs card) { + public TowerOfMurmurs (final TowerOfMurmurs card) { super(card); } @Override - public TowerofMurmurs copy() { - return new TowerofMurmurs(this); + public TowerOfMurmurs copy() { + return new TowerOfMurmurs(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/TreeofTales.java b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales_.java similarity index 88% rename from Mage.Sets/src/mage/sets/mirrodin/TreeofTales.java rename to Mage.Sets/src/mage/sets/mirrodin/TreeOfTales_.java index e98a87ee419..3f239b31556 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/TreeofTales.java +++ b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales_.java @@ -38,21 +38,21 @@ import mage.cards.CardImpl; * * @author Loki */ -public class TreeofTales extends CardImpl { +public class TreeOfTales extends CardImpl { - public TreeofTales (UUID ownerId) { + public TreeOfTales (UUID ownerId) { super(ownerId, 285, "Tree of Tales", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.LAND}, null); this.expansionSetCode = "MRD"; this.addAbility(new GreenManaAbility()); } - public TreeofTales (final TreeofTales card) { + public TreeOfTales (final TreeOfTales card) { super(card); } @Override - public TreeofTales copy() { - return new TreeofTales(this); + public TreeOfTales copy() { + return new TreeOfTales(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodin/VaultofWhispers.java b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers_.java similarity index 87% rename from Mage.Sets/src/mage/sets/mirrodin/VaultofWhispers.java rename to Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers_.java index 753fbea28e1..1b157af339a 100644 --- a/Mage.Sets/src/mage/sets/mirrodin/VaultofWhispers.java +++ b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers_.java @@ -38,21 +38,21 @@ import mage.cards.CardImpl; * * @author Loki */ -public class VaultofWhispers extends CardImpl { +public class VaultOfWhispers extends CardImpl { - public VaultofWhispers (UUID ownerId) { + public VaultOfWhispers (UUID ownerId) { super(ownerId, 286, "Vault of Whispers", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.LAND}, null); this.expansionSetCode = "MRD"; this.addAbility(new BlackManaAbility()); } - public VaultofWhispers (final VaultofWhispers card) { + public VaultOfWhispers (final VaultOfWhispers card) { super(card); } @Override - public VaultofWhispers copy() { - return new VaultofWhispers(this); + public VaultOfWhispers copy() { + return new VaultOfWhispers(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelfortheCause.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause_.java similarity index 88% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/FuelfortheCause.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause_.java index 71f9f1bb562..70fabae0820 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelfortheCause.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/FuelForTheCause_.java @@ -40,9 +40,9 @@ import mage.target.TargetSpell; * * @author Loki */ -public class FuelfortheCause extends CardImpl { +public class FuelForTheCause extends CardImpl { - public FuelfortheCause (UUID ownerId) { + public FuelForTheCause (UUID ownerId) { super(ownerId, 25, "Fuel for the Cause", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{U}{U}"); this.expansionSetCode = "MBS"; this.color.setBlue(true); @@ -51,13 +51,13 @@ public class FuelfortheCause extends CardImpl { this.getSpellAbility().addEffect(new ProliferateEffect()); } - public FuelfortheCause (final FuelfortheCause card) { + public FuelForTheCause (final FuelForTheCause card) { super(card); } @Override - public FuelfortheCause copy() { - return new FuelfortheCause(this); + public FuelForTheCause copy() { + return new FuelForTheCause(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissatheTraitor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor_.java similarity index 83% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/GlissatheTraitor.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor_.java index 3b09130cd42..3fe721441ff 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissatheTraitor.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor_.java @@ -51,8 +51,8 @@ import mage.target.common.TargetCardInYourGraveyard; * * @author Loki */ -public class GlissatheTraitor extends CardImpl { - public GlissatheTraitor (UUID ownerId) { +public class GlissaTheTraitor extends CardImpl { + public GlissaTheTraitor (UUID ownerId) { super(ownerId, 96, "Glissa, the Traitor", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{B}{G}{G}"); this.expansionSetCode = "MBS"; this.supertype.add("Legendary"); @@ -64,40 +64,40 @@ public class GlissatheTraitor extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); this.addAbility(DeathtouchAbility.getInstance()); - this.addAbility(new GlissatheTraitorTriggeredAbility()); + this.addAbility(new GlissaTheTraitorTriggeredAbility()); } - public GlissatheTraitor (final GlissatheTraitor card) { + public GlissaTheTraitor (final GlissaTheTraitor card) { super(card); } @Override - public GlissatheTraitor copy() { - return new GlissatheTraitor(this); + public GlissaTheTraitor copy() { + return new GlissaTheTraitor(this); } } -class GlissatheTraitorTriggeredAbility extends TriggeredAbilityImpl { - private static FilterCard filter = new FilterCard("artifact card"); +class GlissaTheTraitorTriggeredAbility extends TriggeredAbilityImpl { + private static final FilterCard filter = new FilterCard("artifact card"); static { filter.getCardType().add(CardType.ARTIFACT); filter.setScopeCardType(Filter.ComparisonScope.Any); } - GlissatheTraitorTriggeredAbility() { + GlissaTheTraitorTriggeredAbility() { super(Constants.Zone.BATTLEFIELD, new ReturnToHandTargetEffect()); this.addTarget(new TargetCardInYourGraveyard(filter)); } - GlissatheTraitorTriggeredAbility(final GlissatheTraitorTriggeredAbility ability) { + GlissaTheTraitorTriggeredAbility(final GlissaTheTraitorTriggeredAbility ability) { super(ability); } @Override - public GlissatheTraitorTriggeredAbility copy() { - return new GlissatheTraitorTriggeredAbility(this); + public GlissaTheTraitorTriggeredAbility copy() { + return new GlissaTheTraitorTriggeredAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GofortheThroat.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/GofortheThroat.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat_.java index 58917d427cf..d95d6b76861 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GofortheThroat.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat_.java @@ -40,7 +40,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class GofortheThroat extends CardImpl { +public class GoForTheThroat extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); @@ -48,7 +48,7 @@ public class GofortheThroat extends CardImpl { filter.getNotCardType().add(CardType.ARTIFACT); } - public GofortheThroat(UUID ownerId) { + public GoForTheThroat(UUID ownerId) { super(ownerId, 43, "Go for the Throat", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{B}"); this.expansionSetCode = "MBS"; this.color.setBlack(true); @@ -59,12 +59,12 @@ public class GofortheThroat extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect()); } - public GofortheThroat(final GofortheThroat card) { + public GoForTheThroat(final GoForTheThroat card) { super(card); } @Override - public GofortheThroat copy() { - return new GofortheThroat(this); + public GoForTheThroat copy() { + return new GoForTheThroat(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroofBladehold.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java similarity index 91% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/HeroofBladehold.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java index 01fbfcc08ad..228700de925 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroofBladehold.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfBladehold_.java @@ -47,9 +47,9 @@ import mage.players.Player; /** * @author Loki */ -public class HeroofBladehold extends CardImpl { +public class HeroOfBladehold extends CardImpl { - public HeroofBladehold(UUID ownerId) { + public HeroOfBladehold(UUID ownerId) { super(ownerId, 8, "Hero of Bladehold", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "MBS"; this.subtype.add("Human"); @@ -61,13 +61,13 @@ public class HeroofBladehold extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new HeroofBladeholdEffect(), false)); } - public HeroofBladehold(final HeroofBladehold card) { + public HeroOfBladehold(final HeroOfBladehold card) { super(card); } @Override - public HeroofBladehold copy() { - return new HeroofBladehold(this); + public HeroOfBladehold copy() { + return new HeroOfBladehold(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/RallytheForces.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/RallytheForces.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces_.java index f37fc3ba346..becd78317f1 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/RallytheForces.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/RallyTheForces_.java @@ -44,10 +44,10 @@ import mage.filter.common.FilterCreaturePermanent; * * @author Loki */ -public class RallytheForces extends CardImpl { +public class RallyTheForces extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("Attacking creatures"); - public RallytheForces (UUID ownerId) { + public RallyTheForces (UUID ownerId) { super(ownerId, 73, "Rally the Forces", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}"); this.expansionSetCode = "MBS"; this.color.setRed(true); @@ -55,13 +55,13 @@ public class RallytheForces extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Constants.Duration.EndOfTurn, filter, false)); } - public RallytheForces (final RallytheForces card) { + public RallyTheForces (final RallyTheForces card) { super(card); } @Override - public RallytheForces copy() { - return new RallytheForces(this); + public RallyTheForces copy() { + return new RallyTheForces(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadtheSickness.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness_.java similarity index 90% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadtheSickness.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness_.java index 2037341c899..9c56b79bdb5 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadtheSickness.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpreadTheSickness_.java @@ -40,9 +40,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class SpreadtheSickness extends CardImpl { +public class SpreadTheSickness extends CardImpl { - public SpreadtheSickness (UUID ownerId) { + public SpreadTheSickness (UUID ownerId) { super(ownerId, 56, "Spread the Sickness", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{B}"); this.expansionSetCode = "MBS"; this.color.setBlack(true); @@ -51,13 +51,13 @@ public class SpreadtheSickness extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public SpreadtheSickness (final SpreadtheSickness card) { + public SpreadTheSickness (final SpreadTheSickness card) { super(card); } @Override - public SpreadtheSickness copy() { - return new SpreadtheSickness(this); + public SpreadTheSickness copy() { + return new SpreadTheSickness(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThruntheLastTroll.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll_.java similarity index 90% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/ThruntheLastTroll.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll_.java index 45ae1007fd8..8f3c9802b17 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThruntheLastTroll.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThrunTheLastTroll_.java @@ -48,8 +48,8 @@ import mage.filter.FilterStackObject; * * @author Loki */ -public class ThruntheLastTroll extends CardImpl { - public ThruntheLastTroll (UUID ownerId) { +public class ThrunTheLastTroll extends CardImpl { + public ThrunTheLastTroll (UUID ownerId) { super(ownerId, 92, "Thrun, the Last Troll", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "MBS"; this.supertype.add("Legendary"); @@ -63,13 +63,13 @@ public class ThruntheLastTroll extends CardImpl { this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"))); } - public ThruntheLastTroll (final ThruntheLastTroll card) { + public ThrunTheLastTroll (final ThrunTheLastTroll card) { super(card); } @Override - public ThruntheLastTroll copy() { - return new ThruntheLastTroll(this); + public ThrunTheLastTroll copy() { + return new ThrunTheLastTroll(this); } } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurntheTide.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide_.java similarity index 89% rename from Mage.Sets/src/mage/sets/mirrodinbesieged/TurntheTide.java rename to Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide_.java index ffa0a8cde5e..562fc0da502 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TurntheTide.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TurnTheTide_.java @@ -40,22 +40,22 @@ import mage.cards.CardImpl; * * @author Loki */ -public class TurntheTide extends CardImpl { +public class TurnTheTide extends CardImpl { - public TurntheTide (UUID ownerId) { + public TurnTheTide (UUID ownerId) { super(ownerId, 35, "Turn the Tide", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); this.expansionSetCode = "MBS"; this.color.setBlue(true); this.getSpellAbility().addEffect(new BoostOpponentsEffect(-2, 0, Constants.Duration.EndOfTurn)); } - public TurntheTide (final TurntheTide card) { + public TurnTheTide (final TurnTheTide card) { super(card); } @Override - public TurntheTide copy() { - return new TurntheTide(this); + public TurnTheTide copy() { + return new TurnTheTide(this); } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ActofAggression.java b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression_.java similarity index 89% rename from Mage.Sets/src/mage/sets/newphyrexia/ActofAggression.java rename to Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression_.java index f9b457a6233..6a9fde5848c 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ActofAggression.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ActOfAggression_.java @@ -42,9 +42,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author North */ -public class ActofAggression extends CardImpl { +public class ActOfAggression extends CardImpl { - public ActofAggression(UUID ownerId) { + public ActOfAggression(UUID ownerId) { super(ownerId, 78, "Act of Aggression", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{RP}{RP}"); this.expansionSetCode = "NPH"; @@ -56,12 +56,12 @@ public class ActofAggression extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); } - public ActofAggression(final ActofAggression card) { + public ActOfAggression(final ActOfAggression card) { super(card); } @Override - public ActofAggression copy() { - return new ActofAggression(this); + public ActOfAggression copy() { + return new ActOfAggression(this); } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ShrineofBurningRage.java b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage_.java similarity index 91% rename from Mage.Sets/src/mage/sets/newphyrexia/ShrineofBurningRage.java rename to Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage_.java index 01112d04f71..9715fa6ab7d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ShrineofBurningRage.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ShrineOfBurningRage_.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author */ -public class ShrineofBurningRage extends CardImpl { +public class ShrineOfBurningRage extends CardImpl { private final static FilterCard filter = new FilterCard("a red spell"); static { @@ -60,7 +60,7 @@ public class ShrineofBurningRage extends CardImpl { filter.setUseColor(true); } - public ShrineofBurningRage (UUID ownerId) { + public ShrineOfBurningRage (UUID ownerId) { super(ownerId, 153, "Shrine of Burning Rage", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "NPH"; this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), Constants.TargetController.YOU, false)); @@ -72,13 +72,13 @@ public class ShrineofBurningRage extends CardImpl { this.addAbility(ability); } - public ShrineofBurningRage (final ShrineofBurningRage card) { + public ShrineOfBurningRage (final ShrineOfBurningRage card) { super(card); } @Override - public ShrineofBurningRage copy() { - return new ShrineofBurningRage(this); + public ShrineOfBurningRage copy() { + return new ShrineOfBurningRage(this); } } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordofWarandPeace.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java similarity index 93% rename from Mage.Sets/src/mage/sets/newphyrexia/SwordofWarandPeace.java rename to Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java index fd81134e3ae..e944495616d 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/SwordofWarandPeace.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace_.java @@ -60,7 +60,7 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class SwordofWarandPeace extends CardImpl { +public class SwordOfWarAndPeace extends CardImpl { private static FilterCard filter = new FilterCard("red and from white"); static { @@ -70,7 +70,7 @@ public class SwordofWarandPeace extends CardImpl { filter.setScopeColor(Filter.ComparisonScope.Any); } - public SwordofWarandPeace (UUID ownerId) { + public SwordOfWarAndPeace (UUID ownerId) { super(ownerId, 161, "Sword of War and Peace", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "NPH"; this.subtype.add("Equipment"); @@ -80,13 +80,13 @@ public class SwordofWarandPeace extends CardImpl { this.addAbility(new SwordofWarandPeaceAbility()); } - public SwordofWarandPeace (final SwordofWarandPeace card) { + public SwordOfWarAndPeace (final SwordOfWarAndPeace card) { super(card); } @Override - public SwordofWarandPeace copy() { - return new SwordofWarandPeace(this); + public SwordOfWarAndPeace copy() { + return new SwordOfWarAndPeace(this); } } diff --git a/Mage.Sets/src/mage/sets/planechase/GloryofWarfare.java b/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare_.java similarity index 86% rename from Mage.Sets/src/mage/sets/planechase/GloryofWarfare.java rename to Mage.Sets/src/mage/sets/planechase/GloryOfWarfare_.java index 1a1efc117b7..9937283f43d 100644 --- a/Mage.Sets/src/mage/sets/planechase/GloryofWarfare.java +++ b/Mage.Sets/src/mage/sets/planechase/GloryOfWarfare_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class GloryofWarfare extends mage.sets.alarareborn.GloryofWarfare { +public class GloryOfWarfare extends mage.sets.alarareborn.GloryOfWarfare { - public GloryofWarfare (UUID ownerId) { + public GloryOfWarfare (UUID ownerId) { super(ownerId); this.expansionSetCode = "HOP"; this.cardNumber = 88; } - public GloryofWarfare (final GloryofWarfare card) { + public GloryOfWarfare (final GloryOfWarfare card) { super(card); } @Override - public GloryofWarfare copy() { - return new GloryofWarfare(this); + public GloryOfWarfare copy() { + return new GloryOfWarfare(this); } } diff --git a/Mage.Sets/src/mage/sets/planechase/SeatoftheSynod.java b/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod_.java similarity index 88% rename from Mage.Sets/src/mage/sets/planechase/SeatoftheSynod.java rename to Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod_.java index 4a384410151..9566bcc8c03 100644 --- a/Mage.Sets/src/mage/sets/planechase/SeatoftheSynod.java +++ b/Mage.Sets/src/mage/sets/planechase/SeatOfTheSynod_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class SeatoftheSynod extends mage.sets.mirrodin.SeatoftheSynod { +public class SeatOfTheSynod extends mage.sets.mirrodin.SeatOfTheSynod { - public SeatoftheSynod (UUID ownerId) { + public SeatOfTheSynod (UUID ownerId) { super(ownerId); this.cardNumber = 136; this.expansionSetCode = "HOP"; } - public SeatoftheSynod (final SeatoftheSynod card) { + public SeatOfTheSynod (final SeatOfTheSynod card) { super(card); } @Override - public SeatoftheSynod copy() { - return new SeatoftheSynod(this); + public SeatOfTheSynod copy() { + return new SeatOfTheSynod(this); } } diff --git a/Mage.Sets/src/mage/sets/planechase/TreeofTales.java b/Mage.Sets/src/mage/sets/planechase/TreeOfTales_.java similarity index 87% rename from Mage.Sets/src/mage/sets/planechase/TreeofTales.java rename to Mage.Sets/src/mage/sets/planechase/TreeOfTales_.java index c39d2459ffc..755055f4689 100644 --- a/Mage.Sets/src/mage/sets/planechase/TreeofTales.java +++ b/Mage.Sets/src/mage/sets/planechase/TreeOfTales_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class TreeofTales extends mage.sets.mirrodin.TreeofTales { +public class TreeOfTales extends mage.sets.mirrodin.TreeOfTales { - public TreeofTales (UUID ownerId) { + public TreeOfTales (UUID ownerId) { super(ownerId); this.cardNumber = 140; this.expansionSetCode = "HOP"; } - public TreeofTales (final TreeofTales card) { + public TreeOfTales (final TreeOfTales card) { super(card); } @Override - public TreeofTales copy() { - return new TreeofTales(this); + public TreeOfTales copy() { + return new TreeOfTales(this); } } diff --git a/Mage.Sets/src/mage/sets/planechase/VaultofWhispers.java b/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers_.java similarity index 86% rename from Mage.Sets/src/mage/sets/planechase/VaultofWhispers.java rename to Mage.Sets/src/mage/sets/planechase/VaultOfWhispers_.java index cfefcd9ad88..c808867c192 100644 --- a/Mage.Sets/src/mage/sets/planechase/VaultofWhispers.java +++ b/Mage.Sets/src/mage/sets/planechase/VaultOfWhispers_.java @@ -34,21 +34,21 @@ import java.util.UUID; * * @author Loki */ -public class VaultofWhispers extends mage.sets.mirrodin.VaultofWhispers { +public class VaultOfWhispers extends mage.sets.mirrodin.VaultOfWhispers { - public VaultofWhispers (UUID ownerId) { + public VaultOfWhispers (UUID ownerId) { super(ownerId); this.cardNumber = 141; this.expansionSetCode = "HOP"; } - public VaultofWhispers (final VaultofWhispers card) { + public VaultOfWhispers (final VaultOfWhispers card) { super(card); } @Override - public VaultofWhispers copy() { - return new VaultofWhispers(this); + public VaultOfWhispers copy() { + return new VaultOfWhispers(this); } } diff --git a/Mage.Sets/src/mage/sets/ravnika/VotaryoftheConclave.java b/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave_.java similarity index 88% rename from Mage.Sets/src/mage/sets/ravnika/VotaryoftheConclave.java rename to Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave_.java index 7ca21482e67..9ffe2050308 100644 --- a/Mage.Sets/src/mage/sets/ravnika/VotaryoftheConclave.java +++ b/Mage.Sets/src/mage/sets/ravnika/VotaryOfTheConclave_.java @@ -43,9 +43,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class VotaryoftheConclave extends CardImpl { +public class VotaryOfTheConclave extends CardImpl { - public VotaryoftheConclave (UUID ownerId) { + public VotaryOfTheConclave (UUID ownerId) { super(ownerId, 35, "Votary of the Conclave", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "RAV"; this.subtype.add("Human"); @@ -56,13 +56,13 @@ public class VotaryoftheConclave extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{G}"))); } - public VotaryoftheConclave (final VotaryoftheConclave card) { + public VotaryOfTheConclave (final VotaryOfTheConclave card) { super(card); } @Override - public VotaryoftheConclave copy() { - return new VotaryoftheConclave(this); + public VotaryOfTheConclave copy() { + return new VotaryOfTheConclave(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanofKozilek.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek_.java similarity index 89% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanofKozilek.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek_.java index a81c9944cf8..b64f85c86a2 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanofKozilek.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArtisanOfKozilek_.java @@ -44,9 +44,9 @@ import mage.target.common.TargetCardInYourGraveyard; * * @author Loki */ -public class ArtisanofKozilek extends CardImpl { +public class ArtisanOfKozilek extends CardImpl { - public ArtisanofKozilek (UUID ownerId) { + public ArtisanOfKozilek (UUID ownerId) { super(ownerId, 2, "Artisan of Kozilek", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{9}"); this.expansionSetCode = "ROE"; this.subtype.add("Eldrazi"); @@ -58,13 +58,13 @@ public class ArtisanofKozilek extends CardImpl { this.addAbility(new AnnihilatorAbility(2)); } - public ArtisanofKozilek (final ArtisanofKozilek card) { + public ArtisanOfKozilek (final ArtisanOfKozilek card) { super(card); } @Override - public ArtisanofKozilek copy() { - return new ArtisanofKozilek(this); + public ArtisanOfKozilek copy() { + return new ArtisanOfKozilek(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherofTruth.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth_.java similarity index 92% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherofTruth.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth_.java index d8e8903360c..80d93f755b0 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherofTruth.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth_.java @@ -50,9 +50,9 @@ import mage.players.Player; * * @author Loki */ -public class KozilekButcherofTruth extends CardImpl { +public class KozilekButcherOfTruth extends CardImpl { - public KozilekButcherofTruth (UUID ownerId) { + public KozilekButcherOfTruth (UUID ownerId) { super(ownerId, 6, "Kozilek, Butcher of Truth", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{10}"); this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); @@ -64,13 +64,13 @@ public class KozilekButcherofTruth extends CardImpl { this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new KozilekButcherofTruthEffect(), false)); } - public KozilekButcherofTruth (final KozilekButcherofTruth card) { + public KozilekButcherOfTruth (final KozilekButcherOfTruth card) { super(card); } @Override - public KozilekButcherofTruth copy() { - return new KozilekButcherofTruth(this); + public KozilekButcherOfTruth copy() { + return new KozilekButcherOfTruth(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperofSilence.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence_.java similarity index 91% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperofSilence.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence_.java index 9397283b1b0..9cc2292b778 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperofSilence.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LinvalaKeeperOfSilence_.java @@ -50,9 +50,9 @@ import javax.xml.datatype.Duration; * * @author Loki */ -public class LinvalaKeeperofSilence extends CardImpl { +public class LinvalaKeeperOfSilence extends CardImpl { - public LinvalaKeeperofSilence (UUID ownerId) { + public LinvalaKeeperOfSilence (UUID ownerId) { super(ownerId, 33, "Linvala, Keeper of Silence", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); @@ -64,13 +64,13 @@ public class LinvalaKeeperofSilence extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new LinvalaKeeperofSilenceEffect())); } - public LinvalaKeeperofSilence (final LinvalaKeeperofSilence card) { + public LinvalaKeeperOfSilence (final LinvalaKeeperOfSilence card) { super(card); } @Override - public LinvalaKeeperofSilence copy() { - return new LinvalaKeeperofSilence(this); + public LinvalaKeeperOfSilence copy() { + return new LinvalaKeeperOfSilence(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhantheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad_.java similarity index 80% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhantheMad.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad_.java index 07c1453af69..8b9f7dfc81e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhantheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad_.java @@ -57,9 +57,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author maurer.it_at_gmail.com */ -public class SarkhantheMad extends CardImpl { +public class SarkhanTheMad extends CardImpl { - public SarkhantheMad(UUID ownerId) { + public SarkhanTheMad(UUID ownerId) { super(ownerId, 214, "Sarkhan the Mad", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{B}{R}"); this.expansionSetCode = "ROE"; this.subtype.add("Sarkhan"); @@ -68,35 +68,35 @@ public class SarkhantheMad extends CardImpl { this.color.setBlack(true); this.color.setRed(true); - this.addAbility(new LoyaltyAbility(new SarkhantheMadRevealAndDrawEffect(), 0)); + this.addAbility(new LoyaltyAbility(new SarkhanTheMadRevealAndDrawEffect(), 0)); Target targetCreature = new TargetCreaturePermanent(); - Ability sacAbility = new LoyaltyAbility(new SarkhantheMadSacEffect(), -2); + Ability sacAbility = new LoyaltyAbility(new SarkhanTheMadSacEffect(), -2); sacAbility.addTarget(targetCreature); this.addAbility(sacAbility); - Ability damageAbility = new LoyaltyAbility(new SarkhantheMadDragonDamageEffect(), -4); + Ability damageAbility = new LoyaltyAbility(new SarkhanTheMadDragonDamageEffect(), -4); damageAbility.addTarget(new TargetPlayer()); this.addAbility(damageAbility); } - public SarkhantheMad(final SarkhantheMad card) { + public SarkhanTheMad(final SarkhanTheMad card) { super(card); } @Override - public SarkhantheMad copy() { - return new SarkhantheMad(this); + public SarkhanTheMad copy() { + return new SarkhanTheMad(this); } } -class SarkhantheMadRevealAndDrawEffect extends OneShotEffect { +class SarkhanTheMadRevealAndDrawEffect extends OneShotEffect { private static final String effectText = "Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost"; - SarkhantheMadRevealAndDrawEffect ( ) { + SarkhanTheMadRevealAndDrawEffect ( ) { super(Outcome.DrawCard); } - SarkhantheMadRevealAndDrawEffect ( SarkhantheMadRevealAndDrawEffect effect ) { + SarkhanTheMadRevealAndDrawEffect ( SarkhanTheMadRevealAndDrawEffect effect ) { super(effect); } @@ -117,8 +117,8 @@ class SarkhantheMadRevealAndDrawEffect extends OneShotEffect { +class SarkhanTheMadSacEffect extends OneShotEffect { private static final String effectText = "Target creature's controller sacrifices it, then that player puts a 5/5 red Dragon creature token with flying onto the battlefield"; - SarkhantheMadSacEffect ( ) { + SarkhanTheMadSacEffect ( ) { super(Outcome.Sacrifice); } - SarkhantheMadSacEffect ( SarkhantheMadSacEffect effect ) { + SarkhanTheMadSacEffect ( SarkhanTheMadSacEffect effect ) { super(effect); } @@ -152,8 +152,8 @@ class SarkhantheMadSacEffect extends OneShotEffect { } @Override - public SarkhantheMadSacEffect copy() { - return new SarkhantheMadSacEffect(this); + public SarkhanTheMadSacEffect copy() { + return new SarkhanTheMadSacEffect(this); } @Override @@ -162,7 +162,7 @@ class SarkhantheMadSacEffect extends OneShotEffect { } } -class SarkhantheMadDragonDamageEffect extends OneShotEffect { +class SarkhanTheMadDragonDamageEffect extends OneShotEffect { private static final String effectText = "Each Dragon creature you control deals damage equal to its power to target player"; private static final FilterControlledPermanent filter; @@ -173,11 +173,11 @@ class SarkhantheMadDragonDamageEffect extends OneShotEffect { +public class SphinxOfMagosi extends CardImpl { - public SphinxofMagosi (UUID ownerId) { + public SphinxOfMagosi (UUID ownerId) { super(ownerId, 89, "Sphinx of Magosi", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{U}{U}"); this.expansionSetCode = "ROE"; this.subtype.add("Sphinx"); @@ -62,13 +62,13 @@ public class SphinxofMagosi extends CardImpl { this.addAbility(ability); } - public SphinxofMagosi (final SphinxofMagosi card) { + public SphinxOfMagosi (final SphinxOfMagosi card) { super(card); } @Override - public SphinxofMagosi copy() { - return new SphinxofMagosi(this); + public SphinxOfMagosi copy() { + return new SphinxOfMagosi(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentofWarfare.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare_.java similarity index 90% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentofWarfare.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare_.java index c76fb3f7839..088f1179231 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentofWarfare.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/StudentOfWarfare_.java @@ -46,9 +46,9 @@ import mage.cards.LevelerCard; * * @author Loki */ -public class StudentofWarfare extends LevelerCard { +public class StudentOfWarfare extends LevelerCard { - public StudentofWarfare (UUID ownerId) { + public StudentOfWarfare (UUID ownerId) { super(ownerId, 47, "Student of Warfare", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "ROE"; this.subtype.add("Human"); @@ -66,13 +66,13 @@ public class StudentofWarfare extends LevelerCard { this.getLevels().add(new LevelAbility(7, -1, abilities2, 4, 4)); } - public StudentofWarfare (final StudentofWarfare card) { + public StudentOfWarfare (final StudentOfWarfare card) { super(card); } @Override - public StudentofWarfare copy() { - return new StudentofWarfare(this); + public StudentOfWarfare copy() { + return new StudentOfWarfare(this); } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktuktheExplorer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer_.java similarity index 86% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktuktheExplorer.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer_.java index 956a807a5f6..5154691252e 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktuktheExplorer.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer_.java @@ -42,9 +42,9 @@ import mage.game.permanent.token.Token; * * @author Loki */ -public class TuktuktheExplorer extends CardImpl { +public class TuktukTheExplorer extends CardImpl { - public TuktuktheExplorer (UUID ownerId) { + public TuktukTheExplorer (UUID ownerId) { super(ownerId, 169, "Tuktuk the Explorer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{R}"); this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); @@ -53,22 +53,22 @@ public class TuktuktheExplorer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new TuktuktheReturnedToken()))); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken()))); } - public TuktuktheExplorer (final TuktuktheExplorer card) { + public TuktukTheExplorer (final TuktukTheExplorer card) { super(card); } @Override - public TuktuktheExplorer copy() { - return new TuktuktheExplorer(this); + public TuktukTheExplorer copy() { + return new TuktukTheExplorer(this); } } -class TuktuktheReturnedToken extends Token { - TuktuktheReturnedToken() { +class TuktukTheReturnedToken extends Token { + TuktukTheReturnedToken() { super("Tuktuk the Returned", "a legendary 5/5 colorless Goblin Golem artifact creature token"); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogtheInfiniteGyre.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre_.java similarity index 92% rename from Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogtheInfiniteGyre.java rename to Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre_.java index 8475c5d0ed9..4bf5b13eb32 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogtheInfiniteGyre.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre_.java @@ -53,11 +53,11 @@ import mage.target.TargetPermanent; * * @author maurer.it_at_gmail.com */ -public class UlamogtheInfiniteGyre extends CardImpl { +public class UlamogTheInfiniteGyre extends CardImpl { private static final String effectText = "When Ulamog is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library"; - public UlamogtheInfiniteGyre(UUID ownerId) { + public UlamogTheInfiniteGyre(UUID ownerId) { super(ownerId, 12, "Ulamog, the Infinite Gyre", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{11}"); this.expansionSetCode = "ROE"; this.supertype.add("Legendary"); @@ -72,13 +72,13 @@ public class UlamogtheInfiniteGyre extends CardImpl { this.addAbility(new ZoneChangeTriggeredAbility(Zone.GRAVEYARD, new UlamogtheInfiniteGyreEnterGraveyardEffect(), effectText, false)); } - public UlamogtheInfiniteGyre(final UlamogtheInfiniteGyre card) { + public UlamogTheInfiniteGyre(final UlamogTheInfiniteGyre card) { super(card); } @Override - public UlamogtheInfiniteGyre copy() { - return new UlamogtheInfiniteGyre(this); + public UlamogTheInfiniteGyre copy() { + return new UlamogTheInfiniteGyre(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlunttheAssault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault_.java similarity index 89% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/BlunttheAssault.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault_.java index 21f8c6727a5..16a7e0e32f5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BlunttheAssault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BluntTheAssault_.java @@ -43,7 +43,7 @@ import mage.filter.FilterPermanent; * * @author Loki */ -public class BlunttheAssault extends CardImpl { +public class BluntTheAssault extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creature on the battlefield"); @@ -51,7 +51,7 @@ public class BlunttheAssault extends CardImpl { filter.getCardType().add(Constants.CardType.CREATURE); } - public BlunttheAssault (UUID ownerId) { + public BluntTheAssault (UUID ownerId) { super(ownerId, 113, "Blunt the Assault", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{G}"); this.expansionSetCode = "SOM"; this.color.setGreen(true); @@ -59,13 +59,13 @@ public class BlunttheAssault extends CardImpl { this.getSpellAbility().addEffect(new PreventAllCombatDamageEffect(Constants.Duration.EndOfTurn)); } - public BlunttheAssault (final BlunttheAssault card) { + public BluntTheAssault (final BluntTheAssault card) { super(card); } @Override - public BlunttheAssault copy() { - return new BlunttheAssault(this); + public BluntTheAssault copy() { + return new BluntTheAssault(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver_.java similarity index 89% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver_.java index 1727141ad30..ac3a8c6f9b4 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsofQuicksilver.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/BondsOfQuicksilver_.java @@ -46,9 +46,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author nantuko */ -public class BondsofQuicksilver extends CardImpl { +public class BondsOfQuicksilver extends CardImpl { - public BondsofQuicksilver (UUID ownerId) { + public BondsOfQuicksilver (UUID ownerId) { super(ownerId, 29, "Bonds of Quicksilver", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); this.expansionSetCode = "SOM"; this.subtype.add("Aura"); @@ -63,13 +63,13 @@ public class BondsofQuicksilver extends CardImpl { this.addAbility(ability); } - public BondsofQuicksilver (final BondsofQuicksilver card) { + public BondsOfQuicksilver (final BondsOfQuicksilver card) { super(card); } @Override - public BondsofQuicksilver copy() { - return new BondsofQuicksilver(this); + public BondsOfQuicksilver copy() { + return new BondsOfQuicksilver(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordoftheVault.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault_.java similarity index 93% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordoftheVault.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault_.java index a2728d1a6c9..9f8db9c6b01 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordoftheVault.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GethLordOfTheVault_.java @@ -56,7 +56,7 @@ import mage.target.TargetCard; * * @author nantuko */ -public class GethLordoftheVault extends CardImpl { +public class GethLordOfTheVault extends CardImpl { private static FilterCard filter = new FilterCard("artifact or creature card"); @@ -66,7 +66,7 @@ public class GethLordoftheVault extends CardImpl { filter.setScopeCardType(ComparisonScope.Any); } - public GethLordoftheVault (UUID ownerId) { + public GethLordOfTheVault (UUID ownerId) { super(ownerId, 64, "Geth, Lord of the Vault", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "SOM"; this.supertype.add("Legendary"); @@ -96,13 +96,13 @@ public class GethLordoftheVault extends CardImpl { } } - public GethLordoftheVault (final GethLordoftheVault card) { + public GethLordOfTheVault (final GethLordOfTheVault card) { super(card); } @Override - public GethLordoftheVault copy() { - return new GethLordoftheVault(this); + public GethLordOfTheVault copy() { + return new GethLordOfTheVault(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness_.java similarity index 88% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness_.java index 3e1088409e6..fafaa744ba6 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspofDarkness.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GraspOfDarkness_.java @@ -40,9 +40,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class GraspofDarkness extends CardImpl { +public class GraspOfDarkness extends CardImpl { - public GraspofDarkness (UUID ownerId) { + public GraspOfDarkness (UUID ownerId) { super(ownerId, 65, "Grasp of Darkness", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "SOM"; this.color.setBlack(true); @@ -50,13 +50,13 @@ public class GraspofDarkness extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public GraspofDarkness (final GraspofDarkness card) { + public GraspOfDarkness (final GraspOfDarkness card) { super(card); } @Override - public GraspofDarkness copy() { - return new GraspofDarkness(this); + public GraspOfDarkness copy() { + return new GraspOfDarkness(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothoftheHammer.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer_.java similarity index 84% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/KothoftheHammer.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer_.java index aa947392104..fe0ef24c6af 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KothoftheHammer.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KothOfTheHammer_.java @@ -59,7 +59,7 @@ import mage.target.common.TargetLandPermanent; * * @author Loki, North */ -public class KothoftheHammer extends CardImpl { +public class KothOfTheHammer extends CardImpl { static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); private static final FilterLandPermanent filterCount = new FilterLandPermanent("Mountain you control"); @@ -69,7 +69,7 @@ public class KothoftheHammer extends CardImpl { filterCount.setTargetController(Constants.TargetController.YOU); } - public KothoftheHammer (UUID ownerId) { + public KothOfTheHammer (UUID ownerId) { super(ownerId, 94, "Koth of the Hammer", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{2}{R}{R}"); this.expansionSetCode = "SOM"; this.subtype.add("Koth"); @@ -77,30 +77,30 @@ public class KothoftheHammer extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(3)), "")); Ability ability = new LoyaltyAbility(new UntapTargetEffect(), 1); - ability.addEffect(new KothoftheHammerFirstEffect()); + ability.addEffect(new KothOfTheHammerFirstEffect()); ability.addTarget(new TargetLandPermanent(filter)); this.addAbility(ability); this.addAbility(new LoyaltyAbility(new DynamicManaEffect(Mana.RedMana, new PermanentsOnBattlefieldCount(filterCount)), -2)); - this.addAbility(new LoyaltyAbility(new KothoftheHammerThirdEffect(), -5)); + this.addAbility(new LoyaltyAbility(new KothOfTheHammerThirdEffect(), -5)); } - public KothoftheHammer (final KothoftheHammer card) { + public KothOfTheHammer (final KothOfTheHammer card) { super(card); } @Override - public KothoftheHammer copy() { - return new KothoftheHammer(this); + public KothOfTheHammer copy() { + return new KothOfTheHammer(this); } } -class KothoftheHammerFirstEffect extends ContinuousEffectImpl { +class KothOfTheHammerFirstEffect extends ContinuousEffectImpl { - public KothoftheHammerFirstEffect() { + public KothOfTheHammerFirstEffect() { super(Duration.EndOfTurn, Constants.Outcome.BecomeCreature); } - public KothoftheHammerFirstEffect(final KothoftheHammerFirstEffect effect) { + public KothOfTheHammerFirstEffect(final KothOfTheHammerFirstEffect effect) { super(effect); } @@ -137,8 +137,8 @@ class KothoftheHammerFirstEffect extends ContinuousEffectImpl { - public KothoftheHammerThirdEffect() { +class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { + public KothOfTheHammerThirdEffect() { super(Duration.EndOfGame, Constants.Outcome.AddAbility); } - public KothoftheHammerThirdEffect(final KothoftheHammerThirdEffect effect) { + public KothOfTheHammerThirdEffect(final KothOfTheHammerThirdEffect effect) { super(effect); } @@ -166,7 +166,7 @@ class KothoftheHammerThirdEffect extends ContinuousEffectImpl { +public class LiegeOfTheTangle extends CardImpl { - public LiegeoftheTangle (UUID ownerId) { + public LiegeOfTheTangle (UUID ownerId) { super(ownerId, 123, "Liege of the Tangle", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{6}{G}{G}"); this.expansionSetCode = "SOM"; this.subtype.add("Elemental"); @@ -78,23 +68,23 @@ public class LiegeoftheTangle extends CardImpl { this.power = new MageInt(8); this.toughness = new MageInt(8); this.addAbility(TrampleAbility.getInstance()); - this.addAbility(new LiegeoftheTangleTriggeredAbility()); + this.addAbility(new LiegeOfTheTangleTriggeredAbility()); } - public LiegeoftheTangle (final LiegeoftheTangle card) { + public LiegeOfTheTangle (final LiegeOfTheTangle card) { super(card); } @Override - public LiegeoftheTangle copy() { - return new LiegeoftheTangle(this); + public LiegeOfTheTangle copy() { + return new LiegeOfTheTangle(this); } } -class LiegeoftheTangleTriggeredAbility extends TriggeredAbilityImpl { - LiegeoftheTangleTriggeredAbility() { +class LiegeOfTheTangleTriggeredAbility extends TriggeredAbilityImpl { + LiegeOfTheTangleTriggeredAbility() { super(Constants.Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.AWAKENING.createInstance())); - this.addEffect(new LiegeoftheTangleEffect()); + this.addEffect(new LiegeOfTheTangleEffect()); // Ability ability = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, // new ConditionalContinousEffect( // new BecomesCreatureSourceEOTEffect(new AwakeningLandToken(), "land"), @@ -105,13 +95,13 @@ class LiegeoftheTangleTriggeredAbility extends TriggeredAbilityImpl { +class LiegeOfTheTangleEffect extends ContinuousEffectImpl { private static AwakeningLandToken token = new AwakeningLandToken(); - public LiegeoftheTangleEffect() { + public LiegeOfTheTangleEffect() { super(Duration.EndOfGame, Outcome.BecomeCreature); } - public LiegeoftheTangleEffect(final LiegeoftheTangleEffect effect) { + public LiegeOfTheTangleEffect(final LiegeOfTheTangleEffect effect) { super(effect); } @@ -191,8 +181,8 @@ class LiegeoftheTangleEffect extends ContinuousEffectImpl { +public class SeizeTheInitiative extends CardImpl { - public SeizetheInitiative (UUID ownerId) { + public SeizeTheInitiative (UUID ownerId) { super(ownerId, 20, "Seize the Initiative", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{W}"); this.expansionSetCode = "SOM"; this.color.setWhite(true); @@ -54,13 +54,13 @@ public class SeizetheInitiative extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public SeizetheInitiative (final SeizetheInitiative card) { + public SeizeTheInitiative (final SeizeTheInitiative card) { super(card); } @Override - public SeizetheInitiative copy() { - return new SeizetheInitiative(this); + public SeizeTheInitiative copy() { + return new SeizeTheInitiative(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon_.java similarity index 89% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon_.java index 8168a59510f..30684d8534a 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxtheBlightDragon.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SkithiryxTheBlightDragon_.java @@ -47,9 +47,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class SkithiryxtheBlightDragon extends CardImpl { +public class SkithiryxTheBlightDragon extends CardImpl { - public SkithiryxtheBlightDragon (UUID ownerId) { + public SkithiryxTheBlightDragon (UUID ownerId) { super(ownerId, 79, "Skithiryx, the Blight Dragon", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.expansionSetCode = "SOM"; this.supertype.add("Legendary"); @@ -64,13 +64,13 @@ public class SkithiryxtheBlightDragon extends CardImpl this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}{B}"))); } - public SkithiryxtheBlightDragon (final SkithiryxtheBlightDragon card) { + public SkithiryxTheBlightDragon (final SkithiryxTheBlightDragon card) { super(card); } @Override - public SkithiryxtheBlightDragon copy() { - return new SkithiryxtheBlightDragon(this); + public SkithiryxTheBlightDragon copy() { + return new SkithiryxTheBlightDragon(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java similarity index 85% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java index ec1ea61dfe7..cdde35a0929 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordofBodyandMind.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind_.java @@ -59,9 +59,9 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class SwordofBodyandMind extends CardImpl { +public class SwordOfBodyAndMind extends CardImpl { - private static FilterCard filter = new FilterCard("green and from blue"); + private static final FilterCard filter = new FilterCard("green and from blue"); static { filter.setUseColor(true); @@ -71,41 +71,41 @@ public class SwordofBodyandMind extends CardImpl { } - public SwordofBodyandMind (UUID ownerId) { + public SwordOfBodyAndMind (UUID ownerId) { 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 SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new ProtectionAbility(filter), Constants.AttachmentType.EQUIPMENT))); - this.addAbility(new SwordofBodyandMindAbility()); + this.addAbility(new SwordOfBodyAndMindAbility()); } - public SwordofBodyandMind (final SwordofBodyandMind card) { + public SwordOfBodyAndMind (final SwordOfBodyAndMind card) { super(card); } @Override - public SwordofBodyandMind copy() { - return new SwordofBodyandMind(this); + public SwordOfBodyAndMind copy() { + return new SwordOfBodyAndMind(this); } } -class SwordofBodyandMindAbility extends TriggeredAbilityImpl { +class SwordOfBodyAndMindAbility extends TriggeredAbilityImpl { - public SwordofBodyandMindAbility() { + public SwordOfBodyAndMindAbility() { super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken())); this.addEffect(new PutLibraryIntoGraveTargetEffect(10)); this.addTarget(new TargetPlayer()); } - public SwordofBodyandMindAbility(final SwordofBodyandMindAbility ability) { + public SwordOfBodyAndMindAbility(final SwordOfBodyAndMindAbility ability) { super(ability); } @Override - public SwordofBodyandMindAbility copy() { - return new SwordofBodyandMindAbility(this); + public SwordOfBodyAndMindAbility copy() { + return new SwordOfBodyAndMindAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerofCalamities.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities_.java similarity index 89% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TowerofCalamities.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities_.java index 0557cbb7319..2f2eea04f44 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerofCalamities.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TowerOfCalamities_.java @@ -45,9 +45,9 @@ import java.util.UUID; * * @author Loki */ -public class TowerofCalamities extends CardImpl { +public class TowerOfCalamities extends CardImpl { - public TowerofCalamities (UUID ownerId) { + public TowerOfCalamities (UUID ownerId) { super(ownerId, 212, "Tower of Calamities", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "SOM"; Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(12), new ManaCostsImpl("{8}")); @@ -56,13 +56,13 @@ public class TowerofCalamities extends CardImpl { this.addAbility(ability); } - public TowerofCalamities (final TowerofCalamities card) { + public TowerOfCalamities (final TowerOfCalamities card) { super(card); } @Override - public TowerofCalamities copy() { - return new TowerofCalamities(this); + public TowerOfCalamities copy() { + return new TowerOfCalamities(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofCorruption.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption_.java similarity index 91% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofCorruption.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption_.java index 8416158090d..5862aed01f5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofCorruption.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfCorruption_.java @@ -53,9 +53,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author nantuko */ -public class TrigonofCorruption extends CardImpl { +public class TrigonOfCorruption extends CardImpl { - public TrigonofCorruption (UUID ownerId) { + public TrigonOfCorruption (UUID ownerId) { super(ownerId, 213, "Trigon of Corruption", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "SOM"; @@ -78,13 +78,13 @@ public class TrigonofCorruption extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), costs2)); } - public TrigonofCorruption (final TrigonofCorruption card) { + public TrigonOfCorruption (final TrigonOfCorruption card) { super(card); } @Override - public TrigonofCorruption copy() { - return new TrigonofCorruption(this); + public TrigonOfCorruption copy() { + return new TrigonOfCorruption(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofInfestation.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation_.java similarity index 91% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofInfestation.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation_.java index fddfa53a7fc..2065b151500 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofInfestation.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfInfestation_.java @@ -50,11 +50,11 @@ import mage.counters.common.ChargeCounter; /** * @author nantuko */ -public class TrigonofInfestation extends CardImpl { +public class TrigonOfInfestation extends CardImpl { private static InsectInfectToken insectToken = new InsectInfectToken(); - public TrigonofInfestation(UUID ownerId) { + public TrigonOfInfestation(UUID ownerId) { super(ownerId, 214, "Trigon of Infestation", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{4}"); this.expansionSetCode = "SOM"; @@ -72,13 +72,13 @@ public class TrigonofInfestation extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), costs2)); } - public TrigonofInfestation(final TrigonofInfestation card) { + public TrigonOfInfestation(final TrigonOfInfestation card) { super(card); } @Override - public TrigonofInfestation copy() { - return new TrigonofInfestation(this); + public TrigonOfInfestation copy() { + return new TrigonOfInfestation(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofMending.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending_.java similarity index 91% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofMending.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending_.java index 2dfba9646d8..e464d3d57b5 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofMending.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfMending_.java @@ -49,9 +49,9 @@ import mage.counters.common.ChargeCounter; /** * @author nantuko */ -public class TrigonofMending extends CardImpl { +public class TrigonOfMending extends CardImpl { - public TrigonofMending(UUID ownerId) { + public TrigonOfMending(UUID ownerId) { super(ownerId, 215, "Trigon of Mending", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; @@ -69,13 +69,13 @@ public class TrigonofMending extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), costs2)); } - public TrigonofMending(final TrigonofMending card) { + public TrigonOfMending(final TrigonOfMending card) { super(card); } @Override - public TrigonofMending copy() { - return new TrigonofMending(this); + public TrigonOfMending copy() { + return new TrigonOfMending(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage_.java similarity index 92% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage_.java index 98d6512d6e1..5112a85ea68 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofRage.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfRage_.java @@ -54,9 +54,9 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class TrigonofRage extends CardImpl { +public class TrigonOfRage extends CardImpl { - public TrigonofRage(UUID ownerId) { + public TrigonOfRage(UUID ownerId) { super(ownerId, 216, "Trigon of Rage", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "SOM"; @@ -79,13 +79,13 @@ public class TrigonofRage extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), costs2)); } - public TrigonofRage(final TrigonofRage card) { + public TrigonOfRage(final TrigonOfRage card) { super(card); } @Override - public TrigonofRage copy() { - return new TrigonofRage(this); + public TrigonOfRage copy() { + return new TrigonOfRage(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofThought.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought_.java similarity index 91% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofThought.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought_.java index 5a2cd036966..28ad21eb93e 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonofThought.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TrigonOfThought_.java @@ -49,9 +49,9 @@ import mage.counters.common.ChargeCounter; /** * @author nantuko */ -public class TrigonofThought extends CardImpl { +public class TrigonOfThought extends CardImpl { - public TrigonofThought(UUID ownerId) { + public TrigonOfThought(UUID ownerId) { super(ownerId, 217, "Trigon of Thought", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{5}"); this.expansionSetCode = "SOM"; @@ -69,13 +69,13 @@ public class TrigonofThought extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), costs2)); } - public TrigonofThought(final TrigonofThought card) { + public TrigonOfThought(final TrigonOfThought card) { super(card); } @Override - public TrigonofThought copy() { - return new TrigonofThought(this); + public TrigonOfThought copy() { + return new TrigonOfThought(this); } } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet_.java similarity index 95% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet_.java index 7221aa469de..fc1b6ca54a7 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet_.java @@ -50,7 +50,7 @@ import mage.target.TargetPermanent; * @author Loki */ public class TumbleMagnet extends CardImpl { - private static FilterPermanent filter = new FilterPermanent("artifact or creature"); + private static final FilterPermanent filter = new FilterPermanent("artifact or creature"); static { filter.getCardType().add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurntoSlag.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag_.java similarity index 82% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/TurntoSlag.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag_.java index 5aef9c4cfcb..11ac49102c0 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TurntoSlag.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TurnToSlag_.java @@ -34,48 +34,45 @@ 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.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; /** * * @author Loki */ -public class TurntoSlag extends CardImpl { +public class TurnToSlag extends CardImpl { - public TurntoSlag (UUID ownerId) { + public TurnToSlag (UUID ownerId) { super(ownerId, 106, "Turn to Slag", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}{R}"); this.expansionSetCode = "SOM"; this.color.setRed(true); - this.getSpellAbility().addEffect(new TurntoSlagEffect()); + this.getSpellAbility().addEffect(new TurnToSlagEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public TurntoSlag (final TurntoSlag card) { + public TurnToSlag (final TurnToSlag card) { super(card); } @Override - public TurntoSlag copy() { - return new TurntoSlag(this); + public TurnToSlag copy() { + return new TurnToSlag(this); } } -class TurntoSlagEffect extends OneShotEffect { +class TurnToSlagEffect extends OneShotEffect { - public TurntoSlagEffect() { + public TurnToSlagEffect() { super(Constants.Outcome.DestroyPermanent); } - public TurntoSlagEffect(final TurntoSlagEffect effect) { + public TurnToSlagEffect(final TurnToSlagEffect effect) { super(effect); } @@ -100,8 +97,8 @@ class TurntoSlagEffect extends OneShotEffect { } @Override - public TurntoSlagEffect copy() { - return new TurntoSlagEffect(this); + public TurnToSlagEffect copy() { + return new TurnToSlagEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilfortheLost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost_.java similarity index 77% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/VigilfortheLost.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost_.java index fc513a0d21a..28dbdac2155 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilfortheLost.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost_.java @@ -32,19 +32,16 @@ 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.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.VariableCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.costs.mana.VariableManaCost; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.TableEvent; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.players.Player; @@ -53,38 +50,38 @@ import mage.players.Player; * * @author Loki */ -public class VigilfortheLost extends CardImpl { +public class VigilForTheLost extends CardImpl { - public VigilfortheLost (UUID ownerId) { + public VigilForTheLost (UUID ownerId) { super(ownerId, 26, "Vigil for the Lost", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "SOM"; this.color.setWhite(true); - this.addAbility(new VigilfortheLostTriggeredAbility()); + this.addAbility(new VigilForTheLostTriggeredAbility()); } - public VigilfortheLost (final VigilfortheLost card) { + public VigilForTheLost (final VigilForTheLost card) { super(card); } @Override - public VigilfortheLost copy() { - return new VigilfortheLost(this); + public VigilForTheLost copy() { + return new VigilForTheLost(this); } } -class VigilfortheLostTriggeredAbility extends TriggeredAbilityImpl { - VigilfortheLostTriggeredAbility() { - super(Zone.BATTLEFIELD, new VigilfortheLostEffect()); +class VigilForTheLostTriggeredAbility extends TriggeredAbilityImpl { + VigilForTheLostTriggeredAbility() { + super(Zone.BATTLEFIELD, new VigilForTheLostEffect()); } - VigilfortheLostTriggeredAbility(final VigilfortheLostTriggeredAbility ability) { + VigilForTheLostTriggeredAbility(final VigilForTheLostTriggeredAbility ability) { super(ability); } @Override - public VigilfortheLostTriggeredAbility copy() { - return new VigilfortheLostTriggeredAbility(this); + public VigilForTheLostTriggeredAbility copy() { + return new VigilForTheLostTriggeredAbility(this); } @Override @@ -106,12 +103,12 @@ class VigilfortheLostTriggeredAbility extends TriggeredAbilityImpl { - VigilfortheLostEffect() { +class VigilForTheLostEffect extends OneShotEffect { + VigilForTheLostEffect() { super(Constants.Outcome.GainLife); } - VigilfortheLostEffect(final VigilfortheLostEffect effect) { + VigilForTheLostEffect(final VigilForTheLostEffect effect) { super(effect); } @@ -129,8 +126,8 @@ class VigilfortheLostEffect extends OneShotEffect { } @Override - public VigilfortheLostEffect copy() { - return new VigilfortheLostEffect(this); + public VigilForTheLostEffect copy() { + return new VigilForTheLostEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord_.java similarity index 89% rename from Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java rename to Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord_.java index dc8bfff7c8a..56893b1a3da 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WallofTanglecord.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WallOfTanglecord_.java @@ -45,9 +45,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class WallofTanglecord extends CardImpl { +public class WallOfTanglecord extends CardImpl { - public WallofTanglecord (UUID ownerId) { + public WallOfTanglecord (UUID ownerId) { super(ownerId, 222, "Wall of Tanglecord", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}"); this.expansionSetCode = "SOM"; this.subtype.add("Wall"); @@ -59,13 +59,13 @@ public class WallofTanglecord extends CardImpl { new ManaCostsImpl("{G}"))); } - public WallofTanglecord (final WallofTanglecord card) { + public WallOfTanglecord (final WallOfTanglecord card) { super(card); } @Override - public WallofTanglecord copy() { - return new WallofTanglecord(this); + public WallOfTanglecord copy() { + return new WallOfTanglecord(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DruidoftheAnima.java b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima_.java similarity index 87% rename from Mage.Sets/src/mage/sets/shardsofalara/DruidoftheAnima.java rename to Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima_.java index 03a10ab9b31..791cadbf8cc 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/DruidoftheAnima.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/DruidOfTheAnima_.java @@ -30,9 +30,7 @@ package mage.sets.shardsofalara; import java.util.UUID; import mage.Constants.CardType; -import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.MageInt; import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; @@ -43,9 +41,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class DruidoftheAnima extends CardImpl { +public class DruidOfTheAnima extends CardImpl { - public DruidoftheAnima (UUID ownerId) { + public DruidOfTheAnima (UUID ownerId) { super(ownerId, 128, "Druid of the Anima", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.expansionSetCode = "ALA"; this.subtype.add("Elf"); @@ -58,12 +56,12 @@ public class DruidoftheAnima extends CardImpl { this.addAbility(new WhiteManaAbility()); } - public DruidoftheAnima (final DruidoftheAnima card) { + public DruidOfTheAnima (final DruidOfTheAnima card) { super(card); } @Override - public DruidoftheAnima copy() { - return new DruidoftheAnima(this); + public DruidOfTheAnima copy() { + return new DruidOfTheAnima(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansofAkrasa.java b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/GuardiansofAkrasa.java rename to Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa_.java index 175d9715548..16f0b67bd6e 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/GuardiansofAkrasa.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/GuardiansOfAkrasa_.java @@ -40,9 +40,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class GuardiansofAkrasa extends CardImpl { +public class GuardiansOfAkrasa extends CardImpl { - public GuardiansofAkrasa (UUID ownerId) { + public GuardiansOfAkrasa (UUID ownerId) { super(ownerId, 12, "Guardians of Akrasa", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Human"); @@ -54,12 +54,12 @@ public class GuardiansofAkrasa extends CardImpl { this.addAbility(new ExaltedAbility()); } - public GuardiansofAkrasa (final GuardiansofAkrasa card) { + public GuardiansOfAkrasa (final GuardiansOfAkrasa card) { super(card); } @Override - public GuardiansofAkrasa copy() { - return new GuardiansofAkrasa(this); + public GuardiansOfAkrasa copy() { + return new GuardiansOfAkrasa(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofBant.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskofBant.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant_.java index 0701c3c8ef1..f2ee20e1b1b 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofBant.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfBant_.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ObeliskofBant extends CardImpl { +public class ObeliskOfBant extends CardImpl { - public ObeliskofBant (UUID ownerId) { + public ObeliskOfBant (UUID ownerId) { super(ownerId, 212, "Obelisk of Bant", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "ALA"; this.addAbility(new GreenManaAbility()); @@ -52,12 +52,12 @@ public class ObeliskofBant extends CardImpl { this.addAbility(new BlueManaAbility()); } - public ObeliskofBant (final ObeliskofBant card) { + public ObeliskOfBant (final ObeliskOfBant card) { super(card); } @Override - public ObeliskofBant copy() { - return new ObeliskofBant(this); + public ObeliskOfBant copy() { + return new ObeliskOfBant(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofEsper.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskofEsper.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper_.java index e9c446cdb97..f4c81d15864 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofEsper.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfEsper_.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ObeliskofEsper extends CardImpl { +public class ObeliskOfEsper extends CardImpl { - public ObeliskofEsper (UUID ownerId) { + public ObeliskOfEsper (UUID ownerId) { super(ownerId, 213, "Obelisk of Esper", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "ALA"; this.addAbility(new WhiteManaAbility()); @@ -52,12 +52,12 @@ public class ObeliskofEsper extends CardImpl { this.addAbility(new BlackManaAbility()); } - public ObeliskofEsper (final ObeliskofEsper card) { + public ObeliskOfEsper (final ObeliskOfEsper card) { super(card); } @Override - public ObeliskofEsper copy() { - return new ObeliskofEsper(this); + public ObeliskOfEsper copy() { + return new ObeliskOfEsper(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofGrixis.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskofGrixis.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis_.java index 8343176aca8..18c0bfe11a9 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofGrixis.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfGrixis_.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ObeliskofGrixis extends CardImpl { +public class ObeliskOfGrixis extends CardImpl { - public ObeliskofGrixis (UUID ownerId) { + public ObeliskOfGrixis (UUID ownerId) { super(ownerId, 214, "Obelisk of Grixis", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "ALA"; this.addAbility(new BlueManaAbility()); @@ -52,12 +52,12 @@ public class ObeliskofGrixis extends CardImpl { this.addAbility(new RedManaAbility()); } - public ObeliskofGrixis (final ObeliskofGrixis card) { + public ObeliskOfGrixis (final ObeliskOfGrixis card) { super(card); } @Override - public ObeliskofGrixis copy() { - return new ObeliskofGrixis(this); + public ObeliskOfGrixis copy() { + return new ObeliskOfGrixis(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofJund.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskofJund.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund_.java index 08fc9c53010..e06c624b731 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofJund.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfJund_.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ObeliskofJund extends CardImpl { +public class ObeliskOfJund extends CardImpl { - public ObeliskofJund (UUID ownerId) { + public ObeliskOfJund (UUID ownerId) { super(ownerId, 215, "Obelisk of Jund", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "ALA"; this.addAbility(new BlackManaAbility()); @@ -52,12 +52,12 @@ public class ObeliskofJund extends CardImpl { this.addAbility(new GreenManaAbility()); } - public ObeliskofJund (final ObeliskofJund card) { + public ObeliskOfJund (final ObeliskOfJund card) { super(card); } @Override - public ObeliskofJund copy() { - return new ObeliskofJund(this); + public ObeliskOfJund copy() { + return new ObeliskOfJund(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofNaya.java b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/ObeliskofNaya.java rename to Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya_.java index bcb9c3f9b06..aa673d9c26c 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/ObeliskofNaya.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/ObeliskOfNaya_.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ObeliskofNaya extends CardImpl { +public class ObeliskOfNaya extends CardImpl { - public ObeliskofNaya (UUID ownerId) { + public ObeliskOfNaya (UUID ownerId) { super(ownerId, 216, "Obelisk of Naya", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "ALA"; this.addAbility(new RedManaAbility()); @@ -52,12 +52,12 @@ public class ObeliskofNaya extends CardImpl { this.addAbility(new WhiteManaAbility()); } - public ObeliskofNaya (final ObeliskofNaya card) { + public ObeliskOfNaya (final ObeliskOfNaya card) { super(card); } @Override - public ObeliskofNaya copy() { - return new ObeliskofNaya(this); + public ObeliskOfNaya copy() { + return new ObeliskOfNaya(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java rename to Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess_.java index 4f28ef1fa2b..1fb18a0044f 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/OutriderofJhess.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/OutriderOfJhess_.java @@ -39,9 +39,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class OutriderofJhess extends CardImpl { +public class OutriderOfJhess extends CardImpl { - public OutriderofJhess (UUID ownerId) { + public OutriderOfJhess (UUID ownerId) { super(ownerId, 52, "Outrider of Jhess", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); this.expansionSetCode = "ALA"; this.subtype.add("Human"); @@ -52,12 +52,12 @@ public class OutriderofJhess extends CardImpl { this.addAbility(new ExaltedAbility()); } - public OutriderofJhess (final OutriderofJhess card) { + public OutriderOfJhess (final OutriderOfJhess card) { super(card); } @Override - public OutriderofJhess copy() { - return new OutriderofJhess(this); + public OutriderOfJhess copy() { + return new OutriderOfJhess(this); } } diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java b/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction_.java similarity index 77% rename from Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java rename to Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction_.java index 98e3cac4783..753c8f0b824 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/SigilofDistinction.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/SigilOfDistinction_.java @@ -30,8 +30,8 @@ package mage.sets.shardsofalara; 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.abilities.Ability; @@ -51,35 +51,34 @@ import mage.game.permanent.Permanent; * * @author Loki */ -public class SigilofDistinction extends CardImpl { +public class SigilOfDistinction extends CardImpl { - public SigilofDistinction (UUID ownerId) { + public SigilOfDistinction (UUID ownerId) { super(ownerId, 219, "Sigil of Distinction", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{X}"); this.expansionSetCode = "ALA"; this.subtype.add("Equipment"); - this.addAbility(new EntersBattlefieldAbility(new SigilofDistinctionEffect(), "Sigil of Distinction enters the battlefield with X charge counters on it")); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()))); + this.addAbility(new EntersBattlefieldAbility(new SigilOfDistinctionEffect(), "Sigil of Distinction enters the battlefield with X charge counters on it")); + this.addAbility(new EquipAbility(Outcome.AddAbility, new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()))); BoostEquippedEffect effect = new BoostEquippedEffect(new CountersCount(CounterType.CHARGE), new CountersCount(CounterType.CHARGE)); - effect.setStaticText("Equipped creature gets +1/+1 for each charge counter on Sigil of Distinction"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); } - public SigilofDistinction (final SigilofDistinction card) { + public SigilOfDistinction (final SigilOfDistinction card) { super(card); } @Override - public SigilofDistinction copy() { - return new SigilofDistinction(this); + public SigilOfDistinction copy() { + return new SigilOfDistinction(this); } } -class SigilofDistinctionEffect extends OneShotEffect { - public SigilofDistinctionEffect() { - super(Constants.Outcome.Benefit); +class SigilOfDistinctionEffect extends OneShotEffect { + public SigilOfDistinctionEffect() { + super(Outcome.Benefit); } - public SigilofDistinctionEffect(final SigilofDistinctionEffect effect) { + public SigilOfDistinctionEffect(final SigilOfDistinctionEffect effect) { super(effect); } @@ -95,7 +94,7 @@ class SigilofDistinctionEffect extends OneShotEffect { } @Override - public SigilofDistinctionEffect copy() { - return new SigilofDistinctionEffect(this); + public SigilOfDistinctionEffect copy() { + return new SigilOfDistinctionEffect(this); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/shardsofalara/StewardofValeron.java b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron_.java similarity index 88% rename from Mage.Sets/src/mage/sets/shardsofalara/StewardofValeron.java rename to Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron_.java index b0de3c758ce..7ed9bbd627d 100644 --- a/Mage.Sets/src/mage/sets/shardsofalara/StewardofValeron.java +++ b/Mage.Sets/src/mage/sets/shardsofalara/StewardOfValeron_.java @@ -40,9 +40,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class StewardofValeron extends CardImpl { +public class StewardOfValeron extends CardImpl { - public StewardofValeron (UUID ownerId) { + public StewardOfValeron (UUID ownerId) { super(ownerId, 198, "Steward of Valeron", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{G}{W}"); this.expansionSetCode = "ALA"; this.subtype.add("Human"); @@ -56,12 +56,12 @@ public class StewardofValeron extends CardImpl { this.addAbility(new GreenManaAbility()); } - public StewardofValeron (final StewardofValeron card) { + public StewardOfValeron (final StewardOfValeron card) { super(card); } @Override - public StewardofValeron copy() { - return new StewardofValeron(this); + public StewardOfValeron copy() { + return new StewardOfValeron(this); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/AvengerofZendikar.java b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar_.java similarity index 90% rename from Mage.Sets/src/mage/sets/worldwake/AvengerofZendikar.java rename to Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar_.java index 16845ac6162..e3d91d40d63 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AvengerofZendikar.java +++ b/Mage.Sets/src/mage/sets/worldwake/AvengerOfZendikar_.java @@ -47,7 +47,7 @@ import mage.game.permanent.token.PlantToken; * * @author Loki, nantuko, North */ -public class AvengerofZendikar extends CardImpl { +public class AvengerOfZendikar extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Plant creature you control"); private static final FilterControlledPermanent filterLand = new FilterControlledPermanent("land you control"); @@ -58,7 +58,7 @@ public class AvengerofZendikar extends CardImpl { filterLand.getCardType().add(CardType.LAND); } - public AvengerofZendikar (UUID ownerId) { + public AvengerOfZendikar (UUID ownerId) { super(ownerId, 96, "Avenger of Zendikar", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{G}{G}"); this.expansionSetCode = "WWK"; this.subtype.add("Elemental"); @@ -71,12 +71,12 @@ public class AvengerofZendikar extends CardImpl { this.addAbility(new LandfallAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), true)); } - public AvengerofZendikar (final AvengerofZendikar card) { + public AvengerOfZendikar (final AvengerOfZendikar card) { super(card); } @Override - public AvengerofZendikar copy() { - return new AvengerofZendikar(this); + public AvengerOfZendikar copy() { + return new AvengerOfZendikar(this); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/ClawsofValakut.java b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut_.java similarity index 91% rename from Mage.Sets/src/mage/sets/worldwake/ClawsofValakut.java rename to Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut_.java index 2239248e75a..87079a17ba8 100644 --- a/Mage.Sets/src/mage/sets/worldwake/ClawsofValakut.java +++ b/Mage.Sets/src/mage/sets/worldwake/ClawsOfValakut_.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki, North */ -public class ClawsofValakut extends CardImpl { +public class ClawsOfValakut extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control"); @@ -60,7 +60,7 @@ public class ClawsofValakut extends CardImpl { filter.setTargetController(Constants.TargetController.YOU); } - public ClawsofValakut (UUID ownerId) { + public ClawsOfValakut (UUID ownerId) { super(ownerId, 75, "Claws of Valakut", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{R}"); this.expansionSetCode = "WWK"; this.subtype.add("Aura"); @@ -77,13 +77,13 @@ public class ClawsofValakut extends CardImpl { this.addAbility(ability); } - public ClawsofValakut (final ClawsofValakut card) { + public ClawsOfValakut (final ClawsOfValakut card) { super(card); } @Override - public ClawsofValakut copy() { - return new ClawsofValakut(this); + public ClawsOfValakut copy() { + return new ClawsOfValakut(this); } } diff --git a/Mage.Sets/src/mage/sets/worldwake/EyeofUgin.java b/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin_.java similarity index 86% rename from Mage.Sets/src/mage/sets/worldwake/EyeofUgin.java rename to Mage.Sets/src/mage/sets/worldwake/EyeOfUgin_.java index fe05cb21208..3a1fddf3552 100644 --- a/Mage.Sets/src/mage/sets/worldwake/EyeofUgin.java +++ b/Mage.Sets/src/mage/sets/worldwake/EyeOfUgin_.java @@ -53,7 +53,7 @@ import mage.target.common.TargetCardInLibrary; * * @author maurer.it_at_gmail.com */ -public class EyeofUgin extends CardImpl { +public class EyeOfUgin extends CardImpl { private static final FilterCreatureCard filter; @@ -63,37 +63,37 @@ public class EyeofUgin extends CardImpl { filter.setUseColorless(true); } - public EyeofUgin (UUID ownerId) { + public EyeOfUgin (UUID ownerId) { super(ownerId, 136, "Eye of Ugin", Rarity.MYTHIC, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "WWK"; this.supertype.add("Legendary"); this.subtype.add("Land"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EyeofUginCostReductionEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EyeOfUginCostReductionEffect())); Ability searchAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter)), new TapSourceCost()); searchAbility.addCost(new ManaCostsImpl("{7}")); this.addAbility(searchAbility); } - public EyeofUgin (final EyeofUgin card) { + public EyeOfUgin (final EyeOfUgin card) { super(card); } @Override - public EyeofUgin copy() { - return new EyeofUgin(this); + public EyeOfUgin copy() { + return new EyeOfUgin(this); } } -class EyeofUginCostReductionEffect extends CostModificationEffectImpl { +class EyeOfUginCostReductionEffect extends CostModificationEffectImpl { private static final String effectText = "Colorless Eldrazi spells you cast cost {2} less to cast"; - EyeofUginCostReductionEffect ( ) { + EyeOfUginCostReductionEffect ( ) { super(Duration.WhileOnBattlefield, Outcome.Benefit); } - EyeofUginCostReductionEffect(EyeofUginCostReductionEffect effect) { + EyeOfUginCostReductionEffect(EyeOfUginCostReductionEffect effect) { super(effect); } @@ -122,8 +122,8 @@ class EyeofUginCostReductionEffect extends CostModificationEffectImpl { +public class HammerOfRuin extends CardImpl { - public HammerofRuin (UUID ownerId) { + public HammerOfRuin (UUID ownerId) { super(ownerId, 124, "Hammer of Ruin", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); this.expansionSetCode = "WWK"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); - this.addAbility(new HammerofRuinTriggeredAbility()); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0))); + this.addAbility(new HammerOfRuinTriggeredAbility()); + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); } - public HammerofRuin (final HammerofRuin card) { + public HammerOfRuin (final HammerOfRuin card) { super(card); } @Override - public HammerofRuin copy() { - return new HammerofRuin(this); + public HammerOfRuin copy() { + return new HammerOfRuin(this); } } -class HammerofRuinTriggeredAbility extends TriggeredAbilityImpl { +class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl { - HammerofRuinTriggeredAbility() { - super(Constants.Zone.BATTLEFIELD, new DestroyTargetEffect(), true); + HammerOfRuinTriggeredAbility() { + super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true); FilterPermanent filter = new FilterPermanent("Equipment that player controls"); filter.getSubtype().add("Equipment"); filter.setScopeSupertype(mage.filter.Filter.ComparisonScope.Any); this.addTarget(new TargetPermanent(filter)); } - HammerofRuinTriggeredAbility(final HammerofRuinTriggeredAbility ability) { + HammerOfRuinTriggeredAbility(final HammerOfRuinTriggeredAbility ability) { super(ability); } @Override - public HammerofRuinTriggeredAbility copy() { - return new HammerofRuinTriggeredAbility(this); + public HammerOfRuinTriggeredAbility copy() { + return new HammerOfRuinTriggeredAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/worldwake/JointheRanks.java b/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks_.java similarity index 88% rename from Mage.Sets/src/mage/sets/worldwake/JointheRanks.java rename to Mage.Sets/src/mage/sets/worldwake/JoinTheRanks_.java index 181c031e6cf..85107cf5264 100644 --- a/Mage.Sets/src/mage/sets/worldwake/JointheRanks.java +++ b/Mage.Sets/src/mage/sets/worldwake/JoinTheRanks_.java @@ -39,22 +39,22 @@ import mage.game.permanent.token.SoldierToken; * * @author Loki */ -public class JointheRanks extends CardImpl { +public class JoinTheRanks extends CardImpl { - public JointheRanks (UUID ownerId) { + public JoinTheRanks (UUID ownerId) { super(ownerId, 9, "Join the Ranks", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{3}{W}"); this.expansionSetCode = "WWK"; this.color.setWhite(true); this.getSpellAbility().addEffect(new CreateTokenEffect(new SoldierToken(), 2)); } - public JointheRanks (final JointheRanks card) { + public JoinTheRanks (final JoinTheRanks card) { super(card); } @Override - public JointheRanks copy() { - return new JointheRanks(this); + public JoinTheRanks copy() { + return new JoinTheRanks(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales_.java similarity index 90% rename from Mage.Sets/src/mage/sets/zendikar/CallerofGales.java rename to Mage.Sets/src/mage/sets/zendikar/CallerOfGales_.java index acecdfb83d4..8597d7cdee4 100644 --- a/Mage.Sets/src/mage/sets/zendikar/CallerofGales.java +++ b/Mage.Sets/src/mage/sets/zendikar/CallerOfGales_.java @@ -47,9 +47,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class CallerofGales extends CardImpl { +public class CallerOfGales extends CardImpl { - public CallerofGales (UUID ownerId) { + public CallerOfGales (UUID ownerId) { super(ownerId, 43, "Caller of Gales", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U}"); this.expansionSetCode = "ZEN"; this.subtype.add("Merfolk"); @@ -63,12 +63,12 @@ public class CallerofGales extends CardImpl { this.addAbility(ability); } - public CallerofGales (final CallerofGales card) { + public CallerOfGales (final CallerOfGales card) { super(card); } @Override - public CallerofGales copy() { - return new CallerofGales(this); + public CallerOfGales copy() { + return new CallerOfGales(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir_.java similarity index 90% rename from Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java rename to Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir_.java index 52b29cf77d7..a277e4bf3f8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GatekeeperofMalakir.java +++ b/Mage.Sets/src/mage/sets/zendikar/GatekeeperOfMalakir_.java @@ -45,7 +45,7 @@ import mage.target.TargetPlayer; * * @author maurer.it_at_gmail.com */ -public class GatekeeperofMalakir extends CardImpl { +public class GatekeeperOfMalakir extends CardImpl { private static final FilterControlledPermanent filter; @@ -55,7 +55,7 @@ public class GatekeeperofMalakir extends CardImpl { filter.setMessage(" a creature"); } - public GatekeeperofMalakir(UUID ownerId) { + public GatekeeperOfMalakir(UUID ownerId) { super(ownerId, 89, "Gatekeeper of Malakir", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{B}{B}"); this.expansionSetCode = "ZEN"; this.subtype.add("Vampire"); @@ -73,12 +73,12 @@ public class GatekeeperofMalakir extends CardImpl { this.addAbility(ability); } - public GatekeeperofMalakir(final GatekeeperofMalakir card) { + public GatekeeperOfMalakir(final GatekeeperOfMalakir card) { super(card); } @Override - public GatekeeperofMalakir copy() { - return new GatekeeperofMalakir(this); + public GatekeeperOfMalakir copy() { + return new GatekeeperOfMalakir(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere_.java similarity index 92% rename from Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java rename to Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere_.java index fd33f32ed9d..da90e24fef3 100644 --- a/Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java +++ b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere_.java @@ -46,9 +46,9 @@ import mage.target.TargetPermanent; * * @author maurer.it_at_gmail.com */ -public class JourneytoNowhere extends CardImpl { +public class JourneyToNowhere extends CardImpl { - public JourneytoNowhere(UUID ownerId) { + public JourneyToNowhere(UUID ownerId) { super(ownerId, 14, "Journey to Nowhere", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); this.expansionSetCode = "ZEN"; this.color.setWhite(true); @@ -64,13 +64,13 @@ public class JourneytoNowhere extends CardImpl { this.addAbility(ability2); } - public JourneytoNowhere(final JourneytoNowhere card) { + public JourneyToNowhere(final JourneyToNowhere card) { super(card); } @Override - public JourneytoNowhere copy() { - return new JourneytoNowhere(this); + public JourneyToNowhere copy() { + return new JourneyToNowhere(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny_.java similarity index 90% rename from Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java rename to Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny_.java index adc3a333928..752965e689a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/MarkofMutiny.java +++ b/Mage.Sets/src/mage/sets/zendikar/MarkOfMutiny_.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author maurer.it_at_gmail.com */ -public class MarkofMutiny extends CardImpl { +public class MarkOfMutiny extends CardImpl { - public MarkofMutiny (UUID ownerId) { + public MarkOfMutiny (UUID ownerId) { super(ownerId, 137, "Mark of Mutiny", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{R}"); this.expansionSetCode = "ZEN"; @@ -59,13 +59,13 @@ public class MarkofMutiny extends CardImpl { this.getSpellAbility().addEffect(new UntapTargetEffect()); } - public MarkofMutiny (final MarkofMutiny card) { + public MarkOfMutiny (final MarkOfMutiny card) { super(card); } @Override - public MarkofMutiny copy() { - return new MarkofMutiny(this); + public MarkOfMutiny copy() { + return new MarkOfMutiny(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/ObNixilistheFallen.java b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen_.java similarity index 89% rename from Mage.Sets/src/mage/sets/zendikar/ObNixilistheFallen.java rename to Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen_.java index d62e0bc9436..c33d8a7d8bf 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ObNixilistheFallen.java +++ b/Mage.Sets/src/mage/sets/zendikar/ObNixilisTheFallen_.java @@ -45,9 +45,9 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class ObNixilistheFallen extends CardImpl { +public class ObNixilisTheFallen extends CardImpl { - public ObNixilistheFallen (UUID ownerId) { + public ObNixilisTheFallen (UUID ownerId) { super(ownerId, 107, "Ob Nixilis, the Fallen", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.expansionSetCode = "ZEN"; this.supertype.add("Legendary"); @@ -62,12 +62,12 @@ public class ObNixilistheFallen extends CardImpl { this.addAbility(ability); } - public ObNixilistheFallen (final ObNixilistheFallen card) { + public ObNixilisTheFallen (final ObNixilisTheFallen card) { super(card); } @Override - public ObNixilistheFallen copy() { - return new ObNixilistheFallen(this); + public ObNixilisTheFallen copy() { + return new ObNixilisTheFallen(this); } } diff --git a/Mage.Sets/src/mage/sets/zendikar/ShepherdoftheLost.java b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost_.java similarity index 88% rename from Mage.Sets/src/mage/sets/zendikar/ShepherdoftheLost.java rename to Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost_.java index 50586b12d5b..e35aa005d2f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ShepherdoftheLost.java +++ b/Mage.Sets/src/mage/sets/zendikar/ShepherdOfTheLost_.java @@ -41,9 +41,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class ShepherdoftheLost extends CardImpl { +public class ShepherdOfTheLost extends CardImpl { - public ShepherdoftheLost (UUID ownerId) { + public ShepherdOfTheLost (UUID ownerId) { super(ownerId, 34, "Shepherd of the Lost", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{W}"); this.expansionSetCode = "ZEN"; this.subtype.add("Angel"); @@ -55,12 +55,12 @@ public class ShepherdoftheLost extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); } - public ShepherdoftheLost (final ShepherdoftheLost card) { + public ShepherdOfTheLost (final ShepherdOfTheLost card) { super(card); } @Override - public ShepherdoftheLost copy() { - return new ShepherdoftheLost(this); + public ShepherdOfTheLost copy() { + return new ShepherdOfTheLost(this); } }