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

*Nonmana-root abilities with mana subabilities are now properly recognized as mana abilities (Metalworker)

.gitignore

@@ -359,6 +359,7 @@ res/pics/TSP
 res/pics/UDS
 res/pics/ULG
 res/pics/USG
+res/pics/VAN
 res/pics/VIS
 res/pics/WTH
 res/pics/WWK

CHANGES.txt

@@ -1,58 +1,44 @@
-Forge Beta: 11-16-2012 ver 1.3.1
+Forge Beta: 01-04-2013 ver 1.3.4
 
 (Quest icons used created by Teekatas, from his Legendora set http://raindropmemory.deviantart.com)
+(Thanks to the MAGE team for permission to use their targeting arrows.)
+(Thanks to http://www.freesound.org/browse/ for providing some sound files.)
 
-11572 cards in total.
+11760 cards in total.
 
 
-Added Return to Ravnica Guild Sealed Deck mode. Start a new sealed deck game, choose "Block / Set" and then scroll down until you find "Return to Ravnica Guild Sealed (block)". Select that. From the "Choose Set Combination" menu, select the first option. You will be prompted twice to pick your guild (once for the promo cards, once for the actual booster - you should choose the same guild both times). After that you're ready to go.
+Sideboards have been implemented for Human players. We currently have:
 
-A bug for the new set unlocking code is now fixed. Before the fix, you could unlock all you wanted, but the unlocking info and the cards you got would never be saved! Fortunately, your paid money wouldn't be saved either.
+* Sideboard creation support in relevant deck editor modes.
+* In-game sideboarding with persistence between rounds in a match.
+* Sideboard supported as a zone, with some relevant cards already in.
+* Correct validation of decks, both before the game starts and between the rounds (Limited min 40, Constructed min 60, free-form sideboard/main in Draft and Sealed, 1:1 sideboarding with 0 or 15 cards allowed in sideboard in Constructed (all variants) and Quest; OK to have less than minimum between rounds in a match in all modes if lost cards on ante).
+* Correct (fingers crossed) interaction of sideboarding with other relevant aspects of Forge rule enforcement (mulligan and ante interactions were corrected, initial hand and library between rounds were both corrected, everything else looks so far so good).
 
-The Return to Ravnica set pictures are now available and you can download them using the Download LQ Set Picures button. The RtR token generating cards have been updated with set specific images.
+We don't yet have:
 
-The Targeting Overlay has been fixed and re-enabled. It now correctly shows the targeting arcs in cases when it previously showed them in the wrong direction. The match UI is properly refreshed when the targeting arcs are switched on/off. The defunct "mouseover-only" mode is currently disabled (it crashes Forge, difficult to fix).
+* Sorting in the in-game sideboard editor.
+* AI sideboarding.
 
-We have added the Conspire and the Protection mechanics for this version.
+Quest Worlds, stage 1. This version simply allows you to travel between the regular quest world and the newly-added Shandalar world to get different duel opponents and challenges. You will have to complete your current challenges before travelling or you will lose them. 
 
-When choosing cards, sources, etc. using a list box, the currently selected card will now be visually highlighted on the playfield (to better distinguish between e.g. three different cards with the same name on the playfield). Now the visual highlighting of a card will also work when declaring the order of blockers.
+World-specific format enforcing and starting world selection will be added in later stages. Also, something has to be done about locked (non-repeatabled) challenges so they do not end up locking other challenges in different worlds.
 
-Forge now has a sound effect system in place. Several basic sounds are linked to the code now and will be enabled when "Enable Sounds" option is checked in the preferences. It supports WAV and AU file formats. No sound files are included with this commit and must be submitted separately. For the time being you will need to add your own sound files.
+--
 
-Currently supported sound effects are:
+This version of forge includes a few sound files for the new sound effect system. While we have several sounds assigned to a few of the available events there are a number of events that do not yet have a assigned sound file. This should be considered a work in progress and we could use some help in finding interesting sounds that we can add to forge.
 
-AddCounter - add_counter.wav - triggered when a counter is added to a permanent.
-Artifact - artifact.wav - triggered when an artifact is played.
-ArtifactCreature - artifact_creature.wav - triggered when an artifact creature is played.
-BlackLand - black_land.wav - triggered when a land with the "B" mana ability is played.
-BlueLand[*] - blue_land.wav - triggered when a land with the "U" mana ability is played.
-Creature - creature.wav - triggered when a creature is played.
-Damage - damage.wav - triggered when a creature is damaged.
-Destroy - destroy.wav - triggered when a permanent is destroyed.
-Discard - discard.wav - triggered when a player discards a card.
-Draw - draw.wav - triggered when a player draws a card.
-Enchantment - enchant.wav - triggered when an enchantment is played.
-EndOfTurn - end_of_turn.wav - triggered at the end of turn.
-Equip - equip.wav - triggered when an equipment is equipped.
-FlipCoin - flip_coin.wav - triggered when a coin is flipped.
-GreenLand - green_land.wav - triggered when a land with the "G" mana ability is played.
-Instant - instant.wav - triggered when an instant is played.
-LifeLoss - life_loss.wav - triggered when a player loses life.
-LoseDuel[*] - lose_duel.wav - triggered when a player loses a duel.
-ManaBurn - mana_burn.wav - triggered during a mana burn if the appropriate rule is enabled.
-OtherLand - other_land.wav - triggered when a land with non-color mana abilities or any other land is played.
-Planeswalker - planeswalker.wav - triggered when a planeswalker is played.
-Poison - poison.wav - triggered when a player receives a poison counter.
-RedLand - red_land.wav - triggered when a land with the "R" mana ability is played.
-Regen - regeneration.wav - triggered when a creature is regenerated.
-RemoveCounter - remove_counter.wav - triggered when a counter is removed from a permanent.
-Sacrifice - sacrifice.wav - triggered when a permanent is sacrificed.
-Sorcery - sorcery.wav - triggered when a sorcery is played.
-Shuffle[*] - shuffle.wav - triggered when a player shuffles his deck.
-Tap[*] - tap.wav - triggered when a permanent is tapped.
-Untap - untap.wav - triggered when a permanent is untapped.
-WhiteLand - white_land.wav - triggered when a land with the "W" mana ability is played.
-WinDuel - win_duel.wav - triggered when a player wins the duel.
+The sound files need to be in wav or au format, wav appears to be more wide spread but the code can handle either format. The sound files need to be copy right free and they should be in the public domain.
+
+You can either record your own sounds if you have the necessary equipment or you may be able to find an appropriate sound on a web site such as this site:
+
+http://www.freesound.org/browse/
+
+You should note that sound files can be large sized and we would like to avoid this if possible. A good size to shoot for would be 50 K or less. There is a freeware sound editor that may have versions for all operating systems. This app is named Audacity.
+
+We have a forge forum topic at the Collectible Card Games Headquarters web site that is devoted to finding sounds for this new sound system. Please visit this topic and contribute a sound or two. We can use your help and assistance. :)
+
+http://www.slightlymagic.net/forum/viewtopic.php?f=26&t=8570
 
 --
 
@@ -71,7 +57,7 @@ A recent contribution to the code base should fix some of the bugs that people n
 
 We are now using a different system for our snapshot and beta releases. Unfortunately, this new system builds a jar file which does not accurately display the SVN revision number.
 
-Forge may not be fully java 7 compatible at this time. We recommend that people downgrade to java 6.
+Forge is likely to be compatible with Java 7 at this time. Some people have used forge with Java 7 and have not reported any problems that are related to Java 7. If you would like to upgrade to Java 7 and have held off because of Forge then you may upgrade as we do not think that it will cause an incompatibility type of problem at this time. We will continue to try to maintain compatibility with Java 6 for the foreseeable future.
 
 --
 
@@ -84,414 +70,206 @@ Some people use the Windows application 7zip. This utility can be found at http:
 
 Fixes/Features:
 
-- Partiality needs to be 100% or the computer may get the two promo cards and the booster for 2 different guilds in RtR Guild Sealed Mode.
-- Do not show very small cubes (promos with 2 cards) in the main cube selection menu. You can't build a deck around them.
-- Fixed Painbringer.
-- Added Return to Ravnica Guild Sealed Deck mode.
-- Rever accidental commit of wrong version of block #37.
-- Cleared out the changes.txt file, now ready for new material.
-- Added the recent commit logs to changes.txt.
-- Changed more instances of "YouDontCtrl" to "OppCtrl".
-- Changed more instances of "YouDontCtrl" to "OppCtrl".
-- Fixed name of Faerie Impostor in RTR Guild Packs
-- Updated some deck SVars.
-- Improved AI dealing with Flailing Manticore and Flailing Soldier.
-- Fixed AI not paying unless costs of its own triggered abilities.
-- Improved AI of Frost Titan.
-- Made findParentsTargetedPlayer more robust.
-- Tweaked attacking AI.
-- Player has a field of type GameState
-- Experimental AbilityFactory refactoring
-- comment out debug
-- Fixed Utvara Hellkite.
-- Added the property "OppOwn" and converted some cards.
-- Fixed Unleash not interacting correctly with Corpsejack Menace.
-- Fixed order in the script of Gifts Ungiven.
+- Sideboarding: Initial commit. Added full sideboard support with the ability to create sideboards for Constructed and Quest decks, as well as use sideboard in Limited modes; full deck validation depending on the game format; ingame sideboarding that is persistent across the duels of one match. *No AI support yet, hopefully someone will be able to add it in the future*
+- Converted Winds of Change to use RepeatEach so moomarc can use it as an example
+- Display X costs in the deck editor before Colorless Mana (X 1 B instead of 1 X B)
+- Fixed and polished AI using ETB Counterspells (like Mystic Snake).
+- The sideboard is now available as a zone.
+- Added a few missing SetInfos.
+- Preparing the changes.txt file for the next beta build and release.
+- Sideboarding: fixed the sideboard becoming fubar after playing at least one quest match.
+- Sideboarding: minor TODO comment update.
+- Fixed Quest for the Holy Relic.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed P/T of Two-Headed Dragon.
-- Fixed Cataclysm.
-- Fixed Realms Uncharted.
-- Fixed ability of Sphinx of Jwar Isle.
-- Fixed and improved Proliferate.
-- Fixed possible NPE in getCardsIn.
-- AnimateAF refactored
-- AlterLife cut into classes
-- some pointless null checks removed
-- fixed some boxing issues (mixing Boolean and boolean)
-- UI: access to static fields fixed - should refer to a declaring class, not inherited one
-- EditorTableModel: removed some excessive instanceof checks 
-- Placed missing @override clauses
-- Removed unused imports
-- Zone getCards returns a read-only list (used to make a new instance), dependants updated (mostly)
+- Added a way to discard any number of cards via a two-panel interface to the AF Discard.
+- Added the keyword "If CARDNAME would be destroyed, regenerate it.".
+- Corrected the rarity of Last Rites.
+- Sideboarding: the drafting window will no longer show an option to switch between the main and the sideboard (only the drafted deck editor will).
+- The game will no longer complain about the RemAIDeck cards that are located in the AI sideboard (otherwise it polluted limited mode with a list of all cards that the AI drafted but did not put into its deck as if they were put into the deck).
+- A more appropriate measure for the AI complaints about non-AI friendly cards in sideboard: in Limited modes, the AI will currently not complain (because the non-AI friendly cards end up in the sideboard anyway), but in Constructed modes, the AI will complain if any unplayable cards are included in the sideboard.
+- Fixed Demonic Hordes.
+- Sideboarding: Fixed the interaction of sideboarding with flip cards which caused a crash if the card was flipped at the end of the game.
+- Sideboarding: Attempt at fixing interaction of sideboarding with the mulligan in rounds 2 and 3 (experimental, might not actually do the trick).
+- Fixed Jerrard of the Closed Fist.
+- Fixing Sleight of Hand in Quest mode not allowing a free mulligan
+- Sideboarding: Temporarily disabled main/sideboard persistence across duels in a match because the current implementation results in many difficult to fix bugs. Will hopefully reimplement this soon in another way.
+- Sideboarding: removed the old deck persistence system. Hopefully a new implementation will follow soon enough (as soon as I understand how it can be done or someone volunteers to help).
+- Sideboarding: during deck validation between the duels in a match, the deck will be considered valid if it's no less than either the format-enforced minimum or the minimum after the previous duel in a match (to account for the possibility of losing a card on ante).
+- Sideboarding: you can now put any number of snow-covered basic lands into your deck, per MTG rules.
+- A little correction to the previous commit.
+- Evoke is now flagged as non-basic cost.
+- Sideboarding: Attempt two at in-match deck configuration persistence. Currently still not 100% functional (Constructed and Limited seem to work fine, no cards disappearing between matches bugs and persistence works; in Quest, persistence also works but it lasts longer than the match). Ante seems to work correctly, at least in Quest mode.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed a few getCards read-only list errors.
-- Improved AI of some auras/equipments.
-- Fixed Mulligan.
-- Fixed getColorByProminence.
-- Another getCards read-only list errors.
-- Fixed Thrumming Stone.
-- Cleanup.
-- More getCards read-only list errors.
-- Removed obsolete null checks.
-- More getCards read-only list errors.
-- Added a missing import.
-- More getCards read-only list errors.
+- Sideboarding: reverting the last implementation of persistence (again). Another dead idea.
+- Sideboarding: Quest mode now properly requires a sideboard of either 0 or 15 cards.
+- Sideboarding: Take three on trying to befriend sideboarding with ante and all the other stuff. Will either commit to this or revert later if it fails as well.
+- Sideboarding: an off-game sideboard editor button will no longer show for the Limited modes (doesn't make sense for them anyway).
+- Sideboarding: Correctly remove cards that are lost on ante in quest mode from all decks and trunk.
+- Allow a generic reward of 'n rares' (with no color specification) without crashing the game.
+- Sideboarding: removed a no-longer-relevant TODO comment.
+- Sideboarding: renamed a method to startDeckEdits for clarity.
+- Sideboarding: minor code cleanup.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed warnings.
-- Player - shuffle streamlined
-- CardLists.getCMC inlined (there were only 4 of them anyway)
-- minor - code formatting
-- Fixed Ovinomancer.
-- Fixed Past in Flames.
-- AF-Bond refactored
-- AF:Turns refactored
-- removed warnings (excessive casts, extra semicolons)
-- Removed unnecessary cast.
-- AF:Tokens - split into pieces
-- Fixed some FindBugs results.
-- refactor AF: ZoneAffecting
-- some cleanup in BondEffect.java
-- AF:ManaDrain (other mana Abs use some special classes =(
-- AF:DamagePrevent removed excessive casts and semicolons
-- refactor AF:Protect
-- renamed life-related ai and effects to put life as 1st word
-- refactored AF:Play
-- AF: Counters move
-- refactored AF: remaining counters
-- refactor AF:Effect (wish I knew what it is)
-- hasBasicLands predicate for edition
-- 1) You can use a Draft/Sealed deck as your quest starting card pool, 2) You can enforce formats when playing with specific starting pools, 3) Fixed a bug in the custom format dialog.
-- Added javadoc.
-- Code cleanup.
+- Added a fluff piece to the changes.txt file.
+- The AI will no longer try to destroy fetchlands.
+- The AI will now attack with Frozen Shade.
+- More combat AI improvements (predicting pump abilities).
+- Sideboarding: Correctly restore the initial state of quest decks after a match.
+- Sideboarding: A more appropriate location for the quest deck reinitialization, now interacts correctly with winning/losing cards on ante.
+- Add the regular quest environment as a special index 0 world.
+- Added code for CantBeBlockedBy keywords to isUsefulPumpKeyword.
+- Sideboarding: A little code style-related change.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- More cleanup.
-- Basic/snow land sets in quest mode shop and starting deck are randomized.
-- Fix of imports after the last commit.
-- Quest will use a single set to generate lands for shop
-- fixes http://www.slightlymagic.net/forum/viewtopic.php?f=52&t=6333&start=795#p101722
-- refactored AF: Choose
-- refactored AF: Debuff
-- AF; RegenerateAi.java. counter
-- AF: Combat refactored (17800 get!)
-- AF: DelayedTrigger
-- Triggers: replace HashMap with java.util.Map in c-tors
-- a clear check for type of trigger ctor parameters
+- CheckStyle.
+- Another fix for Demonic Hordes.
+- Fixed The Pieces Are Coming Together.
+- made some TgtPrompt more specific
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- AF: Sacrifice, Reveal
-- removed repeating blocks from getStackDescription
-- AF: Clone, SetState
-- AF: GameWin/Loss
-- AF: Permanent state
-- AnimateEffects - change relations between classes
-- BasicLands is list,
-- removed ccnt, 
-- simplified areAllBasics(final String types) in AF:ChangeZone
-- tricked to avoid ref to static method
-- Set unlocking is no longer a special reward for winning matches, instead it is an option button like spell store. More expensive than before, not random, and initially fewer sets to choose from.
-- TriggerMapPlayed - 1st param => Map
-- Added the recent commit logs to changes.txt.
-- Correct version of SSubmenuQuestUtil (actually enables the unlocking code), new sets cost a little more.
-- (non-working) AF: Destrory, Control
-- propper name
-- propper nameAF: Pump
-- Code cleanup: removed some orphaned autogenerated javadocs after Max Mtg's refactoring, cleaned up formatting in some files, removed outdated javadocs that no longer correspond to method signatures after refactoring, moved some significant comments to their proper files.
-- Code cleanup (Phase 2): see r17819
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Save set unlocking information + won cards.
-- GameFormatQuest allowedSetCodes and bannedCardNames are now final and should never be null (set in the constructors).
+- Fixed a NPE in AF Discard.
+- Fixed Thragtusk.
+- The rev number displayed in the title bar is once again displaying an old SVN revision number, remove it.
+- Fixed some missing ability description.
+- Another fix for Scalpelexis.
+- Fixed a possible bug in targetAI related to PayX SVars.
+- Fixed ImprintedCardManaCost xCount.
+- Quest Worlds, stage 1. This version simply allows you to travel between the regular quest world and the newly-added Shandalar world to get different duel opponents and challenges. You will have to complete your current challenges before travelling or you will lose them. 
+- World-specific format enforcing and starting world selection will be added in later stages. Also, something has to be done about locked (non-repeatabled) challenges so they do not end up locking other challenges in different worlds.
 - Added a fluff piece to the changes.txt file.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Updated token download list for RtR (at last)
-- Updated RtR token generating cards with set specific images
-- AB: Clash, Damage
-- AF: Copy, repeat
-- getStackDescription routines now use common routines for string collection
-- any spelleffect class can use common routines to get defined targets
-- Code cleanup (Phase 3): removed some orphaned javadocs, moved some comments, removed some javadocs that no longer correspond to method parameters after refactoring.
-- Added a fluff piece to the changes.txt file.
+- Renumbered the Shandalar challenges to make them unique (in order to prevent potential conflicts with non-repeatable challenges in the main challenges folder).
+- Fixed cost of Simic Basilisk.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-* Fixed and re-enabled Targeting Overlay:
-* Now it correctly shows the targeting arcs in cases when it previously showed them in the wrong direction.
-* The match UI is properly refreshed when the targeting arcs are switched on/off.
-* The defunct "mouseover-only" mode is currently disabled (it crashes Forge, difficult to fix).
-* Probably some bugs still left, but overall seems to function fine.
-- Minor code style fix for the previous commit.
-- AF: Mana Had to refactor the whole class of AbilityMana
-- Repaint the UI after drawing targeting arcs.
-- AF: removing excessive methods, mapParams returns as Map<Str,Str>
-- More optimal UI repaint after drawing the targeting arcs.
-- AF: Cleanup, StoreSVar, Unattach
-- Code cleanup (removing orphaned javadocs and javadocs with parameters that do not correspond to the method definitions).
-- rem warning,
-- force update of player-related into at end of phase.
-- Wrong import ruined build
-- Removed some unused code from the targeting overlay.
-- had wrong cycling cost
-- Fixes OppOwn card property (Geth, Lord of the Vault will work as intended)
-- move effect to right package
-- Script fixes by Diogenes.
-- Little AI fixes.
-- Fixed Phyrexian Gremlins.
-- Fixed Oversold Cemetery
-- CF-Cr: remove unused parameters
-- Added a fluff piece to the changes.txt file.
-- Small changes to how Mulliganing works with Phases (for upcoming Karn Liberated)
-- Made the shape of the targeting arcs a little bit better, also changed the direction of the arc curve to make it look better.
-- Compilation fix for the mulligan (had to make nextPhase public, not sure if it's the correct decision, please review).
-- Some minor cleanup in targeting overlay code.
-- made doTriggerAI final (it calls anyway doTriggerAINoCost anyway, so AF ais will override only nocost version)
-- made a wrapper for doTriggerAINoCost to check subAbilities doTrigger (and removed that code from descendants of SpellAiLogic)
-- made doTriggerAINoCost protected to avoid calling it from outer classes
-- remove imports
-- Set some activating players.
+- Added Phenomena core type,
+- Removed Swing reference from Deck class
+- add org.apache.commons-lang
+- 1. GameType store deck restrictions in a more structured way
+- 2. Check for multiple unique cards considers name the only key attribute 
+- 3. Removed warnings for unused imports
+- Added some missing setinfos for Vanguard Avatars
+- Fixed Royal Assassin Avatar and Oni of Wild Places Avatar
+- Do not display the current world in the Travel destination dialog.
+- CheckStyle.
+- Very minor CheckStyle.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed Angel's Grace.
-- AF: Attach (aura ETB ability is no longer spellpermanent)
-- Fixed the AILogic "BeginningOfOppTurn".
-- Fixed a bug in getAIPlayableMana.
-- AF: apis transformed into an ENUM
-- Cleanup.
+- Small fix to Braids Avatar
+- Fixed Lightmine Field.
+- Added SVar:RemAIDeck:True to Waiting in the Weeds.
+- Added Valid filtering for Defined, used by Earthbind
+- The AI can now use Hidetsugu's Second Rite.
 - Updated some SVars.
-- AF: Charms done
-- Minor cleanup of obsolete javadocs.
-- AF:Charm makes choices on being cast
-- remove unused imports
-- Added a new static ability "CantAttack".
-- Converted some cards (they now work correctly with Planeswalkers).
+- Fixed Mage Slayer
+- Mistype correction.
+- Min/max sideboard size message tweaks.
+- Code simplification.
+- More code simplification.
+- Targeting overlay: Added support for showing arrows for paired creatures, performed some code cleanup.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- CheckStyle.
-- GameFormatQuest inherits from GameFormat... this removed lots of duplicated code
-- removed warnings from some AF.AIs
-- PredicateNamesExcept holds reference to source list (does not create own array)
-- GameFormatQuestToXml.unmarshal: read lists first, then create object to return
-- DevMode: joined card to hand for both players, added "card to battlefield" button
-- removed 140 lines of unused constructors of ListChooser
-- Choosing cards from a list (devmode-addXXXX shows their picture on the right panel)
-- fixes default player targeting for PumpAll, TapAll and UntapAll effects
-- rem warns
-- Streamlined the drawback checks in the AF AI functions.
-- AF: Draw used even a different target player picking priority.
-- Enabled "NeedsToPlay" SVars for all AF spells.
-- canPlayAI has to be abstract
-- once canPlayAI is wrapped is has to be hidden from outside callers
-- AF: ChangeZone converted
-- Orphaned javadoc cleanup.
+- put an end to impropper use of inventoryitem.getType to make checks against card types
+- draft value estimation moved outside of deck class
+- Moved code that checks if a deck matches format to class describing format (althogh a separate validator class might be even a better idea)
+- added a ChooseOrder switch to RepeatEach effect
+- added check that disabled deck checking if developer mode is enabled
+- Modified coin flips to allow just counting heads or tails. Added Fiery Gambit.
+- Read card text more carefully. Reverted changes to FlipCoinEffect.java and flipACoin method. Adjusted Fiery Gambit script.
+- Fixed Academy Researchers can be enchanted by auras that can't legally enchant it
+- Delete Eye of the Storm (with some rule text conflicts)
+- Some SVar updates
+- renamed parameter for better understanding of payments from ManaPool
+- moved colorful part of mana shard parsing inside the mana/ManaCostShard.java file to eliminate code duplication
+- CardColor renamed to ColorSet which reflects class purpose better,
+- Mana stores color in a byte internally (one of MagicColor constants or 0 for colorless)
+- ManaPool.getMana - a cleaner choice of mana to pay.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Running set info for PC2 cards that were never ran previously
-- CheckStyle.
-- CheckStyle.
-- CheckStyle.
-- Performance updates in ComputerUtilAttack.
-- Added Suppression Field.
-- Converted Donate to script
-- AbilityManaPart has to add SA to trigger it raises =(
-- AF:CopyPerm - used shortcuts to select target cards and collect a line
-- CardFactoryUtil: extract method
-- ETBReplacementMove converted to SpellEffect, wrapped it into CommonDrawback
-- Converted Wing Puncture to script.
-- ChangeZoneAi: made method names shorter, removed check for subAb drawbacks (since it's checked in wrapper class)
-- getParent method added to SpellAbility, moved static methods getParent{withProperty} and findRoot to SpellAbility class
-- removed excessive checks from caller methods
-- SpellAbility: targetList removed (noone has assigned to it anything meaningful)
-- Fixing Auras requesting SpellPermanent and causing a crash, since Auras no longer use the SpellPermanent class
-- Adding KeywordMultiplier parameter to StaticContinuous
-- moved params and api into SpellAbility, made param getters NPE-proof, cut reference to AbilityFactory
-- AbilityFactory: getAbility ready to be made static
-- License text + JavaDoc added to QuestUtilUnlockSets.java.
+- cleaned up Fiery Gambit
+- Greatly simplified BoosterDraftAI to pick cards based on calculated card rating.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Initial preparations for the 'quest worlds' code.
-- CheckStyle.
-- Do not display the RtR Guild Sealed block in Draft games.
-- Fixed stack descriptions.
-- undoable attribute moved to SA, 
-- cost removed from manaPart
-- SA: getAbility/getSpell methods were removed, overloaded methods isAbility/isSpell are used instead
-- Spells giving mana work correctly
-- Added RepeatEach AF
-- Converted Rhys the Redeemed to script
-- AI Logic for Rhys the Redeemed equivilant to the existing AI code in CF_Creatures
-- More preliminary work for the quest worlds.
-- Disable test printout in QuestWorld.java.
+- It would appear that I forgot to commit the changes to the ability factory effects when I moved ConditionDescription to the common stack description handler.
+- Reverted LocalCount in favor of RepeatPlayer in RepeatEach (Molten Psyche and Netherborn Phalanx)
+- Converted Myojin of Night's Reach and Imprison This Insolent Wretch to multiplayer scripts
+- Fixed Molten Psyche cost
+- Fixed Divine Light
+- Created Gatecrash branch
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Fixed checkETBEffects.
-- Remove a colon from picture file names so that the proper Gatherer names of cards with the colon may be used (for the upcoming CoP/RoP support).
-- Renamed the file of Craterhoof Behemoth.
-- Fixing Rhys the Redeemed cloning opponents tokens
-- Converted Parallel Evolution to script
-- Fixing CC of Parallel Evolution
-- Converted Siren's Call to Script
-- Additional reference needed to be removed
-- Convert Hurkyl's Recall to script
-- Convert Telling Time to script (the AI may be able to play this now)
-- Convert Intuition to script
-- wrapper will return api (temporary)
-- Cleanup in handleRemembering.
-- First implementation of Conspire mechanic (I plan to expand i to support multiple Conspire instances for interaction with Wort, the Raidmother)
-- Added the card property "attackingYou".
-- Initial implementation of AF ChooseSource for cards that refer to a source in their card text.
-- Compilation fix for the updated AF interface (updating AF ChooseSource).
-- Improved the prompt of unless costs.
-- Added a SpellDescription to Circle of Protection: Artifacts.
-- Circle of Protection: Artifacts will no longer create a useless effect when no source is chosen.
-- Circles of Protection and Runes of Protection will no longer create useless effects when no source is chosen.
-- Added a SpellDescription to all Circles of Protection and Runes of Protection.
-- Removed some unused commented out code in AF ChooseSource (wasn't useful).
-- Added a fluff piece to the changes.txt file.
+- Converted Nezumi Shortfang for multiplayer
+- fix crash during drafts
+- tweak ColorSet toString
+- Added very basic AddPhase AF
+- Added support in PhaseHandler for Additional phases
+- Convert Finest Hour to AddPhase
+- Converted Mass Mutiny for multiplayer.
+- Added TargetsWithDifferentControllers param for targeting with different controllers (should supercede TargetsFromDifferentZone in most cases as it works with player lists instead of using getOpponent)
+- Converted Blatant Thievery for multiplayer.
+- Fixed keyword "CARDNAME untaps during each other player's untap step." for correct application in multiplayer.
+- More cards ready for multiplayer
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Added a more detailed comment to the TODO of the AI part of the AF ChooseSource for future reference.
+- More cards ready for multiplayer
 - CheckStyle.
-- restored triggers (like oblivion ring)
-- Added TapOrUntapAll AF
-- Converted Turnabout to script
-- Fixed the types for Lava Hounds; Pallimud; Scourge of Kher Ridges; Sliptide Serpent
-- remove warning
-- Remove warnings: unspecified generic type, redundant else clause, unused imports, unreachable code, excessive superinterface declaration
-- SA: field delve renamed, isTap/untapAbility removed (cost takes care of that), isTrigger declared by overload in AbilityTriggered
-- The AI will now predict damage prevention replacement effects.
-- Added first steps towards AF ChooseSource AI for CoP's (the AI will choose unblocked attackers).
-- Converted Suffer the Past to script
-- Converted Remove Enchantments to Script, All Instants have no been converted
-- AF ChooseSource: sources already listed as effects "on stack" will no longer also be listed as sources which are "objects referenced on stack by another object".
-- Organizing imports in AF ChooseSource.
-- Organizing imports in AF ChooseSource.
-- Improved AI using War Falcon.
-- When choosing cards, sources, etc. using a list box, the currently selected card will now be visually highlighted on the playfield (to better distinguish between e.g. three different cards with the same name on the playfield).
-- Now the visual highlighting of a card will also work when declaring the order of blockers.
-- Fixed "Players can't gain life." on Everlasting Torment.
-- Fixed "Damage can't be prevented." on Everlasting Torment.
-- Added a fluff piece to the changes.txt file.
+- reverting uglifying checkstyle changes
+- fixing a crash when AI had spare mana after playing a spell.
+- removal of unused code
+- if chains changed to switches
+- Fixed Hakim, Loreweaver
+- Fixed Voyager Staff
+- Fixed Ethereal Haze
+- Improved method name for isControlledByAnyOf predicate
+- Converted Black Vise for multiplayer
+- Removed some printlns I left in a earlier commit.
+- More cards ready for multiplayer
+- Fixed The Fallen (damagedThisGame in CardDamageHistory was never adding damaged players to the array, also made multiplayer compatible)
+- Changed initial array sizes in CardDamageHistory to the number of players in the game
+- More cards ready for multiplayer
+- More cards ready for multiplayer
+- missed two files with my last commit
+- More cards ready for multiplayer
+- Simplified Split Second
+- added SVar:RemAIDeck:True to recently added coin flip cards
+- Hopefully fixed trigger bug in multiplayer.
+- fixed potential bug with Haunt mechanism in multiplayer
+- The Quest world format, if present, overrides the user-defined format.
+- Fixed bad logic in QuestWorld.java.
+- Get rid of the superficial Index parameter. Quest Worlds are identified by their name.
+- Fix misleading JavaDoc in QuestController.java.
+- Converted a few cards by bbbbbbbbba
+- Fixed Linessa, Zephyr Mage
+- Another fix of linessa zephyr mage
+- Support for initial Quest World definition in QuestData.java and QuestController.java when starting a new Quest.
+- Removed an obsolete comment from QuestData.java
+- Allow selection of starting world. If the selected world has a format, it is enforced instead of a user-defined one. (More documentation to follow on the Forge forum.)
+- Disabled the starting Quest World format overriding prized cards format and unlocking. This means that you can now define a custom format and unlock new sets even if you start the game in a format enforcing world, by travelling to a different world that does not enforce a format.
+- Got rid of some getOpponent() calls for multiplayer compatibility
+- Fixing syntax error in AddTurnAI
+- Added the recent commit logs to changes.txt.
+- Fixed Victimize
+- Tweaked CardFactory.copySpellOntoStack to accomodate abilities.
+- Fixed CardDamageHistory crash in deckeditors
+- Renamed AF_CopySpell for clarity
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- slowtrip - remove duplication
-- Removed some unnecessary parameters from the chooseSource scripts.
-- Initial implementation of the sound system for Forge. Supports non-blocking, "preload once, play anytime" sound playback with no memory penalty for playing sounds multiple times. Supports WAV and AU file formats, uses only standard JDK libraries and, as such, fully cross-platform.
-- CheckStyle.
-- Some CheckStyle corrections related to the use of "final".
-- Added a method to loop the sound to the Sounds enumeration.
-- Cleanup.
-- Attempt to remedy the "sound skipping" issue with the sound system.
-- Input: Added an abstract marker method to trace all annonymous descendants, 
-- PayManaCostX moved to separate file
-- added Action class - it's like Command but has parameters.
-- Some more changes to the sound system.
-- removed duplicate code in CField
-- Fixed Kaervek's Torch Rarity SVar
-- Angel's Trumpet is now more generic, and should be compatible with Multiplayer
-- Removed zone parameter from selectCard in all Inputs
-- More work on the sound system.
-- More work on the sound system (cleaning imports).
-- More work on the sound system (magic numbers, CheckStyle).
-- Adding "UseImprinted" Param to RepeatEach for use with SAs that do something else with Remembered Cards.
-- InputSelectManyCards - a common class for all those inlined target-choosing inputs
-- a fix for Phantasmal Terrain and Convincing Mirage
-- Added missing removeImprinted function.
-- Fix an NPE with arcs if the battlefield isn't displayed when trying to draw
-- Added Auto and Reset buttons to VAssignDamage
-- The AI will now use CoP's to protect itself from damage dealing spells.
-- Removed "SVar:RemAIDeck:True" from some of the ChooseSource cards.
-- Improved ChooseSource AI handling spells.
-- Input: using InputSelectMany as core for custom targeting inputs
-- Sound: rem warning
-- Converted Blade of the Bloodchief to Script
-- CheckStyle.
-- Sound system: added an option to toggle the sound effects on/off in the game (currently not linked to any code).
-- Fixed possibility of getting stuck in attachAuraOnIndirectEnterBattlefield.
-- Fixed DelayedTriggerAi not setting an activating player.
-- Quick fix for negative handsizes other than -1, which is used for no maximum (needs a non-hacky solution).
-- Small tweaks to General's Regalia
-- Reverted GameFormatQuest to fix numerous problems caused by r17875 which totally broke GameFormatQuest. The whole reason for having a separate class for GameFormatQuest and why it was not inheriting GameFormat in the first place was that, unlike with the regular GameFormat class, its lists MUST NOT be immutable or it WILL NOT WORK.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- reverting 18047, making changes from 17875 not ruin quest logics
-- the ro fields are just views, marking them as transient
-- ran setinfo and oracle scripts for earlier commits
-- fixing import
-- CheckStyle.
-- Sound system: made the Sounds methods obey the "enable sounds" setting in preferences.
-- Launch of the Sound System: several basic sounds are linked to the code now and will be enabled when "Enable Sounds" option is checked in the preferences. No sound files are included with this commit and must be submitted separately. Details in the forum.
-- Tageting Overlay: fixed a bug that caused the targeting arcs to disappear for some enchantments targeting cards on the other side of the playfield.
-- Added some cost checks to ChooseSourceAi.
-- Fixed a bug in getSpellCostChange.
-- Bloodthirst is now multiplayer compatible.
-- Rewrote the Bloodthirst keyword as a macro for a proper replacement effect.
-- Added a fluff piece to the changes.txt file.
-- Fix more NPEs with Attach no longer using SpellPermanent
-- Sound System: Implemented more sounds and linked them to the code.
-- Sound System: Some crash prevention measures.
-- Sound System: Minor style fix.
-- Sound System: Added the Enchantment sound, some style fixes.
-- Added Magmasaur
-- Fixed RememberRemoved remembering more counters than were originally on a card
-- Sound System: Added the Poison sound.
-- Sound System: Added the Instant and Sorcery sounds.
-- Using SelectManyCards instead of plain input, rem some warnings
-- Quest start options remake - part 1/2. (I just tried to understand all those checkboxes and failed)
-- new quest w/custom format - bugfix
-- Sound System: Added the ability to optionally define sound effects for specific cards by name instead of by type (might prove useful later).
-- Sound System: CheckStyle.
-- Sound System: CheckStyle.
-- Sound System: Renamed some sounds for the sake of clarity.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Converted Nameless Race to script
-- small addition to CostPayLife to enable limiting the maximum available choice when using XChoice
-- improved svar name for Minion of the Wastes
-- Sound System: Added to enumeration and implemented support for the AddCounter, Damage, Destroy, Discard, Equip, LifeLoss, ManaBurn, Regen, RemoveCounter, and Sacrifice sound effects. Also, some minor fixes.
-- Converted Phyrexian Processor to script (by moomarc).
-- AdditionalCostsPaid will now be cleared when a card hits the graveyard.
-- Quest start UI done
-- Conspire is now check on the SA instead of the card.
-- Initial checkin of PermanentCreature AF, a way to organize Creature Spell AIs, with longterm potential of removing SpellPermanent
-- Converted Force of Savagery to Script
-- Sound System: A little fix to the counter sounds. Also, adding back some of the changes that seemingly did not go through the last time.
-- Sound System: Increased the responsiveness of the sound system, should help remedy the skipping or missing sounds.
-- Small fix to Nameless Race
-- Made some scripts multiplayer compatible and other minor tweaks
-- Added the first global rule change: "Damage can't be prevented.".
-- Converted Leyline of Punishment and Everlasting Torment.
-- Added the global rule change: "All damage is dealt as though it's source had wither.".
-- Everlasting Torment is now fully scripted.
-- Converted C "...each player's <phase>" cards to more multiplayer-friendly scripts.
-- ReplacedOppDomain counting method with ActivePlayerDomain (Only card that used OppDomain was converted)
-- Added the global rule change: "The legend rule doesn't apply.".
-- Converted Mirror Gallery to script.
-- Added the global rule change: "Mana pools don't empty as steps and phases end.".
-- Converted Upwelling to script.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Added the global rule change: "Players can't cycle cards.".
-- Converted Stabilizer to script.
-- Fixed Predatory Rampage.
-- Added the global rule change: "Creatures entering the battlefield don't cause abilities to trigger.".
-- Converted Torpor Orb to script.
-- CheckStyle.
-- Initial implementation of "spend only <color> mana when paying X", for the future implementations of Drain Life/Consume Spirit/etc. Currently controlled with SVar:XColor - specify the color of mana to spend on the X cost, e.g. SVar:XColor:B limits the X mana cost to black. Hope it didn't break anything, please test.
-- GlobalRuleChanges is now stored as EnumSet.
-- Fixed a bug in the "Spend only <color> mana on X" routine that allowed any mana to be spent after the first tapped land.
-- Fixed a bug in the "Spend only <color> mana on X" routine that disabled the confirmation button if the wrong type of land was clicked, even if some mana of correct color was already paid before.
-- Added the global rule change: "No more than one creature can attack each turn.", "No more than one creature can attack each combat." and "No more than one creature can block each combat.".
-- GlobalRuleChange enum now has an associated text.
-- Unlocking sets is less expensive now (but still fairly expensive).
-- Code simplification (related to "spend only <color> mana on X").
-- Typo fixes to the QuestData submenu.
-- Sound System: added a previously missed link for the non-combat damage life loss sound.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Fixed a bug that made it possible to select any color of mana from the mana pool when the X mana cost was supposed to be restricted to specific color(s).
-- Checkstyle
-- Fixed AI using Unwilling Recruit.
-- Fixed Curses in attachToPlayerAIPreferences.
-- The AI will now use the ability of Hollow Specter.
-- The AI will no longer animate an equipped Ensouled Scimitar.
-- Quest set unlocks logics written from scratch
-- Improved AI for Auras with "AILogic$ Curse".
-- More Improvements of AI for Auras with "AILogic$ Curse".
-- More Improvements of AI for Auras with "AILogic$ Curse".
-- rem unused import
-- New formula for unlock prices, minor checkstyle.
-- Display up to 2 + (wins/50) (max 8) options when unlocking sets.
-- Bounds checking for unlocking.
-- Better way, use sublist.
-- Simplify nrChoices in unlocking.
+- Made Karn Liberated first ability mandatory
+- Added Mandatory$ True to Parallax Nexus
+- Made Borrowing 100000 Arrows and Theft of Dreams ready for multiplayer
+- Added FollowedBy Parameter in AddPhase which is common to many of these combat + main phase adders
+- Fixed NPEs in QuestController.java when the data directory is empty.
+- added Dragon's Maze 3 letter code
+- fixed some indentation issues. changed Commander set code to match mtg-data.txt
+- Removed code that generates SVar:Rarity line. Rarity SVar is not a required field and is not actually used by Forge.
+- Added replacement effect handler for turns face up. Moved running of triggers for TurnFaceUp to turnFaceUp method in Card.java.
+- Added ChosenCard to defined card types. 
+- Added ForgetChosen parameter to ChooseCardEffect to remove chosen card from host card remembered object list.
+- Added Mandatory parameter to ChooseCardEffect.
+- restructured The Mimeoplasm to somewhat playable by AI
+- Fixed AF Charm AI.
+- Better fix for AF Charm AI.
+- Fixed Zektar Shrine Expedition.
+- Fixed Storm and Epic keywords.
+- Fixed a bug with morphs.
+- The buildDeck function will now throw an error instead of looping infinitely.
+- Adding Arcane type to Overblaze
+- Fixing apostrophe that doesn't display properly
+- added "TriggerZones$ Battlefield" to TurnsFaceUp triggers
+- Added Duration parameter Clone effect.
+- Made copied abilities actually register as copied (and not trigger Rings of Brighthearth again,for example)
+- Nonmana-root abilities with mana subabilities are now properly recognized as mana abilities (Metalworker)
+- Fixed draft AI not building decks.
 - Added the recent commit logs to changes.txt. Preparing for the beta build and release.
 - Preparing the changes.txt file for the next beta build and release.
 
@@ -499,6 +277,9 @@ Fixes/Features:
 Many people helped with this version. A special thank you goes out to them. (Attempted to list names alphabetically):
 
 Agetian
+ArsenalNut
+bbbbbbbbba
+Gos
 Hellfish
 Marc
 Max
@@ -509,86 +290,127 @@ Swordshine
 Chris H
 
 
+Added the following Schemes:
+
+Into the Earthen Maw
+Introductions Are in Order
+Know Naught but Fire
+My Undead Horde Awakens
+
+
+Added the following Vanguard Avatars:
+
+Braids Conjurer Adept Avatar
+Hermit Druid Avatar
+Higure, the Still Wind Avatar
+Loxodon Hierarch Avatar
+Mayael the Anima Avatar
+Mirri, the Cursed Avatar
+Mirror Entity Avatar
+Oni of Wild Places Avatar
+Phage the Untouchable Avatar
+Platinum Angel Avatar
+Prodigal Sorcerer Avatar
+Raksha Golden Cub Avatar
+Reaper King Avatar
+Rith the Awakener Avatar
+Royal Assassin Avatar
+Rumbling Slum Avatar
+Sakashima the Impostor Avatar
+Serra Angel Avatar
+Squee, Goblin Nabob Avatar
+Stalking Tiger Avatar
+Tesya, Orzhov Scion Avatar
+
+
 Added the following cards:
 
-AEthertow
-Arsenal Thresher
-Auriok Replica
-Barkshell Blessing
-Bone Mask
-Booby Trap
-Burn Trail
-Burrenton Forge-Tender
-Cho-Arrim Alchemist
-Circle of Protection: Artifacts
-Circle of Protection: Black
-Circle of Protection: Blue
-Circle of Protection: Green
-Circle of Protection: Red
-Circle of Protection: Shadow
-Circle of Protection: White
-Cleansing
-Consume Spirit
-Daru Spiritualist
-Disturbing Plot
-Divergent Growth
-Doubling Chant
-Dracoplasm
-Drain Life
-Everlasting Torment
-Fire Juggler
-Flaring Pain
-General's Regalia
-Ghastly Discovery
-Giantbaiting
-Gleeful Sabotage
-Greater Realm of Preservation
-Gustcloak Cavalier
-Haazda Shield Mate
-Intervention Pact
-Invulnerability
-Jade Monolith
-Kaervek's Torch
-Karn Liberated
-Kemba's Legion
-Krosan Drover
-Maddening Imp
-Magus of the Scroll
-Memory Sluice
-Metamorphose
-Mine Excavation
-Minion of the Wastes
-Nightshade Assassin
-Oracle's Attendants
-Overlaid Terrain
-Parallax Nexus
-Pentagram of the Ages
-Predatory Focus
-Prismatic Circle
-Proteus Machine
-Reap
-Reverse Damage
-Riftsweeper
-Righteous Aura
-Rising Waters
-Rofellos's Gift
-Rune of Protection: Artifacts
-Rune of Protection: Black
-Rune of Protection: Blue
-Rune of Protection: Green
-Rune of Protection: Lands
-Rune of Protection: Red
-Rune of Protection: White
-Rust Elemental
-Saproling Cluster
-Seasoned Tactician
-Shaman en-Kor
-Shimian Night Stalker
-Story Circle
-Summoner's Egg
-Traitor's Roar
-Unstable Footing
-Wild Might
+Aggravated Assault
+Artifact Possession
+Baki's Curse
+Beacon of Destiny
+Burning Wish
+Carrion Rats
+Carrion Wurm
+Chamber of Manipulation
+Clarion Ultimatum
+Clergy of the Holy Nimbus
+Colfenor's Plans
+Cunning Wish
+Cytoshape
+Death Wish
+Decree of Silence
+Desperate Gambit
+Draining Whelk
+Energy Vortex
+Eye of the Storm
+Faces of the Past
+Feral Contest
+Fiery Gambit
+Fighting Chance
+Final Punishment
+Flux
+Fury of the Horde
+Glittering Wish
+Goblin Psychopath
+Golden Wish
+Graceful Reprieve
+Hakim, Loreweaver
+Haze Frog
+Hellkite Charger
+Hunt Down
+Hunter of Eyeblights
+Impulsive Maneuvers
+Incite War
+Instigator
+Kjeldoran Guard
+Knight of the Holy Nimbus
+Knollspine Dragon
+Lammastide Weave
+Laquatus's Creativity
+Last Rites
+Living Wish
+Mangara's Blessing
+Mimeofacture
+Mizzium Transreliquant
+Mourner's Shield
+Neurok Transmuter
+New Frontiers
+Oath of Lim-Dul
+Overblaze
+Overwhelming Instinct
+Phantasmal Mount
+Razorfin Abolisher
+Relentless Assault
+Renegade Doppleganger
+Rhystic Circle
+Rhystic Scrying
+Rhystic Shield
+Rime Transfusion
+Rimehorn Aurochs
+Ring of Ma'ruf
+Rings of Brighthearth
+Rites of Initiation
+Rites of Refusal
+Rites of Spring
+Roots of Life
+Rysorian Badger
+Sacred Rites
+Savage Beating
+Scion of the Ur Dragon
+Seize the Day
+Shapesharer
+Soulgorger Orgg
+Spawnsire of Ulamog
+Squee's Revenge
+The Mimeoplasm
+Thousand-Year Elixir
+Total War
+Unified Will
+Vesuvan Shapeshifter
+Waves of Aggression
+Web of Inertia
+Woeleecher
 
 
 end

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>forge</artifactId>
     <packaging>jar</packaging>
     <name>Forge</name>
-    <version>1.3.1</version>
+    <version>1.3.4</version>
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent
         using all of the rules.
@@ -152,9 +152,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.1</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.1</developerConnection>
-        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.3.1?repname=forge</url>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.4</connection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.4</developerConnection>
+        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.3.4?repname=forge</url>
     </scm>
 
     <prerequisites>
@@ -722,7 +722,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
-
+	<dependency>
+		<groupId>commons-lang</groupId>
+		<artifactId>commons-lang</artifactId>
+		<version>2.6</version>
+	</dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>

res/PerSetTracking.py

@@ -80,7 +80,7 @@ for currentSet in setCodes :
 	if currentSet == 'VG4' or currentSet == 'VGO' or currentSet == 'VG ' : continue
 	if currentSet == 'FVD' or currentSet == 'FVE' or currentSet == 'FVR' : continue
 	if currentSet == 'SDC' or currentSet == 'AST' or currentSet == 'DKM' : continue
-	if currentSet == 'BTD' or currentSet == 'ARC' or currentSet == 'COM' : continue
+	if currentSet == 'BTD' or currentSet == 'COM' : continue
 	#if currentSet == 'CHR' or currentSet == 'MED' or currentSet == 'H09' : continue
 	if currentSet == 'ME2' or currentSet == 'ME3' or currentSet == 'ME4' : continue
 	if currentSet == 'ATH' or currentSet == 'HOP' or currentSet == 'BRB' : continue

res/blockdata/setdata.txt

@@ -90,3 +90,6 @@ Index:80|Code2:AVR|Code3:AVR|Name:Avacyn Restored
 Index:81|Code2:PC2|Code3:PC2|Name:Planechase 2012 Edition
 Index:82|Code2:M13|Code3:M13|Name:Magic 2013
 Index:83|Code2:RTR|Code3:RTR|Name:Return to Ravnica
+
+Index:86|Code2:VAN|Code3:VAN|Name:Vanguard
+Index:87|Code2:ARC|Code3:ARC|Name:Archenemy

res/cardTemplateScript.py

@@ -15,138 +15,6 @@ class Card:
 		self.oracle = []
 		self.sets = ""
 
-def initSets():
-	# Base Sets
-	forgeSets.append('1E')
-	forgeSets.append('2E')
-	forgeSets.append('2U')
-	forgeSets.append('3E')
-	forgeSets.append('4E')
-	forgeSets.append('5E')
-	forgeSets.append('6E')
-	forgeSets.append('7E')
-	forgeSets.append('8ED')
-	forgeSets.append('9ED')
-	forgeSets.append('10E')
-	forgeSets.append('M10')
-	forgeSets.append('M11')
-	forgeSets.append('M12')
-	forgeSets.append('M13')
-
-	# Multiplayer Sets
-	forgeSets.append('COM')
-
-	# Portal
-	forgeSets.append('POR')
-	forgeSets.append('PO2')
-	forgeSets.append('PTK')
-
-	# Starter
-	forgeSets.append('S99')
-	forgeSets.append('S00')
-
-	# Early Sets
-	forgeSets.append('AN')
-	forgeSets.append('AQ')
-	forgeSets.append('LE')
-	forgeSets.append('DK')
-	forgeSets.append('FE')
-	forgeSets.append('HM')
-
-	# Ice Age
-	forgeSets.append('IA')
-	forgeSets.append('AL')
-	forgeSets.append('CSP')
-
-	# Mirage
-	forgeSets.append('MI')
-	forgeSets.append('VI')
-	forgeSets.append('WL')
-
-	# Rath Cycle
-	forgeSets.append('TE')
-	forgeSets.append('ST')
-	forgeSets.append('EX')
-
-	# Artifacts Cycle
-	forgeSets.append('UZ')
-	forgeSets.append('GU')
-	forgeSets.append('CG')
-
-	# Masques
-	forgeSets.append('MM')
-	forgeSets.append('NE')
-	forgeSets.append('PR')
-
-	# Invasion
-	forgeSets.append('IN')
-	forgeSets.append('PS')
-	forgeSets.append('AP')
-
-	# Odyssey
-	forgeSets.append('OD')
-	forgeSets.append('TOR')
-	forgeSets.append('JUD')
-
-	# Onslaught
-	forgeSets.append('ONS')
-	forgeSets.append('LGN')
-	forgeSets.append('SCG')
-
-	# Mirrodin
-	forgeSets.append('MRD')
-	forgeSets.append('DST')
-	forgeSets.append('5DN')
-
-	# Kamigawa
-	forgeSets.append('CHK')
-	forgeSets.append('BOK')
-	forgeSets.append('SOK')
-
-	# Ravnica
-	forgeSets.append('RAV')
-	forgeSets.append('GPT')
-	forgeSets.append('DIS')
-
-	# Time Spiral
-	forgeSets.append('TSP')
-	forgeSets.append('TSB')
-	forgeSets.append('PLC')
-	forgeSets.append('FUT')
-
-	# Lorwyn
-	forgeSets.append('LRW')
-	forgeSets.append('MOR')
-
-	# Shadowmoor
-	forgeSets.append('SHM')
-	forgeSets.append('EVE')
-
-	# Alara
-	forgeSets.append('ALA')
-	forgeSets.append('CON')
-	forgeSets.append('ARB')
-
-	# Zendikar
-	forgeSets.append('ZEN')
-	forgeSets.append('WWK')
-	forgeSets.append('ROE')
-
-	# Scars of Mirrodin
-	forgeSets.append('SOM')
-	forgeSets.append('MBS')
-	forgeSets.append('NPH')
-	
-	# Innistrad
-	forgeSets.append('ISD')
-	forgeSets.append('DKA')
-	forgeSets.append('AVR')
-	
-	# Return to Ravnica
-	forgeSets.append('RTR')
-	#forgeSets.append('GTC')
-	#forgeSets.append('UNK')
-
 def initKeywords():
         keyWords.append('Cascade')
         keyWords.append('Convoke')
@@ -219,7 +87,6 @@ if not os.path.exists(pathToMtgData) :
         raw_input("")
         sys.exit()
 
-forgeSets = []
 keyWords = []
 mtgDataCards = {}
 setCodes = []
@@ -227,7 +94,6 @@ tmpName = ""
 line = ""
 
 # initialize sets supported by Forge
-initSets()
 initKeywords()
 #Parse mtg-data
 mtgdata = open(pathToMtgData,"r")
@@ -284,7 +150,7 @@ while line:
                         prevLine = tmpLine.replace(mtgName,'CARDNAME')
                 # if card is not creature, set foundPT to true
                 if foundType and not foundPT :
-                        if card.types.find('Creature') == -1 and card.types.find('Planeswalker') == -1: foundPT = True
+                        if card.types.find('Creature') == -1 and card.types.find('Planeswalker') == -1 and card.types.find('Vanguard') == -1 : foundPT = True
                 line = mtgdata.readline()
         # found blank line or end of file so store last line as set info
         card.sets = prevLine.rstrip()
@@ -305,10 +171,14 @@ while inputName != 'quit' :
                 print 'ManaCost:'+cardData.cost
                 print 'Types:'+cardData.types
                 print 'Text:no text'
-                if cardData.types.find('Creature') != -1:
+                if cardData.types.find('Creature') != -1 :
                         print 'PT:'+cardData.pt
                 elif cardData.types.find('Planeswalker') != -1 :
                         print 'Loyalty:'+cardData.pt
+                elif cardData.types.find('Vanguard') != -1 :
+                	    vangModifier = cardData.pt.replace('Hand ','')
+                	    vangModifier = vangModifier.replace(', life ','/')
+                	    print 'HandLifeModifier:'+vangModifier
                 
                 for text in cardData.oracle :
                         # do some prescripting
@@ -334,24 +204,12 @@ while inputName != 'quit' :
                                 if handleKeyords(text,keyWords) == False:
                                         print text
                 #print "\n"
-                tmpSets = cardData.sets
-                tmpSets = tmpSets.split(', ')
-                setInfo = [];
-                for edition in tmpSets :
-                        edition = edition.split(' ');
-                        if forgeSets.count(edition[0]) != 0 :
-                                if edition[1] == 'C' :
-                                        rarity = 'Common'
-                                elif edition[1] == 'U' :
-                                        rarity = 'Uncommon'
-                                elif edition[1] == 'R' :
-                                        rarity = 'Rare'
-                                elif edition[1] == 'M' :
-                                        rarity = 'Mythic'
-                                setInfoStr = 'SetInfo:'+edition[0]+'|'+rarity+'|'+'http://dummy.com/dummy.jpg'
-                                setInfo.append(setInfoStr)
-                print 'SVar:Rarity:'+rarity
-                print 'SVar:Picture:http://www.wizards.com/global/images/magic/general/'+cleanName+'.jpg'
+                if cardData.types.find('Scheme') != -1 :
+                        print 'SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/'+cleanName+'.jpg'
+                elif cardData.types.find('Vanguard') != -1 :
+                        print 'SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/'+cleanName+'.jpg'
+                else :
+                        print 'SVar:Picture:http://www.wizards.com/global/images/magic/general/'+cleanName+'.jpg'
                 print 'End\n'
         else :
                 print inputName+' not found\n'

res/cardsfolder/a/a_display_of_my_dark_power.txt

@@ -0,0 +1,13 @@
+Name:A Display of My Dark Power
+ManaCost:no cost
+Types:Scheme
+Text:no text
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DarkEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+SVar:DarkEffect:AB$ Effect | Cost$ 0 | Name$ Dark Power Scheme | Duration$ UntilYourNextTurn | Triggers$ DarkPower | SVars$ DarkMana
+SVar:DarkPower:Mode$ TapsForMana | ValidCard$ Land | Execute$ DarkMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+SVar:DarkMana:AB$ ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
+SVar:Rarity:Common
+SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/a_display_of_my_dark_power.jpg
+SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/a-display-of-my-dark-power.jpg
+Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+End

res/cardsfolder/a/abeyance.txt

@@ -3,8 +3,8 @@ ManaCost:1 W
 Types:Instant
 Text:no text
 A:SP$ Effect | Cost$ 1 W | ValidTgts$ Player | Name$ Abeyance Effect | StaticAbilities$ STCantBeCast,STCantBeActivated | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
-SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ Player.IsRemembered | Description$ Target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
-SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | Activator$ Player.IsRemembered | NonMana$ True
+SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ Player.IsRemembered | EffectZone$ Command | Description$ Target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
+SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | Activator$ Player.IsRemembered | EffectZone$ Command | NonMana$ True
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abeyance.jpg

res/cardsfolder/a/aboshans_desire.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Threshold$ True | Description$ Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshans_desire.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/59.jpg

res/cardsfolder/a/abyssal_gatekeeper.txt

@@ -4,7 +4,7 @@ Types:Creature Horror
 Text:no text
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player sacrifices a creature.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ Each
+SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ Each
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_gatekeeper.jpg
 SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/1.jpg

res/cardsfolder/a/abyssal_nocturnus.txt

@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Horror
 Text:no text
 PT:2/2
-T:Mode$ Discarded | ValidCard$ Card.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an opponent discards a card, CARDNAME gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an opponent discards a card, CARDNAME gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Fear
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_nocturnus.jpg

res/cardsfolder/a/academy_rector.txt

@@ -4,8 +4,8 @@ Types:Creature Human Cleric
 Text:no text
 PT:1/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for an enchantment card and put that card onto the battlefield. Then shuffle your library.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
-SVar:DBReturn:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Enchantment.YouOwn | ChangeNum$ 1
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Enchantment.YouOwn | ChangeNum$ 1
 SVar:SacMe:4
 SVar:RemRandomDeck:True
 DeckNeeds:Type$Enchantment

res/cardsfolder/a/academy_researchers.txt

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura | AttachedTo$ Self
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource | AttachedTo$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_researchers.jpg
 SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/58.jpg

res/cardsfolder/a/accorder_paladin.txt

@@ -4,7 +4,7 @@ Types:Creature Human Knight
 Text:no text
 PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SVar:TrigBattleCry:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
+SVar:TrigBattleCry:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
 SetInfo:MBS|Uncommon|http://magiccards.info/scans/en/mbs/1.jpg

res/cardsfolder/a/acidic_dagger.txt

@@ -3,11 +3,11 @@ ManaCost:4
 Types:Artifact
 Text:no text
 A:AB$ Effect | Cost$ 4 T | Name$ Acidic Dagger Effect | ValidTgts$ Creature | TgtPrompt$ Select target creature | Triggers$ TrigDam,TrigLeave | SVars$ TrigDestroy,TrigSac,ExileEffect | RememberObjects$ Targeted | ImprintCards$ Self | ActivationPhases$ Upkeep->Declare Attackers - Play Instants and Abilities | SpellDescription$ Whenever target creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn, sacrifice CARDNAME. Activate this ability only before blockers are declared.
-SVar:TrigDam:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ Creature.nonWall | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever targeted creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature.
-SVar:TrigLeave:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Any | Execute$ TrigSac | TriggerDescription$ When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredTarget
+SVar:TrigDam:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ Creature.nonWall | CombatDamage$ True | TriggerZones$ Command | Execute$ TrigDestroy | TriggerDescription$ Whenever targeted creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature.
+SVar:TrigLeave:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Any | Execute$ TrigSac | TriggerZones$ Command | TriggerDescription$ When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
 SVar:TrigSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffect
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | Static$ True
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_dagger.jpg

res/cardsfolder/a/acidic_soil.txt

@@ -2,10 +2,10 @@ Name:Acidic Soil
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 2 R | Defined$ You | NumDmg$ X | SubAbility$ DBDamageOpp | References$ X | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands he or she controls.
-SVar:DBDamageOpp:DB$DealDamage | Defined$ Opponent | NumDmg$ Y | References$ Y
-SVar:X:Count$TypeYouCtrl.Land
-SVar:Y:Count$TypeOppCtrl.Land
+A:SP$ RepeatEach | Cost$ 2 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamageOpp | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands he or she controls.
+SVar:DBDamageOpp:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
+SVar:X:Count$Valid Land.RememberedPlayerCtrl
+SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg

res/cardsfolder/a/aegis_angel.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target permanent is indestructible for as long as you control CARDNAME. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
-SVar:TrigPump:DB$ Pump | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
+SVar:TrigPump:AB$ Pump |  Cost$ 0 | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_angel.jpg

res/cardsfolder/a/aether_rift.txt

@@ -0,0 +1,14 @@
+Name:AEther Rift
+ManaCost:1 R G
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life.
+SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ You | NumCards$ 1 | Mode$ Random | RememberDiscarded$ True | SubAbility$ DBReturn | SpellDescription$ Discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life.
+SVar:DBReturn:DB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Card.IsRemembered | Origin$ Graveyard | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | ConditionCompare$ EQ1 | UnlessCost$ PayLife<5> | UnlessPayer$ Player | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIdeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_rift.jpg
+SetInfo:INV|Rare|http://magiccards.info/scans/en/in/227.jpg
+Oracle:At the beginning of your upkeep, discard a card at random. If you discard a creature card this way, return it from your graveyard to the battlefield unless any player pays 5 life.
+End

res/cardsfolder/a/aether_snap.txt

@@ -0,0 +1,13 @@
+Name:AEther Snap
+ManaCost:3 B B
+Types:Sorcery
+Text:no text
+A:SP$ RemoveCounterAll | Cost$ 3 B B | ValidCards$ Permanent | AllCounterTypes$ True | StackDescription$ SpellDescription | SubAbility$ DBRemove | SpellDescription$ Remove all counters from all permanents and exile all tokens.
+SVar:DBRemove:DB$ ChangeZoneAll | ChangeType$ Card.token | Origin$ Battlefield | Destination$ Exile
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_snap.jpg
+SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/37.jpg
+Oracle:Remove all counters from all permanents and exile all tokens.
+End

res/cardsfolder/a/aethertow.txt

@@ -5,7 +5,7 @@ Text:no text
 A:SP$ ChangeZone | Cost$ 3 WU | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target attacking or blocking creature on top of its owner's library.
 K:Conspire
 T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid
-SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1
+SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aethertow.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/136.jpg

res/cardsfolder/a/agent_of_masks.txt

@@ -4,8 +4,10 @@ Types:Creature Human Advisor
 Text:no text
 PT:2/3
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
-SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
+SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ AFLifeLost
+SVar:AFLifeLost:Number$0
+#AFLifeLost will be set by LoseLife
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/agent_of_masks.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/100.jpg

res/cardsfolder/a/aggravated_assault.txt

@@ -0,0 +1,11 @@
+Name:Aggravated Assault
+ManaCost:2 R
+Types:Enchantment
+Text:no text
+A:AB$ UntapAll | Cost$ 3 R R | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat | SorcerySpeed$ True | SpellDescription$ Untap all creatures you control. After this main phase, there is an additional combat phase followed by an additional main phase. Activate this ability only any time you could cast a sorcery.
+SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | FollowedBy$ ThisPhase | ConditionPhases$ Main1,Main2
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aggravated_assault.jpg
+SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/185.jpg
+Oracle:{3}{R}{R}: Untap all creatures you control. After this main phase, there is an additional combat phase followed by an additional main phase. Activate this ability only any time you could cast a sorcery.
+End

res/cardsfolder/a/air_bladder.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | AddHiddenKeyword$ HIDDEN CARDNAME can block only creatures with flying. | Description$ Enchanted creature has flying and can block only creatures with flying.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | AddHiddenKeyword$ CARDNAME can block only creatures with flying. | Description$ Enchanted creature has flying and can block only creatures with flying.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/air_bladder.jpg
 SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/28.jpg

res/cardsfolder/a/akki_blizzard_herder.txt

@@ -4,7 +4,7 @@ Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player sacrifices a land.
-SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Land | Defined$ Each
+SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Land | Defined$ Each
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akki_blizzard_herder.jpg
 SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/91.jpg

res/cardsfolder/a/akromas_blessing.txt

@@ -5,6 +5,7 @@ Text:no text
 K:Cycling:W
 A:SP$ ChooseColor | Cost$ 2 W | Defined$ You | AILogic$ MostProminentAttackers | SubAbility$ DBProtection | SpellDescription$ Choose a color. Creatures you control gain protection from the chosen color until end of turn.
 SVar:DBProtection:DB$ ProtectionAll | ValidCards$ Creature.YouCtrl | Gains$ ChosenColor
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akromas_blessing.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/1.jpg

res/cardsfolder/a/akron_legionnaire.txt

@@ -3,7 +3,7 @@ ManaCost:6 W W
 Types:Creature Giant Soldier
 Text:no text
 PT:8/4
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+nonArtifact+notnamedAkron Legionnaire | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Except for creatures named CARDNAME and artifact creatures, creatures you control can't attack.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+nonArtifact+notnamedAkron Legionnaire | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Except for creatures named CARDNAME and artifact creatures, creatures you control can't attack.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akron_legionnaire.jpg
 Oracle:Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.

res/cardsfolder/a/aku_djinn.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:5/6
 K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | TriggerDescription$ At the beginning of your upkeep, put a +1/+1 counter on each creature each opponent controls.
-SVar:TrigPutCounterAll:AB$PutCounterAll | Cost$ 0 | ValidCards$ Creature.OppCtrl | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounterAll:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.OppCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aku_djinn.jpg
 SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/1.jpg

res/cardsfolder/a/akuta_born_of_ash.txt

@@ -4,9 +4,10 @@ Types:Legendary Creature Spirit
 Text:no text
 PT:3/2
 K:Haste
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ Opponent | PresentCompare$ LTX | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return CARDNAME from your graveyard to the battlefield.
-SVar:TrigReturn:AB$ChangeZone | Cost$ Sac<1/Swamp> | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GTY | References$ X,Y | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return CARDNAME from your graveyard to the battlefield.
+SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<1/Swamp> | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:X:Count$InYourHand
+SVar:Y:PlayerCountOpponents$HighestCardsInHand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akuta_born_of_ash.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/61.jpg

res/cardsfolder/a/al_abaras_carpet.txt

@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact
 Text:no text
 A:AB$ Effect | Cost$ 5 T | Name$ Al-abara's Carpet Effect | StaticAbilities$ STPrevent | SpellDescription$ Prevent all damage that would be dealt to you this turn by attacking creatures without flying.
-SVar:STPrevent:Mode$ PreventDamage | Target$ You | Source$ Creature.attacking+withoutFlying | Description$ Prevent all damage that would be dealt to you this turn by attacking creatures without flying.
+SVar:STPrevent:Mode$ PreventDamage | EffectZone$ Command | Target$ You | Source$ Creature.attacking+withoutFlying | Description$ Prevent all damage that would be dealt to you this turn by attacking creatures without flying.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/al_abaras_carpet.jpg

res/cardsfolder/a/aladdins_lamp.txt

@@ -0,0 +1,21 @@
+Name:Aladdin's Lamp
+ManaCost:10
+Types:Artifact
+Text:no text
+A:AB$ StoreSVar | Cost$ XCantBe0 X T | SVar$ DigNum | Type$ Count | Expression$ xPaid | SubAbility$ TheMagic | SpellDescription$ The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
+SVar:TheMagic:DB$ Effect | Name$ Aladdin's Wish | ReplacementEffects$ DrawReplace | SVars$ ExileEffect,AladdinDraw,DBDraw,DigNum,AllButOne
+SVar:DrawReplace:Event$ Draw | ValidPlayer$ You | ReplaceWith$ AladdinDraw | Description$ The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card.
+SVar:AladdinDraw:AB$ Dig | Cost$ 0 | DigNum$ DigNum | ChangeNum$ AllButOne | RandomOrder$ True | DestinationZone$ Library | LibraryPosition$ -1 | DestinationZone2$ Library | LibraryPosition2$ 0 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SubAbility$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
+SVar:X:Count$xPaid
+SVar:DigNum:Number$0
+SVar:AIPlayForSub:True
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aladdins_lamp.jpg
+SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/231.jpg
+SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/309.jpg
+SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/70.jpg
+Oracle:{X}, {T}: The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
+End

res/cardsfolder/a/alchemists_refuge.txt

@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Effect | Cost$ U G T | Name$ Refuge Effect | StaticAbilities$ QuickSpell | SpellDescription$ Until end of turn, you may cast nonland cards as though they had flash.
-SVar:QuickSpell:Mode$ Continuous | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast nonland cards as though they had flash.
+SVar:QuickSpell:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ You may cast nonland cards as though they had flash. | Description$ You may cast nonland cards as though they had flash.
 SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True

res/cardsfolder/a/ali_from_cairo.txt

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Human
 Text:no text
 PT:0/1
-K:Damage that would reduce your life total to less than 1 reduces it to 1 instead.
+S:Mode$ Continuous | Affected$ You | AddKeyword$ Damage that would reduce your life total to less than 1 reduces it to 1 instead. | Description$ Damage that would reduce your life total to less than 1 reduces it to 1 instead.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ali_from_cairo.jpg
 SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/44.jpg

res/cardsfolder/a/all_hallows_eve.txt

@@ -7,8 +7,8 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+counters
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+counters_EQ0_SCREAM | PresentZone$ Exile | Execute$ TrigMoveToGraveyard | TriggerZones$ Exile | Secondary$ True | TriggerDescription$ Put CARDNAME into your graveyard and return all creatures to the battlefield.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ SCREAM | CounterNum$ 1
 SVar:TrigMoveToGraveyard:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Graveyard | Defined$ Self | SubAbility$ DBResurrection
-SVar:DBResurrection:DB$ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature
-SVar:DBPutCounter:DB$PutCounter | Defined$ Remembered | CounterType$ SCREAM | CounterNum$ 2
+SVar:DBResurrection:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ SCREAM | CounterNum$ 2
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/all_hallows_eve.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/2.jpg

res/cardsfolder/a/all_shall_smolder_in_my_wake.txt

@@ -0,0 +1,13 @@
+Name:All Shall Smolder in My Wake
+ManaCost:no cost
+Types:Scheme
+Text:no text
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ Ignite | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, destroy up to one target artifact, up to one target enchantment, and up to one target nonbasic land.
+SVar:Ignite:AB$ Destroy | Cost$ 0 | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact to destroy | SubAbility$ Burn
+SVar:Burn:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment to destroy | SubAbility$ Smolder
+SVar:Smolder:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land to destroy
+SVar:Rarity:Common
+SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/all_shall_smolder_in_my_wake.jpg
+SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/all-shall-smolder-in-my-wake.jpg
+Oracle:When you set this scheme in motion, destroy up to one target artifact, up to one target enchantment, and up to one target nonbasic land.
+End

res/cardsfolder/a/aluren.txt

@@ -2,7 +2,7 @@ Name:Aluren
 ManaCost:2 G G
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Creature.cmcLE3 | AddHiddenKeyword$ HIDDEN May be played without paying its mana cost and as though it has flash | AffectedZone$ Hand,Graveyard,Exile | Description$ Any player may play creature cards with converted mana cost 3 or less without paying their mana cost and as though they had flash.
+S:Mode$ Continuous | Affected$ Creature.cmcLE3 | AddHiddenKeyword$ May be played without paying its mana cost and as though it has flash | AffectedZone$ Hand,Graveyard,Exile | Description$ Any player may play creature cards with converted mana cost 3 or less without paying their mana cost and as though they had flash.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aluren.jpg

res/cardsfolder/a/amber_prison.txt

@@ -5,7 +5,7 @@ Text:no text
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Pump | Cost$ 4 T | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | RememberTargets$ True |  SubAbility$ DBTap | SpellDescription$ Tap target artifact, creature, or land. That permanent doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:DBTap:DB$ Tap | Cost$ 0 | Defined$ Targeted
-S:Mode$ Continuous | Affected$ Card.IsRemembered | AddHiddenKeyword$ HIDDEN This card doesn't untap during your next untap step.
+S:Mode$ Continuous | Affected$ Card.IsRemembered | AddHiddenKeyword$ This card doesn't untap during your next untap step.
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigClearRemember | Static$ True
 SVar:TrigClearRemember:DB$Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True

res/cardsfolder/a/an_zerrin_ruins.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseCT | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a creature type.
 SVar:ChooseCT:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature | AILogic$ MostProminentHumanControls
-S:Mode$ Continuous | Affected$ Creature.ChosenType | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | Description$ Creatures of the chosen type don't untap during their controllers' untap steps.
+S:Mode$ Continuous | Affected$ Creature.ChosenType | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures of the chosen type don't untap during their controllers' untap steps.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/an_zerrin_ruins.jpg

res/cardsfolder/a/ancient_craving.txt

@@ -6,6 +6,7 @@ A:SP$ Draw | Cost$ 3 B | NumCards$ 3 | SpellDescription$ You draw three cards an
 SVar:DB:DB$LoseLife | LifeAmount$ 3
 SVar:Rarity:Rare
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/ancient_craving.jpg
+SetInfo:S99|Rare|http://magiccards.info/scans/en/st/64.jpg
 SetInfo:PO2|Rare|http://magiccards.info/scans/en/po2/2.jpg
 Oracle:You draw three cards and you lose 3 life.
 End

res/cardsfolder/a/angelic_arbiter.txt

@@ -4,9 +4,10 @@ Types:Creature Angel
 Text:no text
 PT:5/6
 K:Flying
-S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GE1 | Description$ Each opponent who cast a spell this turn can't attack with creatures.
+S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GE1 | Description$ Each opponent who cast a spell this turn can't attack with creatures.
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Opponent | OpponentAttackedWithCreatureThisTurn$ True | Description$ Each opponent who attacked with a creature this turn can't cast spells.
 SVar:X:Count$ThisTurnCast_Card.YouDontCtrl
+SVar:RemMultiplayer:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_arbiter.jpg
 SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/4.jpg

res/cardsfolder/a/angels_grace.txt

@@ -3,10 +3,8 @@ ManaCost:W
 Types:Instant
 Text:no text
 K:Split second
-A:SP$ Effect | Cost$ W | Name$ Angel's Grace Effect | Keywords$ AliFromCairo | StaticAbilities$ STCantLose,STOppsCantWin | AILogic$ Fog | SpellDescription$ You can't lose the game this turn and your opponents can't win the game this turn. Until end of turn, damage that would reduce your life total to less than 1 reduces it to 1 instead.
-SVar:STCantLose:Mode$ Continuous | Affected$ You | AddKeyword$ You can't lose the game. | Description$ You can't lose the game.
-SVar:STOppsCantWin:Mode$ Continuous | Affected$ You | AddKeyword$ Your opponents can't win the game. | Description$ Your opponents can't win the game.
-SVar:AliFromCairo:Damage that would reduce your life total to less than 1 reduces it to 1 instead.
+A:SP$ Effect | Cost$ W | Name$ Angel's Grace Effect | StaticAbilities$ STCantLose | AILogic$ Fog | SpellDescription$ You can't lose the game this turn and your opponents can't win the game this turn. Until end of turn, damage that would reduce your life total to less than 1 reduces it to 1 instead.
+SVar:STCantLose:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ You can't lose the game. & Your opponents can't win the game. & Damage that would reduce your life total to less than 1 reduces it to 1 instead. | Description$ You can't lose the game. Your opponents can't win the game. Damage that would reduce your life total to less than 1 reduces it to 1 instead.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angels_grace.jpg
 SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/3.jpg

res/cardsfolder/a/angels_trumpet.txt

@@ -2,7 +2,7 @@ Name:Angel's Trumpet
 ManaCost:3
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ Vigilance | Description$ All creatures have vigilance.
+S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Vigilance | Description$ All creatures have vigilance.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigTapAll | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's end step, tap all untapped creatures that player controls that didn't attack this turn. CARDNAME deals damage to the player equal to the number of creatures tapped this way.
 SVar:TrigTapAll:AB$ TapAll | Cost$ 0 | ValidCards$ Creature.untapped+notAttackedThisTurn+ActivePlayerCtrl | RememberTapped$ True | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ AngelDamage | SubAbility$ DBCleanup | References$ AngelDamage 

res/cardsfolder/a/angry_mob.txt

@@ -4,9 +4,9 @@ Types:Creature Human
 Text:no text
 PT:2+*/2+*
 K:Trample
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | PlayerTurn$ True | Description$ As long as it's your turn, CARDNAME's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, CARDNAME's power and toughness are each 2.
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, CARDNAME's power and toughness are each 2.
 SVar:X:Count$Valid Swamp.OppCtrl/Plus.2
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ 2 | SetToughness$ 2 | OpponentTurn$ True
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ 2 | SetToughness$ 2 | Condition$ NotPlayerTurn
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angry_mob.jpg

res/cardsfolder/a/animate_dead.txt

@@ -1,7 +1,16 @@
 Name:Animate Dead
 ManaCost:1 B
 Types:Enchantment Aura
-Text:Enchant creature card in a graveyard\r\nWhen Animate Dead enters the battlefield, if it's on the battlefield, it loses "enchant creature card in a graveyard" and gains "enchant creature put onto the battlefield with Animate Dead." Return enchanted creature card to the battlefield under your control and attach Animate Dead to it. When Animate Dead leaves the battlefield, that creature's controller sacrifices it.
+Text:no text
+K:Enchant creature card in a graveyard
+A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | TgtZone$ Graveyard | AILogic$ Reanimate
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReanimate | TriggerDescription$ When CARDNAME enters the battlefield, if it's on the battlefield, it loses "enchant creature card in a graveyard" and gains "enchant creature put onto the battlefield with CARDNAME." Return enchanted creature card to the battlefield under your control and attach CARDNAME to it.
+SVar:TrigReanimate:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Enchanted | RememberChanged$ True | GainControl$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Self | OverwriteSpells$ True | Abilities$ NewAttach | Keywords$ Enchant creature put onto the battlefield with CARDNAME | RemoveKeywords$ Enchant creature card in a graveyard | Permanent$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered
+SVar:NewAttach:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature.IsRemembered | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When Animate Dead leaves the battlefield, that creature's controller sacrifices it.
+SVar:TrigSacrifice:DB$ Destroy | Sacrifice$ True | Defined$ Remembered
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -1 | Description$ Enchanted creature gets -1/-0.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/5e/en-us/card3823.jpg

res/cardsfolder/a/animate_wall.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant Wall
 A:SP$ Attach | Cost$ W | ValidTgts$ Wall | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can attack as though it didn't have defender. | Description$ Enchanted Wall can attack as though it didn't have defender.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | Description$ Enchanted Wall can attack as though it didn't have defender.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/animate_wall.jpg

res/cardsfolder/a/antagonism.txt

@@ -2,13 +2,11 @@ Name:Antagonism
 ManaCost:3 R
 Types:Enchantment
 Text:no text
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TeaseYou | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals 2 damage to that player unless one of his or her opponents was dealt damage this turn.
-SVar:TeaseYou:DB$ DealDamage | Defined$ You | NumDmg$ 2 | ConditionCheckSVar$ AntagonismX | ConditionSVarCompare$ LE0 | References$ AntagonismX 
-SVar:AntagonismX:Count$OppDamageThisTurn
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | Execute$ TeaseOpp | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals 2  damage to that player unless one of his or her opponents was dealt damage this turn.
-SVar:TeaseOpp:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2 | ConditionCheckSVar$ AntagonismY | ConditionSVarCompare$ LE0 | References$ AntagonismY | 
-SVar:AntagonismY:Count$YourDamageThisTurn
-SVar:NeedsToPlayVar:AntagonismX GE1
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TeaseYou | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals 2 damage to that player unless one of his or her opponents was dealt damage this turn.
+SVar:TeaseYou:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2 | ConditionCheckSVar$ AntagonismX | ConditionSVarCompare$ LE0 | References$ AntagonismX 
+SVar:AntagonismX:TriggeredPlayer$DamageToOppsThisTurn
+SVar:Check:PlayerCountOpponents$DamageToOppsThisTurn
+SVar:NeedsToPlayVar:Check GE1
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/antagonism.jpg

res/cardsfolder/a/anthem_of_rakdos.txt

@@ -3,12 +3,12 @@ ManaCost:2 B R R
 Types:Enchantment
 Text:no text
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ AnthemPump | TriggerDescription$ Whenever a creature you control attacks, it gets +2/+0 until end of turn and CARDNAME deals 1 damage to you.
-SVar:AnthemPump:AB$Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 2 | SubAbility$ RakdosBurn
+SVar:AnthemPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 2 | SubAbility$ RakdosBurn
 SVar:RakdosBurn:DB$ DealDamage | Defined$ You | NumDmg$ 1
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ Hellbent - 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.
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Creature,Player | Hellbent$ True | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ Hellbent - 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.
-SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
-SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwice:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
+SVar:DmgTwiceCombat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare

res/cardsfolder/a/anti_magic_aura.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ CantTarget | ValidCard$ Creature.EnchantedBy | Spell$ True | Description$ Enchanted creature can't be the target of spells and can't be enchanted. This effect doesn't remove CARDNAME.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ CARDNAME can't be enchanted.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't be enchanted.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anti_magic_aura.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/72.jpg

res/cardsfolder/a/anvil_of_bogardan.txt

@@ -2,7 +2,7 @@ Name:Anvil of Bogardan
 ManaCost:2
 Types:Artifact
 Text:no text
-S:Mode$ Continuous | Affected$ Player | SetMaxHandSize$ -1 | Description$ Players have no maximum hand size.
+S:Mode$ Continuous | Affected$ Player | SetMaxHandSize$ Unlimited | Description$ Players have no maximum hand size.
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's draw step, that player draws an additional card, then discards a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1 | Defined$ TriggeredPlayer | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ TriggeredPlayer | NumCards$ 1 | Mode$ TgtChoose

res/cardsfolder/a/apathy.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME doesn't untap during your untap step. | AddTrigger$ TrigUpkeep | AddSVar$ TrigUntap | Description$ Enchanted creature doesn't untap during its controller's untap step. At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | AddTrigger$ TrigUpkeep | AddSVar$ TrigUntap | Description$ Enchanted creature doesn't untap during its controller's untap step. At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
 SVar:TrigUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, that player may discard a card at random. If he or she does, untap that creature.
 SVar:TrigUntap:AB$ Untap | Cost$ Discard<1/Random> | Defined$ Self | SpellDescription$ Untap enchanted creature
 SVar:Rarity:Common

res/cardsfolder/a/aphetto_exterminator.txt

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:3/1
 K:Morph:3 B
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME is turned face up, target creature gets -3/-3 until end of turn.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, target creature gets -3/-3 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aphetto_exterminator.jpg

res/cardsfolder/a/apprentice_necromancer.txt

@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Wizard
 Text:no text
 PT:1/1
-A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME>  | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
+A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
 SVar:DBPump:DB$Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/a/approach_my_molten_realm.txt

@@ -0,0 +1,16 @@
+Name:Approach My Molten Realm
+ManaCost:no cost
+Types:Scheme
+Text:no text
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ MoltenEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead.
+SVar:MoltenEffect:AB$ Effect | Cost$ 0 | Name$ Molten Realm Effect | ReplacementEffects$ MoltenRealm,MoltenRealmCombat | SVars$ DmgTimes2,DmgTimes2Combat,MoltenX | Duration$ UntilYourNextTurn
+SVar:MoltenRealm:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTimes2 | IsCombat$ False | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
+SVar:MoltenRealmCombat:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTimes2Combat | IsCombat$ True | Secondary$ True | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
+SVar:DmgTimes2:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ MoltenX | References$ MoltenX
+SVar:DmgTimes2Combat:AB$ DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ MoltenX | References$ MoltenX
+SVar:MoltenX:ReplaceCount$DamageAmount/Twice
+SVar:Rarity:Common
+SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/approach_my_molten_realm.jpg
+SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/approach-my-molten-realm.jpg
+Oracle:When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead.
+End

res/cardsfolder/a/aquamorph_entity.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:*/*
 K:Morph:2 U
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ MorphChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ MorphChoice | Secondary$ True | Static$ True | TriggerDescription$ When CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ MorphChoice | Secondary$ True | Static$ True | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
 SVar:MorphChoice:AB$ Charm | Cost$ 0 | Defined$ You | Choices$ BigPower,BigTough | CharmNum$ 1
 SVar:BigPower:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 5 | Toughness$ 1 | SpellDescription$ CARDNAME is 5/1
 SVar:BigTough:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 5 | SpellDescription$ CARDNAME is 1/5

res/cardsfolder/a/aquitects_will.txt

@@ -2,10 +2,10 @@ Name:Aquitect's Will
 ManaCost:U
 Types:Tribal Sorcery Merfolk
 Text:no text
-A:SP$ Effect | Cost$ U | Name$ Flood Effect | StaticAbilities$ STFlood | Unique$ True | Duration$ Permanent | SubAbility$ TrigPutCounter | SpellDescription$ Put a flood counter on target land. That land is an island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.
-SVar:TrigPutCounter:DB$ PutCounter | Cost$ 0 | ValidTgts$ Land | CounterType$ FLOOD | CounterNum$ 1 | TgtPrompt$ Select target land | SubAbility$ DBDraw
+A:SP$ Effect | Cost$ U | Name$ Flood Effect | StaticAbilities$ STFlood | Unique$ True | Duration$ Permanent | SubAbility$ TrigPutCounter | StackDescription$ Put a flood counter on target land. That land is an island in addition to its other types for as long as it has a flood counter on it. | SpellDescription$ Put a flood counter on target land. That land is an island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.
+SVar:TrigPutCounter:DB$ PutCounter | Cost$ 0 | ValidTgts$ Land | CounterType$ FLOOD | CounterNum$ 1 | TgtPrompt$ Select target land | SubAbility$ DBDraw | StackDescription$ None
 SVar:DBDraw:DB$ Draw | Cost$ 0 | NumCards$ 1 | ConditionPresent$ Merfolk.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Merfolk,
-SVar:STFlood:Mode$ Continuous | Affected$ Land.counters_GE1_FLOOD | AddType$ Island
+SVar:STFlood:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.counters_GE1_FLOOD | AddType$ Island
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/a/arachnus_web.txt

@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Enchantment Aura
 Text:no text
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature.EnchantedBy+powerGE4 | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the end step, if enchanted creature's power is 4 or greater, destroy CARDNAME.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common

res/cardsfolder/a/arcbound_fiend.txt

@@ -0,0 +1,16 @@
+Name:Arcbound Fiend
+ManaCost:6
+Types:Artifact Creature Horror
+Text:no text
+PT:0/0
+K:Modular 3
+K:Fear
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMoveCounter | TriggerDescription$ At the beginning of your upkeep, you may move a +1/+1 counter from  from target creature onto CARDNAME.
+SVar:TrigMoveCounter:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBMove | StackDescription$ None | SpellDescription$ Move a +1/+1 counter from target creature onto CARDNAME.
+SVar:DBMove:DB$ MoveCounter | Cost$ 0 | Source$ Targeted | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:RemAIdeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/arcbound_fiend.jpg
+SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/96.jpg
+Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nAt the beginning of your upkeep, you may move a +1/+1 counter from target creature onto Arcbound Fiend.\nModular 3 (This enters the battlefield with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+End

res/cardsfolder/a/arcbound_overseer_avatar.txt

@@ -0,0 +1,14 @@
+Name:Arcbound Overseer Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+0/+3
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ BuildCounter | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may put a +1/+1 counter on target creature you control.
+SVar:BuildCounter:AB$ PutCounter | Cost$ 0 | CounterType$ P1P1 | CounterNum$ 1 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ ChargeCounter | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may put a charge counter on target permanent you control.
+SVar:ChargeCounter:AB$ PutCounter | Cost$ 0 | CounterType$ CHARGE | CounterNum$ 1 | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/arcbound_overseer_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/arcbound-overseer.jpg
+Oracle:Hand +0, life +3\nAt the beginning of your upkeep, you may put a +1/+1 counter on target creature you control.\nAt the beginning of your upkeep, you may put a charge counter on target permanent you control.
+End

res/cardsfolder/a/arcbound_ravager.txt

@@ -5,6 +5,7 @@ Text:no text
 PT:0/0
 A:AB$ PutCounter | Cost$ Sac<1/Artifact> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 K:Modular 1
+SVar:BuffedBy:Artifact
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcbound_ravager.jpg
 SetInfo:DST|Rare|http://magiccards.info/scans/en/ds/100.jpg

res/cardsfolder/a/archangel_of_strife.txt

@@ -11,16 +11,16 @@ SVar:WarChoice:DB$ Effect | Name$ Archangel War Effect | ChoiceDescription$ War
 SVar:PeaceChoice:DB$ Effect | Name$ Archangel Peace Effect | ChoiceDescription$ Peace | Duration$ UntilHostLeavesPlay | RememberEffect$ True
 SVar:Attacking:DB$ Effect | Name$ Archangel War Effect | ChoiceDescription$ War | EffectOwner$ Opponent | Duration$ UntilHostLeavesPlay | RememberEffect$ True
 SVar:Defensive:DB$ Effect | Name$ Archangel Peace Effect | ChoiceDescription$ Peace | EffectOwner$ Opponent | Duration$ UntilHostLeavesPlay | RememberEffect$ True
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 3 | CheckSVar$ WarYou | SVarCompare$ GE1 | References$ WarYou
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddToughness$ 3 | CheckSVar$ PeaceYou | SVarCompare$ GE1 | References$ PeaceYou
-S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | AddPower$ 3 | CheckSVar$ WarOpp | SVarCompare$ GE1 | References$ WarOpp
-S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | AddToughness$ 3 | CheckSVar$ PeaceOpp | SVarCompare$ GE1 | References$ PeaceOpp
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddPower$ 3 | CheckSVar$ WarYou | SVarCompare$ GE1 | References$ WarYou
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddToughness$ 3 | CheckSVar$ PeaceYou | SVarCompare$ GE1 | References$ PeaceYou
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.YouDontCtrl | AddPower$ 3 | CheckSVar$ WarOpp | SVarCompare$ GE1 | References$ WarOpp
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.YouDontCtrl | AddToughness$ 3 | CheckSVar$ PeaceOpp | SVarCompare$ GE1 | References$ PeaceOpp
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Self | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:WarYou:Remembered$Valid Card.namedArchangel War Effect+YouCtrl
-SVar:PeaceYou:Remembered$Valid Card.namedArchangel Peace Effect+YouCtrl
-SVar:WarOpp:Remembered$Valid Card.namedArchangel War Effect+YouDontCtrl
-SVar:PeaceOpp:Remembered$Valid Card.namedArchangel Peace Effect+YouDontCtrl
+SVar:WarYou:Count$ValidCommand Card.namedArchangel War Effect+YouCtrl+IsRemembered
+SVar:PeaceYou:Count$ValidCommand Card.namedArchangel Peace Effect+YouCtrl+IsRemembered
+SVar:WarOpp:Count$ValidCommand Card.namedArchangel War Effect+YouDontCtrl+IsRemembered
+SVar:PeaceOpp:Count$ValidCommand Card.namedArchangel Peace Effect+YouDontCtrl+IsRemembered
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archangel_of_strife.jpg

res/cardsfolder/a/archivist.txt

@@ -6,8 +6,9 @@ PT:1/1
 A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archivist.jpg
-SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/60.jpg
-SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/26.jpg
-SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/61.jpg
 Oracle:{T}: Draw a card.
+SetInfo:7ED|Rare|http://magiccards.info/scans/en/7e/61.jpg
+SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/60.jpg
+SetInfo:9ED|Rare|http://magiccards.info/scans/en/9e/60.jpg
+SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/26.jpg
 End

res/cardsfolder/a/archon_of_the_triumvirate.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:4/5
 K:Flying
 T:Mode$ Attacks | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ Detain | TriggerDescription$ Whenever CARDNAME attacks, detain up to two target nonland permanents your opponents control. (Until your next turn, those permanents can't attack or block and their activated abilities can't be activated.)
-SVar:Detain:DB$Pump | TargetMin$ 0 | TargetMax$ 2 | KW$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | IsCurse$ True | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent your opponent controls to detain. | UntilYourNextTurn$ True
+SVar:Detain:DB$ Pump | TargetMin$ 0 | TargetMax$ 2 | KW$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | IsCurse$ True | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent your opponent controls to detain. | UntilYourNextTurn$ True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archon_of_the_triumvirate.jpg

res/cardsfolder/a/arctic_foxes.txt

@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Fox
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN CantBeBlockedBy Creature.powerGE2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ Creatures with power 2 or greater can't block CARDNAME as long as defending player controls a snow land.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CantBeBlockedBy Creature.powerGE2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ Creatures with power 2 or greater can't block CARDNAME as long as defending player controls a snow land.
 SVar:X:Count$Valid Land.Snow+DefenderCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arctic_foxes.jpg

res/cardsfolder/a/ardent_recruit.txt

@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Metalcraft$ True | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME gets +2/+2 as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ardent_recruit.jpg

res/cardsfolder/a/argothian_wurm.txt

@@ -0,0 +1,13 @@
+Name:Argothian Wurm
+ManaCost:3 G
+Types:Creature Beast
+Text:no text
+PT:6/6
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, any player may sacrifice a land. If a player does, put CARDNAME on top of its owner's library.
+SVar:TrigSac:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Defined$ Self | UnlessCost$ Sac<1/Land> | UnlessPayer$ Player | UnlessSwitched$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/argothian_wurm.jpg
+SetInfo:USG|Rare|http://magiccards.info/scans/en/us/236.jpg
+Oracle:Trample\nWhen Argothian Wurm enters the battlefield, any player may sacrifice a land. If a player does, put Argothian Wurm on top of its owner's library.
+End

res/cardsfolder/a/armor_of_thorns.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:You may cast CARDNAME as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.
 K:Enchant nonblack creature
-T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | SpellSpeed$ NotSorcerySpeed | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.
 SVar:TrigDelayedSac:AB$ Animate | Cost$ 0 | Defined$ Self | Triggers$ CleanupTrig | sVars$ Sac | Permanent$ True
 SVar:CleanupTrig:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ Sac | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME.
 SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self

res/cardsfolder/a/arrest.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arrest.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/2.jpg

res/cardsfolder/a/artifact_possession.txt

@@ -0,0 +1,15 @@
+Name:Artifact Possession
+ManaCost:2 B
+Types:Enchantment Aura
+Text:no text
+K:Enchant artifact
+A:SP$ Attach | Cost$ 2 B | ValidTgts$ Artifact | AILogic$ Curse
+T:Mode$ Taps | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without Tap in its activation cost, CARDNAME deals 2 damage to that artifact's controller.
+T:Mode$ AbilityCast | NonTapCost$ True | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever an artifact becomes tapped or a player activates an artifact's ability without T in its activation cost, CARDNAME deals 1 damage to that artifact's controller.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredCardController | NumDmg$ 2
+SVar:RemRandomDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/artifact_possession.jpg
+SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/45.jpg
+Oracle:Enchant artifact\nWhenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {T} in its activation cost, Artifact Possession deals 2 damage to that artifact's controller.
+End

res/cardsfolder/a/ashen_ghoul.txt

@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:3/1
 K:Haste
-A:AB$ChangeZone | Cost$ B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ActivationPhases$ Upkeep | PlayerTurn$ True | IsPresent$ Creature.YouOwn+Above | PresentZone$ Graveyard | PresentCompare$ GE3 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep and only if three or more creature cards are above CARDNAME.
+A:AB$ ChangeZone | Cost$ B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ActivationPhases$ Upkeep | PlayerTurn$ True | IsPresent$ Creature.YouOwn+Above | PresentZone$ Graveyard | PresentCompare$ GE3 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep and only if three or more creature cards are above CARDNAME.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashen_ghoul.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/2.jpg

res/cardsfolder/a/ashling_the_pilgrim_avatar.txt

@@ -0,0 +1,11 @@
+Name:Ashling the Pilgrim Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:-1/+6
+A:AB$ DamageAll | ActivationZone$ Command | Cost$ 2 | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/ashling_the_pilgrim_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/ashling-the-extinguisher.jpg
+Oracle:Hand -1, life +6\n{2}: Ashling the Pilgrim Avatar deals 1 damage to each creature and each player.
+End

res/cardsfolder/a/ashlings_prerogative.txt

@@ -7,8 +7,8 @@ SVar:ChooseMode:AB$ ChooseNumber | Cost$ 0 | Defined$ You | Min$ 0 | Max$ 1 | Li
 S:Mode$ Continuous | Affected$ Creature.cmcM2X | AddKeyword$ Haste | Description$ Each creature with converted mana cost of the chosen value has haste.
 S:Mode$ ETBTapped | ValidCard$ Creature.cmcM2Y | Description$ Each creature without converted mana cost of the chosen value enters the battlefield tapped.
 # The next 2 static abilities add text to the card panel for convenience indicating choice.
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN Chosen:EVEN | CheckSVar$ X | SVarCompare$ EQ0
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN Chosen:ODD | CheckSVar$ X | SVarCompare$ EQ1
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Chosen:EVEN | CheckSVar$ X | SVarCompare$ EQ0
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Chosen:ODD | CheckSVar$ X | SVarCompare$ EQ1
 SVar:X:Count$ChosenNumber
 SVar:Y:Number$ChosenNumber/Plus.1
 SVar:RemAIDeck:True

res/cardsfolder/a/ashnod.txt

@@ -0,0 +1,12 @@
+Name:Ashnod
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+1/-8
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You | Execute$ TrigDestroy | TriggerZones$ Command | TriggerDescription$ Whenever a creature deals damage to you, destroy it.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredSource
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/ashnod.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard/ashnod.jpg
+Oracle:Hand +1, life -8\nWhenever a creature deals damage to you, destroy it.
+End

res/cardsfolder/a/assembly_hall.txt

@@ -0,0 +1,14 @@
+Name:Assembly Hall
+ManaCost:5
+Types:Artifact
+Text:no text
+A:AB$ Reveal | Cost$ 4 T | Defined$ You | RevealValid$ Creature | RememberRevealed$ True | SubAbility$ DBChangeZone | SpellDescription$ Reveal a creature card in your hand. Search your library for a card with the same name as that card, reveal it, and put it into your hand. Then shuffle your library.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Remembered.sameName | ChangeNum$ 1 | SubAbility$ DBCleanup | StackDescription$ Search your library for a permanent card with the same name as the revealed creature and put it into your hand. Then shuffle your library.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/assembly_hall.jpg
+SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/286.jpg
+Oracle:{4}, {T}: Reveal a creature card in your hand. Search your library for a card with the same name as that card, reveal it, and put it into your hand. Then shuffle your library.
+End

res/cardsfolder/a/astral_slide.txt

@@ -3,9 +3,9 @@ ManaCost:2 W
 Types:Enchantment
 Text:no text
 T:Mode$ Cycled | ValidCard$ Card | Execute$ TrigExile | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a player cycles a card, you may exile target creature. If you do, return the exiled card to the battlefield under its owner's control at the beginning of the next end step.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DelTrig
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | TriggerDescription$ Return exiled creature to the battlefield.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigBounce | TriggerDescription$ Return exiled creature to the battlefield.
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/astral_slide.jpg

res/cardsfolder/a/atalya_samite_master.txt

@@ -0,0 +1,15 @@
+Name:Atalya, Samite Master
+ManaCost:3 W W
+Types:Legendary Creature Human Cleric
+Text:no text
+PT:2/3
+A:AB$ Charm | Cost$ X T | XColor$ W | Choices$ PreventDamage,GainLife | CharmNum$ 1 | SpellDescription$ Choose one - Prevent the next X damage that would be dealt to target creature this turn; or you gain X life. Spend only white mana this way.
+SVar:PreventDamage:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ X | References$ X | SpellDescription$ Prevent the next X damage that would be dealt to target creature or player this turn.
+SVar:GainLife:DB$ GainLife | LifeAmount$ X | Defined$ You | References$ X | SpellDescription$ You gain X life.
+SVar:X:Count$xPaid
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/atalya_samite_master.jpg
+SetInfo:INV|Rare|http://magiccards.info/scans/en/in/4.jpg
+Oracle:{X}, {T}: Choose one - Prevent the next X damage that would be dealt to target creature this turn; or you gain X life. Spend only white mana this way.
+End

res/cardsfolder/a/aura_finesse.txt

@@ -3,11 +3,11 @@ ManaCost:U
 Types:Instant
 Text:no text
 A:SP$ Pump | Cost$ U | ValidTgts$ Aura.YouCtrl | TgtPrompt$ Select target aura you control | SubAbility$ FinesseAttach | StackDescription$ None | SpellDescription$ Attach target Aura you control to target creature.Draw a card.
-SVar:FinesseAttach:DB$ Attach | Object$ Targeted | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDraw
+SVar:FinesseAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1
 SVar:RemAIDeck:True
-SVar:Rarity:Rare
+SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_finesse.jpg
-SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/54.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/54.jpg
 Oracle:Attach target Aura you control to target creature.\nDraw a card.
 End

res/cardsfolder/a/aura_graft.txt

@@ -0,0 +1,13 @@
+Name:Aura Graft
+ManaCost:1 U
+Types:Instant
+Text:no text
+A:SP$ GainControl | Cost$ 1 U | ValidTgts$ Aura.AttachedTo Permanent | TgtPrompt$ Select target Aura attached to a permanent | SubAbility$ ChooseNewHost | SpellDescription$ Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant.
+SVar:ChooseNewHost:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Permanent.CanBeEnchantedByTargeted+NotEnchantedByTargeted | ChoiceZone$ Battlefield | SubAbility$ ReEnchant | RememberChosen$ True | AILogic$ AtLeast1 |
+SVar:ReEnchant:DB$ Attach | Object$ ParentTarget | Defined$ Remembered
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_graft.jpg
+SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/62.jpg
+SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/67.jpg
+Oracle:Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant.
+End

res/cardsfolder/a/auriok_edgewright.txt

@@ -3,7 +3,7 @@ ManaCost:W W
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Metalcraft$ True | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Condition$ Metalcraft | Description$ Metalcraft - CARDNAME has double strike as long as you control three or more artifacts.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_edgewright.jpg

res/cardsfolder/a/auriok_replica.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 A:AB$ ChooseSource | Cost$ W Sac<1/CARDNAME> | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ Prevent all damage a source of your choice would deal to you this turn.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromSource | RememberObjects$ Remembered | SVars$ RPreventNextFromSource | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ You | PreventionEffect$ True | Description$ Prevent all damage the chosen source would deal to you this turn.
+SVar:RPreventNextFromSource:Event$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ You | Prevent$ True | PreventionEffect$ True | Description$ Prevent all damage the chosen source would deal to you this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_replica.jpg

res/cardsfolder/a/auriok_steelshaper.txt

@@ -0,0 +1,16 @@
+Name:Auriok Steelshaper
+ManaCost:1 W
+Types:Creature Human Soldier
+Text:no text
+PT:1/1
+S:Mode$ ReduceCost | ValidCard$ Card | Type$ Equip | Activator$ You | Amount$ 1 | Description$ Equip costs you pay cost 1 less.
+S:Mode$ Continuous | Affected$ Creature.Soldier+YouCtrl,Creature.Knight+YouCtrl | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ EQ1 | References$ X | Description$ As long as CARDNAME is equipped, Soldier and/or Knight creatures you control get +1/+1.
+SVar:X:Count$Valid Card.Self+equipped
+SVar:EquipMe:Once
+SVar:RemRandomDeck:True
+DeckNeeds:Type$Equipment
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_steelshaper.jpg
+SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/4.jpg
+Oracle:Equip costs you pay cost {1} less.\nAs long as Auriok Steelshaper is equipped, Soldier and/or Knight creatures you control get +1/+1.
+End

res/cardsfolder/a/auriok_sunchaser.txt

@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Flying | Metalcraft$ True | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and has flying.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Flying | Condition$ Metalcraft | Description$ Metalcraft - As long as you control three or more artifacts, CARDNAME gets +2/+2 and has flying.
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_sunchaser.jpg

res/cardsfolder/a/auriok_survivors.txt

@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:4/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target Equipment card from your graveyard to the battlefield. If you do, you may attach it to CARDNAME.
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Equipment.YouCtrl | SubAbility$ DBAttach
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Equipment.YouCtrl | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Object$ Targeted | Defined$ Self | Optional$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_survivors.jpg

res/cardsfolder/a/auriok_windwalker.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:2/3
 K:Flying
 A:AB$ Pump | Cost$ T | ValidTgts$ Equipment.YouCtrl | TgtPrompt$ Select target equipment you control | SubAbility$ WindwalkerAttach | StackDescription$ None | SpellDescription$ Attach target Equipment you control to target creature you control.
-SVar:WindwalkerAttach:DB$ Attach | Object$ Targeted | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control.
+SVar:WindwalkerAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_windwalker.jpg

res/cardsfolder/a/avacyn_angel_of_hope.txt

@@ -6,7 +6,7 @@ PT:8/8
 K:Flying
 K:Vigilance
 K:Indestructible
-S:Mode$ Continuous | Affected$ Permanent.Other+YouCtrl | AddHiddenKeyword$ HIDDEN Indestructible | Description$ CARDNAME and other permanents you control are indestructible.
+S:Mode$ Continuous | Affected$ Permanent.Other+YouCtrl | AddHiddenKeyword$ Indestructible | Description$ CARDNAME and other permanents you control are indestructible.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avacyn_angel_of_hope.jpg
 SetInfo:AVR|Mythic|http://magiccards.info/scans/en/avr/6.jpg

res/cardsfolder/a/avatar_of_slaughter.txt

@@ -3,7 +3,7 @@ ManaCost:6 R R
 Types:Creature Avatar
 Text:no text
 PT:8/8
-S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Double Strike | AddHiddenKeyword$ HIDDEN CARDNAME attacks each turn if able. | Description$ All creatures have double strike and attack each turn if able.
+S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Double Strike | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ All creatures have double strike and attack each turn if able.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avatar_of_slaughter.jpg
 SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/111.jpg

res/cardsfolder/a/aven_liberator.txt

@@ -5,10 +5,9 @@ Text:no text
 PT:2/3
 K:Flying
 K:Morph:3 W
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProtect | TriggerDescription$ When CARDNAME is turned face up, target creature you control gains protection from the color of your choice until end of turn.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigProtect | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, target creature you control gains protection from the color of your choice until end of turn.
 SVar:TrigProtect:AB$ Protection | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Gains$ Choice | Choices$ AnyColor
 SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_liberator.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/4.jpg

res/cardsfolder/a/aven_mimeomancer.txt

@@ -6,7 +6,7 @@ PT:3/1
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ FEATHER | CounterNum$ 1 | SubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Targeted | staticAbilities$ MimeomancerStatic | Permanent$ True
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | StaticAbilities$ MimeomancerStatic | Permanent$ True
 SVar:MimeomancerStatic:Mode$ Continuous | Affected$ Card.Self+counters_GE1_FEATHER | SetPower$ 3 | SetToughness$ 1 | AddKeyword$ Flying | Description$ CARDNAME is 3/1 and has flying for as long as it has a feather counter on it.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/a/awe_strike.txt

@@ -4,10 +4,10 @@ Types:Instant
 Text:no text
 A:SP$ Effect | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature to entrance | Name$ Awe Struck | ReplacementEffects$ StrikeWithAwe | Triggers$ OutOfSight | SVars$ ExileEffect,GainLifeInstead,X | RememberObjects$ Targeted | AILogic$ Fog | SpellDescription$ The next time target creature would deal damage this turn, prevent that damage. You gain life equal to the damage prevented this way.
 SVar:StrikeWithAwe:Event$ DamageDone | ValidSource$ Card.IsRemembered | ReplaceWith$ GainLifeInstead | PreventionEffect$ True | Description$ The next time the targeted creature would deal damage this turn, prevent that damage. You gain life equal to the damage prevented this way.
-SVar:GainLifeInstead:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ ExileEffect | References$ X
+SVar:GainLifeInstead:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ ExileEffect | References$ X
 SVar:X:ReplaceCount$DamageAmount
-SVar:OutOfSight:Mode$ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.IsRemembered | Execute$ ExileEffect | Static$ True
-SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
+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
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/awe_strike.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/6.jpg

res/cardsfolder/a/azusa_lost_but_seeking.txt

@@ -2,7 +2,7 @@ Name:Azusa, Lost but Seeking
 ManaCost:2 G
 Types:Legendary Creature Human Monk
 Text:no text
-K:AdjustLandPlays:You:2:You may play two additional lands on each of your turns.
+S:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:2 | Description$ You may play two additional lands on each of your turns.
 PT:1/2
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azusa_lost_but_seeking.jpg

res/cardsfolder/b/bakis_curse.txt

@@ -0,0 +1,14 @@
+Name:Baki's Curse
+ManaCost:2 U U
+Types:Sorcery
+Text:no text
+A:SP$ RepeatEach | Cost$ 2 U U | RepeatCards$ Creature | Zone$ Battlefield | RepeatSubAbility$ DBDmg | SpellDescription$ CARDNAME deals 2 damage to each creature for each Aura attached to that creature.
+SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
+SVar:X:Count$Valid Aura.AttachedTo Creature.IsRemembered/Times.2
+SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bakis_curse.jpg
+SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/27.jpg
+Oracle:Baki's Curse deals 2 damage to each creature for each Aura attached to that creature.
+End

res/cardsfolder/b/balduvian_dead.txt

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Zombie
 Text:no text
 PT:2/3
-A:AB$ Token | Cost$ 2 R ExileFromGrave<1/Creature> | TokenAmount$ 1 | TokenName$ Graveborn | TokenTypes$ Creature,Graveborn | TokenOwner$ You | TokenColors$ Black,Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste<>HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Put a 3/1 black and red Graveborn creature token with haste onto the battlefield. Sacrifice it at the beginning of the next end step.
+A:AB$ Token | Cost$ 2 R ExileFromGrave<1/Creature> | TokenAmount$ 1 | TokenName$ Graveborn | TokenTypes$ Creature,Graveborn | TokenOwner$ You | TokenColors$ Black,Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenHiddenKeywords$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Put a 3/1 black and red Graveborn creature token with haste onto the battlefield. Sacrifice it at the beginning of the next end step.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_dead.jpg
 SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/93.jpg

res/cardsfolder/b/bane_of_the_living.txt

@@ -4,7 +4,7 @@ Types:Creature Insect
 Text:no text
 PT:4/3
 K:Morph:X B B
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME is turned face up, all creatures get -X/-X until end of turn.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, all creatures get -X/-X until end of turn.
 SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | References$ X
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True

res/cardsfolder/b/banefire.txt

@@ -4,7 +4,7 @@ Types:Sorcery
 Text:no text
 A:SP$ DealDamage | Cost$ X R | Tgt$ TgtCP | NumDmg$ X | ConditionCheckSVar$ X | ConditionSVarCompare$ LT5 | SubAbility$ BanefulDmg | References$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
 SVar:BanefulDmg:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | NoPrevention$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | References$ X
-S:Mode$ Continuous | Affected$ Self | AffectedZone$ Stack | EffectZone$ All | CharacteristicDefining$ True | AddHiddenKeyword$ HIDDEN CARDNAME can't be countered. | CheckSVar$ X | SVarCompare$ GE5 | Description$ If X is 5 or more, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
+S:Mode$ Continuous | Affected$ Self | AffectedZone$ Stack | EffectZone$ All | CharacteristicDefining$ True | AddHiddenKeyword$ CARDNAME can't be countered. | CheckSVar$ X | SVarCompare$ GE5 | Description$ If X is 5 or more, CARDNAME can't be countered by spells or abilities and the damage can't be prevented.
 SVar:X:Count$xPaid
 Var:PayX:5
 SVar:Rarity:Uncommon

res/cardsfolder/b/baneful_omen.txt

@@ -3,9 +3,9 @@ ManaCost:4 B B B
 Types:Enchantment
 Text:no text
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may reveal the top card of your library. If you do, each opponent loses life equal to that card's converted mana cost.
-SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | RememberChanged$ True | SubAbility$ DBLose
-SVar:DBLose:DB$LoseLife | LifeAmount$ X | Defined$ Opponent | SubAbility$ DBCleanup | References$ X
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | RememberChanged$ True | SubAbility$ DBLose
+SVar:DBLose:DB$ LoseLife | LifeAmount$ X | Defined$ Player.Opponent | SubAbility$ DBCleanup | References$ X
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/baneful_omen.jpg

res/cardsfolder/b/barbarian_bully.txt

@@ -0,0 +1,11 @@
+Name:Barbarian Bully
+ManaCost:2 R
+Types:Creature Human Barbarian
+Text:no text
+PT:2/2
+A:AB$ Pump | Cost$ Discard<1/Random> | NumAtt$ 2 | NumDef$ 2 | UnlessCost$ DamageYou<4> | UnlessPayer$ Player | UnlessAI$ Never | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn unless a player has CARDNAME deal 4 damage to him or her. Activate this ability only once each turn.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/barbarian_bully.jpg
+SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/79.jpg
+Oracle:Discard a card at random: Barbarian Bully gets +2/+2 until end of turn unless a player has Barbarian Bully deal 4 damage to him or her. Activate this ability only once each turn.
+End

res/cardsfolder/b/barbarian_ring.txt

@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBPain | SpellDescription$ Add R to your mana pool. CARDNAME deals 1 damage to you.
 A:AB$ DealDamage | Cost$ R T Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | Activation$ Threshold | PrecostDesc$ Threshold - | SpellDescription$ CARDNAME deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
-SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
+SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbarian_ring.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/313.jpg

res/cardsfolder/b/barkshell_blessing.txt

@@ -5,7 +5,7 @@ Text:no text
 A:SP$ Pump | Cost$ GW | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 K:Conspire
 T:Mode$ SpellCast | ValidCard$ Card.Self | Conspire$ True | Execute$ Conspire | Secondary$ True | TriggerDescription$ Copy CARDNAME if its conspire cost was paid
-SVar:Conspire:AB$ CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1
+SVar:Conspire:AB$ CopySpellAbility | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barkshell_blessing.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/224.jpg

res/cardsfolder/b/barrin.txt

@@ -0,0 +1,12 @@
+Name:Barrin
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+0/+6
+A:AB$ ChangeZone | ActivationZone$ Command | Cost$ Sac<1/Permanent> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+SVar:RemAIDeck:True
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/barrin.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard/barrin.jpg
+Oracle:Hand +0, life +6\nSacrifice a permanent: Return target creature to its owner's hand.
+End

res/cardsfolder/b/battlewise_aven.txt

@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:2/2
 K:Flying
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, Battlewise Aven gets +1/+1 and has first strike.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Condition$ Threshold | Description$ Threshold - As long as seven or more cards are in your graveyard, Battlewise Aven gets +1/+1 and has first strike.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battlewise_aven.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/4.jpg

res/cardsfolder/b/beacon_of_destiny.txt

@@ -0,0 +1,21 @@
+Name:Beacon of Destiny
+ManaCost:1 W
+Types:Creature Human Cleric
+Text:no text
+PT:1/3
+A:AB$ ChooseSource | Cost$ T | Choices$ Card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessCombat,SelflessNonCombat | Triggers$ OutOfSight | SVars$ CombatDmg,NonCombatDmg,ExileEffect,X | References$ SelflessCombat,SelflessNonCombat,OutOfSight,CombatDmg,NonCombatDmg,ExileEffect,X | RememberObjects$ Remembered | ImprintCards$ Self | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:SelflessCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ True | ReplaceWith$ CombatDmg | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
+SVar:SelflessNonCombat:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.IsRemembered | IsCombat$ False | ReplaceWith$ NonCombatDmg | Secondary$ True | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
+SVar:CombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ X | SubAbility$ ExileEffect
+SVar:NonCombatDmg:AB$ DealDamage | Cost$ 0 | Defined$ Imprinted | DamageSource$ ReplacedSource | NumDmg$ X | SubAbility$ ExileEffect
+SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ Imprinted | Execute$ ExileEffect | Static$ True
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:ReplaceCount$DamageAmount
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_of_destiny.jpg
+SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/5.jpg
+Oracle:{T}: The next time a source of your choice would deal damage to you this turn, that damage is dealt to Beacon of Destiny instead.
+End