From e96d28e811283b438594c6e7bd0d78790f108752 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 22 Jun 2017 16:11:44 +0000 Subject: [PATCH] - Ligature AE -> Ae update. --- forge-core/src/main/java/forge/ImageKeys.java | 10 ++++++++++ .../screens/planarconquest/ConquestAEtherScreen.java | 2 +- .../src/forge/screens/planarconquest/ConquestMenu.java | 2 +- .../planarconquest/ConquestMultiverseScreen.java | 2 +- .../screens/planarconquest/ConquestPrefsScreen.java | 2 +- forge-gui/res/cardsfolder/a/aerathi_berserker.txt | 2 +- forge-gui/res/cardsfolder/a/aether_adept.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_barrier.txt | 2 +- forge-gui/res/cardsfolder/a/aether_burst.txt | 6 +++--- forge-gui/res/cardsfolder/a/aether_charge.txt | 2 +- forge-gui/res/cardsfolder/a/aether_figment.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_flash.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_gale.txt | 2 +- forge-gui/res/cardsfolder/a/aether_membrane.txt | 3 +-- forge-gui/res/cardsfolder/a/aether_mutation.txt | 3 +-- forge-gui/res/cardsfolder/a/aether_rift.txt | 2 +- forge-gui/res/cardsfolder/a/aether_shockwave.txt | 2 +- forge-gui/res/cardsfolder/a/aether_snap.txt | 2 +- forge-gui/res/cardsfolder/a/aether_spellbomb.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_sting.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_storm.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_tide.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_tradewinds.txt | 2 +- forge-gui/res/cardsfolder/a/aether_vial.txt | 4 ++-- forge-gui/res/cardsfolder/a/aether_web.txt | 2 +- forge-gui/res/cardsfolder/a/aetherflame_wall.txt | 4 ++-- forge-gui/res/cardsfolder/a/aetherize.txt | 2 +- forge-gui/res/cardsfolder/a/aetherling.txt | 4 ++-- forge-gui/res/cardsfolder/a/aethermages_touch.txt | 8 ++++---- forge-gui/res/cardsfolder/a/aetherplasm.txt | 4 ++-- forge-gui/res/cardsfolder/a/aethersnatch.txt | 4 ++-- forge-gui/res/cardsfolder/a/aethersnipe.txt | 4 ++-- forge-gui/res/cardsfolder/a/aetherspouts.txt | 2 +- forge-gui/res/cardsfolder/a/aethertow.txt | 2 +- forge-gui/res/cardsfolder/a/anchor_to_the_aether.txt | 4 ++-- forge-gui/res/cardsfolder/a/arm_with_aether.txt | 2 +- forge-gui/res/cardsfolder/a/azorius_aethermage.txt | 2 +- forge-gui/res/cardsfolder/c/chaotic_aether.txt | 8 ++++---- forge-gui/res/cardsfolder/f/fold_into_aether.txt | 2 +- forge-gui/res/cardsfolder/f/frozen_aether.txt | 2 +- forge-gui/res/cardsfolder/g/gate_to_the_aether.txt | 2 +- forge-gui/res/cardsfolder/g/ghirapur_aether_grid.txt | 4 ++-- forge-gui/res/cardsfolder/o/obscuring_aether.txt | 4 ++-- forge-gui/res/cardsfolder/s/scornful_aether_lich.txt | 4 ++-- forge-gui/res/cardsfolder/s/surging_aether.txt | 2 +- forge-gui/res/cardsfolder/t/tainted_aether.txt | 2 +- forge-gui/res/cardsfolder/t/the_aether_flues.txt | 4 ++-- forge-gui/res/cardsfolder/u/unravel_the_aether.txt | 2 +- forge-gui/res/cardsfolder/v/vedalken_aethermage.txt | 4 ++-- .../main/java/forge/planarconquest/ConquestData.java | 2 +- .../main/java/forge/planarconquest/ConquestUtil.java | 4 ++-- 51 files changed, 88 insertions(+), 80 deletions(-) diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 914b6cf715e..cf9832b616a 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -101,6 +101,16 @@ public final class ImageKeys { File file = findFile(dir, filename); if (file != null) { return file; } + // AE -> Ae and Ae -> AE for older cards with different file names + // on case-sensitive file systems + if (filename.contains("Ae")) { + file = findFile(dir, filename.replace("Ae", "AE")); + if (file != null) { return file; } + } else if (filename.contains("AE")) { + file = findFile(dir, filename.replace("AE", "Ae")); + if (file != null) { return file; } + } + // some S00 cards are really part of 6ED String s2kAlias = getSetFolder("S00"); if (filename.startsWith(s2kAlias)) { diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index 1ae765e7d09..410e164359a 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -217,7 +217,7 @@ public class ConquestAEtherScreen extends FScreen { private String message; private void updateMessage() { - message = "Tap to pull from the AEther\n{AE}"; + message = "Tap to pull from the Aether\n{AE}"; if (shardCost == 0) { message += "--"; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java index 53c50512bc2..3ff5800fcb6 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java @@ -31,7 +31,7 @@ public class ConquestMenu extends FPopupMenu { setCurrentScreen(multiverseScreen); } }); - private static final FMenuItem aetherItem = new FMenuItem("The AEther", FSkinImage.AETHER_SHARD, new FEventHandler() { + private static final FMenuItem aetherItem = new FMenuItem("The Aether", FSkinImage.AETHER_SHARD, new FEventHandler() { @Override public void handleEvent(FEvent e) { setCurrentScreen(aetherScreen); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index 9f645394d23..06ca7006ad9 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -224,7 +224,7 @@ public class ConquestMultiverseScreen extends FScreen { }; private void awardShards(int shards, boolean fromDuplicateCards) { - String message = "Received AEther Shards"; + String message = "Received Aether Shards"; if (fromDuplicateCards) { //if from duplicate cards, shards already added to model message += " for Duplicate Cards"; } diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java index 49712cfbc20..3dcb149cff1 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java @@ -51,7 +51,7 @@ public class ConquestPrefsScreen extends FScreen { public ConquestPrefsScreen() { super("Conquest Preferences", ConquestMenu.getMenu()); - scroller.add(new PrefsHeader("AEther Shards", FSkinImage.AETHER_SHARD, PrefsGroup.BOOSTER)); + scroller.add(new PrefsHeader("Aether Shards", FSkinImage.AETHER_SHARD, PrefsGroup.BOOSTER)); scroller.add(new PrefsOption("Base Duplicate Value", CQPref.AETHER_BASE_DUPLICATE_VALUE, PrefsGroup.AETHER)); scroller.add(new PrefsOption("Base Exile Value", CQPref.AETHER_BASE_EXILE_VALUE, PrefsGroup.AETHER)); scroller.add(new PrefsOption("Base Retrieve Cost", CQPref.AETHER_BASE_RETRIEVE_COST, PrefsGroup.AETHER)); diff --git a/forge-gui/res/cardsfolder/a/aerathi_berserker.txt b/forge-gui/res/cardsfolder/a/aerathi_berserker.txt index 080390dddff..c74b627be81 100644 --- a/forge-gui/res/cardsfolder/a/aerathi_berserker.txt +++ b/forge-gui/res/cardsfolder/a/aerathi_berserker.txt @@ -1,4 +1,4 @@ -Name:AErathi Berserker +Name:Aerathi Berserker ManaCost:2 R R R Types:Creature Human Berserker PT:2/4 diff --git a/forge-gui/res/cardsfolder/a/aether_adept.txt b/forge-gui/res/cardsfolder/a/aether_adept.txt index 35ebbf58efe..809d85ae7e3 100644 --- a/forge-gui/res/cardsfolder/a/aether_adept.txt +++ b/forge-gui/res/cardsfolder/a/aether_adept.txt @@ -1,8 +1,8 @@ -Name:AEther Adept +Name:Aether Adept ManaCost:1 U U Types:Creature Human Wizard PT:2/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand. SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg -Oracle:When AEther Adept enters the battlefield, return target creature to its owner's hand. +Oracle:When Aether Adept enters the battlefield, return target creature to its owner's hand. diff --git a/forge-gui/res/cardsfolder/a/aether_barrier.txt b/forge-gui/res/cardsfolder/a/aether_barrier.txt index 939841d0db3..fdc8b2a12b0 100644 --- a/forge-gui/res/cardsfolder/a/aether_barrier.txt +++ b/forge-gui/res/cardsfolder/a/aether_barrier.txt @@ -1,4 +1,4 @@ -Name:AEther Barrier +Name:Aether Barrier ManaCost:2 U Types:Enchantment T:Mode$ SpellCast | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}. diff --git a/forge-gui/res/cardsfolder/a/aether_burst.txt b/forge-gui/res/cardsfolder/a/aether_burst.txt index d3581cd47f9..baacd5a8789 100644 --- a/forge-gui/res/cardsfolder/a/aether_burst.txt +++ b/forge-gui/res/cardsfolder/a/aether_burst.txt @@ -1,7 +1,7 @@ -Name:AEther Burst +Name:Aether Burst ManaCost:1 U Types:Instant A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | References$ X | SpellDescription$ Return up to X target creatures to their owners' hands, where X is one plus the number of cards named CARDNAME in all graveyards as you cast CARDNAME. -SVar:X:Count$NamedInAllYards.AEther Burst/Plus.1 +SVar:X:Count$NamedInAllYards.Aether Burst/Plus.1 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_burst.jpg -Oracle:Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst. +Oracle:Return up to X target creatures to their owners' hands, where X is one plus the number of cards named Aether Burst in all graveyards as you cast Aether Burst. diff --git a/forge-gui/res/cardsfolder/a/aether_charge.txt b/forge-gui/res/cardsfolder/a/aether_charge.txt index c852615cc62..f1587fabd22 100644 --- a/forge-gui/res/cardsfolder/a/aether_charge.txt +++ b/forge-gui/res/cardsfolder/a/aether_charge.txt @@ -1,4 +1,4 @@ -Name:AEther Charge +Name:Aether Charge ManaCost:4 R Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Beast.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent. diff --git a/forge-gui/res/cardsfolder/a/aether_figment.txt b/forge-gui/res/cardsfolder/a/aether_figment.txt index 00267a92a41..661f80f7879 100644 --- a/forge-gui/res/cardsfolder/a/aether_figment.txt +++ b/forge-gui/res/cardsfolder/a/aether_figment.txt @@ -1,4 +1,4 @@ -Name:AEther Figment +Name:Aether Figment ManaCost:1 U Types:Creature Illusion PT:1/1 @@ -7,4 +7,4 @@ K:Kicker:3 K:etbCounter:P1P1:2:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with two +1/+1 counters on it. SVar:WasKicked:Count$Kicked.1.0 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_figment.jpg -Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAEther Figment can't be blocked.\nIf AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it. +Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAether Figment can't be blocked.\nIf Aether Figment was kicked, it enters the battlefield with two +1/+1 counters on it. diff --git a/forge-gui/res/cardsfolder/a/aether_flash.txt b/forge-gui/res/cardsfolder/a/aether_flash.txt index 8abbf38937b..e2f346831ec 100644 --- a/forge-gui/res/cardsfolder/a/aether_flash.txt +++ b/forge-gui/res/cardsfolder/a/aether_flash.txt @@ -1,8 +1,8 @@ -Name:AEther Flash +Name:Aether Flash ManaCost:2 R R Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a creature enters the battlefield, CARDNAME deals 2 damage to it. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredCard | NumDmg$ 2 SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_flash.jpg -Oracle:Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it. +Oracle:Whenever a creature enters the battlefield, Aether Flash deals 2 damage to it. diff --git a/forge-gui/res/cardsfolder/a/aether_gale.txt b/forge-gui/res/cardsfolder/a/aether_gale.txt index 6efeb7725ba..9c384b759ad 100644 --- a/forge-gui/res/cardsfolder/a/aether_gale.txt +++ b/forge-gui/res/cardsfolder/a/aether_gale.txt @@ -1,4 +1,4 @@ -Name:AEther Gale +Name:Aether Gale ManaCost:3 U U Types:Sorcery A:SP$ ChangeZone | Cost$ 3 U U | TargetMin$ 6 | TargetMax$ 6 |ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return six target nonland permanents to their owners' hands. diff --git a/forge-gui/res/cardsfolder/a/aether_membrane.txt b/forge-gui/res/cardsfolder/a/aether_membrane.txt index 2b7106cc528..2f6a6641d63 100644 --- a/forge-gui/res/cardsfolder/a/aether_membrane.txt +++ b/forge-gui/res/cardsfolder/a/aether_membrane.txt @@ -1,5 +1,4 @@ Name:Aether Membrane -AltName:AEther Membrane ManaCost:1 R R Types:Creature Wall PT:0/5 @@ -10,4 +9,4 @@ SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlay SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRemembered SVar:HasBlockEffect:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_membrane.jpg -Oracle:Defender, reach (This creature can block creatures with flying.)\nWhenever AEther Membrane blocks a creature, return that creature to its owner's hand at end of combat. +Oracle:Defender, reach (This creature can block creatures with flying.)\nWhenever Aether Membrane blocks a creature, return that creature to its owner's hand at end of combat. diff --git a/forge-gui/res/cardsfolder/a/aether_mutation.txt b/forge-gui/res/cardsfolder/a/aether_mutation.txt index 4b0853d793d..95f0b6dc97c 100644 --- a/forge-gui/res/cardsfolder/a/aether_mutation.txt +++ b/forge-gui/res/cardsfolder/a/aether_mutation.txt @@ -1,9 +1,8 @@ Name:Aether Mutation -AltName:AEther Mutation ManaCost:3 G U Types:Sorcery A:SP$ ChangeZone | Cost$ 3 G U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SubAbility$ TrigToken | SpellDescription$ Return target creature to its owner's hand. Create X 1/1 green Saproling creature tokens, where X is that creature's converted mana cost. -#X will be the Converted Mana Cost of the target of AEther Mutation +#X will be the Converted Mana Cost of the target of Aether Mutation SVar:TrigToken:DB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ X SVar:X:Targeted$CardManaCost DeckHas:Ability$Token diff --git a/forge-gui/res/cardsfolder/a/aether_rift.txt b/forge-gui/res/cardsfolder/a/aether_rift.txt index 8d001b98d3b..b5020d2bce4 100644 --- a/forge-gui/res/cardsfolder/a/aether_rift.txt +++ b/forge-gui/res/cardsfolder/a/aether_rift.txt @@ -1,4 +1,4 @@ -Name:AEther Rift +Name:Aether Rift ManaCost:1 R G Types:Enchantment T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life. diff --git a/forge-gui/res/cardsfolder/a/aether_shockwave.txt b/forge-gui/res/cardsfolder/a/aether_shockwave.txt index 3c8bba9ec39..176e1debc9c 100644 --- a/forge-gui/res/cardsfolder/a/aether_shockwave.txt +++ b/forge-gui/res/cardsfolder/a/aether_shockwave.txt @@ -1,4 +1,4 @@ -Name:AEther Shockwave +Name:Aether Shockwave ManaCost:3 W Types:Instant A:SP$ Charm | Cost$ 3 W | Choices$ DBTapAll,DBTapAll2 | SpellDescription$ Choose one — • Tap all Spirits; • Tap all non-Spirit creatures. diff --git a/forge-gui/res/cardsfolder/a/aether_snap.txt b/forge-gui/res/cardsfolder/a/aether_snap.txt index 3b61fe003c9..c2a64698771 100644 --- a/forge-gui/res/cardsfolder/a/aether_snap.txt +++ b/forge-gui/res/cardsfolder/a/aether_snap.txt @@ -1,4 +1,4 @@ -Name:AEther Snap +Name:Aether Snap ManaCost:3 B B Types:Sorcery A:SP$ RemoveCounterAll | Cost$ 3 B B | ValidCards$ Permanent | AllCounterTypes$ True | StackDescription$ SpellDescription | SubAbility$ DBRemove | SpellDescription$ Remove all counters from all permanents and exile all tokens. diff --git a/forge-gui/res/cardsfolder/a/aether_spellbomb.txt b/forge-gui/res/cardsfolder/a/aether_spellbomb.txt index 6b440bdde84..f70a051e31c 100644 --- a/forge-gui/res/cardsfolder/a/aether_spellbomb.txt +++ b/forge-gui/res/cardsfolder/a/aether_spellbomb.txt @@ -1,4 +1,4 @@ -Name:AEther Spellbomb +Name:Aether Spellbomb ManaCost:1 Types:Artifact A:AB$ ChangeZone | Cost$ U Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand. @@ -7,4 +7,4 @@ SVar:PlayMain1:TRUE SVar:RemRandomDeck:True DeckNeeds:Color$Blue SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_spellbomb.jpg -Oracle:{U}, Sacrifice AEther Spellbomb: Return target creature to its owner's hand.\n{1}, Sacrifice AEther Spellbomb: Draw a card. +Oracle:{U}, Sacrifice Aether Spellbomb: Return target creature to its owner's hand.\n{1}, Sacrifice Aether Spellbomb: Draw a card. diff --git a/forge-gui/res/cardsfolder/a/aether_sting.txt b/forge-gui/res/cardsfolder/a/aether_sting.txt index ba14bba2393..234c99b7fb8 100644 --- a/forge-gui/res/cardsfolder/a/aether_sting.txt +++ b/forge-gui/res/cardsfolder/a/aether_sting.txt @@ -1,7 +1,7 @@ -Name:AEther Sting +Name:Aether Sting ManaCost:3 R Types:Enchantment T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever an opponent casts a creature spell, CARDNAME deals 1 damage to that player. SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredActivator | NumDmg$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_sting.jpg -Oracle:Whenever an opponent casts a creature spell, AEther Sting deals 1 damage to that player. +Oracle:Whenever an opponent casts a creature spell, Aether Sting deals 1 damage to that player. diff --git a/forge-gui/res/cardsfolder/a/aether_storm.txt b/forge-gui/res/cardsfolder/a/aether_storm.txt index 7daeb356adc..7123a8545ff 100644 --- a/forge-gui/res/cardsfolder/a/aether_storm.txt +++ b/forge-gui/res/cardsfolder/a/aether_storm.txt @@ -1,8 +1,8 @@ -Name:AEther Storm +Name:Aether Storm ManaCost:3 U Types:Enchantment S:Mode$ CantBeCast | ValidCard$ Creature | Description$ Creature spells can't be cast. A:AB$ Destroy | Cost$ PayLife<4> | Defined$ Self | NoReg$ True | AnyPlayer$ True | SpellDescription$ Destroy CARDNAME. It can't be regenerated. Any player may activate this ability. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_storm.jpg -Oracle:Creature spells can't be cast.\nPay 4 life: Destroy AEther Storm. It can't be regenerated. Any player may activate this ability. +Oracle:Creature spells can't be cast.\nPay 4 life: Destroy Aether Storm. It can't be regenerated. Any player may activate this ability. diff --git a/forge-gui/res/cardsfolder/a/aether_tide.txt b/forge-gui/res/cardsfolder/a/aether_tide.txt index 990aed21476..ddc8eb8605e 100644 --- a/forge-gui/res/cardsfolder/a/aether_tide.txt +++ b/forge-gui/res/cardsfolder/a/aether_tide.txt @@ -1,4 +1,4 @@ -Name:AEther Tide +Name:Aether Tide ManaCost:X U Types:Sorcery A:SP$ ChangeZone | Cost$ X U Discard | TargetMin$ 0 | TargetMax$ MaxTgts | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | References$ X,MaxTgts | SpellDescription$ Return X target creatures to their owners' hands. @@ -7,4 +7,4 @@ SVar:X:Targeted$Amount SVar:MaxTgts:Count$Valid Creature SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_tide.jpg -Oracle:As an additional cost to cast AEther Tide, discard X creature cards.\nReturn X target creatures to their owners' hands. +Oracle:As an additional cost to cast Aether Tide, discard X creature cards.\nReturn X target creatures to their owners' hands. diff --git a/forge-gui/res/cardsfolder/a/aether_tradewinds.txt b/forge-gui/res/cardsfolder/a/aether_tradewinds.txt index 4bd57613c1c..6b5d01d8e44 100644 --- a/forge-gui/res/cardsfolder/a/aether_tradewinds.txt +++ b/forge-gui/res/cardsfolder/a/aether_tradewinds.txt @@ -1,4 +1,4 @@ -Name:AEther Tradewinds +Name:Aether Tradewinds ManaCost:2 U Types:Instant A:SP$ ChangeZone | Cost$ 2 U | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | SubAbility$ DBChange | SpellDescription$ Return target permanent you control and target permanent you don't control to their owners' hands. diff --git a/forge-gui/res/cardsfolder/a/aether_vial.txt b/forge-gui/res/cardsfolder/a/aether_vial.txt index e57583f5e35..ae094f98b6c 100644 --- a/forge-gui/res/cardsfolder/a/aether_vial.txt +++ b/forge-gui/res/cardsfolder/a/aether_vial.txt @@ -1,4 +1,4 @@ -Name:AEther Vial +Name:Aether Vial ManaCost:1 Types:Artifact A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.cmcEQX+YouCtrl | ChangeNum$ 1 | Optional$ You | References$ X | SpellDescription$ You may put a creature card with converted mana cost equal to the number of charge counters on CARDNAME from your hand onto the battlefield. | StackDescription$ SpellDescription @@ -6,4 +6,4 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | O SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 SVar:X:Count$CardCounters.CHARGE SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_vial.jpg -Oracle:At the beginning of your upkeep, you may put a charge counter on AEther Vial.\n{T}: You may put a creature card with converted mana cost equal to the number of charge counters on AEther Vial from your hand onto the battlefield. +Oracle:At the beginning of your upkeep, you may put a charge counter on Aether Vial.\n{T}: You may put a creature card with converted mana cost equal to the number of charge counters on Aether Vial from your hand onto the battlefield. diff --git a/forge-gui/res/cardsfolder/a/aether_web.txt b/forge-gui/res/cardsfolder/a/aether_web.txt index 6bf9a5495c4..956c1bb51ed 100644 --- a/forge-gui/res/cardsfolder/a/aether_web.txt +++ b/forge-gui/res/cardsfolder/a/aether_web.txt @@ -1,4 +1,4 @@ -Name:AEther Web +Name:Aether Web ManaCost:1 G Types:Enchantment Aura K:Flash diff --git a/forge-gui/res/cardsfolder/a/aetherflame_wall.txt b/forge-gui/res/cardsfolder/a/aetherflame_wall.txt index 2797dcd5342..31988e6f46b 100644 --- a/forge-gui/res/cardsfolder/a/aetherflame_wall.txt +++ b/forge-gui/res/cardsfolder/a/aetherflame_wall.txt @@ -1,4 +1,4 @@ -Name:AEtherflame Wall +Name:Aetherflame Wall ManaCost:1 R Types:Creature Wall PT:0/4 @@ -6,4 +6,4 @@ K:Defender A:AB$ Pump | Cost$ R | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. K:CARDNAME can block creatures with shadow as though they didn't have shadow. SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherflame_wall.jpg -Oracle:Defender\nAEtherflame Wall can block creatures with shadow as though they didn't have shadow.\n{R}: AEtherflame Wall gets +1/+0 until end of turn. +Oracle:Defender\nAetherflame Wall can block creatures with shadow as though they didn't have shadow.\n{R}: Aetherflame Wall gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/a/aetherize.txt b/forge-gui/res/cardsfolder/a/aetherize.txt index cf41a9c24b9..1f7874468f0 100644 --- a/forge-gui/res/cardsfolder/a/aetherize.txt +++ b/forge-gui/res/cardsfolder/a/aetherize.txt @@ -1,4 +1,4 @@ -Name:AEtherize +Name:Aetherize ManaCost:3 U Types:Instant A:SP$ ChangeZoneAll | Cost$ 3 U | ChangeType$ Creature.attacking | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all attacking creatures to their owners' hands. diff --git a/forge-gui/res/cardsfolder/a/aetherling.txt b/forge-gui/res/cardsfolder/a/aetherling.txt index 2eb9cd4674e..ae3fd08125d 100644 --- a/forge-gui/res/cardsfolder/a/aetherling.txt +++ b/forge-gui/res/cardsfolder/a/aetherling.txt @@ -1,4 +1,4 @@ -Name:AEtherling +Name:Aetherling ManaCost:4 U U Types:Creature Shapeshifter PT:4/5 @@ -9,4 +9,4 @@ A:AB$ Pump | Cost$ U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription A:AB$ Pump | Cost$ 1 | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn. A:AB$ Pump | Cost$ 1 | NumAtt$ -1 | NumDef$ +1 | SpellDescription$ CARDNAME gets -1/+1 until end of turn. SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherling.jpg -Oracle:{U}: Exile AEtherling. Return it to the battlefield under its owner's control at the beginning of the next end step.\n{U}: AEtherling can't be blocked this turn.\n{1}: AEtherling gets +1/-1 until end of turn.\n{1}: AEtherling gets -1/+1 until end of turn. +Oracle:{U}: Exile Aetherling. Return it to the battlefield under its owner's control at the beginning of the next end step.\n{U}: Aetherling can't be blocked this turn.\n{1}: Aetherling gets +1/-1 until end of turn.\n{1}: Aetherling gets -1/+1 until end of turn. diff --git a/forge-gui/res/cardsfolder/a/aethermages_touch.txt b/forge-gui/res/cardsfolder/a/aethermages_touch.txt index 5b411df3de9..4a2e2bb69dc 100644 --- a/forge-gui/res/cardsfolder/a/aethermages_touch.txt +++ b/forge-gui/res/cardsfolder/a/aethermages_touch.txt @@ -1,11 +1,11 @@ -Name:AEthermage's Touch +Name:Aethermage's Touch ManaCost:2 W U Types:Instant A:SP$ Dig | Cost$ 2 W U | DigNum$ 4 | Reveal$ True | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature | DestinationZone$ Battlefield | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Reveal the top four cards of your library. You may put a creature card from among them onto the battlefield. It gains "At the beginning of your end step, return this creature to its owner's hand." Then put the rest of the cards revealed this way on the bottom of your library in any order. | StackDescription$ SpellDescription -SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Permanent$ True | Triggers$ TrigAEthermage | sVars$ BounceAEthermage | SubAbility$ DBCleanup | StackDescription$ None +SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Permanent$ True | Triggers$ TrigAethermage | sVars$ BounceAethermage | SubAbility$ DBCleanup | StackDescription$ None SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:TrigAEthermage:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ BounceAEthermage | TriggerDescription$ At the beginning of your end step, return CARDNAME to its owner's hand. -SVar:BounceAEthermage:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand +SVar:TrigAethermage:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ BounceAethermage | TriggerDescription$ At the beginning of your end step, return CARDNAME to its owner's hand. +SVar:BounceAethermage:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/aethermages_touch.jpg Oracle:Reveal the top four cards of your library. You may put a creature card from among them onto the battlefield. It gains "At the beginning of your end step, return this creature to its owner's hand." Then put the rest of the cards revealed this way on the bottom of your library in any order. diff --git a/forge-gui/res/cardsfolder/a/aetherplasm.txt b/forge-gui/res/cardsfolder/a/aetherplasm.txt index 1f01515f78d..d66ad02e7e9 100644 --- a/forge-gui/res/cardsfolder/a/aetherplasm.txt +++ b/forge-gui/res/cardsfolder/a/aetherplasm.txt @@ -1,4 +1,4 @@ -Name:AEtherplasm +Name:Aetherplasm ManaCost:2 U U Types:Creature Illusion PT:1/1 @@ -10,4 +10,4 @@ SVar:X:Remembered$Amount SVar:RemAIDeck:True SVar:HasBlockEffect:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherplasm.jpg -Oracle:Whenever AEtherplasm blocks a creature, you may return AEtherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature. +Oracle:Whenever Aetherplasm blocks a creature, you may return Aetherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature. diff --git a/forge-gui/res/cardsfolder/a/aethersnatch.txt b/forge-gui/res/cardsfolder/a/aethersnatch.txt index a4c30d5b0c5..e9c8313b21c 100644 --- a/forge-gui/res/cardsfolder/a/aethersnatch.txt +++ b/forge-gui/res/cardsfolder/a/aethersnatch.txt @@ -1,8 +1,8 @@ -Name:AEthersnatch +Name:Aethersnatch ManaCost:4 U U Types:Instant A:SP$ ControlSpell | Cost$ 4 U U | ValidTgts$ Card | TargetType$ Spell | Mode$ Gain | SubAbility$ DBChooseTargets | SpellDescription$ Gain control of target spell. You may choose new targets for it. (If that spell becomes a permanent, it enters the battlefield under your control.) SVar:DBChooseTargets:DB$ ChangeTargets | Defined$ Targeted | Optional$ True SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/aethersnatch.jpg -Oracle:Gain control of target spell. You may choose new targets for it. (If that spell becomes a permanent, it enters the battlefield under your control.) \ No newline at end of file +Oracle:Gain control of target spell. You may choose new targets for it. (If that spell becomes a permanent, it enters the battlefield under your control.) diff --git a/forge-gui/res/cardsfolder/a/aethersnipe.txt b/forge-gui/res/cardsfolder/a/aethersnipe.txt index 6d16beb6908..e3fdb1e161c 100644 --- a/forge-gui/res/cardsfolder/a/aethersnipe.txt +++ b/forge-gui/res/cardsfolder/a/aethersnipe.txt @@ -1,4 +1,4 @@ -Name:AEthersnipe +Name:Aethersnipe ManaCost:5 U Types:Creature Elemental PT:4/4 @@ -6,4 +6,4 @@ K:Evoke:1 U U T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent to its owner's hand. SVar:TrigBounce:DB$ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Choose target non-Land permanent. | Origin$ Battlefield | Destination$ Hand SVar:Picture:http://www.wizards.com/global/images/magic/general/aethersnipe.jpg -Oracle:When AEthersnipe enters the battlefield, return target nonland permanent to its owner's hand.\nEvoke {1}{U}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.) +Oracle:When Aethersnipe enters the battlefield, return target nonland permanent to its owner's hand.\nEvoke {1}{U}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.) diff --git a/forge-gui/res/cardsfolder/a/aetherspouts.txt b/forge-gui/res/cardsfolder/a/aetherspouts.txt index 9c0f31aa195..3af9dc706e8 100644 --- a/forge-gui/res/cardsfolder/a/aetherspouts.txt +++ b/forge-gui/res/cardsfolder/a/aetherspouts.txt @@ -1,4 +1,4 @@ -Name:AEtherspouts +Name:Aetherspouts ManaCost:3 U U Types:Instant A:SP$ RepeatEach | Cost$ 3 U U | RepeatCards$ Creature.attacking | RepeatSubAbility$ DBChangeZone | SpellDescription$ For each attacking creature, its owner puts it on the top or bottom of his or her library. diff --git a/forge-gui/res/cardsfolder/a/aethertow.txt b/forge-gui/res/cardsfolder/a/aethertow.txt index 067dbe12b84..1a2e8b0e167 100644 --- a/forge-gui/res/cardsfolder/a/aethertow.txt +++ b/forge-gui/res/cardsfolder/a/aethertow.txt @@ -1,4 +1,4 @@ -Name:AEthertow +Name:Aethertow ManaCost:3 WU Types:Instant A:SP$ ChangeZone | Cost$ 3 WU | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target attacking or blocking creature on top of its owner's library. diff --git a/forge-gui/res/cardsfolder/a/anchor_to_the_aether.txt b/forge-gui/res/cardsfolder/a/anchor_to_the_aether.txt index 8dc989a6d7b..c60e9224c36 100644 --- a/forge-gui/res/cardsfolder/a/anchor_to_the_aether.txt +++ b/forge-gui/res/cardsfolder/a/anchor_to_the_aether.txt @@ -1,7 +1,7 @@ -Name:Anchor to the AEther +Name:Anchor to the Aether ManaCost:2 U Types:Sorcery A:SP$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SubAbility$ DBScry | SpellDescription$ Put target creature on top of its owner's library. Scry 1. SVar:DBScry:DB$ Scry | ScryNum$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/anchor_to_the_aether.jpg -Oracle:Put target creature on top of its owner's library. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) \ No newline at end of file +Oracle:Put target creature on top of its owner's library. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) diff --git a/forge-gui/res/cardsfolder/a/arm_with_aether.txt b/forge-gui/res/cardsfolder/a/arm_with_aether.txt index 62d5f4c8f11..977c92a0cb8 100644 --- a/forge-gui/res/cardsfolder/a/arm_with_aether.txt +++ b/forge-gui/res/cardsfolder/a/arm_with_aether.txt @@ -1,4 +1,4 @@ -Name:Arm with AEther +Name:Arm with Aether ManaCost:2 U Types:Sorcery A:SP$ AnimateAll | Cost$ 2 U | ValidCards$ Creature.YouCtrl | Triggers$ Trig | sVars$ Eff | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." diff --git a/forge-gui/res/cardsfolder/a/azorius_aethermage.txt b/forge-gui/res/cardsfolder/a/azorius_aethermage.txt index e1a2fb7152e..e28e87c1bb1 100644 --- a/forge-gui/res/cardsfolder/a/azorius_aethermage.txt +++ b/forge-gui/res/cardsfolder/a/azorius_aethermage.txt @@ -1,4 +1,4 @@ -Name:Azorius AEthermage +Name:Azorius Aethermage ManaCost:1 W U Types:Creature Human Wizard PT:1/1 diff --git a/forge-gui/res/cardsfolder/c/chaotic_aether.txt b/forge-gui/res/cardsfolder/c/chaotic_aether.txt index c58dbff4894..216ffc81fce 100644 --- a/forge-gui/res/cardsfolder/c/chaotic_aether.txt +++ b/forge-gui/res/cardsfolder/c/chaotic_aether.txt @@ -1,11 +1,11 @@ -Name:Chaotic AEther +Name:Chaotic Aether ManaCost:no cost Types:Phenomenon -T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ AEther | TriggerDescription$ When you encounter CARDNAME, each blank roll of the planar dice is a {CHAOS} roll until a player planeswalks away from a plane. (Then planeswalk away from this phenomenon) -SVar:AEther:AB$ Effect | Cost$ 0 | Name$ Chaotic AEther Effect | StaticAbilities$ STBlankIsChaos | Triggers$ TPWAway | SVars$ ExileSelf | SubAbility$ PWAway +T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ Aether | TriggerDescription$ When you encounter CARDNAME, each blank roll of the planar dice is a {CHAOS} roll until a player planeswalks away from a plane. (Then planeswalk away from this phenomenon) +SVar:Aether:AB$ Effect | Cost$ 0 | Name$ Chaotic Aether Effect | StaticAbilities$ STBlankIsChaos | Triggers$ TPWAway | SVars$ ExileSelf | SubAbility$ PWAway SVar:PWAway:DB$ Planeswalk | Cost$ 0 SVar:STBlankIsChaos:Mode$ Continuous | EffectZone$ Command | GlobalRule$ Each blank roll of the planar dice is a {CHAOS} roll. SVar:TPWAway:Mode$ PlaneswalkedFrom | ValidCard$ Plane | Execute$ ExileSelf | Static$ True | TriggerDescription$ Until a player planeswalks away from a plane, each blank roll of the planar dice is a {CHAOS} roll. SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile SVar:Picture:http://www.wizards.com/global/images/magic/general/chaotic_aether.jpg -Oracle:When you encounter Chaotic AEther, each blank roll of the planar die is a {CHAOS} roll until a player planeswalks away from a plane. (Then planeswalk away from this phenomenon.) +Oracle:When you encounter Chaotic Aether, each blank roll of the planar die is a {CHAOS} roll until a player planeswalks away from a plane. (Then planeswalk away from this phenomenon.) diff --git a/forge-gui/res/cardsfolder/f/fold_into_aether.txt b/forge-gui/res/cardsfolder/f/fold_into_aether.txt index 331b0c485e0..eae12e30b75 100644 --- a/forge-gui/res/cardsfolder/f/fold_into_aether.txt +++ b/forge-gui/res/cardsfolder/f/fold_into_aether.txt @@ -1,4 +1,4 @@ -Name:Fold into AEther +Name:Fold into Aether ManaCost:2 U U Types:Instant A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | RememberCountered$ True | SubAbility$ DBChangeZone | SpellDescription$ Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield. diff --git a/forge-gui/res/cardsfolder/f/frozen_aether.txt b/forge-gui/res/cardsfolder/f/frozen_aether.txt index b4c1aa7c656..03c8b1ec47f 100644 --- a/forge-gui/res/cardsfolder/f/frozen_aether.txt +++ b/forge-gui/res/cardsfolder/f/frozen_aether.txt @@ -1,4 +1,4 @@ -Name:Frozen AEther +Name:Frozen Aether ManaCost:3 U Types:Enchantment S:Mode$ ETBTapped | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped. diff --git a/forge-gui/res/cardsfolder/g/gate_to_the_aether.txt b/forge-gui/res/cardsfolder/g/gate_to_the_aether.txt index f70215857f3..e2f2642bf15 100644 --- a/forge-gui/res/cardsfolder/g/gate_to_the_aether.txt +++ b/forge-gui/res/cardsfolder/g/gate_to_the_aether.txt @@ -1,4 +1,4 @@ -Name:Gate to the AEther +Name:Gate to the Aether ManaCost:6 Types:Artifact T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigAetherDig | TriggerController$ TriggeredPlayer | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player reveals the top card of his or her library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield. diff --git a/forge-gui/res/cardsfolder/g/ghirapur_aether_grid.txt b/forge-gui/res/cardsfolder/g/ghirapur_aether_grid.txt index ae617b4ada5..b9af2a274b6 100644 --- a/forge-gui/res/cardsfolder/g/ghirapur_aether_grid.txt +++ b/forge-gui/res/cardsfolder/g/ghirapur_aether_grid.txt @@ -1,7 +1,7 @@ -Name:Ghirapur AEther Grid +Name:Ghirapur Aether Grid ManaCost:2 R Types:Enchantment A:AB$ DealDamage | Cost$ tapXType<2/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player. SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/ghirapur_aether_grid.jpg -Oracle:Tap two untapped artifacts you control: Ghirapur AEther Grid deals 1 damage to target creature or player. +Oracle:Tap two untapped artifacts you control: Ghirapur Aether Grid deals 1 damage to target creature or player. diff --git a/forge-gui/res/cardsfolder/o/obscuring_aether.txt b/forge-gui/res/cardsfolder/o/obscuring_aether.txt index 6251d98faf9..c75bb9e7b82 100644 --- a/forge-gui/res/cardsfolder/o/obscuring_aether.txt +++ b/forge-gui/res/cardsfolder/o/obscuring_aether.txt @@ -1,4 +1,4 @@ -Name:Obscuring AEther +Name:Obscuring Aether ManaCost:G Types:Enchantment S:Mode$ ReduceCost | ValidCard$ Creature | Type$ MorphDown | Activator$ You | Amount$ 1 | Description$ Face-down creature spells you cast cost {1} less to cast. @@ -6,4 +6,4 @@ A:AB$ SetState | Cost$ 1 G | Defined$ Self | Mode$ TurnFace | SpellDescription$ SVar:RemAIDeck:True DeckHints:Keyword$Morph|Megamorph SVar:Picture:http://www.wizards.com/global/images/magic/general/obscuring_aether.jpg -Oracle:Face-down creature spells you cast cost {1} less to cast.\n{1}{G}: Turn Obscuring AEther face down. (It becomes a 2/2 creature.) +Oracle:Face-down creature spells you cast cost {1} less to cast.\n{1}{G}: Turn Obscuring Aether face down. (It becomes a 2/2 creature.) diff --git a/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt b/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt index 88b5b5da697..e4ab30c90dc 100644 --- a/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt +++ b/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt @@ -1,7 +1,7 @@ -Name:Scornful AEther-Lich +Name:Scornful Aether-Lich ManaCost:3 U Types:Artifact Creature Zombie Wizard PT:2/4 A:AB$ Pump | Cost$ W B | Defined$ Self | KW$ Fear & Vigilance | SpellDescription$ CARDNAME gains fear and vigilance until end of turn. SVar:Picture:http://www.wizards.com/global/images/magic/general/scornful_aether_lich.jpg -Oracle:{W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn. (Attacking doesn't cause it to tap, and it can't be blocked except by artifact creatures and/or black creatures.) +Oracle:{W}{B}: Scornful Aether-Lich gains fear and vigilance until end of turn. (Attacking doesn't cause it to tap, and it can't be blocked except by artifact creatures and/or black creatures.) diff --git a/forge-gui/res/cardsfolder/s/surging_aether.txt b/forge-gui/res/cardsfolder/s/surging_aether.txt index 7d883ea5ce5..906d84a50cf 100644 --- a/forge-gui/res/cardsfolder/s/surging_aether.txt +++ b/forge-gui/res/cardsfolder/s/surging_aether.txt @@ -1,4 +1,4 @@ -Name:Surging AEther +Name:Surging Aether ManaCost:3 U Types:Instant K:Ripple:4 diff --git a/forge-gui/res/cardsfolder/t/tainted_aether.txt b/forge-gui/res/cardsfolder/t/tainted_aether.txt index ed2cb113458..d3d12f4dde1 100644 --- a/forge-gui/res/cardsfolder/t/tainted_aether.txt +++ b/forge-gui/res/cardsfolder/t/tainted_aether.txt @@ -1,4 +1,4 @@ -Name:Tainted AEther +Name:Tainted Aether ManaCost:2 B B Types:Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature enters the battlefield, its controller sacrifices a creature or land. diff --git a/forge-gui/res/cardsfolder/t/the_aether_flues.txt b/forge-gui/res/cardsfolder/t/the_aether_flues.txt index f2a23844f22..77e6b89b0b4 100644 --- a/forge-gui/res/cardsfolder/t/the_aether_flues.txt +++ b/forge-gui/res/cardsfolder/t/the_aether_flues.txt @@ -1,4 +1,4 @@ -Name:The AEther Flues +Name:The Aether Flues ManaCost:no cost Types:Plane Iquatana T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ FluesSacrifice | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may sacrifice a creature. If you do, reveal cards from the top of your library until you reveal a creature card, put that card onto the battlefield, then shuffle all other cards revealed this way into your library. @@ -10,4 +10,4 @@ T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChao SVar:RolledChaos:AB$ ChangeZone | Cost$ 0 | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield SVar:Picture:http://www.wizards.com/global/images/magic/general/the_aether_flues.jpg SVar:AIRollPlanarDieParams:Mode$ Always -Oracle:When you planeswalk to The AEther Flues or at the beginning of your upkeep, you may sacrifice a creature. If you do, reveal cards from the top of your library until you reveal a creature card, put that card onto the battlefield, then shuffle all other cards revealed this way into your library.\nWhenever you roll {CHAOS}, you may put a creature card from your hand onto the battlefield. +Oracle:When you planeswalk to The Aether Flues or at the beginning of your upkeep, you may sacrifice a creature. If you do, reveal cards from the top of your library until you reveal a creature card, put that card onto the battlefield, then shuffle all other cards revealed this way into your library.\nWhenever you roll {CHAOS}, you may put a creature card from your hand onto the battlefield. diff --git a/forge-gui/res/cardsfolder/u/unravel_the_aether.txt b/forge-gui/res/cardsfolder/u/unravel_the_aether.txt index 9bfaf90043e..490652d8b21 100644 --- a/forge-gui/res/cardsfolder/u/unravel_the_aether.txt +++ b/forge-gui/res/cardsfolder/u/unravel_the_aether.txt @@ -1,4 +1,4 @@ -Name:Unravel the AEther +Name:Unravel the Aether ManaCost:1 G Types:Instant A:SP$ ChangeZone | Cost$ 1 G | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ Choose target artifact or enchantment. Its owner shuffles it into his or her library. diff --git a/forge-gui/res/cardsfolder/v/vedalken_aethermage.txt b/forge-gui/res/cardsfolder/v/vedalken_aethermage.txt index 8db740996bc..fc33ac01a29 100644 --- a/forge-gui/res/cardsfolder/v/vedalken_aethermage.txt +++ b/forge-gui/res/cardsfolder/v/vedalken_aethermage.txt @@ -1,4 +1,4 @@ -Name:Vedalken AEthermage +Name:Vedalken Aethermage ManaCost:1 U Types:Creature Vedalken Wizard PT:1/2 @@ -7,4 +7,4 @@ K:TypeCycling:Wizard:3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target Sliver to its owner's hand. SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Sliver | TgtPrompt$ Select target Sliver | Origin$ Battlefield | Destination$ Hand SVar:Picture:http://www.wizards.com/global/images/magic/general/vedalken_aethermage.jpg -Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Vedalken AEthermage enters the battlefield, return target Sliver to its owner's hand.\nWizardcycling {3} ({3}, Discard this card: Search your library for a Wizard card, reveal it, and put it into your hand. Then shuffle your library.) +Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Vedalken Aethermage enters the battlefield, return target Sliver to its owner's hand.\nWizardcycling {3} ({3}, Discard this card: Search your library for a Wizard card, reveal it, and put it into your hand. Then shuffle your library.) diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index e5e0a831181..5aa09093ce5 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -496,7 +496,7 @@ public final class ConquestData { commanderCount = commanders.size(); } - view.getLblAEtherShards().setText("AEther Shards: " + aetherShards); + view.getLblAEtherShards().setText("Aether Shards: " + aetherShards); view.getLblPlaneswalkEmblems().setText("Planeswalk Emblems: " + planeswalkEmblems); view.getLblTotalWins().setText("Total Wins: " + wins); view.getLblTotalLosses().setText("Total Losses: " + losses); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java index 84d914a4448..55409829958 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java @@ -228,7 +228,7 @@ public class ConquestUtil { GUR (null, new ColorFilter(MagicColor.GREEN | MagicColor.BLUE | MagicColor.RED), "Playable in {G}{U}{R}"), WUBR (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK | MagicColor.RED), "Playable in {W}{U}{B}{R}"), - WUBG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK | MagicColor.GREEN), "Playable in {W}{U}{B}{G}"), + GWUB (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK | MagicColor.GREEN), "Playable in {W}{U}{B}{G}"), WBRG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLACK | MagicColor.RED | MagicColor.GREEN), "Playable in {W}{B}{R}{G}"), UBRG (null, new ColorFilter(MagicColor.BLUE | MagicColor.BLACK | MagicColor.RED | MagicColor.GREEN), "Playable in {U}{B}{R}{G}"), @@ -368,7 +368,7 @@ public class ConquestUtil { AEtherFilter.GWU, AEtherFilter.GUR, AEtherFilter.WUBR, - AEtherFilter.WUBG, + AEtherFilter.GWUB, AEtherFilter.WBRG, AEtherFilter.UBRG, AEtherFilter.WUBRG};