diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraofDominion.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java similarity index 92% rename from Mage.Sets/src/mage/sets/championsofkamigawa/AuraofDominion.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java index 3ca22e1671..6bdbc55be7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AuraofDominion.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AuraOfDominion_temp.java @@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class AuraofDominion extends CardImpl { +public class AuraOfDominion extends CardImpl { private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control"); @@ -63,7 +63,7 @@ public class AuraofDominion extends CardImpl { } - public AuraofDominion(UUID ownerId) { + public AuraOfDominion(UUID ownerId) { super(ownerId, 51, "Aura of Dominion", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); @@ -77,13 +77,13 @@ public class AuraofDominion extends CardImpl { this.addAbility(ability); } - public AuraofDominion(final AuraofDominion card) { + public AuraOfDominion(final AuraOfDominion card) { super(card); } @Override - public AuraofDominion copy() { - return new AuraofDominion(this); + public AuraOfDominion copy() { + return new AuraOfDominion(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyofScrolls.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyofScrolls.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java index 01c7cfc24e..0f595f3517 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyofScrolls.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzamiLadyOfScrolls_temp.java @@ -46,7 +46,7 @@ import mage.target.common.TargetControlledPermanent; * * @author Loki */ -public class AzamiLadyofScrolls extends CardImpl { +public class AzamiLadyOfScrolls extends CardImpl { private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control"); @@ -58,7 +58,7 @@ public class AzamiLadyofScrolls extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public AzamiLadyofScrolls (UUID ownerId) { + public AzamiLadyOfScrolls (UUID ownerId) { super(ownerId, 52, "Azami, Lady of Scrolls", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}{U}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -70,13 +70,13 @@ public class AzamiLadyofScrolls extends CardImpl { this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false)))); } - public AzamiLadyofScrolls (final AzamiLadyofScrolls card) { + public AzamiLadyOfScrolls (final AzamiLadyOfScrolls card) { super(card); } @Override - public AzamiLadyofScrolls copy() { - return new AzamiLadyofScrolls(this); + public AzamiLadyOfScrolls copy() { + return new AzamiLadyOfScrolls(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostbutSeeking.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostbutSeeking.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java index 85467fe56c..b680fc7297 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostbutSeeking.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AzusaLostButSeeking_temp.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class AzusaLostbutSeeking extends CardImpl { +public class AzusaLostButSeeking extends CardImpl { - public AzusaLostbutSeeking (UUID ownerId) { + public AzusaLostButSeeking (UUID ownerId) { super(ownerId, 201, "Azusa, Lost but Seeking", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -56,13 +56,13 @@ public class AzusaLostbutSeeking extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new PlayAdditionalLandsControllerEffect(2, Constants.Duration.WhileOnBattlefield))); } - public AzusaLostbutSeeking (final AzusaLostbutSeeking card) { + public AzusaLostButSeeking (final AzusaLostButSeeking card) { super(card); } @Override - public AzusaLostbutSeeking copy() { - return new AzusaLostbutSeeking(this); + public AzusaLostButSeeking copy() { + return new AzusaLostButSeeking(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CageofHands.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java similarity index 80% rename from Mage.Sets/src/mage/sets/championsofkamigawa/CageofHands.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java index 19d1447e57..c964be5acf 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CageofHands.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CageOfHands_temp.java @@ -34,18 +34,13 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.Ability; -import mage.abilities.common.CantBlockAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.CantAttackSourceEffect; -import mage.abilities.effects.common.CantBlockSourceEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; -import mage.abilities.effects.common.continious.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; -import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,9 +51,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class CageofHands extends CardImpl { +public class CageOfHands extends CardImpl { - public CageofHands (UUID ownerId) { + public CageOfHands (UUID ownerId) { super(ownerId, 3, "Cage of Hands", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Aura"); @@ -68,27 +63,27 @@ public class CageofHands extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Constants.Outcome.Neutral)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CageofHandsEffect())); + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CageOfHandsEffect())); this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), new ManaCostsImpl("{1}{W}"))); } - public CageofHands (final CageofHands card) { + public CageOfHands (final CageOfHands card) { super(card); } @Override - public CageofHands copy() { - return new CageofHands(this); + public CageOfHands copy() { + return new CageOfHands(this); } } -class CageofHandsEffect extends RestrictionEffect { +class CageOfHandsEffect extends RestrictionEffect { - public CageofHandsEffect() { + public CageOfHandsEffect() { super(Constants.Duration.WhileOnBattlefield); } - public CageofHandsEffect(final CageofHandsEffect effect) { + public CageOfHandsEffect(final CageOfHandsEffect effect) { super(effect); } @@ -111,8 +106,8 @@ class CageofHandsEffect extends RestrictionEffect { } @Override - public CageofHandsEffect copy() { - return new CageofHandsEffect(this); + public CageOfHandsEffect copy() { + return new CageOfHandsEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CalltoGlory.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java similarity index 91% rename from Mage.Sets/src/mage/sets/championsofkamigawa/CalltoGlory.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java index 3f24118da1..968b99f15e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CalltoGlory.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CallToGlory_temp.java @@ -46,7 +46,7 @@ import mage.players.Player; /** * @author Loki */ -public class CalltoGlory extends CardImpl { +public class CallToGlory extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai"); @@ -56,7 +56,7 @@ private final static FilterCreaturePermanent filter = new FilterCreaturePermanen filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public CalltoGlory(UUID ownerId) { + public CallToGlory(UUID ownerId) { super(ownerId, 4, "Call to Glory", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); this.expansionSetCode = "CHK"; this.color.setWhite(true); @@ -64,13 +64,13 @@ private final static FilterCreaturePermanent filter = new FilterCreaturePermanen this.getSpellAbility().addEffect(new BoostControlledEffect(1, 1, Constants.Duration.EndOfTurn, filter, false)); } - public CalltoGlory(final CalltoGlory card) { + public CallToGlory(final CallToGlory card) { super(card); } @Override - public CalltoGlory copy() { - return new CalltoGlory(this); + public CallToGlory copy() { + return new CallToGlory(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CounseloftheSoratami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami_temp.java similarity index 87% rename from Mage.Sets/src/mage/sets/championsofkamigawa/CounseloftheSoratami.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami_temp.java index be939f0bb1..8edc802ca0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/CounseloftheSoratami.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CounselOfTheSoratami_temp.java @@ -38,22 +38,22 @@ import mage.cards.CardImpl; * * @author Loki */ -public class CounseloftheSoratami extends CardImpl { +public class CounselOfTheSoratami extends CardImpl { - public CounseloftheSoratami (UUID ownerId) { + public CounselOfTheSoratami (UUID ownerId) { super(ownerId, 55, "Counsel of the Soratami", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{U}"); this.expansionSetCode = "CHK"; this.color.setBlue(true); this.getSpellAbility().addEffect(new DrawCardControllerEffect(2)); } - public CounseloftheSoratami (final CounseloftheSoratami card) { + public CounselOfTheSoratami (final CounselOfTheSoratami card) { super(card); } @Override - public CounseloftheSoratami copy() { - return new CounseloftheSoratami(this); + public CounselOfTheSoratami copy() { + return new CounselOfTheSoratami(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceofShadows.java b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/DanceofShadows.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java index 3baaae2c1b..3fda688f84 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/DanceofShadows.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/DanceOfShadows_temp.java @@ -42,9 +42,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class DanceofShadows extends CardImpl { +public class DanceOfShadows extends CardImpl { - public DanceofShadows (UUID ownerId) { + public DanceOfShadows (UUID ownerId) { super(ownerId, 108, "Dance of Shadows", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); @@ -53,13 +53,13 @@ public class DanceofShadows extends CardImpl { this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FearAbility.getInstance(), Constants.Duration.EndOfTurn)); } - public DanceofShadows (final DanceofShadows card) { + public DanceOfShadows (final DanceOfShadows card) { super(card); } @Override - public DanceofShadows copy() { - return new DanceofShadows(this); + public DanceOfShadows copy() { + return new DanceOfShadows(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeofNowhere.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/EyeofNowhere.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java index e264ba7829..db997c2687 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/EyeofNowhere.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EyeOfNowhere_temp.java @@ -39,9 +39,9 @@ import mage.target.TargetPermanent; * * @author Loki */ -public class EyeofNowhere extends CardImpl { +public class EyeOfNowhere extends CardImpl { - public EyeofNowhere (UUID ownerId) { + public EyeOfNowhere (UUID ownerId) { super(ownerId, 59, "Eye of Nowhere", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); @@ -51,13 +51,13 @@ public class EyeofNowhere extends CardImpl { } - public EyeofNowhere (final EyeofNowhere card) { + public EyeOfNowhere (final EyeOfNowhere card) { super(card); } @Override - public EyeofNowhere copy() { - return new EyeofNowhere(this); + public EyeOfNowhere copy() { + return new EyeOfNowhere(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianofSolitude.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/GuardianofSolitude.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java index 8b5822e953..e7252f21da 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianofSolitude.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GuardianOfSolitude_temp.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class GuardianofSolitude extends CardImpl { +public class GuardianOfSolitude extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -56,7 +56,7 @@ public class GuardianofSolitude extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public GuardianofSolitude(UUID ownerId) { + public GuardianOfSolitude(UUID ownerId) { super(ownerId, 64, "Guardian of Solitude", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -68,13 +68,13 @@ public class GuardianofSolitude extends CardImpl { this.addAbility(ability); } - public GuardianofSolitude(final GuardianofSolitude card) { + public GuardianOfSolitude(final GuardianOfSolitude card) { super(card); } @Override - public GuardianofSolitude copy() { - return new GuardianofSolitude(this); + public GuardianOfSolitude copy() { + return new GuardianOfSolitude(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofCleansingFire.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenofCleansingFire.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java index e5f363d34a..d2264ca594 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofCleansingFire.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire_temp.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent; /** * @author Loki */ -public class HondenofCleansingFire extends CardImpl { +public class HondenOfCleansingFire extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); @@ -52,7 +52,7 @@ public class HondenofCleansingFire extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public HondenofCleansingFire(UUID ownerId) { + public HondenOfCleansingFire(UUID ownerId) { super(ownerId, 14, "Honden of Cleansing Fire", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -61,13 +61,13 @@ public class HondenofCleansingFire extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), Constants.TargetController.YOU, false)); } - public HondenofCleansingFire(final HondenofCleansingFire card) { + public HondenOfCleansingFire(final HondenOfCleansingFire card) { super(card); } @Override - public HondenofCleansingFire copy() { - return new HondenofCleansingFire(this); + public HondenOfCleansingFire copy() { + return new HondenOfCleansingFire(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenofInfiniteRage.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java index a7c0f69be4..de4b2bbfe5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage_temp.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author Loki */ -public class HondenofInfiniteRage extends CardImpl { +public class HondenOfInfiniteRage extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); @@ -55,7 +55,7 @@ public class HondenofInfiniteRage extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public HondenofInfiniteRage (UUID ownerId) { + public HondenOfInfiniteRage (UUID ownerId) { super(ownerId, 172, "Honden of Infinite Rage", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -66,13 +66,13 @@ public class HondenofInfiniteRage extends CardImpl { this.addAbility(ability); } - public HondenofInfiniteRage (final HondenofInfiniteRage card) { + public HondenOfInfiniteRage (final HondenOfInfiniteRage card) { super(card); } @Override - public HondenofInfiniteRage copy() { - return new HondenofInfiniteRage(this); + public HondenOfInfiniteRage copy() { + return new HondenOfInfiniteRage(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofLifesWeb.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenofLifesWeb.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java index dc9614d4d7..df700d8ec7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofLifesWeb.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfLifesWeb_temp.java @@ -44,7 +44,7 @@ import mage.game.permanent.token.SpiritToken; /** * @author Loki */ -public class HondenofLifesWeb extends CardImpl { +public class HondenOfLifesWeb extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); @@ -53,7 +53,7 @@ public class HondenofLifesWeb extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public HondenofLifesWeb(UUID ownerId) { + public HondenOfLifesWeb(UUID ownerId) { super(ownerId, 213, "Honden of Life's Web", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -62,13 +62,13 @@ public class HondenofLifesWeb extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false)); } - public HondenofLifesWeb(final HondenofLifesWeb card) { + public HondenOfLifesWeb(final HondenOfLifesWeb card) { super(card); } @Override - public HondenofLifesWeb copy() { - return new HondenofLifesWeb(this); + public HondenOfLifesWeb copy() { + return new HondenOfLifesWeb(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofNightsReach.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenofNightsReach.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java index 4f39491473..12bb71ff35 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofNightsReach.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach_temp.java @@ -45,7 +45,7 @@ import mage.target.common.TargetOpponent; /** * @author Loki */ -public class HondenofNightsReach extends CardImpl { +public class HondenOfNightsReach extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("shrine"); @@ -54,7 +54,7 @@ public class HondenofNightsReach extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public HondenofNightsReach(UUID ownerId) { + public HondenOfNightsReach(UUID ownerId) { super(ownerId, 116, "Honden of Night's Reach", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -65,13 +65,13 @@ public class HondenofNightsReach extends CardImpl { this.addAbility(ability); } - public HondenofNightsReach(final HondenofNightsReach card) { + public HondenOfNightsReach(final HondenOfNightsReach card) { super(card); } @Override - public HondenofNightsReach copy() { - return new HondenofNightsReach(this); + public HondenOfNightsReach copy() { + return new HondenOfNightsReach(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofSeeingWinds.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/HondenofSeeingWinds.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java index dcc713204b..e04df636b5 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HondenofSeeingWinds.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds_temp.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent; /** * @author Loki */ -public class HondenofSeeingWinds extends CardImpl { +public class HondenOfSeeingWinds extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); @@ -52,7 +52,7 @@ public class HondenofSeeingWinds extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public HondenofSeeingWinds(UUID ownerId) { + public HondenOfSeeingWinds(UUID ownerId) { super(ownerId, 69, "Honden of Seeing Winds", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -61,13 +61,13 @@ public class HondenofSeeingWinds extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false)); } - public HondenofSeeingWinds(final HondenofSeeingWinds card) { + public HondenOfSeeingWinds(final HondenOfSeeingWinds card) { super(card); } @Override - public HondenofSeeingWinds copy() { - return new HondenofSeeingWinds(this); + public HondenOfSeeingWinds copy() { + return new HondenOfSeeingWinds(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofAncientLaw.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java index f5b5ce7750..ec58885b0d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofAncientLaw.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw_temp.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; * * @author Loki */ -public class KamiofAncientLaw extends CardImpl { +public class KamiOfAncientLaw extends CardImpl { private final static FilterPermanent filter = new FilterPermanent("enchantment"); static { @@ -55,7 +55,7 @@ public class KamiofAncientLaw extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public KamiofAncientLaw (UUID ownerId) { + public KamiOfAncientLaw (UUID ownerId) { super(ownerId, 21, "Kami of Ancient Law", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -67,13 +67,13 @@ public class KamiofAncientLaw extends CardImpl { this.addAbility(ability); } - public KamiofAncientLaw (final KamiofAncientLaw card) { + public KamiOfAncientLaw (final KamiOfAncientLaw card) { super(card); } @Override - public KamiofAncientLaw copy() { - return new KamiofAncientLaw(this); + public KamiOfAncientLaw copy() { + return new KamiOfAncientLaw(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofFiresRoar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofFiresRoar.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java index 6d71e16807..5b95fc7885 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofFiresRoar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfFiresRoar_temp.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class KamiofFiresRoar extends CardImpl { +public class KamiOfFiresRoar extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit of Arcane spell"); @@ -56,7 +56,7 @@ public class KamiofFiresRoar extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public KamiofFiresRoar(UUID ownerId) { + public KamiOfFiresRoar(UUID ownerId) { super(ownerId, 174, "Kami of Fire's Roar", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -68,13 +68,13 @@ public class KamiofFiresRoar extends CardImpl { this.addAbility(ability); } - public KamiofFiresRoar(final KamiofFiresRoar card) { + public KamiOfFiresRoar(final KamiOfFiresRoar card) { super(card); } @Override - public KamiofFiresRoar copy() { - return new KamiofFiresRoar(this); + public KamiOfFiresRoar copy() { + return new KamiOfFiresRoar(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofLunacy.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofLunacy.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java index 4766894c16..46106b23ec 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofLunacy.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfLunacy_temp.java @@ -40,9 +40,9 @@ import mage.cards.CardImpl; /** * @author Loki */ -public class KamiofLunacy extends CardImpl { +public class KamiOfLunacy extends CardImpl { - public KamiofLunacy(UUID ownerId) { + public KamiOfLunacy(UUID ownerId) { super(ownerId, 119, "Kami of Lunacy", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -53,13 +53,13 @@ public class KamiofLunacy extends CardImpl { this.addAbility(new SoulshiftAbility(5)); } - public KamiofLunacy(final KamiofLunacy card) { + public KamiOfLunacy(final KamiOfLunacy card) { super(card); } @Override - public KamiofLunacy copy() { - return new KamiofLunacy(this); + public KamiOfLunacy copy() { + return new KamiOfLunacy(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofOldStone.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofOldStone.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java index c16add9f03..56fa540c14 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofOldStone.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfOldStone_temp.java @@ -38,9 +38,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class KamiofOldStone extends CardImpl { +public class KamiOfOldStone extends CardImpl { - public KamiofOldStone (UUID ownerId) { + public KamiOfOldStone (UUID ownerId) { super(ownerId, 22, "Kami of Old Stone", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -49,13 +49,13 @@ public class KamiofOldStone extends CardImpl { this.toughness = new MageInt(7); } - public KamiofOldStone (final KamiofOldStone card) { + public KamiOfOldStone (final KamiOfOldStone card) { super(card); } @Override - public KamiofOldStone copy() { - return new KamiofOldStone(this); + public KamiOfOldStone copy() { + return new KamiOfOldStone(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheHunt.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheHunt.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java index b514d46eea..0818bc434a 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheHunt.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheHunt_temp.java @@ -43,7 +43,7 @@ import mage.filter.FilterCard; /** * @author Loki */ -public class KamioftheHunt extends CardImpl { +public class KamiOfTheHunt extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -53,7 +53,7 @@ public class KamioftheHunt extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public KamioftheHunt(UUID ownerId) { + public KamiOfTheHunt(UUID ownerId) { super(ownerId, 219, "Kami of the Hunt", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -63,13 +63,13 @@ public class KamioftheHunt extends CardImpl { this.addAbility(new SpellCastTriggeredAbility(new BoostSourceEffect(1, 1, Constants.Duration.EndOfTurn), filter, false)); } - public KamioftheHunt(final KamioftheHunt card) { + public KamiOfTheHunt(final KamiOfTheHunt card) { super(card); } @Override - public KamioftheHunt copy() { - return new KamioftheHunt(this); + public KamiOfTheHunt copy() { + return new KamiOfTheHunt(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofthePalaceFields.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofthePalaceFields.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java index ca773fe89e..0c6fe27f43 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofthePalaceFields.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfThePalaceFields_temp.java @@ -41,9 +41,9 @@ import mage.cards.CardImpl; /** * @author Loki */ -public class KamiofthePalaceFields extends CardImpl { +public class KamiOfThePalaceFields extends CardImpl { - public KamiofthePalaceFields(UUID ownerId) { + public KamiOfThePalaceFields(UUID ownerId) { super(ownerId, 24, "Kami of the Palace Fields", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{5}{W}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -55,13 +55,13 @@ public class KamiofthePalaceFields extends CardImpl { this.addAbility(new SoulshiftAbility(5)); } - public KamiofthePalaceFields(final KamiofthePalaceFields card) { + public KamiOfThePalaceFields(final KamiOfThePalaceFields card) { super(card); } @Override - public KamiofthePalaceFields copy() { - return new KamiofthePalaceFields(this); + public KamiOfThePalaceFields copy() { + return new KamiOfThePalaceFields(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheWaningMoon.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheWaningMoon.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java index 32a674c5dc..5c088341d0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamioftheWaningMoon.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTheWaningMoon_temp.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class KamioftheWaningMoon extends CardImpl { +public class KamiOfTheWaningMoon extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -57,7 +57,7 @@ public class KamioftheWaningMoon extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public KamioftheWaningMoon(UUID ownerId) { + public KamiOfTheWaningMoon(UUID ownerId) { super(ownerId, 120, "Kami of the Waning Moon", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -70,13 +70,13 @@ public class KamioftheWaningMoon extends CardImpl { this.addAbility(ability); } - public KamioftheWaningMoon(final KamioftheWaningMoon card) { + public KamiOfTheWaningMoon(final KamiOfTheWaningMoon card) { super(card); } @Override - public KamioftheWaningMoon copy() { - return new KamioftheWaningMoon(this); + public KamiOfTheWaningMoon copy() { + return new KamiOfTheWaningMoon(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofTwistedReflection.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KamiofTwistedReflection.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java index eff26f20a3..b745216bb1 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiofTwistedReflection.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfTwistedReflection_temp.java @@ -44,9 +44,9 @@ import mage.target.common.TargetControlledCreaturePermanent; /** * @author Loki */ -public class KamiofTwistedReflection extends CardImpl { +public class KamiOfTwistedReflection extends CardImpl { - public KamiofTwistedReflection(UUID ownerId) { + public KamiOfTwistedReflection(UUID ownerId) { super(ownerId, 71, "Kami of Twisted Reflection", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -58,13 +58,13 @@ public class KamiofTwistedReflection extends CardImpl { this.addAbility(ability); } - public KamiofTwistedReflection(final KamiofTwistedReflection card) { + public KamiOfTwistedReflection(final KamiOfTwistedReflection card) { super(card); } @Override - public KamiofTwistedReflection copy() { - return new KamiofTwistedReflection(this); + public KamiOfTwistedReflection copy() { + return new KamiOfTwistedReflection(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigatheTideStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KeigatheTideStar.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java index d09bddc279..50402484f6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KeigatheTideStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar_temp.java @@ -46,9 +46,9 @@ import javax.xml.transform.Source; /** * @author Loki */ -public class KeigatheTideStar extends CardImpl { +public class KeigaTheTideStar extends CardImpl { - public KeigatheTideStar(UUID ownerId) { + public KeigaTheTideStar(UUID ownerId) { super(ownerId, 72, "Keiga, the Tide Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{U}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -63,13 +63,13 @@ public class KeigatheTideStar extends CardImpl { this.addAbility(ability); } - public KeigatheTideStar(final KeigatheTideStar card) { + public KeigaTheTideStar(final KeigaTheTideStar card) { super(card); } @Override - public KeigatheTideStar copy() { - return new KeigatheTideStar(this); + public KeigaTheTideStar copy() { + return new KeigaTheTideStar(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheNorthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheNorthTree.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java index 3a4543eb6a..732872749d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheNorthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheNorthTree_temp.java @@ -40,9 +40,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class KodamaoftheNorthTree extends CardImpl { +public class KodamaOfTheNorthTree extends CardImpl { - public KodamaoftheNorthTree (UUID ownerId) { + public KodamaOfTheNorthTree (UUID ownerId) { super(ownerId, 222, "Kodama of the North Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -54,13 +54,13 @@ public class KodamaoftheNorthTree extends CardImpl { this.addAbility(ShroudAbility.getInstance()); } - public KodamaoftheNorthTree (final KodamaoftheNorthTree card) { + public KodamaOfTheNorthTree (final KodamaOfTheNorthTree card) { super(card); } @Override - public KodamaoftheNorthTree copy() { - return new KodamaoftheNorthTree(this); + public KodamaOfTheNorthTree copy() { + return new KodamaOfTheNorthTree(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheSouthTree.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheSouthTree.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java index 6b728e5c75..e5cd235b97 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaoftheSouthTree.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KodamaOfTheSouthTree_temp.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent; /** * @author Loki */ -public class KodamaoftheSouthTree extends CardImpl { +public class KodamaOfTheSouthTree extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -57,7 +57,7 @@ public class KodamaoftheSouthTree extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public KodamaoftheSouthTree(UUID ownerId) { + public KodamaOfTheSouthTree(UUID ownerId) { super(ownerId, 223, "Kodama of the South Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -70,13 +70,13 @@ public class KodamaoftheSouthTree extends CardImpl { this.addAbility(ability); } - public KodamaoftheSouthTree(final KodamaoftheSouthTree card) { + public KodamaOfTheSouthTree(final KodamaOfTheSouthTree card) { super(card); } @Override - public KodamaoftheSouthTree copy() { - return new KodamaoftheSouthTree(this); + public KodamaOfTheSouthTree copy() { + return new KodamaOfTheSouthTree(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushotheEveningStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java similarity index 82% rename from Mage.Sets/src/mage/sets/championsofkamigawa/KokushotheEveningStar.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java index b4b106790b..bd7729934d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KokushotheEveningStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar_temp.java @@ -44,9 +44,9 @@ import mage.game.Game; /** * @author Loki */ -public class KokushotheEveningStar extends CardImpl { +public class KokushoTheEveningStar extends CardImpl { - public KokushotheEveningStar(UUID ownerId) { + public KokushoTheEveningStar(UUID ownerId) { super(ownerId, 122, "Kokusho, the Evening Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -56,26 +56,26 @@ public class KokushotheEveningStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushotheEveningStarEffect(), false)); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushoTheEveningStarEffect(), false)); } - public KokushotheEveningStar(final KokushotheEveningStar card) { + public KokushoTheEveningStar(final KokushoTheEveningStar card) { super(card); } @Override - public KokushotheEveningStar copy() { - return new KokushotheEveningStar(this); + public KokushoTheEveningStar copy() { + return new KokushoTheEveningStar(this); } } -class KokushotheEveningStarEffect extends OneShotEffect { - public KokushotheEveningStarEffect() { +class KokushoTheEveningStarEffect extends OneShotEffect { + public KokushoTheEveningStarEffect() { super(Constants.Outcome.Damage); } - public KokushotheEveningStarEffect(final KokushotheEveningStarEffect effect) { + public KokushoTheEveningStarEffect(final KokushoTheEveningStarEffect effect) { super(effect); } @@ -91,8 +91,8 @@ class KokushotheEveningStarEffect extends OneShotEffect { +public class KondaLordOfEiganjo extends CardImpl { - public KondaLordofEiganjo(UUID ownerId) { + public KondaLordOfEiganjo(UUID ownerId) { super(ownerId, 30, "Konda, Lord of Eiganjo", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -57,13 +57,13 @@ public class KondaLordofEiganjo extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); } - public KondaLordofEiganjo(final KondaLordofEiganjo card) { + public KondaLordOfEiganjo(final KondaLordOfEiganjo card) { super(card); } @Override - public KondaLordofEiganjo copy() { - return new KondaLordofEiganjo(this); + public KondaLordOfEiganjo copy() { + return new KondaLordOfEiganjo(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokutheCloudedMirror.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java similarity index 91% rename from Mage.Sets/src/mage/sets/championsofkamigawa/MelokutheCloudedMirror.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java index b3aba47111..d79525c329 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MelokutheCloudedMirror.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MelokuTheCloudedMirror_temp.java @@ -49,7 +49,7 @@ import mage.target.common.TargetControlledPermanent; /** * @author Loki */ -public class MelokutheCloudedMirror extends CardImpl { +public class MelokuTheCloudedMirror extends CardImpl { private final static FilterControlledPermanent filter = new FilterControlledPermanent("a land"); @@ -58,7 +58,7 @@ public class MelokutheCloudedMirror extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public MelokutheCloudedMirror(UUID ownerId) { + public MelokuTheCloudedMirror(UUID ownerId) { super(ownerId, 74, "Meloku the Clouded Mirror", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -73,13 +73,13 @@ public class MelokutheCloudedMirror extends CardImpl { this.addAbility(ability); } - public MelokutheCloudedMirror(final MelokutheCloudedMirror card) { + public MelokuTheCloudedMirror(final MelokuTheCloudedMirror card) { super(card); } @Override - public MelokutheCloudedMirror copy() { - return new MelokutheCloudedMirror(this); + public MelokuTheCloudedMirror copy() { + return new MelokuTheCloudedMirror(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolatWatersEdge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolatWatersEdge.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java index f62cd404a3..592522e99b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolatWatersEdge.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge_temp.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; * * @author Loki */ -public class MinamoSchoolatWatersEdge extends CardImpl { +public class MinamoSchoolAtWatersEdge extends CardImpl { private final static FilterPermanent filter = new FilterPermanent("legendary permanent"); @@ -58,7 +58,7 @@ public class MinamoSchoolatWatersEdge extends CardImpl } - public MinamoSchoolatWatersEdge (UUID ownerId) { + public MinamoSchoolAtWatersEdge (UUID ownerId) { super(ownerId, 279, "Minamo, School at Water's Edge", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -69,13 +69,13 @@ public class MinamoSchoolatWatersEdge extends CardImpl this.addAbility(ability); } - public MinamoSchoolatWatersEdge (final MinamoSchoolatWatersEdge card) { + public MinamoSchoolAtWatersEdge (final MinamoSchoolAtWatersEdge card) { super(card); } @Override - public MinamoSchoolatWatersEdge copy() { - return new MinamoSchoolatWatersEdge(this); + public MinamoSchoolAtWatersEdge copy() { + return new MinamoSchoolAtWatersEdge(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightofSoulsBetrayal.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/NightofSoulsBetrayal.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java index 3d9fd4c154..e25525628d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/NightofSoulsBetrayal.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NightOfSoulsBetrayal_temp.java @@ -42,10 +42,10 @@ import mage.filter.common.FilterCreaturePermanent; * * @author Loki */ -public class NightofSoulsBetrayal extends CardImpl { +public class NightOfSoulsBetrayal extends CardImpl { private static FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures"); - public NightofSoulsBetrayal (UUID ownerId) { + public NightOfSoulsBetrayal (UUID ownerId) { super(ownerId, 133, "Night of Souls' Betrayal", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -53,13 +53,13 @@ public class NightofSoulsBetrayal extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Constants.Duration.WhileOnBattlefield, filter, false))); } - public NightofSoulsBetrayal (final NightofSoulsBetrayal card) { + public NightOfSoulsBetrayal (final NightOfSoulsBetrayal card) { super(card); } @Override - public NightofSoulsBetrayal copy() { - return new NightofSoulsBetrayal(this); + public NightOfSoulsBetrayal copy() { + return new NightOfSoulsBetrayal(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempletotheGrandfathers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempletotheGrandfathers.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java index 8263faf634..9e1c1dfb73 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempletotheGrandfathers.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers_temp.java @@ -47,7 +47,7 @@ import mage.target.TargetPermanent; /** * @author Loki */ -public class OkinaTempletotheGrandfathers extends CardImpl { +public class OkinaTempleToTheGrandfathers extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); @@ -56,7 +56,7 @@ public class OkinaTempletotheGrandfathers extends CardImpl { +public class OrderOfTheSacredBell extends CardImpl { - public OrderoftheSacredBell (UUID ownerId) { + public OrderOfTheSacredBell (UUID ownerId) { super(ownerId, 232, "Order of the Sacred Bell", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Human"); @@ -50,13 +50,13 @@ public class OrderoftheSacredBell extends CardImpl { this.toughness = new MageInt(3); } - public OrderoftheSacredBell (final OrderoftheSacredBell card) { + public OrderOfTheSacredBell (final OrderOfTheSacredBell card) { super(card); } @Override - public OrderoftheSacredBell copy() { - return new OrderoftheSacredBell(this); + public OrderOfTheSacredBell copy() { + return new OrderOfTheSacredBell(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ParttheVeil.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java similarity index 91% rename from Mage.Sets/src/mage/sets/championsofkamigawa/ParttheVeil.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java index b24e1140d0..813edbbf7d 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ParttheVeil.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PartTheVeil_temp.java @@ -43,9 +43,9 @@ import mage.game.permanent.Permanent; /** * @author Loki */ -public class ParttheVeil extends CardImpl { +public class PartTheVeil extends CardImpl { - public ParttheVeil(UUID ownerId) { + public PartTheVeil(UUID ownerId) { super(ownerId, 77, "Part the Veil", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{3}{U}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); @@ -53,13 +53,13 @@ public class ParttheVeil extends CardImpl { this.getSpellAbility().addEffect(new ParttheVeilEffect()); } - public ParttheVeil(final ParttheVeil card) { + public PartTheVeil(final PartTheVeil card) { super(card); } @Override - public ParttheVeil copy() { - return new ParttheVeil(this); + public PartTheVeil copy() { + return new PartTheVeil(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterofSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterofSeshiro.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java index aab20acd6e..b9aa089b57 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterofSeshiro.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SachiDaughterOfSeshiro_temp.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterCreaturePermanent; /** * @author Loki */ -public class SachiDaughterofSeshiro extends CardImpl { +public class SachiDaughterOfSeshiro extends CardImpl { private final static FilterCreaturePermanent snakeFilter = new FilterCreaturePermanent("Snakes"); @@ -60,7 +60,7 @@ public class SachiDaughterofSeshiro extends CardImpl { shamanFilter.getSubtype().add("Shaman"); } - public SachiDaughterofSeshiro(UUID ownerId) { + public SachiDaughterOfSeshiro(UUID ownerId) { super(ownerId, 238, "Sachi, Daughter of Seshiro", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -73,13 +73,13 @@ public class SachiDaughterofSeshiro extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityControlledEffect(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ManaEffect(new Mana(0, 2, 0, 0, 0, 0, 0)), new TapSourceCost()), Constants.Duration.WhileOnBattlefield, shamanFilter, false))); } - public SachiDaughterofSeshiro(final SachiDaughterofSeshiro card) { + public SachiDaughterOfSeshiro(final SachiDaughterOfSeshiro card) { super(card); } @Override - public SachiDaughterofSeshiro copy() { - return new SachiDaughterofSeshiro(this); + public SachiDaughterOfSeshiro copy() { + return new SachiDaughterOfSeshiro(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterofTruth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterofTruth.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java index 23e620cc17..04f604dfd0 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterofTruth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth_temp.java @@ -44,9 +44,9 @@ import mage.cards.CardImpl; * * @author Loki */ -public class SeizanPerverterofTruth extends CardImpl { +public class SeizanPerverterOfTruth extends CardImpl { - public SeizanPerverterofTruth (UUID ownerId) { + public SeizanPerverterOfTruth (UUID ownerId) { super(ownerId, 143, "Seizan, Perverter of Truth", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -61,13 +61,13 @@ public class SeizanPerverterofTruth extends CardImpl { } - public SeizanPerverterofTruth (final SeizanPerverterofTruth card) { + public SeizanPerverterOfTruth (final SeizanPerverterOfTruth card) { super(card); } @Override - public SeizanPerverterofTruth copy() { - return new SeizanPerverterofTruth(this); + public SeizanPerverterOfTruth copy() { + return new SeizanPerverterOfTruth(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshirotheAnointed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java similarity index 92% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SeshirotheAnointed.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java index 43ce21bc46..439eebee78 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshirotheAnointed.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed_temp.java @@ -52,7 +52,7 @@ import mage.target.targetpointer.FixedTarget; /** * @author Loki */ -public class SeshirotheAnointed extends CardImpl { +public class SeshiroTheAnointed extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Snakes"); @@ -60,7 +60,7 @@ public class SeshirotheAnointed extends CardImpl { filter.getSubtype().add("Snake"); } - public SeshirotheAnointed(UUID ownerId) { + public SeshiroTheAnointed(UUID ownerId) { super(ownerId, 241, "Seshiro the Anointed", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -73,13 +73,13 @@ public class SeshirotheAnointed extends CardImpl { this.addAbility(new SeshirotheAnointedAbility()); } - public SeshirotheAnointed(final SeshirotheAnointed card) { + public SeshiroTheAnointed(final SeshiroTheAnointed card) { super(card); } @Override - public SeshirotheAnointed copy() { - return new SeshirotheAnointed(this); + public SeshiroTheAnointed copy() { + return new SeshiroTheAnointed(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkatheBloodsoakedKeep.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/ShinkatheBloodsoakedKeep.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java index d1db731c1f..fe0e0b3ad6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkatheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep_temp.java @@ -48,7 +48,7 @@ import mage.target.TargetPermanent; /** * @author Loki */ -public class ShinkatheBloodsoakedKeep extends CardImpl { +public class ShinkaTheBloodsoakedKeep extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); @@ -57,7 +57,7 @@ public class ShinkatheBloodsoakedKeep extends CardImpl filter.setScopeSupertype(Filter.ComparisonScope.Any); } - public ShinkatheBloodsoakedKeep(UUID ownerId) { + public ShinkaTheBloodsoakedKeep(UUID ownerId) { super(ownerId, 282, "Shinka, the Bloodsoaked Keep", Rarity.RARE, new CardType[]{CardType.LAND}, null); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); @@ -68,13 +68,13 @@ public class ShinkatheBloodsoakedKeep extends CardImpl this.addAbility(ability); } - public ShinkatheBloodsoakedKeep(final ShinkatheBloodsoakedKeep card) { + public ShinkaTheBloodsoakedKeep(final ShinkaTheBloodsoakedKeep card) { super(card); } @Override - public ShinkatheBloodsoakedKeep copy() { - return new ShinkatheBloodsoakedKeep(this); + public ShinkaTheBloodsoakedKeep copy() { + return new ShinkaTheBloodsoakedKeep(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulofMagma.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/SoulofMagma.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java index ff6198884d..8d62378372 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SoulofMagma.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SoulOfMagma_temp.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class SoulofMagma extends CardImpl { +public class SoulOfMagma extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -54,7 +54,7 @@ public class SoulofMagma extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public SoulofMagma(UUID ownerId) { + public SoulOfMagma(UUID ownerId) { super(ownerId, 189, "Soul of Magma", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -66,13 +66,13 @@ public class SoulofMagma extends CardImpl { this.addAbility(ability); } - public SoulofMagma(final SoulofMagma card) { + public SoulOfMagma(final SoulOfMagma card) { super(card); } @Override - public SoulofMagma copy() { - return new SoulofMagma(this); + public SoulOfMagma copy() { + return new SoulOfMagma(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthofCedars.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java similarity index 90% rename from Mage.Sets/src/mage/sets/championsofkamigawa/StrengthofCedars.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java index 4ba61b1474..5b3b8c790b 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthofCedars.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StrengthOfCedars_temp.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class StrengthofCedars extends CardImpl { +public class StrengthOfCedars extends CardImpl { private final static FilterControlledPermanent filter = new FilterControlledPermanent("land your control"); static { @@ -53,7 +53,7 @@ public class StrengthofCedars extends CardImpl { filter.setScopeCardType(Filter.ComparisonScope.Any); } - public StrengthofCedars (UUID ownerId) { + public StrengthOfCedars (UUID ownerId) { super(ownerId, 245, "Strength of Cedars", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{4}{G}"); this.expansionSetCode = "CHK"; this.subtype.add("Arcane"); @@ -63,13 +63,13 @@ public class StrengthofCedars extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public StrengthofCedars (final StrengthofCedars card) { + public StrengthOfCedars (final StrengthOfCedars card) { super(card); } @Override - public StrengthofCedars copy() { - return new StrengthofCedars(this); + public StrengthOfCedars copy() { + return new StrengthOfCedars(this); } } diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefofHope.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java similarity index 91% rename from Mage.Sets/src/mage/sets/championsofkamigawa/ThiefofHope.java rename to Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java index 844e292527..55ac42c5b7 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefofHope.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ThiefOfHope_temp.java @@ -48,7 +48,7 @@ import mage.target.common.TargetOpponent; /** * @author Loki */ -public class ThiefofHope extends CardImpl { +public class ThiefOfHope extends CardImpl { private final static FilterCard filter = new FilterCard("a Spirit or Arcane spell"); @@ -58,7 +58,7 @@ public class ThiefofHope extends CardImpl { filter.setScopeSubtype(Filter.ComparisonScope.Any); } - public ThiefofHope(UUID ownerId) { + public ThiefOfHope(UUID ownerId) { super(ownerId, 147, "Thief of Hope", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.expansionSetCode = "CHK"; this.subtype.add("Spirit"); @@ -72,13 +72,13 @@ public class ThiefofHope extends CardImpl { this.addAbility(new SoulshiftAbility(2)); } - public ThiefofHope(final ThiefofHope card) { + public ThiefOfHope(final ThiefOfHope card) { super(card); } @Override - public ThiefofHope copy() { - return new ThiefofHope(this); + public ThiefOfHope copy() { + return new ThiefOfHope(this); } } diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingtheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java similarity index 76% rename from Mage.Sets/src/mage/sets/eventide/AshlingtheExtinguisher.java rename to Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java index 2f9d7a34c2..6ccb4867c9 100644 --- a/Mage.Sets/src/mage/sets/eventide/AshlingtheExtinguisher.java +++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher_temp.java @@ -35,25 +35,20 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.DiscardTargetEffect; import mage.abilities.effects.common.SacrificeTargetEffect; -import mage.abilities.effects.common.UntapAllLandsControllerEffect; import mage.cards.CardImpl; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetpointer.FixedTarget; /** * * @author Loki */ -public class AshlingtheExtinguisher extends CardImpl { +public class AshlingTheExtinguisher extends CardImpl { - public AshlingtheExtinguisher (UUID ownerId) { + public AshlingTheExtinguisher (UUID ownerId) { super(ownerId, 33, "Ashling, the Extinguisher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{B}{B}"); this.expansionSetCode = "EVE"; this.supertype.add("Legendary"); @@ -62,33 +57,33 @@ public class AshlingtheExtinguisher extends CardImpl { this.color.setBlack(true); this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new AshlingtheExtinguisherTriggeredAbility()); + this.addAbility(new AshlingTheExtinguisherTriggeredAbility()); } - public AshlingtheExtinguisher (final AshlingtheExtinguisher card) { + public AshlingTheExtinguisher (final AshlingTheExtinguisher card) { super(card); } @Override - public AshlingtheExtinguisher copy() { - return new AshlingtheExtinguisher(this); + public AshlingTheExtinguisher copy() { + return new AshlingTheExtinguisher(this); } } -class AshlingtheExtinguisherTriggeredAbility extends TriggeredAbilityImpl { - public AshlingtheExtinguisherTriggeredAbility() { +class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl { + public AshlingTheExtinguisherTriggeredAbility() { super(Constants.Zone.BATTLEFIELD, new SacrificeTargetEffect()); this.addTarget(new TargetCreaturePermanent()); } - public AshlingtheExtinguisherTriggeredAbility(final AshlingtheExtinguisherTriggeredAbility ability) { + public AshlingTheExtinguisherTriggeredAbility(final AshlingTheExtinguisherTriggeredAbility ability) { super(ability); } @Override - public AshlingtheExtinguisherTriggeredAbility copy() { - return new AshlingtheExtinguisherTriggeredAbility(this); + public AshlingTheExtinguisherTriggeredAbility copy() { + return new AshlingTheExtinguisherTriggeredAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/guildpact/AngelofDespair.java b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java similarity index 87% rename from Mage.Sets/src/mage/sets/guildpact/AngelofDespair.java rename to Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java index daec60cff4..28e58abccf 100644 --- a/Mage.Sets/src/mage/sets/guildpact/AngelofDespair.java +++ b/Mage.Sets/src/mage/sets/guildpact/AngelOfDespair_temp.java @@ -32,22 +32,20 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.MageInt; -import mage.abilities.Abilities; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; -import mage.sets.conflux.AbsorbVis; import mage.target.TargetPermanent; /** * * @author Loki */ -public class AngelofDespair extends CardImpl { +public class AngelOfDespair extends CardImpl { - public AngelofDespair (UUID ownerId) { + public AngelOfDespair (UUID ownerId) { super(ownerId, 101, "Angel of Despair", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}{B}{B}"); this.expansionSetCode = "GPT"; this.subtype.add("Angel"); @@ -61,13 +59,13 @@ public class AngelofDespair extends CardImpl { this.addAbility(ability); } - public AngelofDespair (final AngelofDespair card) { + public AngelOfDespair (final AngelOfDespair card) { super(card); } @Override - public AngelofDespair copy() { - return new AngelofDespair(this); + public AngelOfDespair copy() { + return new AngelOfDespair(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandratheFirebrand.java b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java similarity index 86% rename from Mage.Sets/src/mage/sets/magic2012/ChandratheFirebrand.java rename to Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java index 90be26fcc9..f02682eb63 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChandratheFirebrand.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand_temp.java @@ -38,7 +38,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.CopyTargetSpellEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.counters.CounterType; @@ -52,9 +51,9 @@ import mage.target.targetpointer.FixedTarget; * * @author Loki */ -public class ChandratheFirebrand extends CardImpl { +public class ChandraTheFirebrand extends CardImpl { - public ChandratheFirebrand (UUID ownerId) { + public ChandraTheFirebrand (UUID ownerId) { super(ownerId, 124, "Chandra, the Firebrand", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, "{3}{R}"); this.expansionSetCode = "M12"; this.subtype.add("Chandra"); @@ -65,36 +64,36 @@ public class ChandratheFirebrand extends CardImpl { ability1.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability1); - this.addAbility(new LoyaltyAbility(new CreateDelayedTriggeredAbilityEffect(new ChandratheFirebrandAbility()), -2)); + this.addAbility(new LoyaltyAbility(new CreateDelayedTriggeredAbilityEffect(new ChandraTheFirebrandAbility()), -2)); LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(6), -6); ability2.addTarget(new TargetCreatureOrPlayer(0, 6)); this.addAbility(ability2); } - public ChandratheFirebrand (final ChandratheFirebrand card) { + public ChandraTheFirebrand (final ChandraTheFirebrand card) { super(card); } @Override - public ChandratheFirebrand copy() { - return new ChandratheFirebrand(this); + public ChandraTheFirebrand copy() { + return new ChandraTheFirebrand(this); } } -class ChandratheFirebrandAbility extends DelayedTriggeredAbility { - ChandratheFirebrandAbility() { +class ChandraTheFirebrandAbility extends DelayedTriggeredAbility { + ChandraTheFirebrandAbility() { super(new CopyTargetSpellEffect()); } - ChandratheFirebrandAbility(final ChandratheFirebrandAbility ability) { + ChandraTheFirebrandAbility(final ChandraTheFirebrandAbility ability) { super(ability); } @Override - public ChandratheFirebrandAbility copy() { - return new ChandratheFirebrandAbility(this); + public ChandraTheFirebrandAbility copy() { + return new ChandraTheFirebrandAbility(this); } @Override diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonSLawkeeper.java b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/magic2012/GideonSLawkeeper.java rename to Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java index b102dde08e..44d270102a 100644 --- a/Mage.Sets/src/mage/sets/magic2012/GideonSLawkeeper.java +++ b/Mage.Sets/src/mage/sets/magic2012/GideonsLawkeeper_temp.java @@ -45,9 +45,9 @@ import mage.target.common.TargetCreaturePermanent; /** * @author Loki */ -public class GideonSLawkeeper extends CardImpl { +public class GideonsLawkeeper extends CardImpl { - public GideonSLawkeeper(UUID ownerId) { + public GideonsLawkeeper(UUID ownerId) { super(ownerId, 18, "Gideon's Lawkeeper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}"); this.expansionSetCode = "M12"; this.subtype.add("Human"); @@ -61,13 +61,13 @@ public class GideonSLawkeeper extends CardImpl { this.addAbility(ability); } - public GideonSLawkeeper(final GideonSLawkeeper card) { + public GideonsLawkeeper(final GideonsLawkeeper card) { super(card); } @Override - public GideonSLawkeeper copy() { - return new GideonSLawkeeper(this); + public GideonsLawkeeper copy() { + return new GideonsLawkeeper(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinSThirst.java b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java similarity index 89% rename from Mage.Sets/src/mage/sets/magic2012/SorinSThirst.java rename to Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java index 8069b95b90..a919a45def 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinSThirst.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsThirst_temp.java @@ -40,9 +40,9 @@ import mage.target.common.TargetCreaturePermanent; * * @author Loki */ -public class SorinSThirst extends CardImpl { +public class SorinsThirst extends CardImpl { - public SorinSThirst (UUID ownerId) { + public SorinsThirst (UUID ownerId) { super(ownerId, 110, "Sorin's Thirst", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{B}{B}"); this.expansionSetCode = "M12"; this.color.setBlack(true); @@ -51,13 +51,13 @@ public class SorinSThirst extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } - public SorinSThirst (final SorinSThirst card) { + public SorinsThirst (final SorinsThirst card) { super(card); } @Override - public SorinSThirst copy() { - return new SorinSThirst(this); + public SorinsThirst copy() { + return new SorinsThirst(this); } } diff --git a/Mage.Sets/src/mage/sets/magic2012/SorinSVengeance.java b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java similarity index 88% rename from Mage.Sets/src/mage/sets/magic2012/SorinSVengeance.java rename to Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java index b0238539ae..bdc069fbce 100644 --- a/Mage.Sets/src/mage/sets/magic2012/SorinSVengeance.java +++ b/Mage.Sets/src/mage/sets/magic2012/SorinsVengeance_temp.java @@ -40,9 +40,9 @@ import mage.target.TargetPlayer; * * @author Loki */ -public class SorinSVengeance extends CardImpl { +public class SorinsVengeance extends CardImpl { - public SorinSVengeance (UUID ownerId) { + public SorinsVengeance (UUID ownerId) { super(ownerId, 111, "Sorin's Vengeance", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}{B}"); this.expansionSetCode = "M12"; this.color.setBlack(true); @@ -51,13 +51,13 @@ public class SorinSVengeance extends CardImpl { this.getSpellAbility().addTarget(new TargetPlayer()); } - public SorinSVengeance (final SorinSVengeance card) { + public SorinsVengeance (final SorinsVengeance card) { super(card); } @Override - public SorinSVengeance copy() { - return new SorinSVengeance(this); + public SorinsVengeance copy() { + return new SorinsVengeance(this); } } diff --git a/Mage.Sets/src/mage/sets/tenth/CounseloftheSoratami.java b/Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java similarity index 79% rename from Mage.Sets/src/mage/sets/tenth/CounseloftheSoratami.java rename to Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java index a83613244e..91382913b7 100644 --- a/Mage.Sets/src/mage/sets/tenth/CounseloftheSoratami.java +++ b/Mage.Sets/src/mage/sets/tenth/CounselOfTheSoratami_temp.java @@ -29,31 +29,27 @@ package mage.sets.tenth; import java.util.UUID; -import mage.Constants.CardType; -import mage.Constants.Rarity; -import mage.cards.CardImpl; -import mage.sets.alarareborn.MagefireWings; /** * * @author Loki */ -public class CounseloftheSoratami extends mage.sets.championsofkamigawa.CounseloftheSoratami { +public class CounselOfTheSoratami extends mage.sets.championsofkamigawa.CounselOfTheSoratami { - public CounseloftheSoratami (UUID ownerId) { + public CounselOfTheSoratami (UUID ownerId) { super(ownerId); this.expansionSetCode = "10E"; this.cardNumber = 76; } - public CounseloftheSoratami (final CounseloftheSoratami card) { + public CounselOfTheSoratami (final CounselOfTheSoratami card) { super(card); } @Override - public CounseloftheSoratami copy() { - return new CounseloftheSoratami(this); + public CounselOfTheSoratami copy() { + return new CounselOfTheSoratami(this); } } diff --git a/Utils/cardclass.tmpl b/Utils/cardClass_temp.tmpl similarity index 100% rename from Utils/cardclass.tmpl rename to Utils/cardClass_temp.tmpl