diff --git a/forge-gui/res/cardsfolder/b/butcher_of_the_horde.txt b/forge-gui/res/cardsfolder/b/butcher_of_the_horde.txt index 5aa023ca453..05da9de7deb 100644 --- a/forge-gui/res/cardsfolder/b/butcher_of_the_horde.txt +++ b/forge-gui/res/cardsfolder/b/butcher_of_the_horde.txt @@ -3,9 +3,9 @@ ManaCost:1 R W B Types:Creature Demon PT:5/4 K:Flying -A:AB$ GenericChoice | Cost$ Sac<1/Creature.Other/another creature> | Choices$ DBFlying,DBTrample,DBHaste | SpellDescription$ CARDNAME gains your choice of Vigilance, lifelink, or haste until end of turn. -SVar:DBFlying:DB$ Pump | Defined$ Self | KW$ Vigilance | SpellDescription$ CARDNAME gains vigilance until end of turn. -SVar:DBTrample:DB$ Pump | Defined$ Self | KW$ Lifelink | SpellDescription$ CARDNAME gains lifelink until end of turn. +A:AB$ GenericChoice | Cost$ Sac<1/Creature.Other/another creature> | Choices$ DBVigilance,DBLifelink,DBHaste | SpellDescription$ CARDNAME gains your choice of Vigilance, lifelink, or haste until end of turn. +SVar:DBVigilance:DB$ Pump | Defined$ Self | KW$ Vigilance | SpellDescription$ CARDNAME gains vigilance until end of turn. +SVar:DBLifelink:DB$ Pump | Defined$ Self | KW$ Lifelink | SpellDescription$ CARDNAME gains lifelink until end of turn. SVar:DBHaste:DB$ Pump | Defined$ Self | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn. SVar:Picture:http://www.wizards.com/global/images/magic/general/butcher_of_the_horde.jpg Oracle:Flying\nSacrifice another creature: Butcher of the Horde gains your choice of vigilance, lifelink, or haste until end of turn. diff --git a/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt b/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt index 06350a945fc..ccba9cfacf2 100644 --- a/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt +++ b/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt @@ -3,7 +3,7 @@ ManaCost:6 Types:Artifact Creature Construct PT:6/6 K:CantBeBlockedBy Creature.powerLE2 -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 6 damage to target opponnent. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 6 damage to target opponent. SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Opponent | NumDmg$ 6 SVar:Picture:http://www.wizards.com/global/images/magic/general/scuttling_doom_engine.jpg Oracle:Scuttling Doom Engine can't be blocked by creatures with power 2 or less.\nWhen Scuttling Doom Engine dies, it deals 6 damage to target opponent. diff --git a/forge-gui/res/cardsfolder/upcoming/aetherworks_marvel.txt b/forge-gui/res/cardsfolder/upcoming/aetherworks_marvel.txt index bd3a43880d2..243ec55bf6b 100644 --- a/forge-gui/res/cardsfolder/upcoming/aetherworks_marvel.txt +++ b/forge-gui/res/cardsfolder/upcoming/aetherworks_marvel.txt @@ -4,7 +4,7 @@ Types:Legendary Artifact T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Permanent.YouCtrl | TriggerZones$ Battlefield | TriggerController$ TriggeredCardController | Execute$ TrigEnergy | TriggerDescription$ Whenever a permanent you control is put into a graveyard, you get {E} (an energy counter). SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1 A:AB$ PeekAndReveal | Cost$ T PayEnergy<6> | Defined$ You | PeekAmount$ 6 | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBPlay | SpellDescription$ Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order. -SVar:DBPlay:DB$ Play | ValidZone$ Library | Valid$ Card.IsRemembered | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 | SubAbility$ DBRestRandomOrder +SVar:DBPlay:DB$ Play | ValidZone$ Library | Valid$ Card.IsRemembered+nonLand | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 | SubAbility$ DBRestRandomOrder SVar:DBRestRandomOrder:DB$ ChangeZone | Defined$ Remembered | AtRandom$ True | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherworks_marvel.jpg diff --git a/forge-gui/res/cardsfolder/upcoming/speedway_fanatic.txt b/forge-gui/res/cardsfolder/upcoming/speedway_fanatic.txt index 9bfb409b272..775e1b09470 100644 --- a/forge-gui/res/cardsfolder/upcoming/speedway_fanatic.txt +++ b/forge-gui/res/cardsfolder/upcoming/speedway_fanatic.txt @@ -3,6 +3,6 @@ ManaCost:1 R Types:Creature Human Pilot PT:2/1 K:Haste -T:Mode$ Crewed | ValidCrew$ Card.Self | Execute$ TrigSpeedway | TriggerZones$ Battlefield | TriggerDescription$ Whenever Speedway Fanatic crews a Vehicle, that Vehicle gains haste until end of turn. +T:Mode$ Crewed | ValidCrew$ Card.Self | Execute$ TrigSpeedway | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME crews a Vehicle, that Vehicle gains haste until end of turn. SVar:TrigSpeedway:DB$ Pump | Defined$ TriggeredVehicle | KW$ Haste Oracle:Haste\nWhenever Speedway Fanatic crews a Vehicle, that Vehicle gains haste until end of turn. \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java index dc09984067c..4a9a29c34ab 100644 --- a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java @@ -46,6 +46,7 @@ public class PlaneswalkerAchievements extends AchievementCollection { add("Daretti, Ingenious Iconoclast", "Daretti's Mass Production", "Imitation is the sincerest form of irritation."); add("Daretti, Scrap Savant", "Daretti's Recycler", "Save the environment!"); add("Domri Rade", "Domri's Surprise", "That's GOTTA get me a date!"); + add("Dovin Baan", "Dovin's Static", "Have you tried to turn it off and on again?"); add("Elspeth Tirel", "Elspeth's Solitude", "Tokens are my only friends..."); add("Elspeth, Knight-Errant", "Elspeth's Endurance", "Bant will prevail!"); add("Elspeth, Sun's Champion", "Elspeth's Crusade", "With Heliod on my side, I'm invincible!");