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

- can tab focus
  - space/enter to select
  - brighten on hover
- use previous "hover" border for focus indicator
- fix various layout and style bugs (e.g. too-short widths and missing hoverable properties)

.gitignore

@@ -271,6 +271,7 @@ res/decks/Zvi[!!-~]Mowshowitz's[!!-~]Mono-Black[!!-~]Control.dck
 res/decks/constructed/*.dck
 res/decks/draft/*
 res/decks/o1.bdk
+res/decks/plane/*.dck
 res/decks/sealed/*
 res/gauntlet
 res/images
@@ -292,6 +293,7 @@ res/pics/ALA
 res/pics/ALL
 res/pics/APC
 res/pics/ARB
+res/pics/ARC
 res/pics/ARN
 res/pics/ATQ
 res/pics/AVR
@@ -310,7 +312,9 @@ res/pics/EXO
 res/pics/FEM
 res/pics/FUT
 res/pics/GPT
+res/pics/GTC
 res/pics/HML
+res/pics/HOP
 res/pics/ICE
 res/pics/INV
 res/pics/ISD
@@ -359,6 +363,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
@@ -368,6 +373,7 @@ res/pics/icons
 res/pics/tokens
 res/pics_product/*.jpg
 res/preferences
+res/preferences/editor.preferences
 res/preferences/forge.preferences
 res/quest/data
 res/quest/quest.preferences

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

CHANGES.txt

@@ -1,27 +1,15 @@
-Forge Beta: 11-30-2012 ver 1.3.2
+Forge Beta: 02-08-2013 ver 1.3.8
 
 (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.)
 
-11623 cards in total.
+12045 cards in total.
 
 
-All sounds use the event bus model now and are not called directly. Two new sounds to the list of sounds supported by Forge, Blocker Assigned and Token Created. We could use some help in finding interesting sounds that we can add to forge.
+This version is primarily a maintenance release. When we built the 1.3.6 beta we noticed a bug and we were able to fix it fairly quickly. This resulted in the 1.3.7 beta release and we did not announce the 1.3.6 beta release as it was buggy.
 
-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 now have a Vanguard mode implemented. This is a work in progress. The older match layout files are incompatible with the new Vanguard mode. The original match_default.xml, match_preferred.xml and the match_preferred.xml saved to a different name files need to be deleted and can no longer be used. You can keep your editor_preferred.xml file. But you will have to setup your match view panels using the new match_default.xml file.
-
-The visuals for targeting arrows has been improved and looks better, with an adaptation of the arrow drawing code from MAGE. Thanks to the MAGE team for permission for the adaptation.
-
-There were reports that special challenge decks would cause a co-modification error in quest mode. This bug is likely fixed at this time.
+After releasing the 1.3.7 beta we noticed several additional bugs and they have been fixed for the 1.3.8 beta. We also have several new cards and work on the deck editors continue.
 
 --
 
@@ -29,7 +17,7 @@ On several occasions people have noticed that the forge deck editor and/or quest
 
 Several people have noticed that the cards displayed on the battlefield will fail to be displayed when the number of cards on the battlefield increases. Maximizing the human panel can help to re-display the cards.
 
-Some time was spent turning the static ETB triggers into the proper ETB replacement effects they should be, mainly to interact correctly with eachother. This work is not yet finished. As a result there is currently some inconsistencies with "Enters the battlefield with counters" (Not incredibly noticeable).
+Some time was spent turning the static ETB triggers into the proper ETB replacement effects they should be, mainly to interact correctly with each other. This work is not yet finished. As a result there is currently some inconsistencies with "Enters the battlefield with counters" (Not incredibly noticeable).
 
 It seems like the front face of double faced cards aren't triggering properly, but the back face and single faced cards are.
 
@@ -40,7 +28,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 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.
+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. We will continue to try to maintain compatibility with Java 6 for the foreseeable future.
 
 --
 
@@ -53,394 +41,189 @@ Some people use the Windows application 7zip. This utility can be found at http:
 
 Fixes/Features:
 
-- Cleared out the changes.txt file, now ready for new material.
-- CheckStyle.
-- Tweaked doTriggerAINoCost of AF DamageAll.
-- Tweaked shouldPumpCard.
-- CheckStyle.
-- Fixed Squandered Resources.
-- Fixed optional Replacement effects not firing again after "No" is chosen once (experimental).
-- Little script updates.
-- When a game is restarted, set lands played back to 0.
+- sideboarding affects the next match correctly
+- use bulk operations for card moving where ever possible to avoid stale GUI updates
+- reverting unwanted changes from r19381 to core classes
+- fix background coloring not being displayed in deck editor card detail rarity label
+- add tooltip for rarity label
+- Fixed broken Shandalar decks.
+- add default editor preferences file so missing preferences will always have a default value
+- remove editor.preferences from repo -- it will get created as necessary
+- set better width and sorting defaults
+- wrap card catalog toggle filters when the tab is resized small
+- make current deck stats widgets wrappable
+- Converted inlined classes to nested
 - remove unused imports
-- InputSelectManyCards uses only overloads syntax. made abstract
-- Fixed AF Mana used on subabilities.
+- cosmetic changes in chooses (i'm thinking of a good way to make that choices player-independent)
+- Moved check for card controller (used in CardDetailPanel and ImageCache) to card class - that's not perfect, but at least eliminates code duplication.
+- calls to AI-related methods require the player parameter to have AIPlayer type to enable calls to ai-specific methods (like acquiring aicontroller by aiplayer.getcontroller().getai() and performing something from it) without need to cast types)
+- replaced deprecated methods isHuman/isComputer with reference comparisons (to compare with acting player) and checks of player's hostility.
+- predictThreatenedObjects moved from AbilityFactory to ComputerUtil (for now, will find a more specific place later)
+- GameActionUtil.payCostDuringAbilityResolve method now demands player parameter (though it is always human player)
+- fix NPE in card detail when the card does not belong to any set (e.g. a token)
+- GameAction - extract method * 3
+- GameActionUtil - uses common GuiDialog.confirm
+- CardFactoryLands - converted inlined class to nested
+- ChangeZoneEffect - removed stringbuilder wrapper (as it was not used anyway)
+- replaced isComputer/isHuman where it was clear and possible
+- Fixed a bug with AddToughness.
+- Removed reminder text for suspend from Talon Gates. Description was too long for SA choice window so the second choice was hidden (on a 1280 wide display at least). We need to find a way to wrap text in the choice window when it would extend past the edge of the screen.
+- Fix last commit commiting WIP.
+- Another fix for AddToughness.
+- Fixed Verdant Haven.
+- Fixed Ogre Slumlord.
+- Sell lands down to 50 when selling all extras in the card shop
+- Converted Alpha Status to script
+- remove cards from one table after adding them to the other table so the displayed card stays consistent with the focused card
+- Made it possible to include special rewards like predefined cards or duplicate cards in Quest duels.
+* Some notes:
+*  Special rewards for normal duels should be extremely rare, mostly for very hard opponents, 1 special reward per opponent, and always a percentage chance of getting the special reward (preferably less than 50%) rather getting a guaranteed reward.
+*  In the interests of downward compatibility, it is possible to define the Card Reward either in the [quest] portion (like before) or the [metadata] portion of the dck file. (Duels do not have the [quest] portion but if the definition were simply moved from [quest] to [metadata], all current challenge files would have stopped working properly.)
+- Removed duplicate sharesCreatureTypeWith property from isValid
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- More Improvements of AI for Auras with "AILogic$ Curse".
-- Fixing accidental submission of potential Sideboard code
-- Changed the "spend only <color> mana on X" mechanism from using a SVar to using an ability parameter (first step towards implementing e.g. Soul Burn).
-- Fixed AI code meddling with damage replacements.
-- Fixed ConcurrentModificationException in InputMulligan.
-- Fixed InputSelectMany.
-- Improved ChooseSource AI.
-- Fixed a shouldPumpCard call switching P/T.
-- fixed NPE bug in initialize of colorX in InputPayManaX class
-- added code to allow AI to make Charm choice
-- modified inputUntapUpToNType so same card cannot be chosen more than once
+- Made sure Cunning Giant's replacement effect (for now) only triggers if it wasn't blocked, not also if it tramples over something.
+- Fixed Assemble the Legion.
+- Added AIPlayer parameter to doTrigger and chkAIDrawback
+- Fixed CostTapType hanging when X=0.
+- Methods to test a string against a valid card type moved to forge.CardType
+- CommonDrawback: wrote in a single line the complicated chkAIDrawback method
+- removed unused imports
+- CardUtil.getRandom replaced with Aggregates.random
+- getReflectableMana uses Set as collection, so it does not have to check for duplicates before adding new items.
+- united two CMC calculation methods (one was getCMC from card that read characteristics while other took more factors into account)
+- Cunning Giant will now interact correctly with planeswalkers
+- CardEdition: removed ctor overload and made it private (editions must not be created by other code but nested Reader class anyway)
+- Player: isComputer and isHuman methods redefined as getType() == PlayerType(computer/human), no overloads needed in derived classes
+- player.isHostileTo() renamed to more correct 'isOpponentOf()'
+- missing HumanPlayer.java for commit 19420
+- moved GameAction & its util class to forge.game
+- ensure stats labels in deck editor are shown at the correct height on large displays
+- this works around a quirky interaction between WrapLayout and MigLayout that was causing interior cells to be properly resized but the cells surrounding them would not be, resulting in widgets that would be too large or too small for their unupdated containing cells
+- Fixed Krosa Chaos trigger
+- GameAction divided into 2 parts: original keeps cards' zone transitions, GameActionPlay.java holds methods for playing spells (mostly used by human player I guess)
+- in ComputerUtil demanded player to be AiPlayer for playing spells
+- add set type information to setdata.txt and store it via CardEdition
+- The Very Hard Jamuraa decks can now occasionally (rarely) give you special extra rewards.
+- simplify and theme choose sets dialog
+- Minor technical improvement to a check in BoosterUtils.java.
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Sound System: improved the performance of the sound system by synchronizing certain sounds that tend to occur multiple times in rapid succession (damage, life loss, bury a creature) so that only one can play at a time.
-- CheckStyle.
-- Added some LQ pic URLs.
-- added ability to loop over defined cards to RepeatEachEffect. added InGraveyard to Card.hasProperty.
-- Added a LQ pic URL.
-- Fixed Steel Hellkite.
-- ChangeZoneAll with destination Library will now let you choose the order.
-- Fixed spell description for Hypnotic Cloud
+- Improved Sedris, the Traitor King's script to better handle the exile at next EOT
+- Fixed Haste on suspended creatures.
+- Fixed AI ignoring "DiscardValid" parameter.
+- make set chooser dialog overlay-based instead of JDialog-based
+- move type parsing from private constructor to reader class; add comment on purpose of 2-letter codes
+- Fixed Deathpact Angel.
+- differentiate item hilight when a FList listbox has lost focus from when the listbox is selected
+- ensure the CardListViewer always appears in the center of the screen
+- allow spacebar to move cards in DualListBox and enter to select the OK button
+- make color of listbox selection depend on listbox focus, not cell focus
+- avoid NPE when attempting to start a challenge when there isn't one to start
+- set button focus after match; this also gets the game log scrolling properly
+- SpellAbility: afterResolve and afterPayMana were removed, since they were not used.
+- little refactoring for global ruin
+- CardEdition: remove unused ctor
+- SpellAbility: Intrinsic/Extrinsic types were never assigned (removed)
+- setPaidList, beforePayManaAI, setAllReplacingObjects, hasReplacingObject, wasCancelled were never used (removed)
+- reduced visibility of setManaPart, 
+- finalized setReplicateManaCost, setXManaCost, setIsMultiKicker, setIsReplicate, setIsCycling, setConditions, (set/add)OptionalAdditionalCosts since they were called by CardFactoryUtil only => all removed from WrappedAbility.java
+- allow highlighting and copying of match log in ViewWinLose
+- make saving layouts thread safe
+- add ctrl(cmd)+enter hotkey to auto button in ability chooser dialog
+- scroll game log to top on display
+- reshow selected card when the listbox regains focus
+- show current card /after/ the events stop firing so the card data doesn't get overwritten
+- Converting Sheltered Valley to script (no AI exists in hardcode, but we probably should an add an SVar to not play this if that player already controls one of these)
+- Added an ai check svar to Sheltered Valley so that it won't play it if it already has another one on the battlefield
+- AiController.getLandsToPlay will now check NeedsToPlayVar and filter out relevant cards
+- Added a deck editor icon for products. Hooked up the icon in FSkin and added a commented out basic hook for it in SEditorUtil
+- getAvailableMana and mapManaSources accept any player as parameter, since AI wants to evaluate player's mana he might use to pump creatures
+- add pack filter in spell shop
+- use FButtons instead of FLabels on the AssignDamage dialog so default actions and tabbing work properly
+- use predicates instead of a custom count function
+- don't select negative row after buying every last item in the spell shop
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle
-- CheckStyle
-- small script tweaks
-- Fixed Enlightened Tutor not shuffling the library.
-- Added the global rule change: "Each creature assigns combat damage equal to its toughness rather than its power.".
-- Converted Doran, the Siege Tower.
-- Converted Shifting Sliver to script.
-- Cleanup.
-- Created Variants branch.
-- Variants: Created command zone view.
-- Variants: Moved effects and emblems to command zone.
-- Variants: Added a bunch of Vanguard cards (Thanks, Marc!)
-- Variants: Added a Vanguard home screen.
-- Variants: Created command zone view.
-- Variants:2 files weren't added correctly.
-- You no longer have to choose the order of cards for Elixir of Immortality.
-- Fixed payment of phyrexian mana.
-- Fixed Shocklands not using canPayLife(2).
-- The AI will now better react to Platinum Emperion.
-- Added a Java 7 compatibility fluff piece to the changes.txt file.
-- If lethal damage has already been assigned just treat is as 0 in VAssignDamage
-- Minor text change
-- CheckStyle.
-- Vanguard: added AffectedZone parameter to Birds of Paradise Avatar
-- ChangeZone can now remember cards moved from the stack
-- CheckStyle
-- The AI can now use Icy Prison.
-- Cleanup AF can now be used to clear individual defined cards from remembered lists
-- Removed a println I left in my previous commit
-- Variants - Fixed Archangel of Strife
-- Variants - Changed ValidGrave count method to Valid<coma delimited zones> eg:Count$ValidBattlefield,Graveyard Card.YouCtrl
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Variants: Fixed CardRules parser choking on "+" characters.
-- Fixed the wrong player gaining life when GainLife has a targetPlayer and a defined player. Defined player takes preference again as it used to. This fixes Divine Congregation, Gerrard Capashen and Spoils of Evil
-- setinfo and oracle data for Chaotic Backlash
-- Fixed Nomad Mythmaker targeting.
-- CheckStyle.
-- Another fix for Nomad Mythmaker.
-- Fixed Exotic Curse.
-- Reverted Nomad Mythmaker.
-- Cleanup of getLKICopy functions.
-- Fixed Starlit Sanctum.
-- Hopefully the final fix for Nomad Mythmaker
-- More fixing for Nomad Mythmaker.
-- The AI will no longer choose non-Pump Auras with Nomad Mythmaker.
-- The AI will no longer choose non-Pump Auras with Nomad Mythmaker.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Added an AI SVar to Zombie Mob.
-- Booster Draft: added four more choices to block booster draft set order selection (e.g. so that MRD/DST/5DN is possible in addition to only 5DN/DST/MRD, etc.)
-- corrected static ability name in effect script for Ember Gale
-- Variants - Added Ertai (vanguard avatar)
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Made the SVar granted by Tower Above unique.
-- Variants - Added the following avatars: Gerrard, Gix and Greven il-Vec
-- Variants - Hand and life modifiers will now be displayed in the card info panel
-- Variants - Added the following avatars: Grinning Demon Avatar, Hanna and Karn
-- Variants - Added the missing EffectZone param to Hanna and Karn
-- Variants - Added the following avatars: Lyna, Maraxus, Mishra, and Multani
-- CheckStyle.
-- Variants - Added the following avatars: Oracle, Orim, Rofellos, Selenia, and Serra
-- Variants - Fixed TriggerZones for Rofellos
-- Temporary fix for quest challenges.
-- Variants - Added the following avatars: Volrath and Xantcha
-- SoundEffectType holds only filename, unable to reproduce sounds by itself,
-- EventBus added to GameState to properly route the ingame events to Sound system, game log and remote players (when time comes)
-- AudioClips are cached at first request, this may lead to slowdowns (will precache if this is an issue)
-- Most calls to sound system are still preformed directly, with a few only converted to events
-- Variants: Removed avatars with RemAiDeck:True from AI's avatar list.
-- Variants: Made AI aware of the avatar.
-- Merged changes from trunk to Variants: r18254-r18318
-- fix typo for sound
-- setupPlayZone will now call doLayout directly and only once (hopefully fixes the ConcurrentModificationException).
-- Convert Erg Raiders to script
-- Variants - Added the following avatars: Sidar Kondo, Sisay, Squee, Urza, and Sliver Queen, Brood Mother
-- Merged changes from trunk to Variants: r18319-r18323
-- removed '3' from addpoison event
-- the correct parameter is num
-- Variants - Added the following avatars: Starke, Tahngarth, Takara, and Tawnos
-- Changed AdjustLandPlays to a player keyword
-- Converted Explore and Summer Bloom to script
-- More preparations for quest worlds.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Sound System: converted counter sounds to the event bus system, NPE fix when making an audio clip, various minor fixes and typo corrections in sound system and event classes.
-- CheckStyle.
-- Removed some unnecessary updateObservers calls in startRound.
-- Sound System: converted tap/untap sound playback to an event, preliminary support for synced sounds using the event model.
-- Sound System: both synced and non-synced sounds are supported now using the event model (the type of the sound is declared in SoundEffectType constructors).
-- Sound System: converted shuffle and flipcoin sounds to events, some minor stylistic changes.
-- Sound System: converted more sounds to events.
-- Sound System: done converting sounds to events.
-- Sound System: last of the direct sound calls converted to an event.
-- Moved most of the stuff happening in startGame outside of the swingWorker (to fix the ConcurrentModificationException error).
-- Added Arcbound Fiend and Matsu-Tribe Decoy by swordshine.
-- Fixed AI of Aegis Angel.
-- Reimplemented "StackDescription$ SpellDescription".
-- Fixed the global rule change "No more than one creature can attack each combat".
-- Fixed Sleeper Agent.
-- move questWorld out of QuestData package (because only things being serialized should be kept there)
-- remove unused imports (soundeffecttype mostly)
-- Fixed MustBlockCards not being checked for still attacking.
-- Counter class renamed to CounterType
-- CheckStyle.
-- Convert Lighthouse Chronologist to script
-- counters: united calls using multipliers and ignoring them, 
-- removed useless setCounter wrapper
-- Variants: WIP new Vanguard Home screen for multiplayer shenanigans (Does not work yet)
-- CheckStyle.
-- Merged changes from trunk to Variants: r18323-r18354
-- Converted Spirit of Resistance to script.
-- Variants - Added the following avatars: Titania
-- Reorganized Conditions of static abilities (WIP).
-- Variants:Fixed the UI side of the new Vanguard home screen. (Now to make the match actually start!)
-- Variants:Added some apparently unadded scripts from trunk.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Reorganized Conditions of static abilities (WIP).
-- Fixed Alpha Status.
-- CheckStyle.
-- Unblocked missed script folder revisions.
-- Sound System: added two new sounds (Block and Token), fixed a bug that caused the destroy sound to be continuously played at every phase when a planeswalker was on the field.
-- Check for null arrays before assigning in SDisplayUtil
-- Re-Merged 18323-18354 and merged 18357-18366 into Variants. *crosses fingers*
-- Variants - Added setinfo to avatars and uploaded images to cardforge (they should download like any other card now)
-- Variants - Reverted setinfo to avatars (caused crash on set image downloads)
-- Variants:Added VAN set.
-- Variants:Added SetInfo to avatars, courtesy of Marc.
-- Variants:Replaced CardDb.getAllCards() with CardDb.getTraditionalCards() where appropriate.
-- Variants:Reverted preferences.
-- Updated some SVars.
-- Added a fluff piece to the changes.txt file.
-- Cleanup of CloneEffect.
-- Bundled inZone property of cards.
-- Targeting Overlay: much prettier targeting arrows (thanks to the MAGE team for permission for adaptation), some initial work for the "mouseover-only" mode fix (not enabled yet).
-- Variants: Keep separate lists of traditional/nontraditional CardPrinted's in CardDb.
-- Variants: Fixed crash when only playing against 1 opponent on vanguard.
-- Variants: Fixed vanguard match not starting when selecting non-random avatar.
-- Targeting Overlay: Card mouseover mode fixed and enabled, should work fine and should show only the targeting arrows (both combat and non-combat) for the card the mouse is hovering over.
-- Converted the property "SameNameAsImprinted" to the "SharesNameWith" group.
-- Variants - Added the following avatars: Erhnam Djinn Avatar, Etched Oracle Avatar, and Fallen Angel Avatar
-- Targeting Overlay: Fixed a bug with the combat targeting arrows shown both ways in card mouseover mode.
-- Added a fluff piece to the changes.txt file.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Variants: Added error handling for managing not to select deck/avatar in vanguard mode.
-- Variants: Prevented user from selecting multiple avatars.
-- Removed unused imports.
-- Organized imports a little bit better.
-- Cleanup.
-- CheckStyle.
-- renamed CounterAdd/Remove events
-- removed impropper use of CardPrinted getType method
-- commander stored as a single card in deck/Deck.java
-- removed inpropper use of getType of InventoryItem objects
-- check 4 traditionality of card
-- Small renaming in GameAction
-- Reorganized Conditions of static abilities (WIP).
-- Slightly increased the size of the stats panel to better display long winning streaks.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Fixed Haunting Echoes.
-- Variant: Fixed non-Random Vanguard selected.
-- Fixed Karn Avatar.
-- Cleanup of xCount.
-- More cleanup of xCount.
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Convert Sylvan Library to Script
-- Fixed sharesNameWith Imprinted
-- Converted Haunting Echoes to Script
-- Small cleanup in files
-- Added PermanentNoncreature AF
-- Converted Standstill and Bridge from Below to script
-- Targeting Overlay: in the "card mouseover" mode, during the order of blockers declaration, the targeting overlay will first show all the blockers for the card for which the order of blockers is declared, and will also show individual arrows for each blocker when the blocker is selected in the blocker order list.
-- Fixed Erg Raiders
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Variants:Fixed exile origins for some effects
-- CheckStyle.
-- Fixed MaxhandSize < 0 case in InputCleanup.
-- Fixed Oath of Druids.
-- Sound System: Added a previously missed link for the "Life Loss" sound event (now the sound will play during certain damage dealing effect resolutions which were previously missed).
-- Sound System: TODO point removed.
-- Targeting Overlay: minor stylistic fix in the code.
-- Moved generatedMana from ManaEffect to GameActionUtil to use it for the AI to predict what a mana ability will produce (it seems to be the only function that is actually up to date).
-- Removed getProducedMana from AbilityManaPart (it wasn't really functional anyway).
-- Merged r18371-r18427 from trunk into Variants
-- Merged Variants into trunk. You may need to delete match_preferred.xml
-- Convert Lich to Script
-- Convert Phylactery Lich to script
-- Converted Noviken Heart of Progress to script
-- Rechanged ValidGrave to Valid<AnyZone> count method that was lost in the merge.
-- Fixed description for Titania's Song
-- Updated cardTemplateScript.py for variants
-- Updated CHANGES.txt
-- Fixed Jace, Architect of Thought's first ability
-- Added some AI code for casting Bonfire of the Damned via Miracle.
-- Changed Gather Specimens to a replacement instead of triggered effect
-- Fixed some triggers for use from command zone (WIP)
-- Fixed some triggers for use from command zone (Done)
-- Minor script changes
-- Made player tabs in Vanguard setup more descriptive
-- Updated tooltip text for hand icon so that it indicates the player's maximum hand size.
-- Fixed Vanguard player tab names when re-adding players in setup
-- Fixed doTriggerAINoCost in CounterAI when the stack is empty.
-- Added a fluff piece to the changes.txt file.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed max hand size.
-- Removed a debug line from ChangeZone (related to Nafs Asp).
-- Made the effect names for Nafs Asp and Glass Asp more descriptive.
-- Somebody had overwritten worlds.txt in the SVN with an obsolete (incorrect) version, restored.
-- Fix for Squeaking Pie Grubfellows.
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Made static effects reset hand size correctly for Vanguard.
-- Added a LQ pic URL.
-- CheckStyle.
-- AI fix for Karn Liberated.
-- Removing unnecessary "HIDDEN" strings (WIP).
-- Fixed freeze whenever AI cast a creature with Tahngarth avatar
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- changed "getParentTargeting" methods to skip checking the "child" SpellAbility first
-- consolidated code to find the fighters into one common method
-- CheckStyle.
-- reverting earlier changes until better solution is found
-- After a draft finishes, properly reset buttons used in the Deck Editor
-- Updated LQ pic urls for vanguard avatars to replace the cruddy ones from Gatherer
-- Made Vanguard tab panel conform (a little) better to skin theme. Unfortunately, due to *clenches fist* Swing some out of place code had to be added because you can't specify colors for certain parts of the JTabbedPane component in it's actual class because that would make too much sense.
-- Cleanup: Removed duplicate instances of TriggerZones param
-- Vanguard avatar selection will now remove cards with RemRandomDeck flag from the list when choosing Random. Useful for cards like Diamond Queen Avatar that are still great in the right deck.
-- Updated some avatar flags
+- don't let tables extend past bottom of deck editor page
+- calculate the correct table row selection when multiple cards are bought at once
+- change selection highlight in deck editor tables based on component focus to more clearly indicate which table has focus
+- allow tab key to set focus to next component (e.g. prevent tables from swallowing tab and shift-tab)
+- flicker-free reinstatement of current selection when table model data changes
+- Added some text to winlose screen that would explain why player lost or won
+- fixing a crash when creature with B/G sword attacked AI (there was NPE on attempt to iterate over restrictions)
+- make button-like FLabels act more like buttons
+- can tab focus
+- space/enter to select
+- brighten on hover
+- use previous "hover" border for focus indicator
+- fix various layout and style bugs (e.g. too-short widths and missing hoverable properties)
+- Added a medium quest by Nordos: Cipher 2.
+- make start button change appearance on focus
+- avr, m13, rtr, gtc - pictures of boosters and fatpacks
+- moved that infiniteStock field from ItemPool to more approriate place
+- moved infiniteSupply flag into table model, since remove (that should not remove cards when supply is endless) method belongs to model layer.
+- Fixing Domri Rade placing non-Creatures on the bottom of the library
+- Convert Curse of Misfortunes to Script
+- Updating mtg-data.txt with GTC cards.
+- Convert Painter's Servant to Script
+- Small fix for Sewer Nemesis
+- Fixed ai not discarding cards in certain discard modes
+- Fixed the Chaos effect of Goldmeadow
+- Better fix for Goldmeadow
+- Removed a debug output I'd left in an earlier commit
+- delete jpg booster pictures, replace them with PNG (since code wants png), ISD, DKA added
 - 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.
 
 
 Many people helped with this version. A special thank you goes out to them. (Attempted to list names alphabetically):
 
-Agetian
-ArsenalNut
-bigapple90
-Gos
-Hellfish
 Marc
 Max
+Myk
+Nordos
+Rooger
 RumbleBBU
 Sloth
 Sol
 Swordshine
-Zirbert
 Chris H
 
 
-Added the following Vanguard Avatars:
+Added the following Vanguard Avatar:
 
-Arcbound Overseer Avatar
-Ashling the Pilgrim Avatar
-Ashnod
-Barrin
-Birds of Paradise Avatar
-Chronatog Avatar
-Crovax
-Dauntless Escort Avatar
-Diamond Faerie Avatar
-Eladamri
-Eladamri, Lord of Leaves Avatar
-Erhnam Djinn Avatar
-Ertai
-Etched Oracle Avatar
-Fallen Angel Avatar
-Gerrard
-Gix
-Goblin Warchief Avatar
-Greven il-Vec
-Grinning Demon Avatar
-Hanna
-Hell's Caretaker Avatar
-Karn
-Lyna
-Lyzolda, the Blood Witch Avatar
-Maraxus
-Mishra
-Morinfen Avatar
-Multani
-Nekrataal Avatar
-Oracle
-Orim
-Rofellos
-Selenia
-Serra
-Sidar Kondo
-Sisay
-Sliver Queen, Brood Mother
-Squee
-Starke
-Tahngarth
-Takara
-Tawnos
-Titania
-Urza
-Volrath
-Xantcha
+Momir Vig, Simic Visionary Avatar
+
+
+Added the following Planes:
+
+Takenuma
+Talon Gates
 
 
 Added the following cards:
 
-Aladdin's Lamp
-Assembly Hall
-Atalya, Samite Master
-Auriok Steelshaper
-Chaotic Backlash
-Chromeshell Crab
-Chronomantic Escape
-Circle of Solace
-Complicate
-Cragganwick Cremator
-Credit Voucher
-Crimson Hellkite
-Crypt Rats
-Demonfire
-Dromar, the Banisher
-Elfhame Sanctuary
-Ember Gale
-Equal Treatment
-Glass Asp
-Honorable Scout
-Icy Prison
-Island Sanctuary
-Journey of Discovery
-Kaho, Minamo Historian
-Kamahl's Sledge
-Kill Switch
-Lumengrid Augur
-Mirror of Fate
-Mischievous Quanar
-Nafs Asp
-Nomad Mythmaker
-Pay No Heed
-Pilgrim of Justice
-Pilgrim of Virtue
-Prahv, Spires of Order
-Proteus Staff
-Righteous Indignation
-Rith's Charm
-Saprazzan Breaker
-Shell of the Last Kappa
-Shoving Match
-Shrouded Serpent
-Sivvi's Valor
-Spoils of the Vault
-Terastodon
-Tower Above
-Tsabo's Web
-Vassal's Duty
-War Elemental
+Aura Barbs
+Breath of Fury
+Burning-Tree Shaman
+Capricious Efreet
+Coils of the Medusa
+Cunning Giant
+Enchantment Alteration
+Farrel's Mantle
+Keldon Firebombers
+Mana Echoes
+Mirrorwood Treefolk
+Misstep
+Primordial Ooze
+Protean Hydra
+Pyrrhic Revival
+Rohgahh of Kher Keep
+Sedris, the Traitor King
+Sewer Nemesis
+Sewers of Estark
+Signal the Clans
+Skill Borrower
+Wild Swing
+Yamabushi's Storm
 
 
 end

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>forge</artifactId>
     <packaging>jar</packaging>
     <name>Forge</name>
-    <version>1.3.2</version>
+    <version>1.3.8</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.2</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.2</developerConnection>
-        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.3.2?repname=forge</url>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.8</connection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.3.8</developerConnection>
+        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.3.8?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

@@ -5,131 +5,196 @@ pathToMtgData = "mtg-data.txt"
 ############IMPLEMENTATION FOLLOWS############
 import os,sys,fnmatch,re
 
-if not os.path.exists(pathToMtgData) :
-	print("This script requires the text version of Arch's mtg-data to be present.You can download it from slightlymagic.net's forum and either place the text version next to this script or edit this script and provide the path to the file at the top.")
-	print("Press Enter to exit")
-	raw_input("")
-	sys.exit()
+def getSetByFormat(requestedFormat):
+	# Parse out Standard sets from the Format file
+	formatLocation = os.path.join(sys.path[0], 'blockdata', 'formats.txt')
+	with open(formatLocation) as formatFile:
+		formats = formatFile.readlines()
 
-if not os.path.isdir(sys.path[0] + os.sep + 'PerSetTrackingResults') :
-	os.mkdir(sys.path[0] + os.sep + 'PerSetTrackingResults')
+		for format in formats:
+			if requestedFormat not in format:
+				continue
+			parsed = format.split('|')
+			for p in parsed:
+				if not p.startswith('Sets:'):
+					continue
 
-forgeFolderFiles = []
-forgeCards = []
-mtgDataCards = {}
-setCodes = []
-setCodeToName = {}
-forgeCardCount = 0
-mtgDataCardCount = 0
-setCodeCount = 0
+				sets = p.strip().split(':')[1]
+				return sets.split(', ')
 
-hasFetchedSets = False
-hasFetchedCardName = False
-tmpName = ""
-line = ""
-prevline = ""
+	return []
 
-#Parse mtg-data
-print("Parsing mtg-data")
-with open(pathToMtgData) as mtgdata :
-	for line in mtgdata :
-		if not hasFetchedSets :
-			if line != "\n" :
-				splitLine = line.split('  ') 
-				code = splitLine[0]
-				setCodeToName[code] = splitLine[-1].replace('\n', '')
-				#print splitLine, code, setCodeToName[code]
-				setCodes.append(code)
-			else :
-				hasFetchedSets = True
+def printCardSet(implementedSet, missingSet, fileName, setCoverage=None, printImplemented=False, printMissing=True):
+	# Add another file that will print out whichever set is requested
+	# Convert back to lists so they can be sorted
+	impCount = len(implementedSet)
+	misCount = len(missingSet)
+	totalCount = impCount + misCount
 
-		if hasFetchedSets :
-			if not hasFetchedCardName :
-				tmpName = line.rstrip().replace("AE", "Ae")
-				hasFetchedCardName = True
-			if line == "\n" :
-				sets = prevline.split(", ")
-				for i in range(len(sets)):
-					sets[i] = sets[i].split(' ')[0]
-				#print sets
-				mtgDataCards[tmpName] = sets
-				hasFetchedCardName = False
+	filePath = os.path.join(sys.path[0], "PerSetTrackingResults", fileName)
+	with open(filePath, "w") as outfile:
+		if setCoverage:
+			outfile.write(' '.join(setCoverage))
+			outfile.write('\n')
+		outfile.write("Implemented (Missing) / Total = Percentage Implemented\n")
+		outfile.write("%d (%d) / %d = %.2f %%\n" % (impCount, misCount, totalCount, float(impCount)/totalCount*100))
 
-		prevline = line
+		# If you really need to, we can print implemented cards
+		if printImplemented:
+			implemented = list(implementedSet)
+			implemented.sort()
+			outfile.write("\nImplemented (%d):" % impCount)
+			for s in implemented:
+				outfile.write("\n%s" % s)
+			outfile.write("\n")
 
-#Parse Forge
-print("Parsing Forge")
-for root, dirnames, filenames in os.walk("cardsfolder"):
-	for fileName in fnmatch.filter(filenames, '*.txt'):
-		with open(os.path.join(root, fileName))  as currentForgeCard :
-			tmpname = currentForgeCard.readline()
-			tmpname = tmpname[5:].replace("AE","Ae")
-			tmpname = tmpname.rstrip()
-			forgeCards.append(tmpname)
+		# By default Missing will print, but you can disable it
+		if printMissing:
+			missing = list(missingSet)
+			missing.sort()
+			outfile.write("\nMissing (%d):" % misCount)
+			for s in missing:
+				outfile.write("\n%s" % s)
 
-#Compare datasets and output results
-print("Comparing datasets and outputting results.")
-totalData = {}
-currentMissing = []
-currentImplemented = []
-total = 0
-percentage = 0
-for currentSet in setCodes :
-	if currentSet == 'UNH' or currentSet == 'UGL' : continue #skip Unhinged and Unglued since they are only counting basic lands anyway
-	if currentSet == 'VG1' or currentSet == 'VG2' or currentSet == 'VG3' : continue
-	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 == '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
-	if currentSet == 'EVG' or currentSet == 'GVL' or currentSet == 'JVC' : continue
-	for key in mtgDataCards.keys() :
-		setList = mtgDataCards[key]
-		if currentSet in setList:
-			if key in forgeCards :
-				currentImplemented.append(key)
-			else :
-				currentMissing.append(key)
-	total = len(currentMissing)+len(currentImplemented)
+if __name__ == '__main__':
+	if not os.path.exists(pathToMtgData) :
+		print("This script requires the text version of Arch's mtg-data to be present.You can download it from slightlymagic.net's forum and either place the text version next to this script or edit this script and provide the path to the file at the top.")
+		print("Press Enter to exit")
+		raw_input("")
+		sys.exit()
+
+	if not os.path.isdir(sys.path[0] + os.sep + 'PerSetTrackingResults') :
+		os.mkdir(sys.path[0] + os.sep + 'PerSetTrackingResults')
+
+	forgeFolderFiles = []
+	forgeCards = []
+	mtgDataCards = {}
+	setCodes = []
+	setCodeToName = {}
+	forgeCardCount = 0
+	mtgDataCardCount = 0
+	setCodeCount = 0
+
+	hasFetchedSets = False
+	hasFetchedCardName = False
+	tmpName = ""
+	line = ""
+	prevline = ""
+
+	#Parse mtg-data
+	print("Parsing mtg-data")
+	with open(pathToMtgData) as mtgdata :
+		for line in mtgdata :
+			if not hasFetchedSets :
+				if line != "\n" :
+					splitLine = line.split('  ') 
+					code = splitLine[0]
+					setCodeToName[code] = splitLine[-1].replace('\n', '')
+					#print splitLine, code, setCodeToName[code]
+					setCodes.append(code)
+				else :
+					hasFetchedSets = True
+
+			if hasFetchedSets :
+				if not hasFetchedCardName :
+					tmpName = line.rstrip().replace("AE", "Ae")
+					hasFetchedCardName = True
+				if line == "\n" :
+					sets = prevline.split(", ")
+					for i in range(len(sets)):
+						sets[i] = sets[i].split(' ')[0]
+					#print sets
+					mtgDataCards[tmpName] = sets
+					hasFetchedCardName = False
+
+			prevline = line
+
+	#Parse Forge
+	print("Parsing Forge")
+	for root, dirnames, filenames in os.walk("cardsfolder"):
+		for fileName in fnmatch.filter(filenames, '*.txt'):
+			with open(os.path.join(root, fileName))  as currentForgeCard :
+				tmpname = currentForgeCard.readline()
+				tmpname = tmpname[5:].replace("AE","Ae")
+				tmpname = tmpname.rstrip()
+				forgeCards.append(tmpname)
+
+	#Compare datasets and output results
+	print("Comparing datasets and outputting results.")
+	totalData = {}
+	currentMissing = []
+	currentImplemented = []
+	allMissing = set()
+	allImplemented = set()
+	standardMissing = set()
+	standardImplemented = set()
+	total = 0
 	percentage = 0
-	if total > 0 :
-		percentage = (float(len(currentImplemented))/float(total))*100
-	currentMissing.sort()
-	currentImplemented.sort()
 
-	with open(sys.path[0] + os.sep + "PerSetTrackingResults" + os.sep + "set_" + currentSet.strip() + ".txt", "w") as output :
-		output.write("Implemented (" + str(len(currentImplemented)) + "):\n")
-		for everyImplemented in currentImplemented :
-			output.write(everyImplemented + '\n')
-		output.write("\n")
-		output.write("Missing (" + str(len(currentMissing)) + "):\n")
-		for everyMissing in currentMissing :
-			output.write(everyMissing + '\n')
-		output.write("\n")
-		output.write("Total: " + str(total) + "\n")
-		output.write("Percentage implemented: " + str(round(percentage,2)) + "%\n")
-	totalData[currentSet] = (len(currentImplemented),len(currentMissing),total,percentage)
-	del currentMissing[:]
-	del currentImplemented[:]
+	standardSets = getSetByFormat('Standard')
 
-#sort sets by percentage completed
-totalDataList = sorted(totalData.items(), key=lambda (key,entry): entry[3], reverse=True)
+	ignoredSet = [ 'ASTRAL', 'ATH', 'BD', 'BR', 'CM1', 'DD2', 'DDC', 'DDD', 'DDE', 'DDF',
+		'DDG', 'DDH', 'DDI', 'DDJ', 'DKM', 'DRB', 'EVG', 'H09', 'ME2',
+		'ME3', 'ME4', 'MED', 'PD2', 'PD3', 'SDC', 'UG', 'UGL', 'UNH', 
+		'V09', 'V10', 'V11', 'V12',]
 
-totalPercentage = 0
-totalMissing = 0
-totalImplemented = 0
-fullTotal = 0
-with open(sys.path[0] + os.sep + "PerSetTrackingResults" + os.sep + "CompleteStats.txt", "w") as statsfile:
-	statsfile.write("Set: Implemented (Missing) / Total = Percentage Implemented\n")
-	for k,dataKey in totalDataList :
-		totalImplemented += dataKey[0]
-		totalMissing += dataKey[1]
-		fullTotal += dataKey[2]
-		statsfile.write(setCodeToName[k].lstrip() + ": " + str(dataKey[0]) + " (" + str(dataKey[1]) + ") / " + str(dataKey[2]) + " = " + str(round(dataKey[3], 2)) + "%\n")
-	totalPercentage = totalImplemented / fullTotal
-	statsfile.write("\n")
-	statsfile.write("Total over all sets: " + str(totalImplemented) + " (" + str(totalMissing) + ") / " + str(fullTotal))
+	for currentSet in setCodes :
+		# Ignore any sets that we don't tabulate
+		if currentSet in ignoredSet: continue
+		for key in mtgDataCards.keys() :
+			setList = mtgDataCards[key]
+			if currentSet in setList:
+				if key in forgeCards :
+					currentImplemented.append(key)
+				else :
+					currentMissing.append(key)
+		total = len(currentMissing)+len(currentImplemented)
+		percentage = 0       
+		if total > 0 :
+			percentage = (float(len(currentImplemented))/float(total))*100
+		currentMissing.sort()
+		currentImplemented.sort()
 
-print "Done!"
+		with open(sys.path[0] + os.sep + "PerSetTrackingResults" + os.sep + "set_" + currentSet.strip() + ".txt", "w") as output :
+			output.write("Implemented (" + str(len(currentImplemented)) + "):\n")
+			for everyImplemented in currentImplemented :
+				output.write(everyImplemented + '\n')
+			output.write("\n")
+			output.write("Missing (" + str(len(currentMissing)) + "):\n")
+			for everyMissing in currentMissing :
+				output.write(everyMissing + '\n')
+			output.write("\n")
+			output.write("Total: " + str(total) + "\n")
+			output.write("Percentage implemented: " + str(round(percentage,2)) + "%\n")
+		totalData[currentSet] = (len(currentImplemented),len(currentMissing),total,percentage)
+		allMissing |= set(currentMissing)
+		allImplemented |= set(currentImplemented)
+		if currentSet in standardSets:
+			standardMissing |= set(currentMissing)
+			standardImplemented |= set(currentImplemented)
+
+		del currentMissing[:]
+		del currentImplemented[:]
+
+	#sort sets by percentage completed
+	totalDataList = sorted(totalData.items(), key=lambda (key,entry): entry[3], reverse=True)
+
+	totalPercentage = 0
+	totalMissing = 0
+	totalImplemented = 0
+	fullTotal = 0
+	with open(sys.path[0] + os.sep + "PerSetTrackingResults" + os.sep + "CompleteStats.txt", "w") as statsfile:
+		statsfile.write("Set: Implemented (Missing) / Total = Percentage Implemented\n")
+		for k,dataKey in totalDataList :
+			totalImplemented += dataKey[0]
+			totalMissing += dataKey[1]
+			fullTotal += dataKey[2]
+			statsfile.write(setCodeToName[k].lstrip() + ": " + str(dataKey[0]) + " (" + str(dataKey[1]) + ") / " + str(dataKey[2]) + " = " + str(round(dataKey[3], 2)) + "%\n")
+		totalPercentage = totalImplemented / fullTotal
+		statsfile.write("\n")
+		statsfile.write("Total over all sets: " + str(totalImplemented) + " (" + str(totalMissing) + ") / " + str(fullTotal))
+
+	printCardSet(allImplemented, allMissing, "DistinctStats.txt")
+	printCardSet(standardImplemented, standardMissing, "FormatStandard.txt", setCoverage=standardSets)
+
+	print "Done!"

res/blockdata/blocks.txt

@@ -49,3 +49,4 @@ Index:43|Set0:AVR|Name:Avacyn Restored|DraftPacks:3|LandSetCode:AVR|SealedPacks:
 Index:44|Set0:M13|Name:Magic 2013|DraftPacks:3|LandSetCode:M13|SealedPacks:6
 Index:45|Set0:RTR|Name:Return to Ravnica|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
 Index:46|Set0:RTR|Set1:RTR|Set2:RTR|Set3:RTR|Set4:RTR|Meta0:CHOOSE1/CUBE/RtRGuildAzorius/Azorius Guild;CUBE/RtRGuildIzzet/Izzet Guild;CUBE/RtRGuildRakdos/Rakdos Guild;CUBE/RtRGuildGolgari/Golgari Guild;CUBE/RtRGuildSelesnya/Selesnya Guild/GUILD|Meta1:CHOOSE1/CUBE/RtRPromoAzorius/Azorius Guild;CUBE/RtRPromoIzzet/Izzet Guild;CUBE/RtRPromoRakdos/Rakdos Guild;CUBE/RtRPromoGolgari/Golgari Guild;CUBE/RtRPromoSelesnya/Selesnya Guild/PROMO|Name:Return to Ravnica Guild Sealed|DraftPacks:3|LandSetCode:RTR|SealedPacks:7
+Index:47|Set0:GTC|Name:Gatecrash|DraftPacks:3|LandSetCode:RTR|SealedPacks:6

res/blockdata/boosters.txt

@@ -28,6 +28,7 @@ Set:EXO|Commons:11|Uncommons:3|Rares:1
 Set:FEM|Commons:5|Uncommons:2|Rares:1
 Set:FUT|Commons:11|Uncommons:3|Rares:1
 Set:GPT|Commons:11|Uncommons:3|Rares:1
+Set:GTC|Commons:10|Uncommons:3|Rares:1
 Set:HML|Commons:6|Uncommons:2
 Set:ICE|Commons:11|Uncommons:3|Rares:1
 Set:INV|Commons:11|Uncommons:3|Rares:1

res/blockdata/fatpacks.txt

@@ -46,3 +46,4 @@ Set:DKA|LandSet:ISD|Boosters:9|BasicLands:60
 Set:AVR|LandSet:AVR|Boosters:9|BasicLands:60
 Set:M13|LandSet:M13|Boosters:9|BasicLands:80
 Set:RTR|LandSet:RTR|Boosters:9|BasicLands:40
+Set:GTC|LandSet:RTR|Boosters:9|BasicLands:40

res/blockdata/formats.txt

@@ -1,5 +1,5 @@
-Name:Standard|Sets:ISD, DKA, AVR, M13, RTR
-Name:Extended|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep
-Name:Modern|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers; Wild Nacatl
+Name:Standard|Sets:ISD, DKA, AVR, M13, RTR, GTC
+Name:Extended|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep
+Name:Modern|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC|Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl
 Name:Legacy|Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Lotus; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Falling Star; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will; Mental Misstep
 Name:Vintage|Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends

res/blockdata/setdata.txt

@@ -1,94 +1,97 @@
-Index:0|Code2:MBP|Code3:MBP|Name:Media Insert Promo|Alias:PRO
-Index:1|Code2:A|Code3:LEA|Name:Limited Edition Alpha
-Index:2|Code2:B|Code3:LEB|Name:Limited Edition Beta
-Index:3|Code2:U|Code3:2ED|Name:Unlimited Edition
-Index:4|Code2:AN|Code3:ARN|Name:Arabian Nights
-Index:5|Code2:AQ|Code3:ATQ|Name:Antiquities
-Index:6|Code2:R|Code3:3ED|Name:Revised Edition
-Index:7|Code2:LG|Code3:LEG|Name:Legends
-Index:8|Code2:DK|Code3:DRK|Name:The Dark
-Index:9|Code2:FE|Code3:FEM|Name:Fallen Empires
+Index:0|Code2:MBP|Code3:MBP|Type:Other|Name:Media Insert Promo|Alias:PRO
+Index:1|Code2:A|Code3:LEA|Type:Core|Name:Limited Edition Alpha
+Index:2|Code2:B|Code3:LEB|Type:Core|Name:Limited Edition Beta
+Index:3|Code2:U|Code3:2ED|Type:Core|Name:Unlimited Edition
+Index:4|Code2:AN|Code3:ARN|Type:Expansion|Name:Arabian Nights
+Index:5|Code2:AQ|Code3:ATQ|Type:Expansion|Name:Antiquities
+Index:6|Code2:R|Code3:3ED|Type:Core|Name:Revised Edition
+Index:7|Code2:LG|Code3:LEG|Type:Expansion|Name:Legends
+Index:8|Code2:DK|Code3:DRK|Type:Expansion|Name:The Dark
+Index:9|Code2:FE|Code3:FEM|Type:Expansion|Name:Fallen Empires
 
-Index:10|Code2:4E|Code3:4ED|Name:Fourth Edition
-Index:11|Code2:IA|Code3:ICE|Name:Ice Age
-Index:12|Code2:CH|Code3:CHR|Name:Chronicles
-Index:13|Code2:HL|Code3:HML|Name:Homelands
-Index:14|Code2:AL|Code3:ALL|Name:Alliances
-Index:15|Code2:MI|Code3:MIR|Name:Mirage
-Index:16|Code2:VI|Code3:VIS|Name:Visions
-Index:17|Code2:5E|Code3:5ED|Name:Fifth Edition
-Index:18|Code2:PT|Code3:POR|Name:Portal
-Index:19|Code2:WL|Code3:WTH|Name:Weatherlight
+Index:10|Code2:4E|Code3:4ED|Type:Core|Name:Fourth Edition
+Index:11|Code2:IA|Code3:ICE|Type:Expansion|Name:Ice Age
+Index:12|Code2:CH|Code3:CHR|Type:Reprint|Name:Chronicles
+Index:13|Code2:HL|Code3:HML|Type:Expansion|Name:Homelands
+Index:14|Code2:AL|Code3:ALL|Type:Expansion|Name:Alliances
+Index:15|Code2:MI|Code3:MIR|Type:Expansion|Name:Mirage
+Index:16|Code2:VI|Code3:VIS|Type:Expansion|Name:Visions
+Index:17|Code2:5E|Code3:5ED|Type:Core|Name:Fifth Edition
+Index:18|Code2:PT|Code3:POR|Type:Starter|Name:Portal
+Index:19|Code2:WL|Code3:WTH|Type:Expansion|Name:Weatherlight
 
-Index:20|Code2:TE|Code3:TMP|Name:Tempest
-Index:21|Code2:SH|Code3:STH|Name:Stronghold
-Index:22|Code2:EX|Code3:EXO|Name:Exodus
-Index:23|Code2:P2|Code3:PO2|Name:Portal Second Age|Alias:P02
-Index:24|Code2:US|Code3:USG|Name:Urza's Saga
-Index:25|Code2:UL|Code3:ULG|Name:Urza's Legacy
-Index:26|Code2:6E|Code3:6ED|Name:Classic (Sixth Edition)
-Index:27|Code2:UD|Code3:UDS|Name:Urza's Destiny
-Index:28|Code2:P3|Code3:PTK|Name:Portal Three Kingdoms
-Index:29|Code2:ST|Code3:S99|Name:Starter 1999
+Index:20|Code2:TE|Code3:TMP|Type:Expansion|Name:Tempest
+Index:21|Code2:SH|Code3:STH|Type:Expansion|Name:Stronghold
+Index:22|Code2:EX|Code3:EXO|Type:Expansion|Name:Exodus
+Index:23|Code2:P2|Code3:PO2|Type:Starter|Name:Portal Second Age|Alias:P02
+Index:24|Code2:US|Code3:USG|Type:Expansion|Name:Urza's Saga
+Index:25|Code2:UL|Code3:ULG|Type:Expansion|Name:Urza's Legacy
+Index:26|Code2:6E|Code3:6ED|Type:Core|Name:Classic (Sixth Edition)
+Index:27|Code2:UD|Code3:UDS|Type:Expansion|Name:Urza's Destiny
+Index:28|Code2:P3|Code3:PTK|Type:Starter|Name:Portal Three Kingdoms
+Index:29|Code2:ST|Code3:S99|Type:Starter|Name:Starter 1999
 
-Index:30|Code2:MM|Code3:MMQ|Name:Mercadian Masques
-Index:31|Code2:NE|Code3:NMS|Name:Nemesis|Alias:NEM
-Index:32|Code2:S2K|Code3:S00|Name:Starter 2000
-Index:33|Code2:PY|Code3:PCY|Name:Prophecy
-Index:34|Code2:IN|Code3:INV|Name:Invasion
-Index:35|Code2:PS|Code3:PLS|Name:Planeshift
-Index:36|Code2:7E|Code3:7ED|Name:Seventh Edition
-Index:37|Code2:AP|Code3:APC|Name:Apocalypse
-Index:38|Code2:OD|Code3:ODY|Name:Odyssey
-Index:39|Code2:TO|Code3:TOR|Name:Torment
+Index:30|Code2:MM|Code3:MMQ|Type:Expansion|Name:Mercadian Masques
+Index:31|Code2:NE|Code3:NMS|Type:Expansion|Name:Nemesis|Alias:NEM
+Index:32|Code2:S2K|Code3:S00|Type:Starter|Name:Starter 2000
+Index:33|Code2:PY|Code3:PCY|Type:Expansion|Name:Prophecy
+Index:34|Code2:IN|Code3:INV|Type:Expansion|Name:Invasion
+Index:35|Code2:PS|Code3:PLS|Type:Expansion|Name:Planeshift
+Index:36|Code2:7E|Code3:7ED|Type:Core|Name:Seventh Edition
+Index:37|Code2:AP|Code3:APC|Type:Expansion|Name:Apocalypse
+Index:38|Code2:OD|Code3:ODY|Type:Expansion|Name:Odyssey
+Index:39|Code2:TO|Code3:TOR|Type:Expansion|Name:Torment
 
-Index:40|Code2:JU|Code3:JUD|Name:Judgment
-Index:41|Code2:ON|Code3:ONS|Name:Onslaught
-Index:42|Code2:LE|Code3:LGN|Name:Legions
-Index:43|Code2:SC|Code3:SCG|Name:Scourge
-Index:44|Code2:8E|Code3:8ED|Name:Core Set - Eighth Edition
-Index:45|Code2:MR|Code3:MRD|Name:Mirrodin
-Index:46|Code2:DS|Code3:DST|Name:Darksteel
-Index:47|Code2:FD|Code3:5DN|Name:Fifth Dawn
-Index:48|Code2:CHK|Code3:CHK|Name:Champions of Kamigawa
-Index:49|Code2:BOK|Code3:BOK|Name:Betrayers of Kamigawa
+Index:40|Code2:JU|Code3:JUD|Type:Expansion|Name:Judgment
+Index:41|Code2:ON|Code3:ONS|Type:Expansion|Name:Onslaught
+Index:42|Code2:LE|Code3:LGN|Type:Expansion|Name:Legions
+Index:43|Code2:SC|Code3:SCG|Type:Expansion|Name:Scourge
+Index:44|Code2:8E|Code3:8ED|Type:Core|Name:Core Set - Eighth Edition
+Index:45|Code2:MR|Code3:MRD|Type:Expansion|Name:Mirrodin
+Index:46|Code2:DS|Code3:DST|Type:Expansion|Name:Darksteel
+Index:47|Code2:FD|Code3:5DN|Type:Expansion|Name:Fifth Dawn
+Index:48|Code2:CHK|Code3:CHK|Type:Expansion|Name:Champions of Kamigawa
+Index:49|Code2:BOK|Code3:BOK|Type:Expansion|Name:Betrayers of Kamigawa
 
-Index:50|Code2:SOK|Code3:SOK|Name:Saviors of Kamigawa
-Index:51|Code2:9E|Code3:9ED|Name:Core Set - Ninth Edition
-Index:52|Code2:RAV|Code3:RAV|Name:Ravnica: City of Guilds
-Index:53|Code2:GP|Code3:GPT|Name:Guildpact
-Index:54|Code2:DIS|Code3:DIS|Name:Dissension
-Index:55|Code2:CS|Code3:CSP|Name:Coldsnap
-Index:56|Code2:TSP|Code3:TSP|Name:Time Spiral
-Index:57|Code2:TSB|Code3:TSB|Name:Time Spiral Timeshifted
-Index:58|Code2:PLC|Code3:PLC|Name:Planar Chaos
-Index:59|Code2:FUT|Code3:FUT|Name:Future Sight
+Index:50|Code2:SOK|Code3:SOK|Type:Expansion|Name:Saviors of Kamigawa
+Index:51|Code2:9E|Code3:9ED|Type:Core|Name:Core Set - Ninth Edition
+Index:52|Code2:RAV|Code3:RAV|Type:Expansion|Name:Ravnica: City of Guilds
+Index:53|Code2:GP|Code3:GPT|Type:Expansion|Name:Guildpact
+Index:54|Code2:DIS|Code3:DIS|Type:Expansion|Name:Dissension
+Index:55|Code2:CS|Code3:CSP|Type:Expansion|Name:Coldsnap
+Index:56|Code2:TSP|Code3:TSP|Type:Expansion|Name:Time Spiral
+Index:57|Code2:TSB|Code3:TSB|Type:Expansion|Name:Time Spiral Timeshifted
+Index:58|Code2:PLC|Code3:PLC|Type:Expansion|Name:Planar Chaos
+Index:59|Code2:FUT|Code3:FUT|Type:Expansion|Name:Future Sight
 
-Index:60|Code2:10E|Code3:10E|Name:Core Set - Tenth Edition
-Index:61|Code2:LRW|Code3:LRW|Name:Lorwyn
-Index:62|Code2:MOR|Code3:MOR|Name:Morningtide
-Index:63|Code2:SHM|Code3:SHM|Name:Shadowmoor
-Index:64|Code2:EVE|Code3:EVE|Name:Eventide|Alias:EVT
-Index:65|Code2:ALA|Code3:ALA|Name:Shards of Alara
-Index:66|Code2:CFX|Code3:CFX|Name:Conflux|Alias:CON
-Index:67|Code2:ARB|Code3:ARB|Name:Alara Reborn
-Index:68|Code2:M10|Code3:M10|Name:Magic 2010
-Index:69|Code2:ZEN|Code3:ZEN|Name:Zendikar
+Index:60|Code2:10E|Code3:10E|Type:Core|Name:Core Set - Tenth Edition
+Index:61|Code2:LRW|Code3:LRW|Type:Expansion|Name:Lorwyn
+Index:62|Code2:MOR|Code3:MOR|Type:Expansion|Name:Morningtide
+Index:63|Code2:SHM|Code3:SHM|Type:Expansion|Name:Shadowmoor
+Index:64|Code2:EVE|Code3:EVE|Type:Expansion|Name:Eventide|Alias:EVT
+Index:65|Code2:ALA|Code3:ALA|Type:Expansion|Name:Shards of Alara
+Index:66|Code2:CFX|Code3:CFX|Type:Expansion|Name:Conflux|Alias:CON
+Index:67|Code2:ARB|Code3:ARB|Type:Expansion|Name:Alara Reborn
+Index:68|Code2:M10|Code3:M10|Type:Core|Name:Magic 2010
+Index:69|Code2:ZEN|Code3:ZEN|Type:Expansion|Name:Zendikar
 
-Index:70|Code2:WWK|Code3:WWK|Name:Worldwake
-Index:71|Code2:ROE|Code3:ROE|Name:Rise of the Eldrazi
-Index:72|Code2:M11|Code3:M11|Name:Magic 2011
-Index:73|Code2:SOM|Code3:SOM|Name:Scars of Mirrodin
-Index:74|Code2:MBS|Code3:MBS|Name:Mirrodin Besieged
-Index:75|Code2:NPH|Code3:NPH|Name:New Phyrexia
-Index:76|Code2:COM|Code3:COM|Name:Commander
-Index:77|Code2:M12|Code3:M12|Name:Magic 2012
-Index:78|Code2:ISD|Code3:ISD|Name:Innistrad
-Index:79|Code2:DKA|Code3:DKA|Name:Dark Ascension
+Index:70|Code2:WWK|Code3:WWK|Type:Expansion|Name:Worldwake
+Index:71|Code2:ROE|Code3:ROE|Type:Expansion|Name:Rise of the Eldrazi
+Index:72|Code2:M11|Code3:M11|Type:Core|Name:Magic 2011
+Index:73|Code2:SOM|Code3:SOM|Type:Expansion|Name:Scars of Mirrodin
+Index:74|Code2:MBS|Code3:MBS|Type:Expansion|Name:Mirrodin Besieged
+Index:75|Code2:NPH|Code3:NPH|Type:Expansion|Name:New Phyrexia
+Index:76|Code2:COM|Code3:COM|Type:Other|Name:Commander
+Index:77|Code2:M12|Code3:M12|Type:Core|Name:Magic 2012
+Index:78|Code2:ISD|Code3:ISD|Type:Expansion|Name:Innistrad
+Index:79|Code2:DKA|Code3:DKA|Type:Expansion|Name:Dark Ascension
 
-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:80|Code2:AVR|Code3:AVR|Type:Expansion|Name:Avacyn Restored
+Index:81|Code2:PC2|Code3:PC2|Type:Other|Name:Planechase 2012 Edition
+Index:82|Code2:M13|Code3:M13|Type:Core|Name:Magic 2013
+Index:83|Code2:RTR|Code3:RTR|Type:Expansion|Name:Return to Ravnica
+Index:84|Code2:GTC|Code3:GTC|Type:Expansion|Name:Gatecrash
 
-Index:86|Code2:VAN|Code3:VAN|Name:Vanguard
+Index:86|Code2:VAN|Code3:VAN|Type:Other|Name:Vanguard
+Index:87|Code2:ARC|Code3:ARC|Type:Other|Name:Archenemy
+Index:88|Code2:HOP|Code3:HOP|Type:Other|Name:Planechase

res/cardTemplateScript.py

@@ -15,142 +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')
-
-	# Casual Variants and Multiplayer
-	forgeSets.append('COM')
-	forgeSets.append('VAN')
-	forgeSets.append('ARC')
-	forgeSets.append('HOP')
-	forgeSets.append('PC2')
-
-	# 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')
@@ -223,7 +87,6 @@ if not os.path.exists(pathToMtgData) :
         raw_input("")
         sys.exit()
 
-forgeSets = []
 keyWords = []
 mtgDataCards = {}
 setCodes = []
@@ -231,7 +94,6 @@ tmpName = ""
 line = ""
 
 # initialize sets supported by Forge
-initSets()
 initKeywords()
 #Parse mtg-data
 mtgdata = open(pathToMtgData,"r")
@@ -342,26 +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'
-                                elif edition[1] == 'S' :
-                                        rarity = 'Special'
-                                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/abomination.txt

@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Horror
 Text:no text
 PT:2/6
-T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.Green,Creature.White | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+T:Mode$ AttackerBlocked | ValidCard$ Creature.Green,Creature.White | ValidBlocker$ Card.Self | DelayedTrigger$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
 T:Mode$ Blocks | ValidCard$ Creature.Green,Creature.White | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
 SVar:DelTrigBlocked:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocked | TriggerDescription$ Destroy blocked creature at end of combat.
 SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | TriggerDescription$ Destroy blocking creature at end of combat.

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_at_tolaria_west.txt

@@ -0,0 +1,17 @@
+Name:Academy at Tolaria West
+ManaCost:no cost
+Types:Plane Dominaria
+Text:no text
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | IsPresent$ Card.YouCtrl | PresentZone$ Hand | PresentCompare$ EQ0 | Execute$ AcademicDraw | TriggerDescription$ At the beginning of your end step, if you have no cards in hand, draw seven cards.
+SVar:AcademicDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 7
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, discard your hand.
+SVar:RolledChaos:AB$ Discard | Cost$ 0 | Mode$ Hand | Defined$ You
+T:Mode$ PlanarDice | Result$ Planeswalk | TriggerZones$ Command | Execute$ RolledWalk | Secondary$ True | TriggerDescription$ Whenever you roll Planeswalk, put this card on the bottom of its owner's planar deck face down, then move the top card of your planar deck off that planar deck and turn it face up
+SVar:RolledWalk:AB$ Planeswalk | Cost$ 0
+A:AB$ RollPlanarDice | Cost$ X | SorcerySpeed$ True | ActivationZone$ Command | SpellDescription$ Roll the planar dice.
+SVar:X:Count$RolledThisTurn
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_at_tolaria_west.jpg
+SetInfo:HOP|Common|http://magiccards.info/extras/plane/planechase/academy-at-tolaria-west.jpg
+Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever you roll {C}, discard your hand.
+End

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

@@ -4,7 +4,7 @@ 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$ 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 | TriggerDescription$ When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger.
+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$ Command | Destination$ Exile | Static$ True

res/cardsfolder/a/acidic_sliver.txt

@@ -4,7 +4,7 @@ Types:Creature Sliver
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Damage | Description$ All Slivers have "2, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
-SVar:Damage:AB$DealDamage | Cost$ 2 Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+SVar:Damage:AB$DealDamage | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:BuffedBy:Sliver
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_sliver.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/act_of_treason.txt

@@ -7,6 +7,7 @@ SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/121.jpg
 SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/124.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/85.jpg
 SetInfo:M12|Common|http://magiccards.info/scans/en/m12/121.jpg
 Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
 End

res/cardsfolder/a/adaptive_automaton.txt

@@ -3,8 +3,8 @@ ManaCost:3
 Types:Artifact Creature Construct
 Text:no text
 PT:2/2
-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$ MostProminentInComputerDeck
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
 S:Mode$ Continuous | Affected$ Card.Self | AddType$ ChosenType | Description$ CARDNAME is the chosen type in addition to its other types.
 S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control of the chosen type get +1/+1.
 SVar:Rarity:Rare

res/cardsfolder/a/adaptive_snapjaw.txt

@@ -0,0 +1,11 @@
+Name:Adaptive Snapjaw
+ManaCost:4 G
+Types:Creature Lizard Beast
+Text:no text
+PT:6/2
+K:Evolve
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_snapjaw.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/113.jpg
+Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
+End

res/cardsfolder/a/advice_from_the_fae.txt

@@ -5,7 +5,7 @@ Text:no text
 A:SP$ Dig | Cost$ 2/U 2/U 2/U | DigNum$ 4 | ChangeNum$ 1 | SubAbility$ Dig2 | ConditionCheckSVar$ X | ConditionSVarCompare$ LEY | References$ X,Y | SpellDescription$ Look at the top five cards of your library. If you control more creatures than each other player, put two of those cards into your hand. Otherwise, put one of them into your hand. Then put the rest on the bottom of your library in any order.
 SVar:Dig2:DB$ Dig | DigNum$ 4 | ChangeNum$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | References$ X,Y
 SVar:X:Count$Valid Creature.YouCtrl
-SVar:Y:Count$Valid Creature.YouDontCtrl
+SVar:Y:PlayerCountOther$HighestValid Creature.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advice_from_the_fae.jpg

res/cardsfolder/a/aeolipile.txt

@@ -2,7 +2,7 @@ Name:Aeolipile
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ DealDamage | Cost$ 1 T Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 1 T Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeolipile.jpg
 SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/166.jpg

res/cardsfolder/a/aerial_maneuver.txt

@@ -0,0 +1,9 @@
+Name:Aerial Maneuver
+ManaCost:1 W
+Types:Instant
+Text:no text
+A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Flying & First Strike | SpellDescription$ Target creature gets +1/+1 and gains flying and first strike until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_maneuver.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/1.jpg
+Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
+End

res/cardsfolder/a/aether_membrane.txt

@@ -5,9 +5,9 @@ Text:no text
 PT:0/5
 K:Defender
 K:Reach
-T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | DelayedTrigger$ DelayedTrig | TriggerDescription$ Whenever CARDNAME blocks a creature, return that creature to its owner's hand at end of combat.
 SVar:DelayedTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return blocked creature to its owner's hand at end of combat.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
+SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredAttacker
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_membrane.jpg
 SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/93.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/aetherize.txt

@@ -0,0 +1,10 @@
+Name:AEtherize
+ManaCost:3 U
+Types:Instant
+Text:no text
+A:SP$ ChangeZoneAll | Cost$ 3 U | ChangeType$ Creature.attacking | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all attacking creatures to their owners' hands.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherize.jpg
+SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/29.jpg
+Oracle:Return all attacking creatures to their owner's hand.
+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/agoraphobia.txt

@@ -0,0 +1,12 @@
+Name:Agoraphobia
+ManaCost:1 U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -5 | Description$ Enchanted creature gets -5/-0.
+A:AB$ ChangeZone | Cost$ 2 U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/agoraphobia.jpg
+SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/30.jpg
+Oracle:Enchant creature\nEnchanted creature gets -5/-0.\n{2}{U}: Return Agoraphobia to its owner's hand.
+End

res/cardsfolder/a/airdrop_condor.txt

@@ -4,7 +4,7 @@ Types:Creature Bird
 Text:no text
 PT:2/2
 K:Flying
-A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Goblin/Goblin creature> | Tgt$ TgtCP | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target creature or player.
+A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Goblin/Goblin creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target creature or player.
 SVar:X:Sacrificed$CardPower
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon

res/cardsfolder/a/aisling_leprechaun.txt

@@ -3,10 +3,10 @@ ManaCost:G
 Types:Creature Faerie
 Text:no text
 PT:1/1
-T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigAnimate1 | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.)
-T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigAnimate2 | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.)
-SVar:TrigAnimate1:AB$Animate | Cost$ 0 | Defined$ TriggeredAttacker | Colors$ Green | Permanent$ True
-SVar:TrigAnimate2:AB$Animate | Cost$ 0 | Defined$ TriggeredBlocker | Colors$ Green | Permanent$ True
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigAnimateAttacker  | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.)
+T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigAnimateBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, that creature becomes green. (This effect lasts indefinitely.)
+SVar:TrigAnimateAttacker:AB$Animate | Cost$ 0 | Defined$ TriggeredAttacker | Colors$ Green | Permanent$ True
+SVar:TrigAnimateBlocker:AB$Animate | Cost$ 0 | Defined$ TriggeredBlocker | Colors$ Green | Permanent$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aisling_leprechaun.jpg
 SetInfo:LEG|Common|http://magiccards.info/scans/en/lg/87.jpg

res/cardsfolder/a/ajani_goldmane.txt

@@ -6,7 +6,7 @@ Loyalty:4
 A:AB$ GainLife | Cost$ AddCounter<1/LOYALTY> | LifeAmount$ 2 | Planeswalker$ True | SpellDescription$ You gain 2 life.
 A:AB$ PutCounterAll | Cost$ SubCounter<1/LOYALTY> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | Planeswalker$ True | SubAbility$ DBPumpAll | SpellDescription$ Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance
-A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | TokenAmount$ 1 | TokenName$ Avatar | TokenTypes$ Creature,Avatar | TokenOwner$ You | TokenColors$ White | TokenPower$ X | TokenToughness$ X | TokenStaticAbilities$ Static | TokenSVars$ X | Planeswalker$ True | Ultimate$ True | References$ X | SpellDescription$ Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total."
+A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | TokenAmount$ 1 | TokenName$ Avatar | TokenTypes$ Creature,Avatar | TokenOwner$ You | TokenColors$ White | TokenPower$ X | TokenToughness$ X | TokenImage$ W N N Avatar | TokenStaticAbilities$ Static | TokenSVars$ X | Planeswalker$ True | Ultimate$ True | References$ X | SpellDescription$ Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total."
 SVar:Static:Mode$ Continuous | SetPower$ X | SetToughness$ X | CharacteristicDefining$ True | Description$ This creature's power and toughness are each equal to your life total.
 SVar:X:Count$YourLifeTotal
 SVar:Rarity:Mythic

res/cardsfolder/a/ajani_vengeant.txt

@@ -4,7 +4,7 @@ Types:Planeswalker Ajani
 Text:no text
 Loyalty:3
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | KW$ HIDDEN This card doesn't untap during your next untap step. | ValidTgts$ Permanent | Permanent$ True | IsCurse$ True | SpellDescription$ Target permanent doesn't untap during its controller's next untap step.
-A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Tgt$ TgtCP | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to target creature or player and you gain 3 life.
+A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to target creature or player and you gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 A:AB$ DestroyAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | SpellDescription$ Destroy all lands target player controls.
 SVar:Rarity:Mythic

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/akoum_boulderfoot.txt

@@ -4,7 +4,7 @@ Types:Creature Giant Warrior
 Text:no text
 PT:4/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target creature or player.
-SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 1
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum_boulderfoot.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/134.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/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/alaborn_zealot.txt

@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Soldier
 Text:no text
 PT:1/1
-T:Mode$ Blocks | ValidCard$ Card.Self | ValidAttacker$ Creature | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME.
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self  | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME blocks a creature, destroy that creature and CARDNAME.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DestroySelf
 SVar:DestroySelf:DB$Destroy | Cost$ 0 | Defined$ Self
 SVar:Rarity:Uncommon

res/cardsfolder/a/aladdins_ring.txt

@@ -2,7 +2,7 @@ Name:Aladdin's Ring
 ManaCost:8
 Types:Artifact
 Text:no text
-A:AB$ DealDamage | Cost$ 8 T | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 8 T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aladdins_ring.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/291.jpg

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/alloy_golem.txt

@@ -3,8 +3,8 @@ ManaCost:6
 Types:Artifact Creature Golem
 Text:no text
 PT:4/4
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
-SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You
+K:ETBReplacement:Other:ChooseColor
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
 S:Mode$ Continuous| Affected$ Card.Self | SetColor$ ChosenColor | Description$ CARDNAME is the chosen color. (It's still an artifact.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/alloy_golem.jpg

res/cardsfolder/a/alms_beast.txt

@@ -0,0 +1,11 @@
+Name:Alms Beast
+ManaCost:2 W B
+Types:Creature Beast
+Text:no text
+PT:6/6
+S:Mode$ Continuous | Affected$ Creature.blockedBySource,Creature.blockingSource | AddKeyword$ Lifelink | Description$ Creatures blocking or blocked by CARDNAME have lifelink.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/alms_beast.jpg
+SetInfo:GTC|Rare|http://magiccards.info/scans/en/gtc/141.jpg
+Oracle:Creatures blocking or blocked by Alms Beast have lifelink.
+End

res/cardsfolder/a/alpha_authority.txt

@@ -0,0 +1,12 @@
+Name:Alpha Authority
+ManaCost:1 G
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | AddHiddenKeyword$ CARDNAME can't be blocked by more than one creature. | Description$ Enchanted creature has hexproof and can't be blocked by more than one creature.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/alpha_authority.jpg
+SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/114.jpg
+Oracle:Enchant creature\nEnchanted creature has hexproof and can't be blocked by more than one creature.
+End

res/cardsfolder/a/alpha_status.txt

@@ -1,8 +1,12 @@
 Name:Alpha Status
 ManaCost:2 G
 Types:Enchantment Aura
-Text:Enchant Creature \r\nEnchanted creatures gets +2/+2 for each other creature on the battlefield that shares a creature type with it.
-A:SP$Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
+Text:no text
+K:Enchant Creature
+A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ AffectedX | AddToughness$ AffectedX | References$ AffectedX | EffectZone$ Battlefield | Description$ Enchanted creature gets +2/+2 for each other creature on the battlefield that shares a creature type with it.
+SVar:AffectedX:Count$Valid Creature.sharesCreatureTypeWith+Other/Times.2
+SVar:PlayMain1:TRUE
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/alpha_status.jpg

res/cardsfolder/a/ambush_commander.txt

@@ -4,7 +4,7 @@ Types:Creature Elf
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Forest.YouCtrl | SetPower$ 1 | SetToughness$ 1 | AddType$ Creature & Elf | SetColor$ Green | Description$ Forests you control are 1/1 green Elf creatures that are still lands.
-A:AB$Pump | Cost$ 1 G Sac<1/Elf> | Tgt$ TgtC | NumAtt$ 3 | NumDef$ 3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
+A:AB$Pump | Cost$ 1 G Sac<1/Elf> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ambush_commander.jpg
 SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/111.jpg

res/cardsfolder/a/an_zerrin_ruins.txt

@@ -2,8 +2,8 @@ Name:An-Zerrin Ruins
 ManaCost:2 R R
 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
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentHumanControls | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
 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

res/cardsfolder/a/anaba_shaman.txt

@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Minotaur Shaman
 Text:no text
 PT:2/2
-A:AB$ DealDamage | Cost$ R T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anaba_shaman.jpg
 SetInfo:HML|Common|http://magiccards.info/scans/en/hl/84.jpg|2

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/ancient_hydra.txt

@@ -4,7 +4,7 @@ Types:Creature Hydra
 Text:no text
 PT:5/1
 K:Fading:5
-A:AB$ DealDamage | Cost$ 1 SubCounter<1/FADE> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 1 SubCounter<1/FADE> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_hydra.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/76.jpg

res/cardsfolder/a/angelic_arbiter.txt

@@ -7,6 +7,7 @@ K:Flying
 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/angelic_edict.txt

@@ -0,0 +1,10 @@
+Name:Angelic Edict
+ManaCost:4 W
+Types:Sorcery
+Text:no text
+A:SP$ ChangeZone | Cost$ 4 W | ValidTgts$ Creature,Enchantment | TgtPrompt$ Select target creature or enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature or enchantment.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_edict.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/2.jpg
+Oracle:Exile target creature or enchantment.
+End

res/cardsfolder/a/angelic_favor.txt

@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Instant
 Text:no text
 A:SP$ Token | Cost$ tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>HIDDEN At the beginning of the end step, exile CARDNAME. | ActivationPhases$ BeginCombat->EndCombat | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
-A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>HIDDEN At the beginning of the end step, exile CARDNAME. | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenHiddenKeywords$ At the beginning of the end step, exile CARDNAME. | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_favor.jpg

res/cardsfolder/a/angelic_skirmisher.txt

@@ -0,0 +1,16 @@
+Name:Angelic Skirmisher
+ManaCost:4 W W
+Types:Creature Angel
+Text:no text
+PT:4/4
+K:Flying
+T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each combat, choose first strike, vigilance or lifelink. Creatures you control gain that ability until end of turn.
+SVar:TrigChoose:AB$ GenericChoice | Cost$ 0 | Choices$ PumpFirstStrike,PumpVigilance,PumpLifelink | Defined$ You
+SVar:PumpFirstStrike:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | ChoiceDescription$ First strike
+SVar:PumpVigilance:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance | ChoiceDescription$ Vigilance
+SVar:PumpLifelink:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Lifelink | ChoiceDescription$ Lifelink
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_skirmisher.jpg
+SetInfo:GTC|Rare|http://magiccards.info/scans/en/gtc/3.jpg
+Oracle:Flying\nAt the beginning of each combat, choose first strike, vigilance, or lifelink. Creatures you control gain that ability until end of turn.
+End

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 | EffectZone$ Command | Affected$ You | AddKeyword$ You can't lose the game. | Description$ You can't lose the game.
-SVar:STOppsCantWin:Mode$ Continuous | EffectZone$ Command | 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/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/annihilating_fire.txt

@@ -2,7 +2,7 @@ Name:Annihilating Fire
 ManaCost:1 R R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ 3 | SubAbility$ Annihilate | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ Annihilate | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:Annihilate:DB$ Pump | KW$ HIDDEN If CARDNAME would be put into a graveyard, exile it instead. | Defined$ Targeted
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/annihilating_fire.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/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/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/apocalypse_hydra.txt

@@ -3,7 +3,7 @@ ManaCost:X G R
 Types:Creature Hydra
 Text:Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it.
 PT:0/0
-A:AB$ DealDamage | Cost$ 1 R SubCounter<1/P1P1> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 1 R SubCounter<1/P1P1> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 # This xPaid doesn't do anything, it's just needed to make Cost work properly
 SVar:X:Count$xPaid
 SVar:Rarity:Mythic

res/cardsfolder/a/apprentice_sorcerer.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | PlayerTurn$ True | ActivationPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_sorcerer.jpg
 SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/32.jpg

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,8 +2,8 @@ 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 | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.counters_GE1_FLOOD | AddType$ Island
 SVar:RemRandomDeck:True

res/cardsfolder/a/arc_blade.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Sorcery
 Text:no text
 K:Suspend:3:2 R
-A:SP$ DealDamage | Cost$ 3 R R | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DBChange |  SpellDescription$ CARDNAME deals 2 damage to target creature or player. Exile CARDNAME with three time counters on it.
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBChange |  SpellDescription$ CARDNAME deals 2 damage to target creature or player. Exile CARDNAME with three time counters on it.
 SVar:DBChange:DB$ChangeZone | Origin$ Stack | Destination$ Exile | RememberChanged$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Remembered | CounterType$ TIME | CounterNum$ 3 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

res/cardsfolder/a/arc_slogger.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Beast
 Text:no text
 PT:4/5
-A:AB$ DealDamage | Cost$ R ExileFromTop<10/Card> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$ DealDamage | Cost$ R ExileFromTop<10/Card> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_slogger.jpg
 SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/85.jpg

res/cardsfolder/a/arcane_teachings.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddAbility$ Damage | Description$ Enchanted creature gets +2/+2 and has "T: This creature deals 1 damage to target creature or player."
-SVar:Damage:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_teachings.jpg
 Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nEnchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to target creature or player."

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/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/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/armored_transport.txt

@@ -0,0 +1,11 @@
+Name:Armored Transport
+ManaCost:3
+Types:Artifact Creature Construct
+Text:Prevent all damage that would be dealt to CARDNAME by creatures blocking it.
+PT:2/1
+K:PreventAllDamageBy Creature.blockingSource
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/armored_transport.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/226.jpg
+Oracle:Prevent all combat damage that would be dealt to Armored Transport by creatures blocking it.
+End

res/cardsfolder/a/arrogant_bloodlord.txt

@@ -3,10 +3,10 @@ ManaCost:1 B B
 Types:Creature Vampire Knight
 Text:no text
 PT:4/4
-T:Mode$ Blocks | ValidCard$ Creature.powerLE1 | ValidBlocked$ Card.Self | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.powerLE1 | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature.powerLE1 | DelayedTrigger$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature with power 1 or less, destroy CARDNAME at end of combat.
 SVar:DelTrig:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy CARDNAME at end of combat.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Self
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arrogant_bloodlord.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/94.jpg

res/cardsfolder/a/arrows_of_justice.txt

@@ -0,0 +1,10 @@
+Name:Arrows of Justice
+ManaCost:2 RW
+Types:Instant
+Text:no text
+A:SP$ DealDamage | Cost$ 2 RW | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target attacking or blocking creature.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/arrows_of_justice.jpg
+SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/211.jpg
+Oracle:Arrows of Justice deals 4 damage to target attacking or blocking creature.
+End

res/cardsfolder/a/arsenal_thresher.txt

@@ -3,8 +3,8 @@ ManaCost:2 WB U
 Types:Artifact Creature Construct
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, you may reveal any number of other artifact cards from your hand. CARDNAME enters the battlefield with a +1/+1 counter on it for each card revealed this way.
-SVar:TrigReveal:AB$ Reveal | Cost$ 0 | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPutCounters
+K:ETBReplacement:Other:DBReveal
+SVar:DBReveal:DB$ Reveal | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPutCounters | SpellDescription$ As CARDNAME enters the battlefield, you may reveal any number of other artifact cards from your hand. CARDNAME enters the battlefield with a +1/+1 counter on it for each card revealed this way.
 SVar:DBPutCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount

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/artillerize.txt

@@ -2,7 +2,7 @@ Name:Artillerize
 ManaCost:3 R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 3 R Sac<1/Artifact;Creature/artifact or creature> | Tgt$ TgtCP | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or player.
+A:SP$ DealDamage | Cost$ 3 R Sac<1/Artifact;Creature/artifact or creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or player.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/artillerize.jpg

res/cardsfolder/a/ashes_of_the_fallen.txt

@@ -2,8 +2,8 @@ Name:Ashes of the Fallen
 ManaCost:2
 Types:Artifact
 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$ MostProminentInComputerDeck
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
 S:Mode$ Continuous | Affected$ Creature.YouOwn | AffectedZone$ Graveyard | AddType$ ChosenType | Description$ Each creature card in your graveyard has the chosen creature type in addition to its other types.
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True

res/cardsfolder/a/ashling_the_extinguisher_avatar.txt

@@ -0,0 +1,11 @@
+Name:Ashling, the Extinguisher Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+1/-3
+A:AB$ DestroyAll | ActivationZone$ Command | Cost$ 5 | ValidCards$ Permanent.nonLand | PlayerTurn$ True | SubAbility$ DBRemoveAB | SpellDescription$ Destroy all nonland permanents. Activate this ability only once and only during your turn.
+SVar:DBRemoveAB:DB$ Animate | RemoveAllAbilities$ True | Permanent$ True
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/ashling_the_extinguisher_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/ashling-the-extinguisher.jpg
+Oracle:Hand +1, life -3\n{5}: Destroy all nonland permanents. Activate this ability only once and only during your turn.
+End

res/cardsfolder/a/ashmouth_hound.txt

@@ -3,10 +3,10 @@ ManaCost:1 R
 Types:Creature Elemental Hound
 Text:no text
 PT:2/1
-T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigDamage1 | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature.
-T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self | Execute$ TrigDamage2 | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature.
-SVar:TrigDamage1:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1
-SVar:TrigDamage2:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 1
+T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self  | Execute$ TrigDamageAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature.
+T:Mode$ Blocks | ValidCard$ Creature | ValidBlocked$ Card.Self  | Execute$ TrigDamageBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 1 damage to that creature.
+SVar:TrigDamageAttacker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredAttacker | NumDmg$ 1
+SVar:TrigDamageBlocker:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredBlocker | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashmouth_hound.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/128.jpg

res/cardsfolder/a/assault_griffin.txt

@@ -7,6 +7,7 @@ K:Flying
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/assault_griffin.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/6.jpg
+SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/4.jpg
 SetInfo:M12|Common|http://magiccards.info/scans/en/m12/8.jpg
 Oracle:Flying
 End

res/cardsfolder/a/assemble_the_legion.txt

@@ -0,0 +1,13 @@
+Name:Assemble the Legion
+ManaCost:3 R W
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a muster counter on CARDNAME. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ MUSTER | CounterNum$ 1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenImage$ RW 1 1 Soldier | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ Red,White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | References$ X
+SVar:X:Count$CardCounters.MUSTER
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/assemble_the_legion.jpg
+SetInfo:GTC|Rare|http://magiccards.info/scans/en/gtc/142.jpg
+Oracle:At the beginning of your upkeep, put a muster counter on Assemble the Legion. Then put a 1/1 red and white Soldier creature token with haste onto the battlefield for each muster counter on Assemble the Legion.
+End

res/cardsfolder/a/aura_barbs.txt

@@ -0,0 +1,17 @@
+Name:Aura Barbs
+ManaCost:2 R
+Types:Instant Arcane
+Text:no text
+A:SP$ RepeatEach | Cost$ 2 R | RepeatCards$ Enchantment | Zone$ Battlefield | RepeatSubAbility$ DBDmg | SubAbility$ DBRepeatDmg | SpellDescription$ Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to.
+SVar:DBDmg:DB$ DealDamage | NumDmg$ 2 | DamageSource$ Remembered | Defined$ RememberedController
+SVar:DBRepeatDmg:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Aura.AttachedTo Creature | Zone$ Battlefield | RepeatSubAbility$ DBDmgTarget
+SVar:DBDmgTarget:DB$ PumpAll | ValidCards$ Creature.EnchantedBy Imprinted| RememberAllPumped$ True | SubAbility$ DBAuraDmg
+SVar:DBAuraDmg:DB$ DealDamage | NumDmg$ 2 | DamageSource$ Imprinted | Defined$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_barbs.jpg
+SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/94.jpg
+Oracle:Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to.
+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/aurelia_the_warleader.txt

@@ -0,0 +1,16 @@
+Name:Aurelia, the Warleader
+ManaCost:2 R R W W
+Types:Legendary Creature Angel
+Text:no text
+PT:3/4
+K:Flying
+K:Vigilance
+K:Haste
+T:Mode$ Attacks | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | FirstAttack$ True | TriggerDescription$ Whenever CARDNAME attacks for the first time each turn, untap all creatures you control. After this phase, there is an additional combat phase.
+SVar:TrigUntap:AB$ UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat
+SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aurelia_the_warleader.jpg
+SetInfo:GTC|Mythic|http://magiccards.info/scans/en/gtc/143.jpg
+Oracle:Flying, vigilance, haste\nWhenever Aurelia, the Warleader attacks for the first time each turn, untap all creatures you control. After this phase, there is an additional combat phase.
+End

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