From 82f6f7d4d5ee5b9b9cd366c1e9f9ca02de4c066a Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 18 Sep 2017 03:32:26 +0000 Subject: [PATCH] - [XLN] Assorted fixes. --- forge-gui/res/cardsfolder/upcoming/commune_with_dinosaurs.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/crushing_canopy.txt | 2 +- forge-gui/res/cardsfolder/upcoming/dire_fleet_captain.txt | 2 +- forge-gui/res/cardsfolder/upcoming/dire_fleet_hoarder.txt | 2 +- forge-gui/res/cardsfolder/upcoming/drover_of_the_mighty.txt | 2 +- forge-gui/res/cardsfolder/upcoming/firecannon_blast.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/jace_cunning_castaway.txt | 2 +- forge-gui/res/cardsfolder/upcoming/kinjallis_sunwing.txt | 2 +- forge-gui/res/cardsfolder/upcoming/march_of_the_drowned.txt | 2 +- .../res/cardsfolder/upcoming/priest_of_the_wakening_sun.txt | 2 +- forge-gui/res/cardsfolder/upcoming/skymarch_bloodletter.txt | 3 +-- forge-gui/res/cardsfolder/upcoming/snapping_sailback.txt | 2 +- forge-gui/res/cardsfolder/upcoming/storm_fleet_spy.txt | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/commune_with_dinosaurs.txt b/forge-gui/res/cardsfolder/upcoming/commune_with_dinosaurs.txt index 65cfc052bc4..6f35f0de08d 100644 --- a/forge-gui/res/cardsfolder/upcoming/commune_with_dinosaurs.txt +++ b/forge-gui/res/cardsfolder/upcoming/commune_with_dinosaurs.txt @@ -1,7 +1,7 @@ Name:Commune with Dinosaurs -ManaCost:1 G +ManaCost:G Types:Sorcery -A:SP$ Dig | Cost$ 1 G | DigNum$ 5 | ChangeNum$ 1 | ChangeValid$ Creature.Dinosaur,Land | Optional$ True | SpellDescription$ Look at the top five cards of your library. You may reveal a Dinosaur or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order. +A:SP$ Dig | Cost$ G | DigNum$ 5 | ChangeNum$ 1 | ChangeValid$ Creature.Dinosaur,Land | Optional$ True | SpellDescription$ Look at the top five cards of your library. You may reveal a Dinosaur or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order. SVar:Picture:http://www.wizards.com/global/images/magic/general/commune_with_dinosaurs.jpg DeckHints:Type$Dinosaur Oracle:Look at the top five cards of your library. You may reveal a Dinosaur or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order. diff --git a/forge-gui/res/cardsfolder/upcoming/crushing_canopy.txt b/forge-gui/res/cardsfolder/upcoming/crushing_canopy.txt index 6aa4ee428bc..50dd87ff7d8 100644 --- a/forge-gui/res/cardsfolder/upcoming/crushing_canopy.txt +++ b/forge-gui/res/cardsfolder/upcoming/crushing_canopy.txt @@ -5,4 +5,4 @@ A:SP$ Charm | Cost$ 2 G | Choices$ DBDestroy,DBDestroy2 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Destroy target creature with flying. SVar:DBDestroy2:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SpellDescription$ Destroy target enchantment. SVar:Picture:http://www.wizards.com/global/images/magic/general/crushing_canopy.jpg -Oracle:Choose one �\n� Destroy target creature with flying.\n� Destroy target enchantment. +Oracle:Choose one —\n• Destroy target creature with flying.\n• Destroy target enchantment. diff --git a/forge-gui/res/cardsfolder/upcoming/dire_fleet_captain.txt b/forge-gui/res/cardsfolder/upcoming/dire_fleet_captain.txt index b163cd23d5c..d8d952ea3cb 100644 --- a/forge-gui/res/cardsfolder/upcoming/dire_fleet_captain.txt +++ b/forge-gui/res/cardsfolder/upcoming/dire_fleet_captain.txt @@ -1,7 +1,7 @@ Name:Dire Fleet Captain ManaCost:B R Types:Creature Orc Pirate -PT:2/1 +PT:2/2 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+1 until end of turn for each other attacking Pirate. SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X | References$ X SVar:X:Count$Valid Pirate.attacking+Other diff --git a/forge-gui/res/cardsfolder/upcoming/dire_fleet_hoarder.txt b/forge-gui/res/cardsfolder/upcoming/dire_fleet_hoarder.txt index 6dd19bf9120..fed5e10f3e4 100644 --- a/forge-gui/res/cardsfolder/upcoming/dire_fleet_hoarder.txt +++ b/forge-gui/res/cardsfolder/upcoming/dire_fleet_hoarder.txt @@ -7,4 +7,4 @@ SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Treasure | TokenTypes$ Ar SVar:ABMana:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool. DeckHas:Ability$Token SVar:Picture:http://www.wizards.com/global/images/magic/general/wily_goblin.jpg -Oracle:When Wily Goblin enters the battlefield, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool." +Oracle:When Dire Fleet Hoarder dies, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color to your mana pool." diff --git a/forge-gui/res/cardsfolder/upcoming/drover_of_the_mighty.txt b/forge-gui/res/cardsfolder/upcoming/drover_of_the_mighty.txt index 27260826bbc..f383c8fca21 100644 --- a/forge-gui/res/cardsfolder/upcoming/drover_of_the_mighty.txt +++ b/forge-gui/res/cardsfolder/upcoming/drover_of_the_mighty.txt @@ -7,4 +7,4 @@ A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any col SVar:Y:Count$Valid Dinosaur.Other+YouCtrl SVar:BuffedBy:Dinosaur SVar:Picture:http://mythicspoiler.com/ixa/cards/droverofthemighty.jpg -Oracle:Drover of the Mighty gets +2/+2 as long as you control a Dinosaur./n{T}: Add one mana of any color to your mana pool. +Oracle:Drover of the Mighty gets +2/+2 as long as you control a Dinosaur.\n{T}: Add one mana of any color to your mana pool. diff --git a/forge-gui/res/cardsfolder/upcoming/firecannon_blast.txt b/forge-gui/res/cardsfolder/upcoming/firecannon_blast.txt index a537568553e..7332bf3fbe6 100644 --- a/forge-gui/res/cardsfolder/upcoming/firecannon_blast.txt +++ b/forge-gui/res/cardsfolder/upcoming/firecannon_blast.txt @@ -1,8 +1,8 @@ Name:Firecannon Blast ManaCost:1 R R Types:Sorcery -A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. Raid � CARDNAME deals 6 damage to that creature instead if you attacked with a creature this turn. +A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. Raid — CARDNAME deals 6 damage to that creature instead if you attacked with a creature this turn. SVar:DBDealDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest SVar:RaidTest:Count$AttackersDeclared SVar:Picture:http://www.wizards.com/global/images/magic/general/firecannon_blast.jpg -Oracle:Firecannon Blast deals 3 damage to target creature.\nRaid � Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn. \ No newline at end of file +Oracle:Firecannon Blast deals 3 damage to target creature.\nRaid — Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/jace_cunning_castaway.txt b/forge-gui/res/cardsfolder/upcoming/jace_cunning_castaway.txt index d5eea5cf2b4..38e1e8d2f35 100644 --- a/forge-gui/res/cardsfolder/upcoming/jace_cunning_castaway.txt +++ b/forge-gui/res/cardsfolder/upcoming/jace_cunning_castaway.txt @@ -1,7 +1,7 @@ Name:Jace, Cunning Castaway ManaCost:1 U U Types:Legendary Planeswalker Jace -Loyalty:4 +Loyalty:3 A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ TrigDrawDiscard | SVars$ DBDraw,DBDiscard | Duration$ EndOfTurn | Name$ Jace, Cunning Castaway Effect | SpellDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card. SVar:TrigDrawDiscard:Mode$ CombatDamageDoneOnce | ValidSource$ Creature.YouCtrl | TriggerZones$ Command | ValidTarget$ Player | Execute$ DBDraw | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card. SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. diff --git a/forge-gui/res/cardsfolder/upcoming/kinjallis_sunwing.txt b/forge-gui/res/cardsfolder/upcoming/kinjallis_sunwing.txt index 49b969fe17e..8013c24d60d 100644 --- a/forge-gui/res/cardsfolder/upcoming/kinjallis_sunwing.txt +++ b/forge-gui/res/cardsfolder/upcoming/kinjallis_sunwing.txt @@ -5,4 +5,4 @@ PT:2/3 K:Flying S:Mode$ ETBTapped | ValidCard$ Creature.OppCtrl | Description$ Creatures your opponents control enter the battlefield tapped. SVar:Picture:http://www.wizards.com/global/images/magic/general/kinjallis_sunwing.jpg -Oracle:Creatures your opponents control enter the battlefield tapped. +Oracle:Flying\nCreatures your opponents control enter the battlefield tapped. diff --git a/forge-gui/res/cardsfolder/upcoming/march_of_the_drowned.txt b/forge-gui/res/cardsfolder/upcoming/march_of_the_drowned.txt index d7d5727163b..0ee37affcf2 100644 --- a/forge-gui/res/cardsfolder/upcoming/march_of_the_drowned.txt +++ b/forge-gui/res/cardsfolder/upcoming/march_of_the_drowned.txt @@ -6,4 +6,4 @@ SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mand SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target Pirate cards in your graveyard | ValidTgts$ Pirate.YouOwn | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ Return two target Pirate cards from your graveyard to your hand. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/march_of_the_drowned.jpg -Oracle:Choose one �\n� Return target creature card from your graveyard to your hand.\n� Return two target Pirate cards from your graveyard to your hand. +Oracle:Choose one —\n• Return target creature card from your graveyard to your hand.\n• Return two target Pirate cards from your graveyard to your hand. diff --git a/forge-gui/res/cardsfolder/upcoming/priest_of_the_wakening_sun.txt b/forge-gui/res/cardsfolder/upcoming/priest_of_the_wakening_sun.txt index fe526856102..dba41793c73 100644 --- a/forge-gui/res/cardsfolder/upcoming/priest_of_the_wakening_sun.txt +++ b/forge-gui/res/cardsfolder/upcoming/priest_of_the_wakening_sun.txt @@ -7,4 +7,4 @@ SVar:ABGainLife:DB$ GainLife | UnlessCost$ Reveal<1/Creature.Dinosaur> | UnlessP A:AB$ ChangeZone | Cost$ 3 W W Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Dinosaur | ChangeNum$ 1 | SpellDescription$ Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. SVar:Picture:http://www.wizards.com/global/images/magic/general/priest_of_the_wakening_sun.jpg DeckHints:Type$Dinosaur -Oracle:At the beginning of your upkeep, you may reveal a Dinosaur card from your hand. If you do, you gain 2 life.\n{3}{W}{W}, sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. +Oracle:At the beginning of your upkeep, you may reveal a Dinosaur card from your hand. If you do, you gain 2 life.\n{3}{W}{W}, Sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. diff --git a/forge-gui/res/cardsfolder/upcoming/skymarch_bloodletter.txt b/forge-gui/res/cardsfolder/upcoming/skymarch_bloodletter.txt index 86e9ed8734e..00620df1d40 100644 --- a/forge-gui/res/cardsfolder/upcoming/skymarch_bloodletter.txt +++ b/forge-gui/res/cardsfolder/upcoming/skymarch_bloodletter.txt @@ -7,5 +7,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigDrain:DB$LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/skymarch_bloodletter.jpg -Oracle:Flying -When Skymarch Bloodletters enters the battlefield, target opponent loses 1 life and you gain 1 life. \ No newline at end of file +Oracle:Flying\nWhen Skymarch Bloodletters enters the battlefield, target opponent loses 1 life and you gain 1 life. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/snapping_sailback.txt b/forge-gui/res/cardsfolder/upcoming/snapping_sailback.txt index 1ab3169fa70..378632a0239 100644 --- a/forge-gui/res/cardsfolder/upcoming/snapping_sailback.txt +++ b/forge-gui/res/cardsfolder/upcoming/snapping_sailback.txt @@ -7,4 +7,4 @@ T:Mode$ DamageDone | Execute$ TrigPutCounter | ValidTarget$ Card.Self | TriggerZ SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:HasCombatEffect:TRUE SVar:Picture:http://mythicspoiler.com/ixa/cards/snappingsailback.jpg -Oracle:Enrage — Whenever Snapping Sailback is dealt damage, put a +1/+1 counter on it. (It must survive the damage to get the counter.) \ No newline at end of file +Oracle:Flash\nEnrage — Whenever Snapping Sailback is dealt damage, put a +1/+1 counter on it. (It must survive the damage to get the counter.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/storm_fleet_spy.txt b/forge-gui/res/cardsfolder/upcoming/storm_fleet_spy.txt index b7ba2b549c8..b9b67b67ba8 100644 --- a/forge-gui/res/cardsfolder/upcoming/storm_fleet_spy.txt +++ b/forge-gui/res/cardsfolder/upcoming/storm_fleet_spy.txt @@ -1,7 +1,7 @@ Name:Storm Fleet Spy ManaCost:2 U Types:Creature Human Pirate -PT:3/2 +PT:2/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDraw | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 SVar:RaidTest:Count$AttackersDeclared