[maven-release-plugin] prepare release forge-1.5.3

Slightly tweaked and relabeled the UI components for color preference selection, to make them slightly more intuitive.

.gitattributes

@@ -134,6 +134,7 @@ res/cardsfolder/a/aetherflame_wall.txt svneol=native#text/plain
 res/cardsfolder/a/aetherize.txt -text
 res/cardsfolder/a/aetherling.txt -text
 res/cardsfolder/a/aethermages_touch.txt svneol=native#text/plain
+res/cardsfolder/a/aetherplasm.txt -text
 res/cardsfolder/a/aethersnipe.txt svneol=native#text/plain
 res/cardsfolder/a/aethertow.txt -text
 res/cardsfolder/a/affa_guard_hound.txt svneol=native#text/plain
@@ -1607,6 +1608,7 @@ res/cardsfolder/c/carnival_hellsteed.txt -text
 res/cardsfolder/c/carnival_of_souls.txt svneol=native#text/plain
 res/cardsfolder/c/carnivorous_plant.txt svneol=native#text/plain
 res/cardsfolder/c/carnophage.txt svneol=native#text/plain
+res/cardsfolder/c/carom.txt -text
 res/cardsfolder/c/carpet_of_flowers.txt -text
 res/cardsfolder/c/carrier_pigeons.txt svneol=native#text/plain
 res/cardsfolder/c/carrion.txt svneol=native#text/plain
@@ -1815,6 +1817,7 @@ res/cardsfolder/c/charisma.txt -text
 res/cardsfolder/c/charm_peddler.txt -text
 res/cardsfolder/c/charmbreaker_devils.txt -text
 res/cardsfolder/c/charmed_griffin.txt svneol=native#text/plain
+res/cardsfolder/c/charmed_pendant.txt -text
 res/cardsfolder/c/charnelhoard_wurm.txt svneol=native#text/plain
 res/cardsfolder/c/chartooth_cougar.txt svneol=native#text/plain
 res/cardsfolder/c/chasm_drake.txt svneol=native#text/plain
@@ -3282,6 +3285,7 @@ res/cardsfolder/e/electryte.txt -text
 res/cardsfolder/e/elemental_appeal.txt -text
 res/cardsfolder/e/elemental_augury.txt svneol=native#text/plain
 res/cardsfolder/e/elemental_mastery.txt svneol=native#text/plain
+res/cardsfolder/e/elemental_resonance.txt -text
 res/cardsfolder/e/elephant_ambush.txt svneol=native#text/plain
 res/cardsfolder/e/elephant_grass.txt svneol=native#text/plain
 res/cardsfolder/e/elephant_graveyard.txt svneol=native#text/plain
@@ -3575,6 +3579,7 @@ res/cardsfolder/e/exalted_angel.txt svneol=native#text/plain
 res/cardsfolder/e/exalted_dragon.txt -text
 res/cardsfolder/e/exava_rakdos_blood_witch.txt -text
 res/cardsfolder/e/excavation.txt svneol=native#text/plain
+res/cardsfolder/e/excavator.txt -text
 res/cardsfolder/e/excise.txt svneol=native#text/plain
 res/cardsfolder/e/exclude.txt svneol=native#text/plain
 res/cardsfolder/e/exclusion_ritual.txt -text
@@ -8621,6 +8626,7 @@ res/cardsfolder/p/protean_hulk.txt -text
 res/cardsfolder/p/protean_hydra.txt -text
 res/cardsfolder/p/protect_serve.txt -text
 res/cardsfolder/p/protective_bubble.txt svneol=native#text/plain
+res/cardsfolder/p/protective_sphere.txt -text
 res/cardsfolder/p/proteus_machine.txt -text
 res/cardsfolder/p/proteus_staff.txt -text
 res/cardsfolder/p/protomatter_powder.txt svneol=native#text/plain
@@ -10537,6 +10543,7 @@ res/cardsfolder/s/snow_covered_swamp.txt svneol=native#text/plain
 res/cardsfolder/s/snow_devil.txt svneol=native#text/plain
 res/cardsfolder/s/snow_fortress.txt svneol=native#text/plain
 res/cardsfolder/s/snow_hound.txt svneol=native#text/plain
+res/cardsfolder/s/snowblind.txt -text
 res/cardsfolder/s/snuff_out.txt svneol=native#text/plain
 res/cardsfolder/s/soar.txt -text
 res/cardsfolder/s/soaring_hope.txt svneol=native#text/plain
@@ -10744,6 +10751,7 @@ res/cardsfolder/s/spellstutter_sprite.txt svneol=native#text/plain
 res/cardsfolder/s/spelltithe_enforcer.txt -text
 res/cardsfolder/s/spelltwine.txt -text
 res/cardsfolder/s/spellweaver_helix.txt -text svneol=unset#text/plain
+res/cardsfolder/s/spellweaver_volute.txt -text
 res/cardsfolder/s/spellwild_ouphe.txt -text
 res/cardsfolder/s/sphere_of_duty.txt svneol=native#text/plain
 res/cardsfolder/s/sphere_of_grace.txt svneol=native#text/plain
@@ -11399,6 +11407,7 @@ res/cardsfolder/t/takeno_samurai_general.txt -text
 res/cardsfolder/t/takenos_cavalry.txt svneol=native#text/plain
 res/cardsfolder/t/takenuma.txt -text
 res/cardsfolder/t/takenuma_bleeder.txt svneol=native#text/plain
+res/cardsfolder/t/takklemaggot.txt -text
 res/cardsfolder/t/talaras_bane.txt -text
 res/cardsfolder/t/talaras_battalion.txt -text
 res/cardsfolder/t/talas_air_ship.txt svneol=native#text/plain
@@ -13573,6 +13582,7 @@ res/quest/duels/Batman[!!-~]3.dck -text
 res/quest/duels/Beast[!!-~]1.dck -text
 res/quest/duels/Bela[!!-~]Lugosi[!!-~]3.dck -text
 res/quest/duels/Betty[!!-~]Rubble[!!-~]3.dck -text
+res/quest/duels/Bilbo[!!-~]Baggins[!!-~]2.dck -text
 res/quest/duels/Black[!!-~]Abott[!!-~]2.dck -text
 res/quest/duels/Black[!!-~]Flame[!!-~]3.dck -text
 res/quest/duels/Black[!!-~]Panther[!!-~]2.dck -text
@@ -13732,6 +13742,7 @@ res/quest/duels/Homer[!!-~]Simpson[!!-~]2.dck -text
 res/quest/duels/Homer[!!-~]Simpson[!!-~]3.dck -text
 res/quest/duels/Hookah-Smoking[!!-~]Caterpillar[!!-~]2.dck -text
 res/quest/duels/Hugo[!!-~]Drax[!!-~]1.dck -text
+res/quest/duels/Hugo[!!-~]Drax[!!-~]2.dck -text
 res/quest/duels/Hulk[!!-~]2.dck -text
 res/quest/duels/Iceman[!!-~]3.dck -text
 res/quest/duels/Indiana[!!-~]Jones[!!-~]1.dck -text
@@ -14417,6 +14428,11 @@ res/skins/smith/bg_splash.png -text
 res/skins/smith/bg_texture.jpg -text
 res/skins/smith/font1.ttf -text
 res/skins/smith/sprite_icons.png -text
+res/skins/the_dale/bg_match.jpg -text
+res/skins/the_dale/bg_splash.png -text
+res/skins/the_dale/bg_texture.jpg -text
+res/skins/the_dale/font1.ttf -text
+res/skins/the_dale/sprite_icons.png -text
 res/skins/the_simpsons/bg_match.jpg -text
 res/skins/the_simpsons/bg_splash.png -text
 res/skins/the_simpsons/bg_texture.jpg -text
@@ -14757,6 +14773,7 @@ src/main/java/forge/card/cardfactory/CardFactoryUtil.java svneol=native#text/pla
 src/main/java/forge/card/cardfactory/CardStorageReader.java svneol=native#text/plain
 src/main/java/forge/card/cardfactory/package-info.java svneol=native#text/plain
 src/main/java/forge/card/cost/Cost.java svneol=native#text/plain
+src/main/java/forge/card/cost/CostAddMana.java -text
 src/main/java/forge/card/cost/CostDamage.java -text
 src/main/java/forge/card/cost/CostDiscard.java -text
 src/main/java/forge/card/cost/CostDraw.java -text
@@ -14899,7 +14916,6 @@ src/main/java/forge/card/trigger/WrappedAbility.java -text
 src/main/java/forge/card/trigger/ZCTrigger.java svneol=native#text/plain
 src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain
 src/main/java/forge/control/ChatArea.java -text
-src/main/java/forge/control/ControlBazaarUI.java -text
 src/main/java/forge/control/FControl.java -text
 src/main/java/forge/control/FControlGameEventHandler.java -text
 src/main/java/forge/control/FControlGamePlayback.java -text
@@ -15068,6 +15084,8 @@ src/main/java/forge/gui/MultiLineLabelUI.java svneol=native#text/plain
 src/main/java/forge/gui/SOverlayUtils.java -text
 src/main/java/forge/gui/UnsortedListModel.java -text
 src/main/java/forge/gui/WrapLayout.java -text
+src/main/java/forge/gui/bazaar/CBazaarUI.java -text
+src/main/java/forge/gui/bazaar/VBazaarUI.java -text
 src/main/java/forge/gui/deckchooser/DecksComboBox.java -text
 src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java -text
 src/main/java/forge/gui/deckchooser/FDeckChooser.java -text
@@ -15113,6 +15131,7 @@ src/main/java/forge/gui/events/UiEventBlockerAssigned.java -text
 src/main/java/forge/gui/framework/DragCell.java -text
 src/main/java/forge/gui/framework/DragTab.java -text
 src/main/java/forge/gui/framework/EDocID.java -text
+src/main/java/forge/gui/framework/FScreen.java -text
 src/main/java/forge/gui/framework/ICDoc.java -text
 src/main/java/forge/gui/framework/IDocIdList.java -text
 src/main/java/forge/gui/framework/ILocalRepaint.java -text
@@ -15177,6 +15196,7 @@ src/main/java/forge/gui/home/settings/CSubmenuAvatars.java -text
 src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java -text
 src/main/java/forge/gui/home/settings/CSubmenuPreferences.java -text
 src/main/java/forge/gui/home/settings/CSubmenuReleaseNotes.java -text
+src/main/java/forge/gui/home/settings/GamePlayerUtil.java -text
 src/main/java/forge/gui/home/settings/VSubmenuAvatars.java -text
 src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java -text
 src/main/java/forge/gui/home/settings/VSubmenuPreferences.java -text
@@ -15260,12 +15280,11 @@ src/main/java/forge/gui/match/views/VPicture.java -text
 src/main/java/forge/gui/match/views/VPlayers.java -text
 src/main/java/forge/gui/match/views/VStack.java -text
 src/main/java/forge/gui/match/views/package-info.java svneol=native#text/plain
-src/main/java/forge/gui/menubar/FMenuBar.java -text
-src/main/java/forge/gui/menubar/IMenuProvider.java -text
-src/main/java/forge/gui/menubar/MenuUtil.java -text
 src/main/java/forge/gui/menus/ForgeMenu.java -text
 src/main/java/forge/gui/menus/HelpMenu.java -text
+src/main/java/forge/gui/menus/IMenuProvider.java -text
 src/main/java/forge/gui/menus/LayoutMenu.java -text
+src/main/java/forge/gui/menus/MenuUtil.java -text
 src/main/java/forge/gui/package-info.java svneol=native#text/plain
 src/main/java/forge/gui/toolbox/CardFaceSymbols.java svneol=native#text/plain
 src/main/java/forge/gui/toolbox/FAbsolutePositioner.java -text
@@ -15408,6 +15427,7 @@ src/main/java/forge/quest/QuestUtilCards.java -text
 src/main/java/forge/quest/QuestUtilUnlockSets.java -text
 src/main/java/forge/quest/QuestWorld.java -text
 src/main/java/forge/quest/SellRules.java -text
+src/main/java/forge/quest/StartingPoolPreferences.java -text
 src/main/java/forge/quest/StartingPoolType.java -text
 src/main/java/forge/quest/bazaar/IQuestBazaarItem.java svneol=native#text/plain
 src/main/java/forge/quest/bazaar/QuestBazaarManager.java svneol=native#text/plain
@@ -15488,12 +15508,14 @@ src/main/java/forge/util/storage/StorageReaderFileSections.java -text
 src/main/java/forge/util/storage/StorageReaderFolder.java -text
 src/main/java/forge/util/storage/package-info.java -text
 src/main/java/forge/view/ButtonUtil.java svneol=native#text/plain
+src/main/java/forge/view/FDialog.java -text
 src/main/java/forge/view/FFrame.java -text
+src/main/java/forge/view/FNavigationBar.java -text
 src/main/java/forge/view/FTitleBar.java -text
+src/main/java/forge/view/FTitleBarBase.java -text
 src/main/java/forge/view/FView.java -text
 src/main/java/forge/view/Main.java -text
 src/main/java/forge/view/SplashFrame.java -text
-src/main/java/forge/view/ViewBazaarUI.java -text
 src/main/java/forge/view/arcane/CardArea.java svneol=native#text/plain
 src/main/java/forge/view/arcane/CardPanel.java svneol=native#text/plain
 src/main/java/forge/view/arcane/CardPanelContainer.java svneol=native#text/plain
@@ -15516,7 +15538,6 @@ src/test/java/forge/GuiDownloadPicturesLQTest.java svneol=native#text/plain
 src/test/java/forge/GuiDownloadSetPicturesLQTest.java svneol=native#text/plain
 src/test/java/forge/GuiProgressBarWindowTest.java svneol=native#text/plain
 src/test/java/forge/PanelTest.java svneol=native#text/plain
-src/test/java/forge/ReadDraftRankingsTest.java -text
 src/test/java/forge/RunTest.java svneol=native#text/plain
 src/test/java/forge/TinyTest.java svneol=native#text/plain
 src/test/java/forge/card/mana/ManaPartTest.java svneol=native#text/plain

CHANGES.txt

@@ -1,21 +1,44 @@
-Forge Beta: 10-01-2013 ver 1.5.1
+Forge Beta: 10-18-2013 ver 1.5.3
 
 
-13328 cards in total.
+13337 cards in total.
 
 
 -------------
 Release Notes
 -------------
 
-- Forge freezing during a match bug -
-A number of people have reported this bug and we now feel that it may have been fixed in this version. Please play test this version and let us know.
+- Navigation tabs -
+Forge now display navigation tabs in the titlebar and supports switching screens without closing them.
+By default, Home and Deck Editor are available as tabs, with another closable tab added for any game you start.
+X button in upper right now exits Forge rather than going back to Home screen.
+To concede the current game, use the X button in the Game tab itself.
+Deck Editor and Exit Forge buttons have been removed from the Home screen since they're both accessible on the titlebar.
 
 
-- Skinned titlebar for main window -
-Titlebar is now skinned instead of displaying using standard OS window titlebar
-Maximizing window now displays full-screen
-Can use Layout > View > Titlebar (F11) to toggle visibility of titlebar (will also open full-screen if hiding titlebar)
+- True Full Screen support -
+Full Screen is now toggled using F11 and has its own button on the title bar.
+Maximize will no longer pretend to be Full Screen by covering up the taskbar.
+When in Full Screen mode, the titlebar will be hidden unless you move the mouse to the top of the screen.
+A "Lock/Unlock" Title Bar button will be available in Full Screen mode to toggle whether the title bar should remain visible at all times.
+When in Full Screen mode, a clock will appear to the left of the "Lock/Unlock Title Bar" button.
+The title bar will appear on top of other components if not locked rather than pushing anything down.
+The title bar will remain visible while accessing the Forge menu.
+
+
+- Window fixes -
+Minimize no longer crashes on Mac
+Message and Input dialogs now appear properly centered and on top of main Forge window.
+Prompt to save in Deck Editor (if unsaved changes) when using Forge > Restart.
+
+
+- Introducing the Forge button -
+The old menu bar has been removed.
+The Forge button on the left side of the titlebar will drop down the same menu of options.
+The Alt and Menu keys will also open this menu (even if the titlebar is hidden), with full keyboard navigation of the menus then possible.
+The titlebar, minimize, maximize, and close buttons have all been increased in height to make room for the Forge button.
+Menu items have been increased in height to make them more touch screen friendly. They also now enforce a minimum 100px width.
+F1 has been changed to launch the Forge wiki since it no longer needs to toggle menu bar visibility.
 
 
 - Forge now requires Java 7 -
@@ -34,30 +57,49 @@ Currently, the windows/unix release of Forge includes a launcher file named "for
 New Cards
 ---------
 
-Chaos Moon
-Deep Water
-Infernal Darkness
-Mana Reflection
-Mausoleum Turnkey
-Naked Singularity
-Pale Moon
-Pulse of Llanowar
-Reality Twist
-Ritual of Subdual
-
-
------------
-New Schemes
------------
-
-Nature Demands an Offering
+AEtherplasm
+Carom
+Charmed Pendant
+Elemental Resonance
+Excavator
+Protective Sphere
+Snowblind
+Spellweaver Volute
+Takklemaggot
 
 
 --------------------
-New Vanguard Avatars
+New C13 branch Cards
 --------------------
 
-Mirri
+Act of Authority
+Angel of Finality
+Baleful Force
+Bane of Progress
+Curse of Chaos
+Curse of Forsaken
+Curse of Inertia
+Curse of Predation
+Curse of Shallow Graves
+Derevi, Empyrial Tactician
+Diviner Spirit
+Djinn of Infinite Deceits
+Eye of Doom
+Fell Shepherd
+Gahiji, Honored One
+Hooded Horror
+Illusionist's Gambit
+Nekusar, the Mindrazer
+Oloro, Ageless Ascetic
+Restore
+Roon of the Hidden Realm
+Shattergang Brothers
+Spawning Grounds
+Surveyor's Scope
+Sydri, Galvanic Genius
+Tempt with Immortality
+Tidal Force
+True-Name Nemesis
 
 
 ------------
@@ -86,8 +128,10 @@ DrDev
 Dripton
 Gos
 Hellfish
-Max
+Nordos
+RumbleBBU
 Sloth
+Sol
 spr
 Swordshine
 Chris H

README.txt

@@ -847,6 +847,16 @@ Card overlays can be switched on/off during a match via the Game menu. Added new
 Forge now includes most of the new Theros cards. It may take a few days before these new card pictures become available for downloading via the "Download LQ Card Pictures" button. The LQ set pictures tend to take a few more weeks to process before they become available for downloading via the "Download LQ Set Pictures" button. Please be patient.
 
 
+- Forge freezing during a match bug -
+A number of people have reported this bug and we now feel that it may have been fixed in this version. Please play test this version and let us know.
+
+
+- Skinned titlebar for main window -
+Titlebar is now skinned instead of displaying using standard OS window titlebar
+Maximizing window now displays full-screen
+Can use Layout > View > Titlebar (F11) to toggle visibility of titlebar (will also open full-screen if hiding titlebar)
+
+
 Our Lawyers Made Us Do This:
 ----------------------------
 

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>forge</artifactId>
     <packaging>jar</packaging>
     <name>Forge</name>
-    <version>1.5.1</version>
+    <version>1.5.3</version>
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent
         using all of the rules.
@@ -153,9 +153,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.5.1</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.5.1</developerConnection>
-        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.5.1?repname=forge</url>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.5.3</connection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.5.3</developerConnection>
+        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.5.3?repname=forge</url>
     </scm>
 
     <prerequisites>

res/cardsfolder/a/aetherplasm.txt

@@ -0,0 +1,12 @@
+Name:AEtherplasm
+ManaCost:2 U U
+Types:Creature Illusion
+PT:1/1
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | OptionalDecider$ You | Execute$ TrigBounce | TriggerDescription$ Whenever CARDNAME blocks a creature, you may return CARDNAME to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature.
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self | RememberChanged$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Blocking$ TriggeredAttacker | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Amount
+SVar:RemAIDeck: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.

res/cardsfolder/a/akki_underminer.txt

@@ -2,7 +2,7 @@ Name:Akki Underminer
 ManaCost:3 R
 Types:Creature Goblin Rogue Shaman
 PT:1/1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a permanent.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a permanent.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ TriggeredTarget | SacValid$ Permanent
 SVar:MustBeBlocked:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akki_underminer.jpg

res/cardsfolder/a/ashling_the_extinguisher.txt

@@ -2,7 +2,7 @@ Name:Ashling, the Extinguisher
 ManaCost:2 B B
 Types:Legendary Creature Elemental Shaman
 PT:4/4
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDestroy | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, choose target creature that player controls. He or she sacrifices that creature.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, choose target creature that player controls. He or she sacrifices that creature.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl | Sacrifice$ True | TgtPrompt$ Select target creature defending player controls
 SVar:MustBeBlocked:True
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Eventide/ashling_the_extinguisher.jpg

res/cardsfolder/a/augury_adept.txt

@@ -2,7 +2,7 @@ Name:Augury Adept
 ManaCost:1 WU WU
 Types:Creature Kithkin Wizard
 PT:2/2
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, reveal the top card of your library and put that card into your hand. You gain life equal to its converted mana cost.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, reveal the top card of your library and put that card into your hand. You gain life equal to its converted mana cost.
 SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | RememberChanged$ True | SubAbility$ DBGain
 SVar:DBGain:DB$GainLife | LifeAmount$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True

res/cardsfolder/a/aunties_snitch.txt

@@ -4,7 +4,7 @@ Types:Creature Goblin Rogue
 PT:3/1
 K:CARDNAME can't block.
 SVar:AltCost:Cost$ 1 B | Activation$ ProwlGoblin | Description$ Prowl 1 B (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Goblin or Rogue.)
-T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl,Rogue.YouCtrl | TriggerZones$ Graveyard | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever a Goblin or Rogue you control deals combat damage to a player, if CARDNAME is in your graveyard, you may return CARDNAME to your hand.
+T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl,Rogue.YouCtrl | TriggerZones$ Graveyard | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ Whenever a Goblin or Rogue you control deals combat damage to a player, if CARDNAME is in your graveyard, you may return CARDNAME to your hand.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aunties_snitch.jpg
 Oracle:Auntie's Snitch can't block.\nProwl {1}{B} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Goblin or Rogue.)\nWhenever a Goblin or Rogue you control deals combat damage to a player, if Auntie's Snitch is in your graveyard, you may return Auntie's Snitch to your hand.

res/cardsfolder/a/azorius_chancery.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W U | SpellDescription$ Add W U to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_chancery.jpg
 Oracle:Azorius Chancery enters the battlefield tapped.\nWhen Azorius Chancery enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{U} to your mana pool.

res/cardsfolder/b/beacon_hawk.txt

@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Bird
 PT:1/1
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigUntap | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may untap target creature.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigUntap | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may untap target creature.
 A:AB$ Pump | Cost$ W | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | ValidTgts$ Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_hawk.jpg

res/cardsfolder/b/blazing_specter.txt

@@ -4,7 +4,7 @@ Types:Creature Specter
 PT:2/2
 K:Flying
 K:Haste
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_specter.jpg
 Oracle:Flying, haste\nWhenever Blazing Specter deals combat damage to a player, that player discards a card.

res/cardsfolder/b/blind_zealot.txt

@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Human Cleric
 PT:2/2
 K:Intimidate
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may sacrifice it. If you do, destroy target creature that player controls.
 SVar:TrigDestroy:AB$Destroy | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls | NoRegen$ False
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blind_zealot.jpg

res/cardsfolder/b/bloodcrazed_neonate.txt

@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Vampire
 PT:2/1
 K:CARDNAME attacks each turn if able.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodcrazed_neonate.jpg
 Oracle:Bloodcrazed Neonate attacks each turn if able.\nWhenever Bloodcrazed Neonate deals combat damage to a player, put a +1/+1 counter on it.

res/cardsfolder/b/bloom_tender.txt

@@ -2,11 +2,11 @@ Name:Bloom Tender
 ManaCost:1 G
 Types:Creature Elf Druid
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ W | ConditionCheckSVar$ CheckW | ConditionSVarCompare$ GE1 | SubAbility$ DBManaU | SpellDescription$ For each color among permanents you control, add one mana of that color to your mana pool.
-SVar:DBManaU:DB$ Mana | Produced$ U | ConditionCheckSVar$ CheckU | ConditionSVarCompare$ GE1 | SubAbility$ DBManaB
-SVar:DBManaB:DB$ Mana | Produced$ B | ConditionCheckSVar$ CheckB | ConditionSVarCompare$ GE1 | SubAbility$ DBManaR
-SVar:DBManaR:DB$ Mana | Produced$ R | ConditionCheckSVar$ CheckR | ConditionSVarCompare$ GE1 | SubAbility$ DBManaG
-SVar:DBManaG:DB$ Mana | Produced$ G | ConditionCheckSVar$ CheckG | ConditionSVarCompare$ GE1
+A:AB$ Mana | Cost$ T | Produced$ W | ConditionCheckSVar$ CheckW | References$ CheckW | ConditionSVarCompare$ GE1 | SubAbility$ DBManaU | SpellDescription$ For each color among permanents you control, add one mana of that color to your mana pool.
+SVar:DBManaU:DB$ Mana | Produced$ U | ConditionCheckSVar$ CheckU | References$ CheckU | ConditionSVarCompare$ GE1 | SubAbility$ DBManaB
+SVar:DBManaB:DB$ Mana | Produced$ B | ConditionCheckSVar$ CheckB | References$ CheckB | ConditionSVarCompare$ GE1 | SubAbility$ DBManaR
+SVar:DBManaR:DB$ Mana | Produced$ R | ConditionCheckSVar$ CheckR | References$ CheckR | ConditionSVarCompare$ GE1 | SubAbility$ DBManaG
+SVar:DBManaG:DB$ Mana | Produced$ G | ConditionCheckSVar$ CheckG | References$ CheckG | ConditionSVarCompare$ GE1
 SVar:CheckW:Count$Valid Permanent.YouCtrl+White
 SVar:CheckU:Count$Valid Permanent.YouCtrl+Blue
 SVar:CheckB:Count$Valid Permanent.YouCtrl+Black

res/cardsfolder/b/boggart_mob.txt

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Goblin Warrior
 PT:5/5
 K:Champion:Goblin
-T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield.
+T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever a Goblin you control deals combat damage to a player, you may put a 1/1 black Goblin Rogue creature token onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin Rogue | TokenTypes$ Creature,Goblin,Rogue | TokenOwner$ You | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boggart_mob.jpg

res/cardsfolder/b/bojuka_bog.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target player's graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile all cards from target player's graveyard.
 SVar:TrigExile:AB$ChangeZoneAll | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | IsCurse$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bojuka_bog.jpg
 Oracle:Bojuka Bog enters the battlefield tapped.\nWhen Bojuka Bog enters the battlefield, exile all cards from target player's graveyard.\n{T}: Add {B} to your mana pool.

res/cardsfolder/b/borborygmos.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R G G
 Types:Legendary Creature Cyclops
 PT:6/7
 K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigCounters | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on each creature you control.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCounters | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on each creature you control.
 SVar:TrigCounters:AB$PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/borborygmos.jpg
 Oracle:Trample\nWhenever Borborygmos deals combat damage to a player, put a +1/+1 counter on each creature you control.

res/cardsfolder/b/boros_garrison.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R W | SpellDescription$ Add R W to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_garrison.jpg
 Oracle:Boros Garrison enters the battlefield tapped.\nWhen Boros Garrison enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{W} to your mana pool.

res/cardsfolder/b/boulderfall.txt

@@ -2,5 +2,5 @@ Name:Boulderfall
 ManaCost:6 R R
 Types:Instant
 A:SP$ DealDamage | Cost$ 6 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to distribute damage to | NumDmg$ 5 | TargetMin$ 1 | TargetMax$ 5 | DividedAsYouChoose$ 5 | SpellDescription$ CARDNAME deals 5 damage divided as you choose among any number of target creatures and/or players.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/boulderfal.jpg
+SVar:Picture:http://www.wizards.com/global/images/magic/general/boulderfall.jpg
 Oracle:Boulderfall deals 5 damage divided as you choose among any number of target creatures and/or players.

res/cardsfolder/b/braid_of_fire.txt

@@ -1,7 +1,7 @@
 Name:Braid of Fire
 ManaCost:1 R
 Types:Enchantment
-Text:Cumulative upkeep-Add R to your mana pool.
+K:Cumulative upkeep:AddMana<1/R>:Add R to your mana pool.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/braid_of_fire.jpg
 Oracle:Cumulative upkeep-Add {R} to your mana pool. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)

res/cardsfolder/b/breath_of_fury.txt

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Enchantment Aura
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 2 R R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to attach Breath of Fury to | AILogic$ Pump
-T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Opponent | CombatDamage$ True | Execute$ NewFuriousLeader | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature deals combat damage to a player, sacrifice it and attach CARDNAME to a creature you control. If you do, untap all creatures you control and after this phase, there is an additional combat phase.
+T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ NewFuriousLeader | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature deals combat damage to a player, sacrifice it and attach CARDNAME to a creature you control. If you do, untap all creatures you control and after this phase, there is an additional combat phase.
 SVar:NewFuriousLeader:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.NotEnchantedBy+YouCtrl+CanBeEnchantedBy | SubAbility$ TrigSacrifice
 SVar:TrigSacrifice:DB$ SacrificeAll | ValidCards$ Card.EnchantedBy | SubAbility$ StillFurious | RememberSacrificed$ True
 SVar:StillFurious:DB$ Attach | Defined$ ChosenCard | ConditionCheckSVar$ WasSacced | ConditionSVarCompare$ EQ1 | SubAbility$ Cleanup

res/cardsfolder/c/cabal_executioner.txt

@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Human Cleric
 PT:2/2
 K:Morph:3 B B
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a creature.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices a creature.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ TriggeredTarget | SacValid$ Creature
 SVar:MustBeBlocked:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_executioner.jpg

res/cardsfolder/c/carom.txt

@@ -0,0 +1,20 @@
+Name:Carom
+ManaCost:1 W
+Types:Instant
+A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage to | ImprintTargets$ True | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. Draw a card.
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature to redirect damage from | TargetUnique$ True | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,RestDmgCombat,RestDmg,ExileEffect,X,Y | RememberObjects$ Targeted | ImprintCards$ Imprinted | SubAbility$ DBCleanup
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.
+SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1 | SubAbility$ RestDmgCombat | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
+SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ 1 | SubAbility$ RestDmg | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
+SVar:RestDmgCombat:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
+SVar:RestDmg:DB$ DealDamage | Defined$ Remembered | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ ExileEffect | Static$ True
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
+SVar:X:ReplaceCount$DamageAmount/Minus.1
+SVar:Y:ReplaceCount$DamageAmount
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/carom.jpg
+Oracle:The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead.\nDraw a card.

res/cardsfolder/c/caustic_wasps.txt

@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Insect
 PT:1/1
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target artifact that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target artifact that player controls.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select an artifact your opponent controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caustic_wasps.jpg
 Oracle:Flying\nWhenever Caustic Wasps deals combat damage to a player, you may destroy target artifact that player controls.

res/cardsfolder/c/chained_to_the_rocks.txt

@@ -10,5 +10,6 @@ SVar:ComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Valid
 SVar:TrigReturn:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ ExileSelf
 SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 SVar:PlayMain1:TRUE
+SVar:NeedsToPlay:Creature.OppCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chained_to_the_rocks.jpg
 Oracle:Enchant Mountain you control\nWhen Chained to the Rocks enters the battlefield, exile target creature an opponent controls until Chained to the Rocks leaves the battlefield. (That creature returns under its owner's control.)

res/cardsfolder/c/charmed_pendant.txt

@@ -0,0 +1,15 @@
+Name:Charmed Pendant
+ManaCost:4
+Types:Artifact
+A:AB$ Mana | Cost$ T Mill<1> | Produced$ W | Amount$ ManaW | References$ ManaW | InstantSpeed$ True | SubAbility$ DBManaU | SpellDescription$ For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant.
+SVar:DBManaU:DB$ Mana | Produced$ U | Amount$ ManaU | References$ ManaU | SubAbility$ DBManaB
+SVar:DBManaB:DB$ Mana | Produced$ B | Amount$ ManaB | References$ ManaB | SubAbility$ DBManaR
+SVar:DBManaR:DB$ Mana | Produced$ R | Amount$ ManaR | References$ ManaR | SubAbility$ DBManaG
+SVar:DBManaG:DB$ Mana | Produced$ G | Amount$ ManaG | References$ ManaG
+SVar:ManaW:Milled$ChromaSource.W
+SVar:ManaU:Milled$ChromaSource.U
+SVar:ManaB:Milled$ChromaSource.B
+SVar:ManaR:Milled$ChromaSource.R
+SVar:ManaG:Milled$ChromaSource.G
+SVar:Picture:http://www.wizards.com/global/images/magic/general/charmed_pendant.jpg
+Oracle:{T}, Put the top card of your library into your graveyard: For each colored mana symbol in that card's mana cost, add one mana of that color to your mana pool. Activate this ability only any time you could cast an instant. (For example, if the card's mana cost is {3}{U}{U}{B}, you add {U}{U}{B} to your mana pool.)

res/cardsfolder/c/chilling_apparition.txt

@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Spirit
 PT:1/1
 A:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chilling_apparition.jpg
 Oracle:{B}: Regenerate Chilling Apparition.\nWhenever Chilling Apparition deals combat damage to a player, that player discards a card.

res/cardsfolder/c/crosstown_courier.txt

@@ -2,7 +2,7 @@ Name:Crosstown Courier
 ManaCost:1 U
 Types:Creature Vedalken
 PT:2/1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player puts that many cards from the top of his or her library into his or her graveyard.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player puts that many cards from the top of his or her library into his or her graveyard.
 SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crosstown_courier.jpg

res/cardsfolder/d/damping_field.txt

@@ -1,7 +1,7 @@
 Name:Damping Field
 ManaCost:2 W
 Types:Enchantment
-Text:Players can't untap more than one artifact during their untap steps.
+S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't untap more than one artifact during your untap step. | Description$ Players can't untap more than one artifact during their untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/damping_field.jpg

res/cardsfolder/d/darigaaz_the_igniter.txt

@@ -3,7 +3,7 @@ ManaCost:3 B R G
 Types:Legendary Creature Dragon
 PT:6/6
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChooseColor | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 R. If you do, choose a color, then that player reveals his or her hand and Darigaaz deals damage to the player equal to the number of cards of that color revealed this way.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChooseColor | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 R. If you do, choose a color, then that player reveals his or her hand and Darigaaz deals damage to the player equal to the number of cards of that color revealed this way.
 SVar:TrigChooseColor:AB$ ChooseColor | Cost$ 2 R | Defined$ You | AILogic$ MostProminentInHumanDeck | SubAbility$ DBRevealHand
 SVar:DBRevealHand:DB$ RevealHand | Defined$ TriggeredTarget | RememberRevealed$ True | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ TriggeredTarget | NumDmg$ X | SubAbility$ DBCleanup | References$ X

res/cardsfolder/d/dark_betrayal.txt

@@ -1,6 +1,6 @@
 Name:Dark Betrayal
 ManaCost:B
-Types:Sorcery
+Types:Instant
 A:SP$ Destroy | Cost$ B | ValidTgts$ Creature.Black | TgtPrompt$ Select target black creature | SpellDescription$ Destroy target black creature.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_betrayal.jpg

res/cardsfolder/d/dawning_purist.txt

@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/2
 K:Morph:1 W
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target enchantment that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target enchantment that player controls.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment.DefenderCtrl | TgtPrompt$ Select an enchantment your opponent controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawning_purist.jpg
 Oracle:Whenever Dawning Purist deals combat damage to a player, you may destroy target enchantment that player controls.\nMorph {1}{W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)

res/cardsfolder/d/dimir_aqueduct.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U B | SpellDescription$ Add U B to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_aqueduct.jpg
 Oracle:Dimir Aqueduct enters the battlefield tapped.\nWhen Dimir Aqueduct enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{B} to your mana pool.

res/cardsfolder/d/dimir_cutpurse.txt

@@ -2,7 +2,7 @@ Name:Dimir Cutpurse
 ManaCost:1 U B
 Types:Creature Spirit
 PT:2/2
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDrawDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDrawDiscard | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you draw a card.
 SVar:TrigDrawDiscard:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_cutpurse.jpg

res/cardsfolder/d/drop_of_honey.txt

@@ -1,7 +1,9 @@
 Name:Drop of Honey
 ManaCost:G
 Types:Enchantment
-Text:At the beginning of your upkeep, destroy the creature with the least power. It can't be regenerated. If two or more creatures are tied for least power, you choose one of them.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChooseOneToDestroy | TriggerDescription$ At the beginning of your upkeep, destroy the creature with the least power. It can't be regenerated. If two or more creatures are tied for least power, you choose one of them.
+SVar:TrigChooseOneToDestroy:AB$ ChooseCard | Cost$ 0 | Choices$ Creature.leastPower+withoutIndestructible | Mandatory$ True | SubAbility$ DBDestroy
+SVar:DBDestroy:DB$ Destroy | Defined$ ChosenCard | NoRegen$ True
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When there are no creatures on the battlefield, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:NeedsToPlay:Creature.YouDontCtrl+leastPower

res/cardsfolder/e/ebonblade_reaper.txt

@@ -5,7 +5,7 @@ PT:1/1
 K:Morph:3 B B
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks, you lose half your life, rounded up.
 SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ EbonXYou | References$ EbonXYou
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigLoseLifeOpp | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses half his or her life, rounded up.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLifeOpp | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses half his or her life, rounded up.
 SVar:TrigLoseLifeOpp:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredTarget | LifeAmount$ EbonXOpp | References$ EbonXOpp
 SVar:EbonXYou:Count$YourLifeTotal/HalfUp
 SVar:EbonXOpp:Count$OppLifeTotal/HalfUp

res/cardsfolder/e/elemental_resonance.txt

@@ -0,0 +1,9 @@
+Name:Elemental Resonance
+ManaCost:2 G G
+Types:Enchantment Aura
+K:Enchant permanent
+A:SP$ Attach | Cost$ 2 G G | ValidTgts$ Permanent | AILogic$ Pump
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost to your mana pool. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)
+SVar:TrigMana:AB$ Mana | Cost$ 0 | Produced$ Special EnchantedManaCost
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_resonance.jpg
+Oracle:Enchant permanent\nAt the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost to your mana pool. (Mana cost includes color. If a mana symbol has multiple colors, choose one.)

res/cardsfolder/e/emissary_of_despair.txt

@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Spirit
 PT:2/1
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses 1 life for each artifact he or she controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses 1 life for each artifact he or she controls.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredTarget | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Artifact.DefenderCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emissary_of_despair.jpg

res/cardsfolder/e/emissary_of_hope.txt

@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Spirit
 PT:2/1
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you gain 1 life for each artifact that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you gain 1 life for each artifact that player controls.
 SVar:TrigLoseLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$  X
 SVar:X:Count$Valid Artifact.DefenderCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emissary_of_hope.jpg

res/cardsfolder/e/erdwal_ripper.txt

@@ -3,7 +3,7 @@ ManaCost:1 R R
 Types:Creature Vampire
 PT:2/1
 K:Haste
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/erdwal_ripper.jpg
 Oracle:Haste\nWhenever Erdwal Ripper deals combat damage to a player, put a +1/+1 counter on it.

res/cardsfolder/e/excavator.txt

@@ -0,0 +1,8 @@
+Name:Excavator
+ManaCost:2
+Types:Artifact
+A:AB$ Pump | Cost$ T Sac<1/Land.Basic/basic land> | DefinedLandwalk$ Sacrificed | ValidTgts$ Creature | SpellDescription$ Target creature gains landwalk of each of the land types of the sacrificed land until end of turn.
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/excavator.jpg
+Oracle:{T}, Sacrifice a basic land: Target creature gains landwalk of each of the land types of the sacrificed land until end of turn.

res/cardsfolder/f/falkenrath_exterminator.txt

@@ -2,7 +2,7 @@ Name:Falkenrath Exterminator
 ManaCost:1 R
 Types:Creature Vampire Archer
 PT:1/1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 A:AB$ DealDamage | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target creature equal to the number of +1/+1 counters on it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$CardCounters.P1P1

res/cardsfolder/f/ferropede.txt

@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Insect
 PT:1/1
 K:Unblockable
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may remove a counter from target permanent.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may remove a counter from target permanent.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | CounterType$ Any | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ferropede.jpg
 Oracle:Ferropede can't be blocked.\nWhenever Ferropede deals combat damage to a player, you may remove a counter from target permanent.

res/cardsfolder/g/garza_zol_plague_queen.txt

@@ -6,7 +6,7 @@ K:Flying
 K:Haste
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garza_zol_plague_queen.jpg
 Oracle:Flying, haste\nWhenever a creature dealt damage by Garza Zol, Plague Queen this turn dies, put a +1/+1 counter on Garza Zol.\nWhenever Garza Zol deals combat damage to a player, you may draw a card.

res/cardsfolder/g/ghoulcallers_chant.txt

@@ -2,7 +2,7 @@ Name:Ghoulcaller's Chant
 ManaCost:B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouOwn | PrecostDesc$ Choose one - | SpellDescription$ Return target creature card from your graveyard to your hand
-A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target Zombie cards in your graveyard | ValidTgts$ Creature.Zombie+YouOwn | TargetMin$ 2 | TargetMax$ 2 | PrecostDesc$ or | SpellDescription$ return two target Zombie cards from your graveyard to your hand.
+A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select two target Zombie cards in your graveyard | ValidTgts$ Zombie.YouOwn | TargetMin$ 2 | TargetMax$ 2 | PrecostDesc$ or | SpellDescription$ return two target Zombie cards from your graveyard to your hand.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghoulcallers_chant.jpg
 Oracle:Choose one - Return target creature card from your graveyard to your hand; or return two target Zombie cards from your graveyard to your hand.

res/cardsfolder/g/glare_of_subdual.txt

@@ -2,5 +2,6 @@ Name:Glare of Subdual
 ManaCost:2 G W
 Types:Enchantment
 A:AB$ Tap | Cost$ tapXType<1/Creature> | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | SpellDescription$ Tap target artifact or creature.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glare_of_subdual.jpg
 Oracle:Tap an untapped creature you control: Tap target artifact or creature.

res/cardsfolder/g/golgari_rot_farm.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B G | SpellDescription$ Add B G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_rot_farm.jpg
 Oracle:Golgari Rot Farm enters the battlefield tapped.\nWhen Golgari Rot Farm enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{G} to your mana pool.

res/cardsfolder/g/gruul_turf.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R G | SpellDescription$ Add R G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_turf.jpg
 Oracle:Gruul Turf enters the battlefield tapped.\nWhen Gruul Turf enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {R}{G} to your mana pool.

res/cardsfolder/h/heirs_of_stromkirk.txt

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Vampire
 PT:2/2
 K:Intimidate
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heirs_of_stromkirk.jpg
 Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)\nWhenever Heirs of Stromkirk deals combat damage to a player, put a +1/+1 counter on it.

res/cardsfolder/h/hellcarver_demon.txt

@@ -3,7 +3,7 @@ ManaCost:3 B B B
 Types:Creature Demon
 PT:6/6
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, sacrifice all other permanents you control and discard your hand. Exile the top six cards of your library. You may cast any number of nonland cards exiled this way without paying their mana costs.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, sacrifice all other permanents you control and discard your hand. Exile the top six cards of your library. You may cast any number of nonland cards exiled this way without paying their mana costs.
 SVar:TrigSacrifice:AB$ SacrificeAll | Cost$ 0 | ValidCards$ Permanent.YouCtrl+Other | SubAbility$ DBDiscardHand
 SVar:DBDiscardHand:DB$ Discard | Mode$ Hand | Defined$ You | SubAbility$ DBExileSix
 SVar:DBExileSix:DB$ Mill | Destination$ Exile | RememberMilled$ True | NumCards$ 6 | SubAbility$ DBPlayThem

res/cardsfolder/h/hellkite_tyrant.txt

@@ -4,7 +4,7 @@ Types:Creature Dragon
 PT:6/5
 K:Flying
 K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigGainControl | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, gain control of all artifacts that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGainControl | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, gain control of all artifacts that player controls.
 SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | AllValid$ Artifact.DefenderCtrl | NewController$ You
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | PresentCompare$ GE20 | IsPresent$ Artifact.YouCtrl | Execute$ WinGame | TriggerDescription$ At the beginning of your upkeep, if you control twenty or more artifacts, you win the game.
 SVar:WinGame:AB$ WinsGame | Cost$ 0 | Defined$ You

res/cardsfolder/h/higure_the_still_wind.txt

@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Legendary Creature Human Ninja
 PT:3/4
 A:AB$ ChangeZone | Cost$ 2 U U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 U U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (2 U U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigSearch | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a Ninja card, reveal it, and put it into your hand. If you do, shuffle your library.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigSearch | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a Ninja card, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigSearch:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Ninja | ChangeNum$ 1 | ShuffleNonMandatory$ True
 A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Ninja | KW$ HIDDEN Unblockable | SpellDescription$ Target Ninja creature can't be blocked this turn. | TgtPrompt$ Select target Ninja creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/higure_the_still_wind.jpg

res/cardsfolder/h/hystrodon.txt

@@ -4,7 +4,7 @@ Types:Creature Beast
 PT:3/4
 K:Trample
 K:Morph:1 G G
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hystrodon.jpg
 Oracle:Trample\nWhenever Hystrodon deals combat damage to a player, you may draw a card.\nMorph {1}{G}{G} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)

res/cardsfolder/i/imi_statue.txt

@@ -1,7 +1,7 @@
 Name:Imi Statue
 ManaCost:3
 Types:Artifact
-Text:Players can't untap more than one artifact during their untap steps.
+S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't untap more than one artifact during your untap step. | Description$ Players can't untap more than one artifact during their untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imi_statue.jpg

res/cardsfolder/i/ink_eyes_servant_of_oni.txt

@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Legendary Creature Rat Ninja
 PT:5/4
 A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control.
 SVar:TrigAnimate:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.DefenderCtrl | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control.
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ink_eyes_servant_of_oni.jpg

res/cardsfolder/i/intet_the_dreamer.txt

@@ -3,7 +3,7 @@ ManaCost:3 U R G
 Types:Legendary Creature Dragon
 PT:6/6
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 U. If you do, exile the top card of your library face down. You may look at that card for as long as it remains exiled. You may play that card without paying its mana cost for as long as Intet remains on the battlefield.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 U. If you do, exile the top card of your library face down. You may look at that card for as long as it remains exiled. You may play that card without paying its mana cost for as long as Intet remains on the battlefield.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 2 U | Defined$ TopOfLibrary | Origin$ Library | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ You may look at this card. | PumpZone$ Exile | SubAbility$ DBPump2 | Permanent$ True
 SVar:DBPump2:DB$ Pump | Defined$ Remembered | KW$ May be played without paying its mana cost | PumpZone$ Exile | UntilHostLeavesPlay$ True | SubAbility$ DBCleanup

res/cardsfolder/i/intruder_alarm.txt

@@ -1,7 +1,7 @@
 Name:Intruder Alarm
 ManaCost:2 U
 Types:Enchantment
-Text:Creatures don't untap during their controllers' untap steps.
+S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't untap creatures during your untap step. | Description$ Creatures don't untap during their controllers' untap steps.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigUntapAll | TriggerDescription$ Whenever a creature enters the battlefield, untap all creatures.
 SVar:TrigUntapAll:AB$UntapAll | Cost$ 0 | ValidCards$ Creature | SpellDescription$ untap all creatures.
 SVar:RemRandomDeck:True

res/cardsfolder/i/izzet_boilerworks.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U R | SpellDescription$ Add U R to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_boilerworks.jpg
 Oracle:Izzet Boilerworks enters the battlefield tapped.\nWhen Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {U}{R} to your mana pool.

res/cardsfolder/i/izzet_keyrune.txt

@@ -4,7 +4,7 @@ Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Animate | Cost$ U R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Artifact,Creature,Elemental | Colors$ Blue,Red | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 blue and red Elemental artifact creature.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard | OptionalDecider$ You | RememberDrawn$ True
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True

res/cardsfolder/k/kathari_bomber.txt

@@ -4,7 +4,7 @@ Types:Creature Bird Shaman
 PT:2/2
 K:Flying
 K:Unearth:3 B R
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ When CARDNAME deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice CARDNAME.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ When CARDNAME deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice CARDNAME.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 2 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ DBSac
 SVar:DBSac:DB$Sacrifice | Cost$ 0 | SacValid$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kathari_bomber.jpg

res/cardsfolder/k/kederekt_parasite.txt

@@ -3,6 +3,6 @@ ManaCost:B
 Types:Creature Horror
 PT:1/1
 T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Permanent.Red+YouCtrl | Execute$ TrigDamage | TriggerDescription$ Whenever an opponent draws a card, if you control a red permanent, you may have CARDNAME deal 1 damage to that player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kederekt_parasite.jpg
 Oracle:Whenever an opponent draws a card, if you control a red permanent, you may have Kederekt Parasite deal 1 damage to that player.

res/cardsfolder/l/land_equilibrium.txt

@@ -1,7 +1,8 @@
 Name:Land Equilibrium
 ManaCost:2 U U
 Types:Enchantment
-Text:If an opponent who controls at least as many lands as you do would put a land onto the battlefield, that player instead puts that land onto the battlefield then sacrifices a land.
-SVar:SacLand:DB$ Sacrifice | SacValid$ Land | Defined$ Opponent | SpellDescription$ Opponent sacrifices a land
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Land.OppCtrl+ControllerControlsAtLeastAsManyLand | ReplaceWith$ MoveToPlay | Description$ If an opponent who controls at least as many lands as you do would put a land onto the battlefield, that player instead puts that land onto the battlefield then sacrifices a land.
+SVar:MoveToPlay:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | SubAbility$ SacLand
+SVar:SacLand:DB$ Sacrifice | SacValid$ Land | Defined$ ReplacedCardController
 SVar:Picture:http://www.wizards.com/global/images/magic/general/land_equilibrium.jpg
 Oracle:If an opponent who controls at least as many lands as you do would put a land onto the battlefield, that player instead puts that land onto the battlefield then sacrifices a land.

res/cardsfolder/l/lavacore_elemental.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Elemental
 PT:5/3
 K:Vanishing:1
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put a time counter on CARDNAME.
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put a time counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ TIME | CounterNum$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavacore_elemental.jpg

res/cardsfolder/l/leshracs_sigil.txt

@@ -3,7 +3,7 @@ ManaCost:B B
 Types:Enchantment
 A:AB$ ChangeZone | Cost$ B B | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDiscard | OptionalDecider$ You | TriggerDescription$ Whenever an opponent casts a green spell, you may pay B B. If you do, look at that player's hand and choose a card from it. The player discards that card.
-SVar:TrigDiscard:AB$Discard | Cost$ B B | Defined$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose
+SVar:TrigDiscard:AB$ Discard | Cost$ B B | Defined$ TriggeredActivator | NumCards$ 1 | Mode$ RevealYouChoose
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leshracs_sigil.jpg
 Oracle:Whenever an opponent casts a green spell, you may pay {B}{B}. If you do, look at that player's hand and choose a card from it. The player discards that card.\n{B}{B}: Return Leshrac's Sigil to its owner's hand.

res/cardsfolder/l/lightning_reaver.txt

@@ -4,7 +4,7 @@ Types:Creature Zombie Beast
 PT:3/3
 K:Haste
 K:Fear
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a charge counter on it.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a charge counter on it.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your end step, CARDNAME deals damage equal to the number of charge counters on it to each opponent.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ 1
 SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | Defined$ Player.Opponent | NumDmg$ X | References$ X

res/cardsfolder/l/lightwielder_paladin.txt

@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Human Knight
 PT:4/4
 K:First Strike
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may exile target black or red permanent that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may exile target black or red permanent that player controls.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Permanent.Black+DefenderCtrl,Permanent.Red+DefenderCtrl | TgtPrompt$ Choose target black or red permanent. | Origin$ Battlefield | Destination$ Exile | IsCurse$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightwielder_paladin.jpg
 Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nWhenever Lightwielder Paladin deals combat damage to a player, you may exile target black or red permanent that player controls.

res/cardsfolder/l/lilianas_caress.txt

@@ -2,6 +2,6 @@ Name:Liliana's Caress
 ManaCost:1 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$TrigLoseLife | TriggerDescription$ Whenever an opponent discards a card, that player loses 2 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 2
+SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lilianas_caress.jpg
 Oracle:Whenever an opponent discards a card, that player loses 2 life.

res/cardsfolder/l/lilianas_reaver.txt

@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Zombie
 PT:4/3
 K:Deathtouch
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you put a 2/2 black Zombie creature token onto the battlefield tapped.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card and you put a 2/2 black Zombie creature token onto the battlefield tapped.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ MakeToken
 SVar:MakeToken:DB$Token | TokenImage$ B 2 2 Zombie | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lilianas_reaver.jpg

res/cardsfolder/l/lone_revenant.txt

@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Creature Spirit
 PT:4/4
 K:Hexproof
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | CheckSVar$ NumYouCtrl | SVarCompare$ EQ0 | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the others on the bottom of your library in any order.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | CheckSVar$ NumYouCtrl | SVarCompare$ EQ0 | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control no other creatures, look at the top four cards of your library. Put one of them into your hand and the others on the bottom of your library in any order.
 SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 4
 SVar:NumYouCtrl:Count$Valid Creature.Other+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lone_revenant.jpg

res/cardsfolder/l/lyzolda_the_blood_witch_avatar.txt

@@ -8,6 +8,6 @@ SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$
 SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Hellbent$ True | Execute$ LyzoldasDiscard | TriggerDescription$ Hellbent - At the beginning of your end step, if you have no cards in hand, each of your opponents discards a card.
-SVar:LyzoldasDiscard:AB$ Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
+SVar:LyzoldasDiscard:AB$ Discard | Cost$ 0 | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/lyzolda_the_blood_witch_avatar.jpg
 Oracle:Hand -1, life -1\nHellbent - As long as you have no cards in hand, if a source you control would deal damage to a creature or player, it deals double that damage to that creature or player instead.\nHellbent - At the beginning of your end step, if you have no cards in hand, each of your opponents discards a card.

res/cardsfolder/m/marsh_viper.txt

@@ -3,6 +3,6 @@ ManaCost:3 G
 Types:Creature Snake
 PT:1/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player gets two poison counters. (A player with ten or more poison counters loses the game.)
-SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 2
+SVar:TrigPoison:AB$ Poison | Cost$ 0 | Defined$ TriggeredTarget | Num$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marsh_viper.jpg
 Oracle:Whenever Marsh Viper deals damage to an opponent, that player gets two poison counters. (A player with ten or more poison counters loses the game.)

res/cardsfolder/m/megrim.txt

@@ -2,6 +2,6 @@ Name:Megrim
 ManaCost:2 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever an opponent discards a card, CARDNAME deals 2 damage to that player.
-SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 2
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredCardController | NumDmg$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/megrim.jpg
 Oracle:Whenever an opponent discards a card, Megrim deals 2 damage to that player.

res/cardsfolder/m/memory_erosion.txt

@@ -2,6 +2,6 @@ Name:Memory Erosion
 ManaCost:1 U U
 Types:Enchantment
 T:Mode$ SpellCast | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever an opponent casts a spell, that player puts the top two cards of his or her library into his or her graveyard.
-SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ Opponent | NumCards$ 2
+SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredActivator | NumCards$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_erosion.jpg
 Oracle:Whenever an opponent casts a spell, that player puts the top two cards of his or her library into his or her graveyard.

res/cardsfolder/m/mindcrank.txt

@@ -2,7 +2,7 @@ Name:Mindcrank
 ManaCost:2
 Types:Artifact
 T:Mode$ LifeLost | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. (Damage dealt by sources without infect causes loss of life.)
-SVar:TrigMill:AB$Mill | Cost$ 0 | Defined$ Opponent | NumCards$ X | References$ X
+SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ X | References$ X
 SVar:X:TriggerCount$LifeAmount
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindcrank.jpg

res/cardsfolder/m/mungha_wurm.txt

@@ -1,7 +1,7 @@
 Name:Mungha Wurm
 ManaCost:2 G G
 Types:Creature Wurm
-Text:You can't untap more than one land during your untap step.
 PT:6/5
+S:Mode$ Continuous | Affected$ You | AddKeyword$ You can't untap more than one land during your untap step. | Description$ You can't untap more than one land during your untap step.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mungha_wurm.jpg
 Oracle:You can't untap more than one land during your untap step.

res/cardsfolder/n/nest_invader.txt

@@ -2,7 +2,7 @@ Name:Nest Invader
 ManaCost:1 G
 Types:Creature Eldrazi Drone
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add 1 to your mana pool."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. It has "Sacrifice this creature: Add 1 to your mana pool."
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenAbilities$ ABMana
 SVar:ABMana:AB$Mana | Cost$ Sac<1/CARDNAME> | Produced$ 1 | Amount$ 1 | SpellDescription$ Add 1 to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nest_invader.jpg

res/cardsfolder/n/neurok_commando.txt

@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Creature Human Rogue
 PT:2/1
 K:Shroud
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_commando.jpg
 Oracle:Shroud\nWhenever Neurok Commando deals combat damage to a player, you may draw a card.

res/cardsfolder/n/nicol_bolas.txt

@@ -5,6 +5,6 @@ PT:7/7
 K:Flying
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U B R
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, that player discards his or her hand.
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | Mode$ Hand
+SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | Mode$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas.jpg
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.\nWhenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.

res/cardsfolder/n/night_dealings.txt

@@ -1,7 +1,7 @@
 Name:Night Dealings
 ManaCost:2 B B
 Types:Enchantment
-T:Mode$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a source you control deals damage to another player, put that many theft counters on CARDNAME.
+T:Mode$ DamageDone | ValidSource$ Card.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a source you control deals damage to another player, put that many theft counters on CARDNAME.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ THEFT | CounterNum$ Y | References$ Y
 A:AB$ ChangeZone | Cost$ 2 B B SubCounter<X/THEFT> | Origin$ Library | Destination$ Hand | ChangeType$ Card.nonLand+YouCtrl+cmcEQChosenX | ChangeNum$ 1 | Reveal$ True | Shuffle$ True | References$ X | SpellDescription$ Search your library for a nonland card with converted mana cost X, reveal it, and put it into your hand. Then shuffle your library.
 SVar:X:XChoice

res/cardsfolder/n/nightveil_specter.txt

@@ -3,7 +3,7 @@ ManaCost:UB UB UB
 Types:Creature Specter
 PT:2/3
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles the top card of his or her library.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles the top card of his or her library.
 SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Destination$ Exile | RememberMilled$ True
 S:Mode$ Continuous | Affected$ Card.IsRemembered+OppOwn | AffectedZone$ Exile | AddHiddenKeyword$ May be played by your opponent | Description$ You may play cards exiled with CARDNAME.
 S:Mode$ Continuous | Affected$ Card.IsRemembered+YouOwn | AffectedZone$ Exile | AddHiddenKeyword$ May be played

res/cardsfolder/n/ninja_of_the_deep_hours.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Human Ninja
 PT:2/2
 A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (1 U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ninja_of_the_deep_hours.jpg
 Oracle:Ninjutsu {1}{U} ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Ninja of the Deep Hours deals combat damage to a player, you may draw a card.

res/cardsfolder/o/orochi_colony.txt

@@ -1,7 +1,7 @@
 Name:Orochi Colony
 ManaCost:no cost
 Types:Plane Kamigawa
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigRamp | TriggerZones$ Command | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigRamp | TriggerZones$ Command | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
 SVar:TrigRamp:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, target creature can't be blocked this turn.
 SVar:RolledChaos:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | KW$ HIDDEN Unblockable

res/cardsfolder/o/orzhov_basilica.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 A:AB$ Mana | Cost$ T | Produced$ W B | SpellDescription$ Add W B to your mana pool.
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_basilica.jpg
 Oracle:Orzhov Basilica enters the battlefield tapped.\nWhen Orzhov Basilica enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{B} to your mana pool.

res/cardsfolder/p/pain_magnification.txt

@@ -2,6 +2,6 @@ Name:Pain Magnification
 ManaCost:1 B R
 Types:Enchantment
 T:Mode$ DamageDone | ValidTarget$ Opponent | DamageAmount$ GE3 | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent is dealt 3 or more damage by a single source, that player discards a card.
-SVar:TrigDestroy:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
+SVar:TrigDestroy:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pain_magnification.jpg
 Oracle:Whenever an opponent is dealt 3 or more damage by a single source, that player discards a card.

res/cardsfolder/p/porphyry_nodes.txt

@@ -1,7 +1,9 @@
 Name:Porphyry Nodes
 ManaCost:W
 Types:Enchantment
-Text:At the beginning of your upkeep, destroy the creature with the least power. It can't be regenerated. If two or more creatures are tied for least power, you choose one of them.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChooseOneToDestroy | TriggerDescription$ At the beginning of your upkeep, destroy the creature with the least power. It can't be regenerated. If two or more creatures are tied for least power, you choose one of them.
+SVar:TrigChooseOneToDestroy:AB$ ChooseCard | Cost$ 0 | Choices$ Creature.leastPower+withoutIndestructible | Mandatory$ True | SubAbility$ DBDestroy
+SVar:DBDestroy:DB$ Destroy | Defined$ ChosenCard | NoRegen$ True
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When there are no creatures on the battlefield, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:NeedsToPlay:Creature.YouDontCtrl+leastPower

res/cardsfolder/p/protective_sphere.txt

@@ -0,0 +1,11 @@
+Name:Protective Sphere
+ManaCost:2 W
+Types:Enchantment
+A:AB$ ChooseSource | Cost$ 1 PayLife<1> | Choices$ Card.SharesColorWith ActivationColor | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ Prevent all damage that would be dealt to you this turn by a source of your choice that shares a color with the mana spent on this activation cost. (Colorless mana prevents no damage.)
+SVar:DBEffect:DB$ Effect | StaticAbilities$ PreventFromSource | References$ PreventFromSource | RememberObjects$ Remembered | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:PreventFromSource:Mode$ PreventDamage | EffectZone$ Command | Target$ You | Source$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to you by a source of your choice that shares a color with the mana spent on this activation cost.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/protective_sphere.jpg
+Oracle:{1}, Pay 1 life: Prevent all damage that would be dealt to you this turn by a source of your choice that shares a color with the mana spent on this activation cost. (Colorless mana prevents no damage.)

res/cardsfolder/r/rakdos_carnarium.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B R | SpellDescription$ Add B R to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_carnarium.jpg
 Oracle:Rakdos Carnarium enters the battlefield tapped.\nWhen Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {B}{R} to your mana pool.

res/cardsfolder/r/raven_guild_master.txt

@@ -2,7 +2,7 @@ Name:Raven Guild Master
 ManaCost:1 U U
 Types:Creature Human Wizard Mutant
 PT:1/1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles the top ten cards of his or her library.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles the top ten cards of his or her library.
 SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 10 | Destination$ Exile
 K:Morph:2 U U
 SVar:Picture:http://www.wizards.com/global/images/magic/general/raven_guild_master.jpg

res/cardsfolder/r/riptide_pilferer.txt

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Merfolk Rogue
 PT:1/1
 K:Morph:U
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_pilferer.jpg
 Oracle:Whenever Riptide Pilferer deals combat damage to a player, that player discards a card.\nMorph {U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)

res/cardsfolder/r/rith_the_awakener.txt

@@ -3,7 +3,7 @@ ManaCost:3 R G W
 Types:Legendary Creature Dragon
 PT:6/6
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 G. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay 2 G. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color.
 SVar:TrigChoose:AB$ ChooseColor | Cost$ 2 G | Defined$ You | AILogic$ MostProminentPermanent | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$Valid Permanent.ChosenColor

res/cardsfolder/r/rith_the_awakener_avatar.txt

@@ -2,7 +2,7 @@ Name:Rith, the Awakener Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/+6
-T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you may pay 5. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.
+T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Command | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you may pay 5. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.
 SVar:TrigToken:AB$ Token | Cost$ 5 | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 red Dragon creature token with flying onto the battlefield.
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/rith_the_awakener_avatar.jpg
 Oracle:Hand +0, life +6\nWhenever a creature you control deals combat damage to a player, you may pay {5}. If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.

res/cardsfolder/r/rustmouth_ogre.txt

@@ -2,7 +2,7 @@ Name:Rustmouth Ogre
 ManaCost:4 R R
 Types:Creature Ogre
 PT:5/4
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target artifact that player controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may destroy target artifact that player controls.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.DefenderCtrl | TgtPrompt$ Select an artifact your opponent controls.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rustmouth_ogre.jpg
 Oracle:Whenever Rustmouth Ogre deals combat damage to a player, you may destroy target artifact that player controls.

res/cardsfolder/s/scroll_rack.txt

@@ -2,7 +2,7 @@ Name:Scroll Rack
 ManaCost:2
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 1 T | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ XFetch | References$ XFetch | RememberChanged$ True | SubAbility$ DBDig | SpellDescription$ Exile any number of cards from your hand face down. Put that many cards from the top of your library into your hand. Then look at the exiled cards and put them on top of your library in any order. | StackDescription$ SpellDescription
-SVar:DBDig:DB$ Dig | DigNum$ X | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | SubAbility$ DBReplace
+SVar:DBDig:DB$ Dig | DigNum$ X | References$ X | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | SubAbility$ DBReplace
 SVar:DBReplace:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Library | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:XFetch:Count$InYourHand

res/cardsfolder/s/scroll_thief.txt

@@ -2,7 +2,7 @@ Name:Scroll Thief
 ManaCost:2 U
 Types:Creature Merfolk Rogue
 PT:1/3
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scroll_thief.jpg
 Oracle:Whenever Scroll Thief deals combat damage to a player, draw a card.

res/cardsfolder/s/selesnya_sanctuary.txt

@@ -5,6 +5,6 @@ K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ G W | SpellDescription$ Add G W to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Land.Basic+YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_sanctuary.jpg
 Oracle:Selesnya Sanctuary enters the battlefield tapped.\nWhen Selesnya Sanctuary enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{W} to your mana pool.

res/cardsfolder/s/shadowmage_infiltrator.txt

@@ -3,7 +3,7 @@ ManaCost:1 U B
 Types:Creature Human Wizard
 PT:1/3
 K:Fear
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowmage_infiltrator.jpg
 Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nWhenever Shadowmage Infiltrator deals combat damage to a player, you may draw a card.

res/cardsfolder/s/sharding_sphinx.txt

@@ -3,7 +3,7 @@ ManaCost:4 U U
 Types:Artifact Creature Sphinx
 PT:4/4
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Creature.Artifact+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Opponent | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever an artifact creature you control deals combat damage to a player, you may put a 1/1 blue Thopter artifact creature token with flying onto the battlefield.
+T:Mode$ DamageDone | ValidSource$ Creature.Artifact+YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever an artifact creature you control deals combat damage to a player, you may put a 1/1 blue Thopter artifact creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Thopter | TokenTypes$ Artifact,Creature,Thopter | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sharding_sphinx.jpg
 Oracle:Flying\nWhenever an artifact creature you control deals combat damage to a player, you may put a 1/1 blue Thopter artifact creature token with flying onto the battlefield.

res/cardsfolder/s/shoreline_salvager.txt

@@ -2,7 +2,7 @@ Name:Shoreline Salvager
 ManaCost:3 B
 Types:Creature Surrakar
 PT:3/3
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | IsPresent$ Island.YouCtrl | CombatDamage$ True | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control an Island, you may draw a card.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | IsPresent$ Island.YouCtrl | CombatDamage$ True | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, if you control an Island, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Shoreline_Salvager.jpg
 Oracle:Whenever Shoreline Salvager deals combat damage to a player, if you control an Island, you may draw a card.

res/cardsfolder/s/sigil_of_sleep.txt

@@ -3,9 +3,7 @@ ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ You | Execute$ TrigReturnYou | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand.
-SVar:TrigReturnYou:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | IsCurse$ True | Origin$ Battlefield | Destination$ Hand
-T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Opponent | Execute$ TrigReturnOpp | Secondary$ True | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand.
-SVar:TrigReturnOpp:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature your opponent controls | IsCurse$ True | Origin$ Battlefield | Destination$ Hand
+T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player  | Execute$ TrigReturn | TriggerDescription$ Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand.
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select target creature your opponent controls | IsCurse$ True | Origin$ Battlefield | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_of_sleep.jpg
 Oracle:Enchant creature\nWhenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand.