From d45ca543c9e9d1a5326126a0ab0fdf62dbbe721d Mon Sep 17 00:00:00 2001 From: Sol Date: Tue, 5 Apr 2016 15:36:54 +0000 Subject: [PATCH] - Running Oracle scraper to just fix all Oracle issues in (hopefully) one shot - Rename two DFC cards that don't list both names in file name --- .gitattributes | 4 ++-- forge-gui/res/cardsfolder/a/alms_of_the_vein.txt | 3 +-- forge-gui/res/cardsfolder/a/apothecary_geist.txt | 5 ++--- forge-gui/res/cardsfolder/a/avacyns_judgment.txt | 2 +- forge-gui/res/cardsfolder/b/brain_in_a_jar.txt | 3 +-- forge-gui/res/cardsfolder/b/bygone_bishop.txt | 5 ++--- ...cted_killer.txt => convicted_killer_branded_howler.txt} | 0 forge-gui/res/cardsfolder/e/engulf_the_shore.txt | 5 ++--- forge-gui/res/cardsfolder/e/epiphany_at_the_drownyard.txt | 3 +-- forge-gui/res/cardsfolder/e/equestrian_skill.txt | 3 +-- forge-gui/res/cardsfolder/e/essence_flux.txt | 3 +-- forge-gui/res/cardsfolder/e/ever_after.txt | 3 +-- forge-gui/res/cardsfolder/f/from_under_the_floorboards.txt | 2 +- forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt | 3 +-- forge-gui/res/cardsfolder/g/ghoulcallers_accomplice.txt | 3 +-- forge-gui/res/cardsfolder/g/grotesque_mutation.txt | 3 +-- forge-gui/res/cardsfolder/g/gryffs_boon.txt | 4 +--- forge-gui/res/cardsfolder/h/harness_the_storm.txt | 2 +- forge-gui/res/cardsfolder/i/invasive_surgery.txt | 3 +-- forge-gui/res/cardsfolder/l/lilianas_indignation.txt | 7 +++---- forge-gui/res/cardsfolder/m/morkrut_necropod.txt | 3 +-- forge-gui/res/cardsfolder/n/nagging_thoughts.txt | 3 +-- forge-gui/res/cardsfolder/o/olivias_bloodsworn.txt | 1 - forge-gui/res/cardsfolder/p/pack_guardian.txt | 3 +-- forge-gui/res/cardsfolder/s/senseless_rage.txt | 3 +-- forge-gui/res/cardsfolder/s/slayers_plate.txt | 5 ++--- forge-gui/res/cardsfolder/t/topplegeist.txt | 2 +- forge-gui/res/cardsfolder/t/triskaidekaphobia.txt | 3 +-- forge-gui/res/cardsfolder/t/true-faith_censer.txt | 3 +-- forge-gui/res/cardsfolder/v/vessel_of_nascency.txt | 3 +-- forge-gui/res/cardsfolder/w/welcome_to_the_fold.txt | 2 +- ...bey.txt => westvale_abbey_ormendahl_profane_prince.txt} | 0 forge-gui/res/cardsfolder/w/wild-field_scarecrow.txt | 5 ++--- 33 files changed, 38 insertions(+), 64 deletions(-) rename forge-gui/res/cardsfolder/c/{convicted_killer.txt => convicted_killer_branded_howler.txt} (100%) rename forge-gui/res/cardsfolder/w/{westvale_abbey.txt => westvale_abbey_ormendahl_profane_prince.txt} (100%) diff --git a/.gitattributes b/.gitattributes index 077e5788340..c3a03c4937f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3915,7 +3915,7 @@ forge-gui/res/cardsfolder/c/convalescence.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/convalescent_care.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/conversion.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/conversion_chamber.txt svneol=native#text/plain -forge-gui/res/cardsfolder/c/convicted_killer.txt -text +forge-gui/res/cardsfolder/c/convicted_killer_branded_howler.txt -text forge-gui/res/cardsfolder/c/conviction.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/convincing_mirage.txt svneol=native#text/plain forge-gui/res/cardsfolder/c/convolute.txt svneol=native#text/plain @@ -16603,7 +16603,7 @@ forge-gui/res/cardsfolder/w/wellspring.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wellwisher.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/werebear.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/western_paladin.txt svneol=native#text/plain -forge-gui/res/cardsfolder/w/westvale_abbey.txt -text +forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt -text forge-gui/res/cardsfolder/w/wetland_sambar.txt -text forge-gui/res/cardsfolder/w/whalebone_glider.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wheel_and_deal.txt svneol=native#text/plain diff --git a/forge-gui/res/cardsfolder/a/alms_of_the_vein.txt b/forge-gui/res/cardsfolder/a/alms_of_the_vein.txt index e977619bc22..ff868fd10ca 100644 --- a/forge-gui/res/cardsfolder/a/alms_of_the_vein.txt +++ b/forge-gui/res/cardsfolder/a/alms_of_the_vein.txt @@ -5,5 +5,4 @@ A:SP$ LoseLife | Cost$ 2 B | ValidTgts$ Opponent | LifeAmount$ 3 | SubAbility$ D SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 3 K:Madness:B SVar:Picture:http://www.wizards.com/global/images/magic/general/alms_of_the_vein.jpg -Oracle:Target opponent loses 3 life and you gain three life\nMadness {B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) - +Oracle:Target opponent loses 3 life and you gain 3 life.\nMadness {B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) diff --git a/forge-gui/res/cardsfolder/a/apothecary_geist.txt b/forge-gui/res/cardsfolder/a/apothecary_geist.txt index 2c3204ce42d..06968adf416 100644 --- a/forge-gui/res/cardsfolder/a/apothecary_geist.txt +++ b/forge-gui/res/cardsfolder/a/apothecary_geist.txt @@ -4,7 +4,6 @@ Types:Creature Spirit PT:2/3 K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | IsPresent$ Spirit.Other+YouCtrl | TriggerDescription$ When CARDNAME enters the battlefield, if you control another Spirit, gain 3 life. -SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 3 +SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 3 SVar:Picture:http://www.wizards.com/global/images/magic/general/apothecary_geist.jpg -Oracle:Flying\nWhen Apothecary Geist enters the battlefield, if you control another Spirit, gain 3 life. - +Oracle:Flying\nWhen Apothecary Geist enters the battlefield, if you control another Spirit, you gain 3 life. diff --git a/forge-gui/res/cardsfolder/a/avacyns_judgment.txt b/forge-gui/res/cardsfolder/a/avacyns_judgment.txt index 5385958a6a5..5e83ef3f2b2 100644 --- a/forge-gui/res/cardsfolder/a/avacyns_judgment.txt +++ b/forge-gui/res/cardsfolder/a/avacyns_judgment.txt @@ -9,4 +9,4 @@ SVar:Y:Count$Madness.X.3 SVar:X:Count$xPaid #X Will get overwritten by Announce SVar:Picture:http://www.wizards.com/global/images/magic/general/avacyn's_judgment.jpg -Oracle:Madness XR (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nAvacyn's Judgment deals 2 damage divided as you choose among any number of target creatures and/or players. If Avacyn's Judgment's madness cost was paid, it deals X damage divided as you choose among those creatures and/or players instead. +Oracle:Madness {X}{R} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nAvacyn's Judgment deals 2 damage divided as you choose among any number of target creatures and/or players. If Avacyn's Judgment's madness cost was paid, it deals X damage divided as you choose among those creatures and/or players instead. diff --git a/forge-gui/res/cardsfolder/b/brain_in_a_jar.txt b/forge-gui/res/cardsfolder/b/brain_in_a_jar.txt index bcdfab03817..145cab3e62b 100644 --- a/forge-gui/res/cardsfolder/b/brain_in_a_jar.txt +++ b/forge-gui/res/cardsfolder/b/brain_in_a_jar.txt @@ -7,5 +7,4 @@ A:AB$ Scry | Cost$ 3 T SubCounter | ScryNum$ X | References$ X |SpellD SVar:X:XChoice SVar:Y:Count$CardCounters.CHARGE SVar:Picture:http://www.wizards.com/global/images/magic/general/brain_in_a_jar.jpg -Oracle:{1} , {T} : Put a charge counter on Brain in a Jar, then you may cast an instant or sorcery card with converted mana cost equal to the number of charge counters on Brain in a Jar from your hand without paying its mana cost.\n {3} , {T} : Remove X charge counters from Brain in a Jar: Scry X. - +Oracle:{1}, {T}: Put a charge counter on Brain in a Jar, then you may cast an instant or sorcery card with converted mana cost equal to the number of charge counters on Brain in a Jar from your hand without paying its mana cost.\n{3}, {T}, Remove X charge counters from Brain in a Jar: Scry X. diff --git a/forge-gui/res/cardsfolder/b/bygone_bishop.txt b/forge-gui/res/cardsfolder/b/bygone_bishop.txt index 5dd081afa98..859f8ed3f04 100644 --- a/forge-gui/res/cardsfolder/b/bygone_bishop.txt +++ b/forge-gui/res/cardsfolder/b/bygone_bishop.txt @@ -5,6 +5,5 @@ PT:2/3 K:Flying T:Mode$ SpellCast | ValidCard$ Creature+cmcLE3 | ValidActivatingPlayer$ You | Execute$ DBToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell with converted mana cost 3 or less, investigate. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Clue | TokenTypes$ Artifact,Clue | TokenOwner$ You | TokenColors$ Colorless | TokenImage$ c clue | TokenAbilities$ ABDraw -SVar:ABDraw:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card. -Oracle:Whenever you cast a creature spell with converted mana cost 3 or less, investigate. (Put a colorless Clue artifact token onto the battlefield with "2, Sacrifice this artifact: Draw a card.") - +SVar:ABDraw:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card. +Oracle:Flying\nWhenever you cast a creature spell with converted mana cost 3 or less, investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.") diff --git a/forge-gui/res/cardsfolder/c/convicted_killer.txt b/forge-gui/res/cardsfolder/c/convicted_killer_branded_howler.txt similarity index 100% rename from forge-gui/res/cardsfolder/c/convicted_killer.txt rename to forge-gui/res/cardsfolder/c/convicted_killer_branded_howler.txt diff --git a/forge-gui/res/cardsfolder/e/engulf_the_shore.txt b/forge-gui/res/cardsfolder/e/engulf_the_shore.txt index 3511607a352..78426ab0d24 100644 --- a/forge-gui/res/cardsfolder/e/engulf_the_shore.txt +++ b/forge-gui/res/cardsfolder/e/engulf_the_shore.txt @@ -2,7 +2,6 @@ Name:Engulf the Shore ManaCost:3 U Types:Instant A:SP$ ChangeZoneAll | Cost$ 3 U | ChangeType$ Creature.toughnessLEX | Origin$ Battlefield | Destination$ Hand | References$ X | SpellDescription$ Return all creatures to their owners' hands. -SVar:X:Count$Valid Island.YouCtrl +SVar:X:Count$Valid Island.YouCtrl SVar:Picture:http://www.wizards.com/global/images/magic/general/engulf_the_shore.jpg -Oracle:Return to their owners' hand all creatures with toughness less than or equal to the number of Islands you control. - +Oracle:Return to their owners' hands all creatures with toughness less than or equal to the number of Islands you control. diff --git a/forge-gui/res/cardsfolder/e/epiphany_at_the_drownyard.txt b/forge-gui/res/cardsfolder/e/epiphany_at_the_drownyard.txt index a587b22a290..25aadddeaa3 100644 --- a/forge-gui/res/cardsfolder/e/epiphany_at_the_drownyard.txt +++ b/forge-gui/res/cardsfolder/e/epiphany_at_the_drownyard.txt @@ -9,5 +9,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Y:Count$xPaid/Plus.1 SVar:X:Count$xPaid SVar:Picture:http://www.wizards.com/global/images/magic/general/epiphany_at_the_drownyard.jpg -Oracle:Reveal the top X plus one cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the rest into your graveyard. - +Oracle:Reveal the top X plus one cards of your library and separate them into two piles. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard. diff --git a/forge-gui/res/cardsfolder/e/equestrian_skill.txt b/forge-gui/res/cardsfolder/e/equestrian_skill.txt index b89a2b79cfd..cd1b08eee23 100644 --- a/forge-gui/res/cardsfolder/e/equestrian_skill.txt +++ b/forge-gui/res/cardsfolder/e/equestrian_skill.txt @@ -6,5 +6,4 @@ A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3. S:Mode$ Continuous | Affected$ Creature.Human+EnchantedBy | AddKeyword$ Trample | Description$ As long as enchanted creature is a Human, it has trample. SVar:Picture:http://www.wizards.com/global/images/magic/general/equestrian_skill.jpg -Oracle:Enchant creature\nEnchanted Creature gets +3/+3.\nAs long as enchanted creature is a Human, it has trample. - +Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nAs long as enchanted creature is a Human, it has trample. diff --git a/forge-gui/res/cardsfolder/e/essence_flux.txt b/forge-gui/res/cardsfolder/e/essence_flux.txt index 67e043d067a..3703bca32fe 100644 --- a/forge-gui/res/cardsfolder/e/essence_flux.txt +++ b/forge-gui/res/cardsfolder/e/essence_flux.txt @@ -8,5 +8,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Valid Spirit SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_flux.jpg -Oracle:Exile target creature you control, then return it to the battlefield under its owner's control. If it's a Spirit, put a +1/+1 counter on it. - +Oracle:Exile target creature you control, then return that card to the battlefield under its owner's control. If it's a Spirit, put a +1/+1 counter on it. diff --git a/forge-gui/res/cardsfolder/e/ever_after.txt b/forge-gui/res/cardsfolder/e/ever_after.txt index 658b87d709e..03cbe40d907 100644 --- a/forge-gui/res/cardsfolder/e/ever_after.txt +++ b/forge-gui/res/cardsfolder/e/ever_after.txt @@ -5,5 +5,4 @@ A:SP$ ChangeZone | Cost$ 4 B B | Origin$ Graveyard | Destination$ Battlefield | SVar:Animate:DB$Animate | Defined$ Targeted | Types$ Zombie | Colors$ Black | Permanent$ True | SubAbility$ DBPut SVar:DBPut:DB$ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ -1 SVar:Picture:http://www.wizards.com/global/images/magic/general/ever_after.jpg -Oracle:Return up to two target creature cards from your graveyard onto the battlefield. Each of those creatures is a black Zombie in addition to its other colors and types. Put Ever After on the bottom of its owner's library. - +Oracle:Return up to two target creature cards from your graveyard to the battlefield. Each of those creatures is a black Zombie in addition to its other colors and types. Put Ever After on the bottom of its owner's library. diff --git a/forge-gui/res/cardsfolder/f/from_under_the_floorboards.txt b/forge-gui/res/cardsfolder/f/from_under_the_floorboards.txt index 6b2a78b3702..9dd38187960 100644 --- a/forge-gui/res/cardsfolder/f/from_under_the_floorboards.txt +++ b/forge-gui/res/cardsfolder/f/from_under_the_floorboards.txt @@ -7,4 +7,4 @@ SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ Y | References$ Y SVar:X:Count$xPaid SVar:Y:Count$Madness.X.3 SVar:Picture:http://www.wizards.com/global/images/magic/general/from_under_the_floorboards.jpg -Oracle:Madness {X}{B}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nPut three 2/2 black Zombie creature tokens onto the battlefield tapped and you gain 3 life. If From Under the Floorboards madness cost was paid, instead put X of those tokens onto the battlefield tapped and you gain X life. +Oracle:Madness {X}{B}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nPut three 2/2 black Zombie creature tokens onto the battlefield tapped and you gain 3 life. If From Under the Floorboards's madness cost was paid, instead put X of those tokens onto the battlefield tapped and you gain X life. diff --git a/forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt b/forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt index 72db309ee43..9f008278a7a 100644 --- a/forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt +++ b/forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt @@ -10,5 +10,4 @@ SVar:NeedsToPlayVar:Y LE6 SVar:Y:Count$CardsInYourHand SVar:BuffedBy:Card SVar:Picture:http://www.wizards.com/global/images/magic/general/geralfs_masterpiece.jpg -Oracle:Flying\nGeralf's Masterpiece gets -1/-1 for each card in your hand.\n{3}{U}, Discard three cards: Return Geralf's Materpiece from your graveyard to the battlefield tapped. - +Oracle:Flying\nGeralf's Masterpiece gets -1/-1 for each card in your hand.\n{3}{U}, Discard three cards: Return Geralf's Masterpiece from your graveyard to the battlefield tapped. diff --git a/forge-gui/res/cardsfolder/g/ghoulcallers_accomplice.txt b/forge-gui/res/cardsfolder/g/ghoulcallers_accomplice.txt index 74a4e257f54..306b7334d43 100644 --- a/forge-gui/res/cardsfolder/g/ghoulcallers_accomplice.txt +++ b/forge-gui/res/cardsfolder/g/ghoulcallers_accomplice.txt @@ -4,5 +4,4 @@ Types:Creature Human Rogue PT:2/2 A:AB$ Token | Cost$ 3 B ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | SorcerySpeed$ True | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie SOI | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield. Activate this ability only anytime you could cast a sorcery. SVar:Picture:http://www.wizards.com/global/images/magic/general/ghoulcallers_accomplice.jpg -Oracle:{3}{B}, Exile Ghoulcaller's Accomplice from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield. Activate this ability only anytime you could cast a sorcery. - +Oracle:{3}{B}, Exile Ghoulcaller's Accomplice from your graveyard: Put a 2/2 black Zombie creature token onto the battlefield. Activate this ability only any time you could cast a sorcery. diff --git a/forge-gui/res/cardsfolder/g/grotesque_mutation.txt b/forge-gui/res/cardsfolder/g/grotesque_mutation.txt index 3afd478161e..de61e5f765b 100644 --- a/forge-gui/res/cardsfolder/g/grotesque_mutation.txt +++ b/forge-gui/res/cardsfolder/g/grotesque_mutation.txt @@ -3,5 +3,4 @@ ManaCost:1 B Types:Instant A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +1 | KW$ Lifelink | SpellDescription$ Target creature gets +3/+1 and gains lifelink until end of turn. (Damage dealt by the creature also causes its contoller to gain that much life.) SVar:Picture:http://www.wizards.com/global/images/magic/general/grotesque_mnutation.jpg -Oracle:Target creature gets +3/+1 and gains lifelink until end of turn. (Damage dealt by the creature also causes its contoller to gain that much life.) - +Oracle:Target creature gets +3/+1 and gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.) diff --git a/forge-gui/res/cardsfolder/g/gryffs_boon.txt b/forge-gui/res/cardsfolder/g/gryffs_boon.txt index 051903ac9d7..689b5f856da 100644 --- a/forge-gui/res/cardsfolder/g/gryffs_boon.txt +++ b/forge-gui/res/cardsfolder/g/gryffs_boon.txt @@ -4,9 +4,7 @@ Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 0 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+0 and has flying. - A:AB$ Pump | Cost$ 3 W | ActivationZone$ Graveyard | ValidTgts$ Creature | SorcerySpeed$ True | TgtPrompt$ Choose a creature | SubAbility$ DBChange | SpellDescription$ Return Gryff's Boon from your graveyard to the battlefield attached to target creature. Activate this ability only any time you could cast a sorcery. | StackDescription$ SpellDescription SVar:DBChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ ParentTarget | SpellDescription$ | StackDescription$ SpellDescription - SVar:Picture:http://www.wizards.com/global/images/magic/general/gryffs_boon.jpg -Oracle:Enchanted creature gets +1/+0 and has flying.\n{3}{W}: Return Gryff's Boon from your graveyard to the battlefield attached to target creature. Activate this ability only any time you could cast a sorcery. +Oracle:Enchant creature\nEnchanted creature gets +1/+0 and has flying.\n{3}{W}: Return Gryff's Boon from your graveyard to the battlefield attached to target creature. Activate this ability only any time you could cast a sorcery. diff --git a/forge-gui/res/cardsfolder/h/harness_the_storm.txt b/forge-gui/res/cardsfolder/h/harness_the_storm.txt index f4d292597d1..57d0319dfc0 100644 --- a/forge-gui/res/cardsfolder/h/harness_the_storm.txt +++ b/forge-gui/res/cardsfolder/h/harness_the_storm.txt @@ -6,4 +6,4 @@ SVar:TrigPump:AB$ Pump | Cost$ 0 | TgtZone$ Graveyard | ValidTgts$ Instant.YouCt SVar:TrigPlay:DB$ Play | Defined$ Targeted | Optional$ True SVar:NonStackingEffect:True SVar:Picture:http://www.wizards.com/global/images/magic/general/harness_the_storm.jpg -Oracle:Whenever you cast an instant or sorcery spell from your hand, you may cast target card with the same name as that spell from your graveyard. (you still pay its costs.) +Oracle:Whenever you cast an instant or sorcery spell from your hand, you may cast target card with the same name as that spell from your graveyard. (You still pay its costs.) diff --git a/forge-gui/res/cardsfolder/i/invasive_surgery.txt b/forge-gui/res/cardsfolder/i/invasive_surgery.txt index f482d33a60f..9bcbb0cb4a0 100644 --- a/forge-gui/res/cardsfolder/i/invasive_surgery.txt +++ b/forge-gui/res/cardsfolder/i/invasive_surgery.txt @@ -5,5 +5,4 @@ A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Sorcery | RememberCount SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Remembered.sameName | Condition$ Delirium | Origin$ Graveyard,Hand,Library | Defined$ TargetedController | Destination$ Exile | Search$ True | Shuffle$ True | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/invasive_surgery.jpg -Oracle:Counter target sorcery spell.\nDelirium - If there are four or more card types amongst cards in your graveyard, search the graveyard, hand, and library of that spell's controller for cards with the same name as that spell, exile those cards, then that player shuffles his or her library. - +Oracle:Counter target sorcery spell.\nDelirium — If there are four or more card types among cards in your graveyard, search the graveyard, hand, and library of that spell's controller for any number of cards with the same name as that spell, exile those cards, then that player shuffles his or her library. diff --git a/forge-gui/res/cardsfolder/l/lilianas_indignation.txt b/forge-gui/res/cardsfolder/l/lilianas_indignation.txt index 693fcd540c3..d4402eb4240 100644 --- a/forge-gui/res/cardsfolder/l/lilianas_indignation.txt +++ b/forge-gui/res/cardsfolder/l/lilianas_indignation.txt @@ -4,8 +4,7 @@ Types:Sorcery A:SP$ Mill | Cost$ X B | NumCards$ X | References$ X | Defined$ You | RememberMilled$ True | SubAbility$ DBLoseLife | SpellDescription$ Put the top X cards of your library into your graveyard. Target player loses 2 life for each creature card put into the graveyard this way. SVar:DBLoseLife:DB$LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ Y | References$ Y | SubAbility$ Cleanup SVar:X:Count$xPaid -SVar:Y:Count$ValidGraveyard Creature.IsRemembered/Times.2 -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:Y:Count$ValidGraveyard Creature.IsRemembered/Times.2 +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/lilianas_indignation.jpg -Oracle:Put the top X cards of your library into your graveyard. Target player loses 2 life for each creature card put into the graveyard this way. - +Oracle:Put the top X cards of your library into your graveyard. Target player loses 2 life for each creature card put into your graveyard this way. diff --git a/forge-gui/res/cardsfolder/m/morkrut_necropod.txt b/forge-gui/res/cardsfolder/m/morkrut_necropod.txt index 9a20655d858..a0366853bb3 100644 --- a/forge-gui/res/cardsfolder/m/morkrut_necropod.txt +++ b/forge-gui/res/cardsfolder/m/morkrut_necropod.txt @@ -7,5 +7,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigSac | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice another creature or land. SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature.Other,Land.Other SVar:Picture:http://www.wizards.com/global/images/magic/general/morkrut_necropod.jpg -Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Morkut Necropod attacks or blocks, sacrifice another creature or land. - +Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever Morkrut Necropod attacks or blocks, sacrifice another creature or land. diff --git a/forge-gui/res/cardsfolder/n/nagging_thoughts.txt b/forge-gui/res/cardsfolder/n/nagging_thoughts.txt index ba36b49ffa5..927c5f6aa65 100644 --- a/forge-gui/res/cardsfolder/n/nagging_thoughts.txt +++ b/forge-gui/res/cardsfolder/n/nagging_thoughts.txt @@ -4,5 +4,4 @@ Types:Sorcery A:SP$ Dig | Cost$ 1 U | DigNum$ 2 | ChangeNum$ 1 | DestinationZone2$ Graveyard | SpellDescription$ Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library. K:Madness:1 U SVar:Picture:http://www.wizards.com/global/images/magic/general/nagging_thoughts.jpg -Oracle:Look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.\nMadness {1}{U} (If you discard this card, discard it into exile. When you do, cast it or put it into your graveyard.) - +Oracle:Look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.\nMadness {1}{U} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) diff --git a/forge-gui/res/cardsfolder/o/olivias_bloodsworn.txt b/forge-gui/res/cardsfolder/o/olivias_bloodsworn.txt index 0ff46fa3679..d34181a6445 100644 --- a/forge-gui/res/cardsfolder/o/olivias_bloodsworn.txt +++ b/forge-gui/res/cardsfolder/o/olivias_bloodsworn.txt @@ -9,4 +9,3 @@ SVar:PlayMain1:Always SVar:BuffedBy:Creature.Vampire SVar:Picture:http://www.wizards.com/global/images/magic/general/olivias_bloodsworn.jpg Oracle:Flying\nOlivia's Bloodsworn can't block.\n{R}: Target Vampire gains haste until end of turn. - diff --git a/forge-gui/res/cardsfolder/p/pack_guardian.txt b/forge-gui/res/cardsfolder/p/pack_guardian.txt index 99f02c8231b..ffc43c35ab2 100644 --- a/forge-gui/res/cardsfolder/p/pack_guardian.txt +++ b/forge-gui/res/cardsfolder/p/pack_guardian.txt @@ -6,5 +6,4 @@ K:Flash T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, you may discard a land card. If you do, put a 2/2 green wolf creature token onto the battlefield. SVar:TrigToken:AB$ Token | Cost$ Discard<1/Land> | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | g 2 2 wolf SOI SVar:Picture:http://www.wizards.com/global/images/magic/general/pack_guardian.jpg -Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Pack Guardian enters the battlefield, you may discard a land card. If you do, put a 2/2 green wolf creature token onto the battlefield. - +Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Pack Guardian enters the battlefield, you may discard a land card. If you do, put a 2/2 green Wolf creature token onto the battlefield. diff --git a/forge-gui/res/cardsfolder/s/senseless_rage.txt b/forge-gui/res/cardsfolder/s/senseless_rage.txt index dc28ac6e251..2a5af93b4fc 100644 --- a/forge-gui/res/cardsfolder/s/senseless_rage.txt +++ b/forge-gui/res/cardsfolder/s/senseless_rage.txt @@ -6,5 +6,4 @@ A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Enchanted creature gets +2/+2. K:Madness:1 R SVar:Picture:http://www.wizards.com/global/images/magic/general/senseless_rage.jpg -Oracle:Enchant creature\nEnchanted creature gets +2/+2.\nMadness {1}{R} (If you discard this card, discard it into exile. When you do, cast this card for its madness cost or put it into your graveyard.) - +Oracle:Enchant creature\nEnchanted creature gets +2/+2.\nMadness {1}{R} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.) diff --git a/forge-gui/res/cardsfolder/s/slayers_plate.txt b/forge-gui/res/cardsfolder/s/slayers_plate.txt index 06914d50b95..ebad74d90a0 100644 --- a/forge-gui/res/cardsfolder/s/slayers_plate.txt +++ b/forge-gui/res/cardsfolder/s/slayers_plate.txt @@ -3,8 +3,7 @@ ManaCost:3 Types:Artifact Equipment S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 4 | AddToughness$ 2 | Description$ Equipped creature gets +4/+2. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy+Human | Execute$ TrigToken | TriggerDescription$ Whenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield. -SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ w 1 1 spirit SOI | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying +SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ w 1 1 spirit SOI | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying K:Equip 3 SVar:Picture:http://www.wizards.com/global/images/magic/general/slayers_plate.jpg -Oracle:Equipped creature get +4/+2.\nWhenever equipped creature dies if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield.\nEquip {3} - +Oracle:Equipped creature gets +4/+2.\nWhenever equipped creature dies, if it was a Human, put a 1/1 white Spirit creature token with flying onto the battlefield.\nEquip {3} diff --git a/forge-gui/res/cardsfolder/t/topplegeist.txt b/forge-gui/res/cardsfolder/t/topplegeist.txt index f191613c29f..d691cc40999 100644 --- a/forge-gui/res/cardsfolder/t/topplegeist.txt +++ b/forge-gui/res/cardsfolder/t/topplegeist.txt @@ -9,4 +9,4 @@ SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose SVar:TripTapOpp:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.ActivePlayerCtrl | TgtPrompt$ Choose target creature the active player controls. SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/topplegeist.jpg -Oracle:When Topplegeist enters the battlefield, tap target creature an opponent controls.\nDelirium - At the beginning of each opponent's upkeep, if there are four or more card types among cards in your graveyard, tap target creature that player controls. +Oracle:Flying\nWhen Topplegeist enters the battlefield, tap target creature an opponent controls.\nDelirium — At the beginning of each opponent's upkeep, if there are four or more card types among cards in your graveyard, tap target creature that player controls. diff --git a/forge-gui/res/cardsfolder/t/triskaidekaphobia.txt b/forge-gui/res/cardsfolder/t/triskaidekaphobia.txt index 118e18e29cb..af51d02285d 100644 --- a/forge-gui/res/cardsfolder/t/triskaidekaphobia.txt +++ b/forge-gui/res/cardsfolder/t/triskaidekaphobia.txt @@ -9,5 +9,4 @@ SVar:DBLoseGame2:DB$ LosesGame | Cost$ 0 | Defined$ Player.LifeEquals_13 | SubAb SVar:DBLoseLife:DB$ LoseLife | Defined$ Player | LifeAmount$ 1 SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/triskaidekaphobia.jpg -Oracle:At the beginning of your upkeep, choose one -\n• Each player with exactly 13 life loses the game, then each player gains 1 life.\n• Each player with exactly 13 life loses the game, then each player loses 1 life. - +Oracle:At the beginning of your upkeep, choose one —\n• Each player with exactly 13 life loses the game, then each player gains 1 life.\n• Each player with exactly 13 life loses the game, then each player loses 1 life. diff --git a/forge-gui/res/cardsfolder/t/true-faith_censer.txt b/forge-gui/res/cardsfolder/t/true-faith_censer.txt index ba4f34f6cdd..98a20e119a4 100644 --- a/forge-gui/res/cardsfolder/t/true-faith_censer.txt +++ b/forge-gui/res/cardsfolder/t/true-faith_censer.txt @@ -5,5 +5,4 @@ S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ S:Mode$ Continuous | Affected$ Card.EquippedBy+Human | AddPower$ 1 | Description$ As long as equipped creature is a Human it gets an additional +1/+0. K:Equip 2 SVar:Picture:http://www.wizards.com/global/images/magic/general/true_faith_censer.jpg -Oracle:Equipped creature gets +1/+1 and has vigilance.\nAs long as equipped creature is a Human it gets an additional +1/+0.\nEquip {2} - +Oracle:Equipped creature gets +1/+1 and has vigilance.\nAs long as equipped creature is a Human, it gets an additional +1/+0.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.) diff --git a/forge-gui/res/cardsfolder/v/vessel_of_nascency.txt b/forge-gui/res/cardsfolder/v/vessel_of_nascency.txt index 4d8d1841d72..e43f53c5358 100644 --- a/forge-gui/res/cardsfolder/v/vessel_of_nascency.txt +++ b/forge-gui/res/cardsfolder/v/vessel_of_nascency.txt @@ -3,5 +3,4 @@ ManaCost:G Types:Enchantment A:AB$ Dig | Cost$ 1 G Sac<1/CARDNAME> | DigNum$ 4 | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Artifact,Creature,Enchantment,Land,Planeswalker | DestinationZone2$ Graveyard | SpellDescription$ Reveal the top four card of your library. You may put an artifact, creature, enchantment, land, or planeswalker card from among them into your hand. Put the rest into your graveyard. SVar:Picture:http://www.wizards.com/global/images/magic/general/vessel_of_nascency.jpg -Oracle:{1}{G}, Sacrifice Vessel of Nascency: Reveal the top four card of your library. You may put an artifact, creature, enchantment, land, or planeswalker card from among them into your hand. Put the rest into your graveyard. - +Oracle:{1}{G}, Sacrifice Vessel of Nascency: Reveal the top four cards of your library. You may put an artifact, creature, enchantment, land, or planeswalker card from among them into your hand. Put the rest into your graveyard. diff --git a/forge-gui/res/cardsfolder/w/welcome_to_the_fold.txt b/forge-gui/res/cardsfolder/w/welcome_to_the_fold.txt index 94631c4afd6..d71b015174e 100644 --- a/forge-gui/res/cardsfolder/w/welcome_to_the_fold.txt +++ b/forge-gui/res/cardsfolder/w/welcome_to_the_fold.txt @@ -8,4 +8,4 @@ SVar:X:Count$xPaid SVar:Z:Targeted$Valid Creature.toughnessLEY SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/welcome_to_the_fold.jpg -Oracle:Mandess XUU (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nGain control of target creature if its toughness is 2 or less. If Welcome to the Fold's madness cost was paid, instead gain control of that creature if its toughness is X or less. +Oracle:Madness {X}{U}{U} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)\nGain control of target creature if its toughness is 2 or less. If Welcome to the Fold's madness cost was paid, instead gain control of that creature if its toughness is X or less. diff --git a/forge-gui/res/cardsfolder/w/westvale_abbey.txt b/forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt similarity index 100% rename from forge-gui/res/cardsfolder/w/westvale_abbey.txt rename to forge-gui/res/cardsfolder/w/westvale_abbey_ormendahl_profane_prince.txt diff --git a/forge-gui/res/cardsfolder/w/wild-field_scarecrow.txt b/forge-gui/res/cardsfolder/w/wild-field_scarecrow.txt index 8ae15f336a2..61036beb770 100644 --- a/forge-gui/res/cardsfolder/w/wild-field_scarecrow.txt +++ b/forge-gui/res/cardsfolder/w/wild-field_scarecrow.txt @@ -3,7 +3,6 @@ ManaCost:3 Types:Artifact Creature Scarecrow PT:1/4 K:Defender -A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. +A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. SVar:Picture:http://www.wizards.com/global/images/magic/general/wild_field_scarecrow.jpg -Oracle:Defender\n{2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic lands, reveal them and put them into your hand. Then shuffle your library. - +Oracle:Defender\n{2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library.