From 3817118bc0ed8eab56934a51f4dfbd9c2bbd768e Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Sun, 18 Oct 2015 22:26:40 -0700 Subject: [PATCH] Fix 'Of', 'By' and 'The' in card names --- .../src/mage/deck/ShardsOfAlaraBlock.java | 2 +- .../mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java | 2 +- .../mage/sets/championsofkamigawa/RyuseiTheFallingStar.java | 2 +- Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java | 2 +- Mage.Sets/src/mage/sets/legends/ArenaOfTheAncients.java | 2 +- Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java | 2 +- Mage.Sets/src/mage/sets/magicorigins/ConsecratedByBlood.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java | 2 +- Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java | 2 +- .../org/mage/test/cards/abilities/keywords/CyclingTest.java | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ShardsOfAlaraBlock.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ShardsOfAlaraBlock.java index 44fc5e3e6b3..c8915b5a8b1 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ShardsOfAlaraBlock.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/ShardsOfAlaraBlock.java @@ -37,7 +37,7 @@ import mage.cards.decks.Constructed; public class ShardsOfAlaraBlock extends Constructed { public ShardsOfAlaraBlock() { - super("Constructed - Shards Of Alara Block"); + super("Constructed - Shards of Alara Block"); setCodes.add("ALA"); setCodes.add("CON"); setCodes.add("ARB"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java index bc9ef137476..ac250e6c060 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MyojinOfInfiniteRage.java @@ -59,7 +59,7 @@ public class MyojinOfInfiniteRage extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("lands"); public MyojinOfInfiniteRage(UUID ownerId) { - super(ownerId, 181, "Myojin Of Infinite Rage", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{R}{R}{R}"); + super(ownerId, 181, "Myojin of Infinite Rage", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{7}{R}{R}{R}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Spirit"); diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java index 22072830492..db772aa455f 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java @@ -53,7 +53,7 @@ public class RyuseiTheFallingStar extends CardImpl { } public RyuseiTheFallingStar(UUID ownerID) { - super(ownerID, 185, "Ryusei, The Falling Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}"); + super(ownerID, 185, "Ryusei, the Falling Star", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}"); this.expansionSetCode = "CHK"; this.supertype.add("Legendary"); this.subtype.add("Dragon"); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java index 8bebbae8f2e..6e76865f938 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java @@ -104,7 +104,7 @@ class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl { return true; } } - // Voice Of Resurgence Dies + // Voice of Resurgence Dies if (event.getType() == GameEvent.EventType.ZONE_CHANGE && getSourceId().equals(event.getTargetId())) { ZoneChangeEvent zce = (ZoneChangeEvent) event; return zce.getFromZone().equals(Zone.BATTLEFIELD) && zce.getToZone().equals(Zone.GRAVEYARD); diff --git a/Mage.Sets/src/mage/sets/legends/ArenaOfTheAncients.java b/Mage.Sets/src/mage/sets/legends/ArenaOfTheAncients.java index c5564f03ead..c8d98544ed1 100644 --- a/Mage.Sets/src/mage/sets/legends/ArenaOfTheAncients.java +++ b/Mage.Sets/src/mage/sets/legends/ArenaOfTheAncients.java @@ -32,7 +32,7 @@ public class ArenaOfTheAncients extends CardImpl { } public ArenaOfTheAncients(UUID ownerId) { - super(ownerId, 215, "Arena Of The Ancients", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); + super(ownerId, 215, "Arena of the Ancients", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "LEG"; // When Arena of the Ancients enters the battlefield, tap all Legendary creatures diff --git a/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java b/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java index 1ad585e45f5..ea454dc5cdb 100644 --- a/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java +++ b/Mage.Sets/src/mage/sets/magic2010/DjinnOfWishes.java @@ -105,7 +105,7 @@ class DjinnOfWishesEffect extends OneShotEffect { Card card = player.getLibrary().getFromTop(game); Cards cards = new CardsImpl(); cards.add(card); - player.revealCards("Djinn Of Wishes", cards, game); + player.revealCards("Djinn of Wishes", cards, game); player.getLibrary().removeFromTop(game); diff --git a/Mage.Sets/src/mage/sets/magicorigins/ConsecratedByBlood.java b/Mage.Sets/src/mage/sets/magicorigins/ConsecratedByBlood.java index db3331a17ff..48fed631acf 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/sets/magicorigins/ConsecratedByBlood.java @@ -66,7 +66,7 @@ public class ConsecratedByBlood extends CardImpl { } public ConsecratedByBlood(UUID ownerId) { - super(ownerId, 87, "Consecrated By Blood", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); + super(ownerId, 87, "Consecrated by Blood", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}"); this.expansionSetCode = "ORI"; this.subtype.add("Aura"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java index b271ba24413..e34548dbd8b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfGrace.java @@ -53,7 +53,7 @@ public class DiscipleOfGrace extends CardImpl { } public DiscipleOfGrace(UUID ownerId) { - super(ownerId, 10, "Disciple Of Grace", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 10, "Disciple of Grace", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java index 8edffd89acc..b639fb3aaf9 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/DiscipleOfLaw.java @@ -53,7 +53,7 @@ public class DiscipleOfLaw extends CardImpl { } public DiscipleOfLaw(UUID ownerId) { - super(ownerId, 11, "Disciple Of Law", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); + super(ownerId, 11, "Disciple of Law", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Human"); this.subtype.add("Cleric"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java index fa51e7b9e59..2fa195c2d3b 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfGrace.java @@ -53,7 +53,7 @@ public class VoiceOfGrace extends CardImpl { } public VoiceOfGrace(UUID ownerId) { - super(ownerId, 54, "Voice Of Grace", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); + super(ownerId, 54, "Voice of Grace", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Angel"); diff --git a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java index 898152c6247..51fcaf8fcba 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java +++ b/Mage.Sets/src/mage/sets/urzassaga/VoiceOfLaw.java @@ -52,7 +52,7 @@ public class VoiceOfLaw extends CardImpl { } public VoiceOfLaw(UUID ownerId) { - super(ownerId, 55, "Voice Of Law", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); + super(ownerId, 55, "Voice of Law", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.expansionSetCode = "USG"; this.subtype.add("Angel"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java index e50598c40b4..472fada8fb9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CyclingTest.java @@ -96,7 +96,7 @@ public class CyclingTest extends CardTestPlayerBase { addCard(Zone.GRAVEYARD, playerA, "Decree of Pain"); // Protection from black // Cycling {2} ({2}, Discard this card: Draw a card.) - addCard(Zone.BATTLEFIELD, playerB, "Disciple Of Grace"); + addCard(Zone.BATTLEFIELD, playerB, "Disciple of Grace"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cycling {3}{B}{B}"); activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Cycling {2}"); @@ -108,7 +108,7 @@ public class CyclingTest extends CardTestPlayerBase { assertHandCount(playerB, 0); assertGraveyardCount(playerA, "Decree of Pain", 1); - assertPermanentCount(playerB, "Disciple Of Grace", 1); + assertPermanentCount(playerB, "Disciple of Grace", 1); }