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

- Converted several cards to replacement effects

.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

.settings/org.eclipse.jdt.core.prefs

@@ -1,16 +1,15 @@
-#Wed Jul 27 18:40:11 EDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

CHANGES.txt

@@ -1,180 +1,107 @@
-Forge Beta: 06-14-2013 ver 1.4.1
+Forge Beta: 08-16-2013 ver 1.4.6
 
 
-12819 cards in total.
+13076 cards in total.
 
 
 -------------
 Release Notes
 -------------
 
-- Java 7 -
+- Window size/position now remembered between sessions -
-The devs are discussing a plan to update the battlefield display code with Java FX 2.2 and this should help to improve a few things. Java FX 2.2 requires Java 7 so please update your Java runtime environment in the nearest future. At some point a new version of Forge will no longer run under Java 6.
+Works with multiple monitors.
+Remembers whether the window was maximized or un-maximized.
+The first time you launch Forge after this update, the window will be maximized on default monitor, with 800x600 centered being used if you un-maximize. This matches how it worked before.
+Remembers last un-maximized size even if the window is currently maximized such that, if you un-maximize the window, it will restore to that size at the center of the current monitor.
+Window will be made accessible even if monitor setup or screen resolution is different between sessions.
+
+
+- Card Zoomer Updates -
+The Card Zoomer/Preview now supports split, flip and double-sided cards including cards played face down (eg. morph).
+Split cards (name contains "//") are now rotated 90 degrees for easier viewing.
+If a card is a flip- or double-sided card then you can easily view the alternate image using...
+<EFBFBD><EFBFBD>- wheel mode : flick wheel forward or tap CTRL key.
+<EFBFBD><EFBFBD>- button mode : tap CTRL key.
+The standard flip graphic (the two rotated arrows) is displayed if the card can be flipped or transformed.
+
+
+- Home Screen UI Improvements -
+The menu on the Home Screen is now scrollable using either a mouse wheel or arrow buttons that will appear at the top or bottom if scrolling can occur in that direction
+The Deck Editor and Exit Forge buttons are now laid out vertically to make it easier to add launch buttons for new screens coming down the pipeline (hint, hint...)
+The menu on the Home Screen has been made narrower and the logo size increased to decrease whitespace and increase the width of the main panel
+Release notes added to Games Settings section.
+
+
+- User Preferences -
+There's a new user preference that lets you choose whether a 0-cost block should prompt you to pay or to pay it automatically. This only affects blocking situations where you would have to actually pay 0, (e.g. War Cadence with X = 0). By default you'll be prompted for payment, allowing you to, for instance, prevent forced blocks by activating War Cadence for 0 then not paying the block cost.
+
+
+- Forge now requires Java 7 -
+Please update your Java runtime environment. At this point Forge versions 1.4.2 and above will no longer run under Java 6.
 
 
 - New M14 cards -
-We have added a branch to our SVN for the new cards that are currently being scripted. These cards are not yet available in this build of forge. Please be patient and they will soon become available.
+Forge now includes most of the new M14 cards. It may take a few days before these new card pictures become available for downloading via the "Download LQ Card Pictures" button. The LQ set pictures tend to take a few more weeks to process before they become available for downloading via the "Download LQ Set Pictures" button. Please be patient.
 
 
 - Match and Deck Editor Layout problems -
 The match and deck editor windows contain panels that can be moved and/or resized. The changes that you make are saved to files that are named "editor.xml" and "match.xml". These files can be found in your userDir/preferences/ directory.
 
-Sometimes people will decide that they do not like the changes that they made and wish to go back to the original layout. To reset layouts to deafult, go to the Game Settings -> Preferences -> Troubleshooting section. You will find at this location two buttons that will reset the match layout and the deck editor layouts.
+Sometimes people will decide that they do not like the changes that they made and wish to go back to the original layout. To reset layouts to default, go to the Game Settings -> Preferences -> Troubleshooting section. You will find at this location two buttons that will reset the match layout and the deck editor layouts.
 
 Also use the mentioned measure if your match or deckeditor won't start - it would help in 90% of the cases.
 
 
-- The AI Drafting has been improved -
+- The Mac OS X application -
-The AI evaluated the basic lands higher than anything else. Fixed. The AI would pick cards with RemAIDeck but only at a much lowered pick rate. For example the best pick in a 250 card set would become the 75th best pick, the 20th best pick would become the 95th and so on. Divided this factor by 3 (so the first pick would become the 25th pick). Please test whether this has improved the draft experience.
+At this time Forge now requires Java 7 and will no longer run under Java 6.
+
+Unfortunately, the Mac OS X builder that we were using does not support Java 7. We hope to find and to use a different Mac OS X builder in order to continue releasing a Mac OS bundled application like we have in the past.
+
+Currently, the windows/unix release of Forge includes a launcher file named "forge.command". Double click on the "forge.command" launcher command file and this will in turn launch the Forge jar file via the terminal application while increasing the Java heap space. This should be a temporary inconvenience.
 
 
 ---------
 New Cards
 ---------
 
-Amulet of Quoz
+Arcanum Wings
-Aphetto Dredging
+Awesome Presence
-Archive Trap
+Ayesha Tanaka
-Battlefield Scrounger
+Citadel of Pain
-Chain Stasis
+Clockspinning
-Chancellor of the Annex
+Cocoon
-Chisei, Heart of Oceans
+Copperhoof Vorrac
-Choking Vines
+Grip of Chaos
-Cobra Trap
+Harsh Judgment
-Defensive Formation
+Heat Wave
-Dream Chisel
+Mangara's Equity
-Dream Leash
+Monsoon
-Exiled Doomsayer
+No Quarter
-Fossil Find
+Rasputin Dreamweaver
-Gemstone Caverns
+Rock Jockey
-Grave Consequences
+Stoneshaker Shaman
-Grimoire Thief
+Stranglehold
-Hankyu
+Strionic Resonator
-Hibernation's End
+Traveling Plague
-Indentured Djinn
+Volcano Hellion
-Ion Storm
+Wall of Caltrops
-Jester's Scepter
+War Cadence
-Jetting Glasskite
+Wiitigo
-Jotun Grunt
-Kira, Great Glass Spinner
-Kithkin Armor
-Krark's Thumb
-Leashling
-Liquid Fire
-Martyr of Bones
-Master Warcraft
-Melee
-Minion of Leshrac
-Odric, Master Tactician
-Patron of the Akki
-Patron of the Kitsune
-Patron of the Moon
-Patron of the Nezumi
-Patron of the Orochi
-Penance
-Power Conduit
-Prowling Pangolin
-Psychic Vortex
-Research // Development
-Search for Survivors
-Shimmering Glasskite
-Spinning Darkness
-Summoning Trap
-Tainted Specter
-Teferi's Curse
-Temporary Truce
-Thelon's Chant
-Thought Lash
-Thran Turbine
-Tidal Influence
-Time and Tide
-Tourach's Chant
-Truce
-Uba Mask
-Void Maw
 
 
 ----------
 New Planes
 ----------
 
-Furnace Layer
+Jund
-Kharasha Foothills
+Lair of the Ashen Idol
-Mimano
+Mount Keralia
-Mirrored Depths
-
-
---------------------
-New M14 branch Cards
---------------------
-
-Accursed Spirit
-Advocate of the Beast
-Ajani's Chosen
-Archangel of Thune
-Awaken the Ancient
-Battle Sliver
-Blur Sliver
-Bonescythe Sliver
-Charging Grffin
-Corpse Hauler
-Dawnstrike Paladin
-Deathgaze Cockatrice
-Devout Invocation
-Elvish Mystic
-Enlarge
-Fleshpulper Giant
-Glimpse the Future
-Grim Return
-Groundshaker Sliver
-Guardian of the Ages
-Hive Stirrings
-Hunt the Weak
-Into the Wilds
-Jace's Mindseeker
-Kalonian Tusker
-Liliana's Reaver
-Marauding Maulhorn
-Master of Diversion
-Megantic Sliver
-Molten Birth
-Ogre Battledriver
-Predatory Sliver
-Primeval Bounty
-Regathan Firecat
-Ring of Three Wishes
-Rise of the Dark Realms
-Scourge of Valkas
-Sentinel Sliver
-Seraph of the Sword
-Shadowborn Apostle
-Shadowborn Demon
-Sliver Construct
-Soulmender
-Sporemound
-Staff of the Death Magus
-Staff of the Flame Magus
-Staff of the Mind Magus
-Staff of the Wild Magus
-Steelform Sliver
-Stonehorn Chanter
-Striking Sliver
-Thorncaster Sliver
-Undead Minotaur
-Vampire Warlord
-Vastwood Hydra
-Vial of Poison
-Windreader Sphinx
-Woodborn Behemoth
-Young Pyromancer
 
 
 ------------
 Known Issues
 ------------
 
-A small number of cards including Wall of Corpses, Abu Ja'far and others with a similar ability are not functional. The common issue here is actually that they check the blocker/attacker after being removed from the battlefield. Probably need to use LKI. Regular destroy/destroy all effects work just fine. The problem cards are caring about battlefield specific properties, that no longer apply when the base card is no longer on the battlefield.
-
 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 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).
@@ -182,8 +109,6 @@ Some time was spent turning the static ETB triggers into the proper ETB replacem
 A recent contribution to the code base should fix some of the bugs that people noticed with cloning type abilities. At this time there is one remaining issue that we hope will be addressed in the near future:
 Copies of cards that setup Zone Change triggers via addComesIntoPlayCommand and addLeavesPlayCommand will not function correctly.
 
-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.
-
 The Forge archive includes a readme.txt file and we ask that you spend a few minutes reading this file as it contains some information that may prove useful. We do tend to update this file at times and you should quickly read this file and look for new information for each and every new release. Thank you.
 
 The archive format used for the Forge distribution is ".tar.bz2". There are utilities for Windows, Mac OS and the various *nix's that can be used to extract/decompress these ".tar.bz2" archives. We recommend that you extract/decompress the Forge archive into a new and unused folder.
@@ -197,17 +122,17 @@ Contributors to This Release
 
 Agetian
 Asepetci
-Diogenes
+dmacgamer
+DrDev
 Gos
-Hellfish
+lazylockie
 Marc
 Max
-Nordos
-RedDeckWins
-Sidereal
 Sloth
 Sol
+spr
 Swordshine
+Zirbert
 Chris H
 
 

README.txt

@@ -401,9 +401,11 @@ Draw [*] - draw.wav - triggered when a player draws a card.
 Enchantment [*] - enchant.wav - triggered when an enchantment is played.
 EndOfTurn [*] - end_of_turn.wav - triggered at the end of turn.
 Equip [*] - equip.wav - triggered when an equipment is equipped.
+Exile - exile.wav - triggered when a card is exiled.
 FlipCoin [*] - flip_coin.wav - triggered when a coin is flipped.
 GreenLand [*] - green_land.wav - triggered when a land with the "G" mana ability is played.
 Instant [*] - instant.wav - triggered when an instant is played.
+LifeGain - life_gain.wav - triggered when a player gains life.
 LifeLoss [*] - life_loss.wav - triggered when a player loses life.
 LoseDuel[*] - lose_duel.wav - triggered when a player loses a duel.
 ManaBurn - mana_burn.wav - triggered during a mana burn if the appropriate rule is enabled.
@@ -694,6 +696,76 @@ Targeting Overlay:
 Targeting arrows will now be shown for equipments equipping permanents currently under opponent's control (for those rare cases when e.g. an equipped creature gets Switcheroo'd for something else).
 
 
+The AI Drafting has been improved:
+----------------------------------
+
+The AI evaluated the basic lands higher than anything else. Fixed. The AI would pick cards with RemAIDeck but only at a much lowered pick rate. For example the best pick in a 250 card set would become the 75th best pick, the 20th best pick would become the 95th and so on. Divided this factor by 3 (so the first pick would become the 25th pick). Please test whether this has improved the draft experience.
+
+
+Planechase AI:
+--------------
+
+This version of Forge includes basic support for AI opponents making use of the planar die in Planechase game mode. The AI will be able to use the "Roll the planar die" ability for most of the planes currently supported by Forge. Please note that this AI is currently in its infant stage, so don't expect it to utilize the planar die in a very smart fashion.
+
+
+Adding additional opponent decks to your /res/quest/duels/ directory:
+---------------------------------------------------------------------
+
+Some people are adding additional opponent decks to their /res/quest/duels/ directory in an attempt to increase the number of opponents they will face while playing a quest.
+
+The decks located in your /res/quest/duels/ directory are text files that have a file extension of ".dck" rather than the file extension ".txt". These deck files can be loaded into a basic text editor. You can view the contents of the deck files this way.
+
+There is a metadata line for the deck's difficulty setting. Normal decks do not contain this metadata line for the deck's difficulty setting. Starting with Forge version 1.4.3 any deck file that does not include the deck's difficulty setting will be automatically assigned a value of "medium".
+
+You can add a line for the deck's difficulty setting using a text editor and then saving the deck file. Currently, Forge will recognize the following settings:
+
+Difficulty=easy
+Difficulty=medium
+Difficulty=hard
+Difficulty=very hard
+
+At the start of a new quest you will only face opponent decks that have an easy difficulty setting. After you have won a number of matches you will then face the opponent decks that have a medium difficulty setting. After you have won an additional number of matches you will then face the opponent decks that have a hard difficulty setting. Opponent decks that have a very hard difficulty setting may occassionally appear as a possible opponent instead of a opponent deck that has a hard difficulty setting.
+
+
+- version 1.4.4 -
+We were not able to release version 1.4.4 and are releasing 1.4.5 instead. Enjoy.
+
+
+- Deck Editor and General UI improvements -
+You can now right-click on a color filter button to show only cards of that color, filtering out all other colors. Similar with card type filter buttons.
+Can double click row for deck to open it (in addition to clicking edit icon)
+The selected tab on each draggable pane will now be remembered between sessions
+Fixed bug where hover effect didn't work the first time hovering over a row that had just been deselected
+Fixed bug where middle and right clicking buttons did the same behavior as left clicking, and fixed bug where clicking multiple buttons quickly (such as filters) while moving the mouse around would result in clicks not registering sometimes.
+Fixed so cards are "selected" on mouse up instead of mouse down, allowing things like drag drop and zoom to work if the card is currently actionable
+Fixed so, after dragging a pane tab to a new location, the pane it was in before selects its most recent remaining tab instead of being blank
+
+
+- Card Zoomer -
+Now you can gaze at your HQ images in all their glory with just a flick of the mousewheel, holding the middle mouse button down, or holding the left and right mouse buttons down at the same time. This feature will also increase the size of low quality pics up to the size used for high quality pics, but the image will not be very clear.
+
+Instructions:
+- Works on any card image in the Deck Editor or Duel screen.
+- Move your mouse over the card you want to zoom and mouse-wheel forward.
+- Mouse-wheel back, mouse click or pressing ESC closes the zoomed image.
+
+Limitations:
+- Only works with the mouse wheel at the moment.
+- Does not show the other side of double-sided cards yet.
+
+WIP:
+- Press and hold the CTRL key while mousing over a card to see zoomed image.
+- Flipping double-sided card.
+
+
+- Preferences updates -
+All reset buttons now appear under Troubleshooting section. Increased visibility of Troubleshooting section by moving to the top of the preferences screen. Added confirmation dialogs to all reset buttons.
+
+Converted Skins list to themed combo and added to new Visual Themes section. Converted AI Profile list to themed combo and moved to top of GamePlay section. New Visual Themes setting to hide or show background image on match screen. Default show.
+
+These new themed combo boxes when used with a theme which uses white colored text will cause readability problems for people using Mac OS X. A new "Themed ComboBox" setting is now available in the preferences section which will enable/disable themed combos should you be having readability problems with the new themed combo used in the preferences page.
+
+
 Our Lawyers Made Us Do This:
 ----------------------------
 

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>forge</artifactId>
     <packaging>jar</packaging>
     <name>Forge</name>
-    <version>1.4.1</version>
+    <version>1.4.6</version>
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent
         using all of the rules.
@@ -28,7 +28,7 @@
             ISO-8859-1
         </project.reporting.outputEncoding>
         <configSourceDirectory>src/main/config</configSourceDirectory>
-        <jettyVersion>8.1.10.v20130312</jettyVersion>
+        <jettyVersion>8.1.11.v20130520</jettyVersion>
     </properties>
     <developers>
         <developer>
@@ -68,7 +68,7 @@
         </developer>
         <developer>
             <id>moomarc</id>
-            <name>moomarc</name>
+            <name>Marc Fowler</name>
             <roles>
                 <role>developer</role>
             </roles>
@@ -153,9 +153,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.1</connection>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.6</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.1</developerConnection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.6</developerConnection>
-        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.4.1?repname=forge</url>
+        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.4.6?repname=forge</url>
     </scm>
 
     <prerequisites>
@@ -246,7 +246,7 @@
 
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.3.2</version><!--$NO-MVN-MAN-VER$-->
+                <version>2.4.1</version><!--$NO-MVN-MAN-VER$-->
                 <configuration>
                     <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
                 </configuration>
@@ -263,8 +263,8 @@
             </plugin>
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
+                <artifactId>replacer</artifactId>
-                <version>1.4.1</version>
+                <version>1.5.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -274,8 +274,10 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <file>${configSourceDirectory}/forge.sh</file>
+                    <basedir>${configSourceDirectory}</basedir>
-                    <outputFile>${project.build.directory}/forge.sh</outputFile>
+                    <filesToInclude>forge.sh, forge.command</filesToInclude>
+                    <outputBasedir>${project.build.directory}</outputBasedir>
+                    <outputDir>.</outputDir>
                     <regex>false</regex>
                     <replacements>
                         <replacement>
@@ -319,19 +321,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
+                    <source>1.7</source>
-                    <target>1.6</target>
+                    <target>1.7</target>
-                    <compilerId>groovy-eclipse-compiler</compilerId>
-							      <!-- set verbose to be true if you want lots of uninteresting messages -->
-							      <!-- <verbose>true</verbose> -->
                 </configuration>
-						    <dependencies>
-						      <dependency>
-						        <groupId>org.codehaus.groovy</groupId>
-						        <artifactId>groovy-eclipse-compiler</artifactId>
-						        <version>2.7.0-01</version>
-						      </dependency>
-						    </dependencies>
             </plugin>
 
             <plugin>
@@ -437,12 +429,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>2.8</version>
                 </plugin>
 
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>2.4.1</version>
                 </plugin>
 
                 <plugin>
@@ -574,7 +566,7 @@
 
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.8</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -624,7 +616,7 @@
                     <linkXRef>true</linkXRef>
                     <sourceEncoding>utf-8</sourceEncoding>
                     <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.6</targetJdk>
+                    <targetJdk>1.7</targetJdk>
                 </configuration>
             </plugin>
 
@@ -708,7 +700,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.2.3</version>
+            <version>2.2.4</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
@@ -718,7 +710,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.8.1</version>
+            <version>6.8.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -746,7 +738,13 @@
             <artifactId>minlog</artifactId>
             <version>1.2</version>
         </dependency>
-
+        <!--dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>javafx</artifactId>
+            <version>2.2</version>
+            <systemPath>${java.home}/lib/jfxrt.jar</systemPath>
+            <scope>system</scope>
+        </dependency-->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -760,7 +758,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.19</version>
+            <version>2.3.20</version>
         </dependency>
     </dependencies>
 
@@ -814,7 +812,7 @@
                     <plugin>
                         <groupId>com.akathist.maven.plugins.launch4j</groupId>
                         <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>1.3.4</version>
+                        <version>1.5.2</version>
                         <executions>
                             <execution>
                                 <id>l4j-gui</id>
@@ -835,7 +833,7 @@
                                         <preCp>anything</preCp>
                                     </classPath>
                                     <jre>
-                                        <minVersion>1.6.0</minVersion>
+                                        <minVersion>1.7.0</minVersion>
                                         <maxHeapSize>1024</maxHeapSize>
                                     </jre>
                                     <versionInfo>
@@ -880,6 +878,7 @@
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}" />
                                         <copy todir="${project.build.directory}/${project.build.finalName}">
                                             <fileset dir="${project.build.directory}" includes="forge.sh" />
+                                            <fileset dir="${project.build.directory}" includes="forge.command" />
                                             <fileset dir="${basedir}" includes="forge.profile.properties.example" />
                                             <fileset dir="${basedir}" includes="LICENSE.txt" />
                                             <fileset dir="${basedir}" includes="README.txt" />
@@ -894,15 +893,18 @@
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
                                         <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                         <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
                                             <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="forge.sh" />
+                                                <include name="forge.command" />
                                                 <include name="forge.exe" />
                                             </tarfileset>
                                             <tarfileset dir="${project.build.directory}/${project.build.finalName}">
                                                 <include name="**" />
                                                 <exclude name="forge.sh" />
+                                                <exclude name="forge.command" />
                                                 <exclude name="forge.exe" />
                                             </tarfileset>
                                         </tar>
@@ -952,6 +954,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <properties>
                 <license.file.name>"LICENSE.txt"</license.file.name>
@@ -1064,6 +1067,120 @@
             </build>
         </profile>
 
+        <profile>
+            <properties>
+                <license.file.name>"LICENSE.txt"</license.file.name>
+                <changes.file.name>"CHANGES.txt"</changes.file.name>
+                <readme.file.name>"README.txt"</readme.file.name>
+                <forge.file.name>"Forge"</forge.file.name>
+                <applications.file.name>"Applications"</applications.file.name>
+            </properties>
+            <id>osx-test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.7</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ant</groupId>
+                                <artifactId>ant-nodeps</artifactId>
+                                <version>1.8.1</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.oracle.appbundler</groupId>
+                                <artifactId>appbundler</artifactId>
+                                <version>1.0</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>osx-appbundle</id>
+                                <phase>pre-integration-test</phase>
+                                <configuration>
+                                    <target>
+                                        <mkdir dir="${project.build.directory}/${project.build.finalName}-osx" />
+                                        <copy todir="${project.build.directory}/${project.build.finalName}-osx">
+                                            <fileset dir="${basedir}" includes="LICENSE.txt" />
+                                            <fileset dir="${basedir}" includes="README.txt" />
+                                            <fileset dir="${basedir}" includes="CHANGES.txt" />
+                                        </copy>
+                                        <mkdir dir="${project.build.directory}/res/cardsfolder" />
+                                        <zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
+                                        <taskdef name="bundleapp" classpathref="maven.runtime.classpath" classname="com.oracle.appbundler.AppBundlerTask" />
+                                        <bundleapp outputdirectory="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" displayname="${project.name}" shortversion="${project.version}" identifier="forge.view.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" applicationCategory="public.app-category.games" mainclassname="forge.view.Main">
+                                                    <classpath file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar" />
+                                                    <classpath file="${basedir}/res/cardsfolder" />
+                                                    <classpath file="${project.build.directory}/res/cardsfolder/cardsfolder.zip" />
+                                                    <classpath file="${basedir}/forge.profile.properties.example" />
+                                                    <option value="-Dapple.laf.useScreenMenuBar=true" />
+                                                    <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
+                                                    <option value="-Dcom.apple.macos.useScreenMenuBar=true" />
+                                                    <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge" />
+                                                    <option value="-Dcom.apple.smallTabs=true" />
+                                                    <option value="-Xmx1024M" />
+                                                    <option value="-Duser.dir=Contents/Resources" />
+                                        </bundleapp>
+                                        <symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" resource="/Applications" />
+                                        <exec executable="${basedir}/${configSourceDirectory}/create-dmg" failonerror="false">
+                                            <arg line="--volname ${project.name}-${project.version} --background ${basedir}/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx" />
+                                        </exec>
+                                        <tar basedir="${project.build.directory}" includes="${project.build.finalName}.dmg" destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2" compression="bzip2" />
+                                        <!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> -->
+                                        <exec executable="rm" failonerror="false">
+                                            <arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications" />
+                                        </exec>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
+                            <execution>
+                                <id>released-version</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>released-version</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>attach-distribution-osx</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${project.build.directory}/${project.build.finalName}-osx.tar.bz2
+                                            </file>
+                                            <type>tar.bz2</type>
+                                            <classifier>osx</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>test-deploy</id>
             <distributionManagement>

res/ai/Default.ai

@@ -1 +1,5 @@
-AI_MULLIGAN_THRESHOLD=5
+DEFAULT_MAX_PLANAR_DIE_ROLLS_PER_TURN=1
+DEFAULT_MIN_TURN_TO_ROLL_PLANAR_DIE=3
+DEFAULT_PLANAR_DIE_ROLL_CHANCE=50
+MULLIGAN_THRESHOLD=5
+PLANAR_DIE_ROLL_HESITATION_CHANCE=10

res/ai/Reckless.ai

@@ -0,0 +1,5 @@
+DEFAULT_MAX_PLANAR_DIE_ROLLS_PER_TURN=1
+DEFAULT_MIN_TURN_TO_ROLL_PLANAR_DIE=1
+DEFAULT_PLANAR_DIE_ROLL_CHANCE=100
+MULLIGAN_THRESHOLD=2
+PLANAR_DIE_ROLL_HESITATION_CHANCE=0

res/blockdata/blocks.txt

@@ -48,4 +48,5 @@ Return to Ravnica, 3/6/RTR, RTR GTC DGM
 Return to Ravnica Guild Sealed, -/6/RTR, RTR RTR RTR Meta-Choose(S(RTR Prerelease Azorius Guild)Azorius guild;S(RTR Prerelease Selesnya Guild)Selesnya guild;S(RTR Prerelease Izzet Guild)Izzet guild;S(RTR Prerelease Rakdos Guild)Rakdos guild;S(RTR Prerelease Golgari Guild)Golgari guild)Guild
 Gatecrash Guild Sealed, -/6/RTR, GTC GTC GTC Meta-Choose(S(GTC Prerelease Orzhov Guild)Orzhov guild;S(GTC Prerelease Boros Guild)Boros guild;S(GTC Prerelease Dimir Guild)Dimir guild;S(GTC Prerelease Simic Guild)Simic guild;S(GTC Prerelease Gruul Guild)Gruul guild)Guild
 Dragon's Maze Race, -/5/RTR, DGM DGM DGM Meta-Choose(All(S(RTR Azorius Guild);Random(S(GTC Orzhov Guild);S(GTC Boros Guild);S(GTC Simic Guild);S(GTC Dimir Guild)))Azorius guild and a secret ally;All(S(RTR Selesnya Guild);Random(S(GTC Gruul Guild);S(GTC Orzhov Guild);S(GTC Boros Guild);S(GTC Simic Guild)))Selesnya guild and a secret ally;All(S(RTR Izzet Guild);Random(S(GTC Gruul Guild);S(GTC Dimir Guild);S(GTC Simic Guild);S(GTC Boros Guild)))Izzet guild and a secret ally;All(S(RTR Rakdos Guild);Random(S(GTC Orzhov Guild);S(GTC Dimir Guild);S(GTC Gruul Guild);S(GTC Boros Guild)))Rakdos guild and a secret ally;All(S(RTR Golgari Guild);Random(S(GTC Orzhov Guild);S(GTC Dimir Guild);S(GTC Simic Guild);S(GTC Gruul Guild)))Golgari guild and a secret ally;All(S(GTC Orzhov Guild);Random(S(RTR Azorius Guild);S(RTR Golgari Guild);S(RTR Selesnya Guild);S(RTR Rakdos Guild)))Orzhov guild and a secret ally;All(S(GTC Boros Guild);Random(S(RTR Azorius Guild);S(RTR Rakdos Guild);S(RTR Selesnya Guild);S(RTR Izzet Guild)))Boros guild and a secret ally;All(S(GTC Dimir Guild);Random(S(RTR Azorius Guild);S(RTR Izzet Guild);S(RTR Rakdos Guild);S(RTR Golgari Guild)))Dimir guild and a secret ally;All(S(GTC Simic Guild);Random(S(RTR Azorius Guild);S(RTR Golgari Guild);S(RTR Izzet Guild);S(RTR Selesnya Guild)))Simic guild and a secret ally;All(S(GTC Gruul Guild);Random(S(RTR Golgari Guild);S(RTR Izzet Guild);S(RTR Rakdos Guild);S(RTR Selesnya Guild)))Gruul guild and a secret ally)Guild
-Modern Masters, 3/6/M13, MMA
+Modern Masters, 3/6/M13, MMA
+Magic 2014, 3/6/M14, M14

res/blockdata/fatpacks.txt

@@ -47,4 +47,5 @@ AVR: 9 Boosters, 80 BasicLands
 M13: 9 Boosters, 80 BasicLands 
 RTR: 9 Boosters, 80 BasicLands 
 GTC: 9 Boosters, 80 BasicLands RTR
-DGM: 9 Boosters, 80 BasicLands RTR
+DGM: 9 Boosters, 80 BasicLands RTR
+M14: 9 Boosters, 80 BasicLands 

res/blockdata/formats.txt

@@ -1,12 +1,12 @@
 [Standard]
-Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM
+Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
 
 [Extended]
-Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
+Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
 Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep
 
 [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, DGM
+Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, 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, DGM, M14
 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
 
 [Legacy]

res/cardsfolder/a/a_display_of_my_dark_power.txt

@@ -6,5 +6,4 @@ SVar:DarkEffect:AB$ Effect | Cost$ 0 | Name$ Dark Power Scheme | Duration$ Until
 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:Picture:http://www.cardforge.org/fpics/lq_schemes/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.
+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.
-SetInfo:ARC Common

res/cardsfolder/a/abandon_hope.txt

@@ -5,5 +5,4 @@ A:SP$ Discard | Cost$ X 1 B Discard<X/Card/card> | ValidTgts$ Opponent | Mode$ R
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandon_hope.jpg
-Oracle:As an additional cost to cast Abandon Hope, discard X cards.\nLook at target opponent's hand and choose X cards from it. That player discards those cards.
+Oracle:As an additional cost to cast Abandon Hope, discard X cards.\nLook at target opponent's hand and choose X cards from it. That player discards those cards.
-SetInfo:TMP Uncommon

res/cardsfolder/a/abandoned_outpost.txt

@@ -5,5 +5,4 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandoned_outpost.jpg
-Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
+Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
-SetInfo:ODY Common

res/cardsfolder/a/abattoir_ghoul.txt

@@ -7,5 +7,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TriggeredCard$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abattoir_ghoul.jpg
-Oracle:First strike\nWhenever a creature dealt damage by Abattoir Ghoul this turn dies, you gain life equal to that creature's toughness.
+Oracle:First strike\nWhenever a creature dealt damage by Abattoir Ghoul this turn dies, you gain life equal to that creature's toughness.
-SetInfo:ISD Uncommon

res/cardsfolder/a/abbey_gargoyles.txt

@@ -5,6 +5,4 @@ PT:3/4
 K:Flying
 K:Protection from red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_gargoyles.jpg
-Oracle:Flying, protection from red
+Oracle:Flying, protection from red
-SetInfo:5ED Uncommon
-SetInfo:HML Uncommon

res/cardsfolder/a/abbey_griffin.txt

@@ -5,5 +5,4 @@ PT:2/2
 K:Flying
 K:Vigilance
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_griffin.jpg
-Oracle:Flying, vigilance
+Oracle:Flying, vigilance
-SetInfo:ISD Common

res/cardsfolder/a/abbey_matron.txt

@@ -4,5 +4,4 @@ Types:Creature Human Cleric
 PT:1/3
 A:AB$ Pump | Cost$ W T | NumDef$ +3 | SpellDescription$ CARDNAME gets +0/+3 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_matron.jpg
-Oracle:{W}, {T}: Abbey Matron gets +0/+3 until end of turn.
+Oracle:{W}, {T}: Abbey Matron gets +0/+3 until end of turn.
-SetInfo:HML Common x2

res/cardsfolder/a/abduction.txt

@@ -10,6 +10,4 @@ T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destina
 SVar:TrigReturnOwner:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abduction.jpg
-Oracle:Enchant creature\nWhen Abduction enters the battlefield, untap enchanted creature.\nYou control enchanted creature.\nWhen enchanted creature dies, return that card to the battlefield under its owner's control.
+Oracle:Enchant creature\nWhen Abduction enters the battlefield, untap enchanted creature.\nYou control enchanted creature.\nWhen enchanted creature dies, return that card to the battlefield under its owner's control.
-SetInfo:WTH Uncommon
-SetInfo:6ED Uncommon

res/cardsfolder/a/abeyance.txt

@@ -4,7 +4,6 @@ Types:Instant
 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 | 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:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abeyance.jpg
-Oracle: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.\nDraw a card.
+Oracle: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.\nDraw a card.
-SetInfo:WTH Rare

res/cardsfolder/a/abjure.txt

@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue/blue permanent> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abjure.jpg
-Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
+Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
-SetInfo:WTH Common

res/cardsfolder/a/abolish.txt

@@ -4,6 +4,4 @@ Types:Instant
 A:SP$ Destroy | Cost$ 1 W W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:AltCost:Cost$ Discard<1/Plains>
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abolish.jpg
-Oracle:You may discard a Plains card rather than pay Abolish's mana cost.\nDestroy target artifact or enchantment.
+Oracle:You may discard a Plains card rather than pay Abolish's mana cost.\nDestroy target artifact or enchantment.
-SetInfo:PCY Uncommon
-SetInfo:DDF Uncommon

res/cardsfolder/a/abomination.txt

@@ -9,6 +9,4 @@ SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execu
 SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker
 SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
-Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
+Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
-SetInfo:LEG Uncommon
-SetInfo:4ED Uncommon

res/cardsfolder/a/aboroth.txt

@@ -4,5 +4,4 @@ Types:Creature Elemental
 PT:9/9
 K:Cumulative upkeep:AddCounter<1/M1M1>:Put a -1/-1 counter on CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboroth.jpg
-Oracle:Cumulative upkeep-Put a -1/-1 counter on Aboroth. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
+Oracle:Cumulative upkeep-Put a -1/-1 counter on Aboroth. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
-SetInfo:WTH Rare

res/cardsfolder/a/aboshan_cephalid_emperor.txt

@@ -5,5 +5,4 @@ PT:3/3
 A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
 A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshan_cephalid_emperor.jpg
-Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
+Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
-SetInfo:ODY Rare

res/cardsfolder/a/aboshans_desire.txt

@@ -6,5 +6,4 @@ A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshans_desire.jpg
-Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
+Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
-SetInfo:ODY Common

res/cardsfolder/a/about_face.txt

@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/about_face.jpg
-Oracle:Switch target creature's power and toughness until end of turn.
+Oracle:Switch target creature's power and toughness until end of turn.
-SetInfo:ULG Common

res/cardsfolder/a/abrupt_decay.txt

@@ -4,5 +4,4 @@ Types:Instant
 K:CARDNAME can't be countered.
 A:SP$ Destroy | Cost$ B G | ValidTgts$ Permanent.nonLand+cmcLE3 | TgtPrompt$ Select target nonland permanent with converted mana cost 3 or less | SpellDescription$ Destroy target nonland permanent with converted mana cost 3 or less.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abrupt_decay.jpg
-Oracle:Abrupt Decay can't be countered by spells or abilities.\nDestroy target nonland permanent with converted mana cost 3 or less.
+Oracle:Abrupt Decay can't be countered by spells or abilities.\nDestroy target nonland permanent with converted mana cost 3 or less.
-SetInfo:RTR Rare

res/cardsfolder/a/absolute_grace.txt

@@ -5,5 +5,4 @@ S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from black | De
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_grace.jpg
-Oracle:All creatures have protection from black.
+Oracle:All creatures have protection from black.
-SetInfo:USG Uncommon

res/cardsfolder/a/absolute_law.txt

@@ -5,5 +5,4 @@ S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from red | Desc
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_law.jpg
-Oracle:All creatures have protection from red.
+Oracle:All creatures have protection from red.
-SetInfo:USG Uncommon

res/cardsfolder/a/absolver_thrull.txt

@@ -5,5 +5,4 @@ PT:2/3
 K:Haunt:TrigDestroy:Destroy target enchantment.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment
 Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Absolver Thrull enters the battlefield or the creature it haunts dies, destroy target enchantment.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/absolver_thrull.jpg
+SVar:Picture:http://www.wizards.com/global/images/magic/general/absolver_thrull.jpg
-SetInfo:GPT Common

res/cardsfolder/a/absorb.txt

@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Counter | Cost$ W U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. You gain 3 life. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card23155.jpg
-Oracle:Counter target spell. You gain 3 life.
+Oracle:Counter target spell. You gain 3 life.
-SetInfo:INV Rare

res/cardsfolder/a/absorb_vis.txt

@@ -5,6 +5,4 @@ K:TypeCycling:Basic:1 B
 A:SP$ LoseLife | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absorb_vis.jpg
-Oracle:Target player loses 4 life and you gain 4 life.\nBasic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+Oracle:Target player loses 4 life and you gain 4 life.\nBasic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
-SetInfo:DDK Common
-SetInfo:CFX Common

res/cardsfolder/a/abu_jafar.txt

@@ -5,6 +5,4 @@ PT:0/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
-Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
+Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
-SetInfo:CHR Uncommon
-SetInfo:ARN Uncommon

res/cardsfolder/a/abuna_acolyte.txt

@@ -5,5 +5,4 @@ PT:1/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature.Artifact | Amount$ 2 | TgtPrompt$ Select target artifact creature | SpellDescription$ Prevent the next 2 damage that would be dealt to target artifact creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abuna_acolyte.jpg
-Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
+Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
-SetInfo:SOM Uncommon

res/cardsfolder/a/abunas_chant.txt

@@ -7,5 +7,4 @@ A:SP$ GainLife | Cost$ 5 W | PrecostDesc$ Entwine | CostDesc$ 2 | LifeAmount$ 5
 SVar:DBPreventDamage:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
-Oracle:Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
+Oracle:Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
-SetInfo:5DN Common

res/cardsfolder/a/abundance.txt

@@ -7,6 +7,4 @@ SVar:DigLand:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | FoundDes
 SVar:DigNonland:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ nonLand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundance.jpg
-Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
+Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
-SetInfo:10E Rare
-SetInfo:USG Rare

res/cardsfolder/a/abundant_growth.txt

@@ -4,9 +4,8 @@ Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
-SVar:FreeCard:DB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:FreeCard:DB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "T: Add one mana of any color to your mana pool."
 SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundant_growth.jpg
-Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
+Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
-SetInfo:AVR Common

res/cardsfolder/a/abyssal_gatekeeper.txt

@@ -5,6 +5,4 @@ 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:Picture:http://www.wizards.com/global/images/magic/general/abyssal_gatekeeper.jpg
-Oracle:When Abyssal Gatekeeper dies, each player sacrifices a creature.
+Oracle:When Abyssal Gatekeeper dies, each player sacrifices a creature.
-SetInfo:DDC Common
-SetInfo:WTH Common

res/cardsfolder/a/abyssal_horror.txt

@@ -4,9 +4,6 @@ Types:Creature Horror
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
-SVar:TrigDiscard:DB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
+SVar:TrigDiscard:DB$ Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg
-Oracle:Flying\nWhen Abyssal Horror enters the battlefield, target player discards two cards.
+Oracle:Flying\nWhen Abyssal Horror enters the battlefield, target player discards two cards.
-SetInfo:S99 Rare
-SetInfo:7ED Rare
-SetInfo:USG Rare

res/cardsfolder/a/abyssal_hunter.txt

@@ -6,6 +6,4 @@ A:AB$ DealDamage | Cost$ B T | ValidTgts$ Creature | TgtPrompt$ Select target cr
 SVar:DBTap:DB$ Tap | Defined$ Targeted
 SVar:X:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_hunter.jpg
-Oracle:{B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
+Oracle:{B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
-SetInfo:MIR Rare
-SetInfo:6ED Rare

res/cardsfolder/a/abyssal_nightstalker.txt

@@ -5,5 +5,4 @@ PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscards | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player discards a card.
 SVar:TrigDiscards:AB$ Discard | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/abyssal_nightstalker.jpg
-Oracle:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
+Oracle:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
-SetInfo:PO2 Uncommon

res/cardsfolder/a/abyssal_nocturnus.txt

@@ -5,5 +5,4 @@ PT:2/2
 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:Picture:http://www.wizards.com/global/images/magic/general/abyssal_nocturnus.jpg
-Oracle:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+Oracle:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
-SetInfo:GPT Rare

res/cardsfolder/a/abyssal_persecutor.txt

@@ -8,5 +8,4 @@ S:Mode$ Continuous | Affected$ You | AddKeyword$ You can't win the game. | Descr
 S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ You can't lose the game. | Description$ Your opponents can't lose the game.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_persecutor.jpg
-Oracle:Flying, trample\nYou can't win the game and your opponents can't lose the game.
+Oracle:Flying, trample\nYou can't win the game and your opponents can't lose the game.
-SetInfo:WWK Mythic

res/cardsfolder/a/abyssal_specter.txt

@@ -6,10 +6,4 @@ K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_specter.jpg
-Oracle:Flying\nWhenever Abyssal Specter deals damage to a player, that player discards a card.
+Oracle:Flying\nWhenever Abyssal Specter deals damage to a player, that player discards a card.
-SetInfo:8ED Uncommon
-SetInfo:7ED Uncommon
-SetInfo:6ED Uncommon
-SetInfo:5ED Uncommon
-SetInfo:ICE Uncommon
-SetInfo:DDC Uncommon

res/cardsfolder/a/academy_at_tolaria_west.txt

@@ -6,5 +6,5 @@ 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
 SVar:Picture:http://www.wizards.com/global/images/magic/general/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.
+SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | CardsInHandLE$ 2
-SetInfo:HOP Common
+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.

res/cardsfolder/a/academy_raider.txt

@@ -0,0 +1,12 @@
+Name:Academy Raider
+ManaCost:2 R
+Types:Creature Human Warrior
+PT:1/1
+K:Intimidate
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may discard a card. If you do, draw a card.
+SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_raider.jpg
+Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)\nWhenever Academy Raider deals combat damage to a player, you may discard a card. If you do, draw a card.

res/cardsfolder/a/academy_rector.txt

@@ -9,5 +9,4 @@ SVar:SacMe:4
 SVar:RemRandomDeck:True
 DeckNeeds:Type$Enchantment
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_rector.jpg
-Oracle:When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
+Oracle:When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
-SetInfo:UDS Rare

res/cardsfolder/a/academy_researchers.txt

@@ -5,6 +5,4 @@ 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.CanEnchantSource | AttachedTo$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_researchers.jpg
-Oracle:When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
+Oracle:When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
-SetInfo:10E Uncommon
-SetInfo:USG Uncommon

res/cardsfolder/a/academy_ruins.txt

@@ -4,5 +4,4 @@ Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ ChangeZone | Cost$ 1 U T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_ruins.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
+Oracle:{T}: Add {1} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
-SetInfo:TSP Rare

res/cardsfolder/a/accelerate.txt

@@ -2,7 +2,6 @@ Name:Accelerate
 ManaCost:1 R
 Types:Instant
 A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SubAbility$ DBDraw | SpellDescription$ Target creature gains haste until end of turn.
-SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerate.jpg
-Oracle:Target creature gains haste until end of turn.\nDraw a card.
+Oracle:Target creature gains haste until end of turn.\nDraw a card.
-SetInfo:TOR Common

res/cardsfolder/a/accelerated_mutation.txt

@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | References$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
 SVar:X:Count$MaxCMCYouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerated_mutation.jpg
-Oracle:Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
+Oracle:Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
-SetInfo:SCG Common

res/cardsfolder/a/acceptable_losses.txt

@@ -3,5 +3,4 @@ ManaCost:3 R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 R Discard<1/Random> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acceptable_losses.jpg
-Oracle:As an additional cost to cast Acceptable Losses, discard a card at random.\nAcceptable Losses deals 5 damage to target creature.
+Oracle:As an additional cost to cast Acceptable Losses, discard a card at random.\nAcceptable Losses deals 5 damage to target creature.
-SetInfo:ODY Common

res/cardsfolder/a/accorder_paladin.txt

@@ -5,5 +5,4 @@ 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:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
-Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
+Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SetInfo:MBS Uncommon

res/cardsfolder/a/accorders_shield.txt

@@ -4,5 +4,4 @@ Types:Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+3 and has vigilance.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorders_shield.jpg
-Oracle:Equipped creature gets +0/+3 and has vigilance.\nEquip {3}
+Oracle:Equipped creature gets +0/+3 and has vigilance.\nEquip {3}
-SetInfo:SOM Common

res/cardsfolder/a/accumulated_knowledge.txt

@@ -2,8 +2,7 @@ Name:Accumulated Knowledge
 ManaCost:1 U
 Types:Instant
 A:SP$ Draw | Cost$ 1 U | Defined$ You | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ Draw a card, then draw cards equal to the number of cards named CARDNAME in all graveyards.
-SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ X | References$ X
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
 SVar:X:Count$NamedInAllYards.Accumulated Knowledge
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accumulated_knowledge.jpg
-Oracle:Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
+Oracle:Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
-SetInfo:NMS Common

res/cardsfolder/a/accursed_centaur.txt

@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accursed_centaur.jpg
-Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
+Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
-SetInfo:ONS Common

res/cardsfolder/a/accursed_spirit.txt

@@ -0,0 +1,7 @@
+Name:Accursed Spirit
+ManaCost:3 B
+Types:Creature Spirit
+PT:3/2
+K:Intimidate
+SVar:Picture:http://www.wizards.com/global/images/magic/general/accursed_spirit.jpg
+Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)

res/cardsfolder/a/acid_rain.txt

@@ -4,5 +4,4 @@ Types:Sorcery
 A:SP$ DestroyAll | Cost$ 3 U | ValidCards$ Forest | SpellDescription$ Destroy all Forests.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_rain.jpg
-Oracle:Destroy all Forests.
+Oracle:Destroy all Forests.
-SetInfo:LEG Rare

res/cardsfolder/a/acid_web_spider.txt

@@ -4,8 +4,7 @@ Types:Creature Spider
 PT:3/5
 K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target Equipment.
-SVar:TrigDestroy:DB$Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment.
+SVar:TrigDestroy:DB$ Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_web_spider.jpg
-Oracle:Reach\nWhen Acid Web Spider enters the battlefield, you may destroy target Equipment.
+Oracle:Reach\nWhen Acid Web Spider enters the battlefield, you may destroy target Equipment.
-SetInfo:SOM Uncommon

res/cardsfolder/a/acidic_dagger.txt

@@ -9,5 +9,4 @@ SVar:TrigSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_dagger.jpg
-Oracle:{4}, {T}: 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 Acidic Dagger. Activate this ability only before blockers are declared.
+Oracle:{4}, {T}: 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 Acidic Dagger. Activate this ability only before blockers are declared.
-SetInfo:MIR Rare

res/cardsfolder/a/acidic_slime.txt

@@ -4,12 +4,7 @@ Types:Creature Ooze
 PT:2/2
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact, enchantment, or land.
-SVar:TrigDestroy:DB$Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_slime.jpg
-Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
+Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
-SetInfo:M11 Uncommon
-SetInfo:M10 Uncommon
-SetInfo:M12 Uncommon
-SetInfo:COM Uncommon
-SetInfo:M13 Uncommon

res/cardsfolder/a/acidic_sliver.txt

@@ -6,6 +6,4 @@ S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Damage | Description$ All Sl
 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:Picture:http://www.wizards.com/global/images/magic/general/acidic_sliver.jpg
-Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
+Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
-SetInfo:H09 Uncommon
-SetInfo:STH Uncommon

res/cardsfolder/a/acidic_soil.txt

@@ -7,5 +7,4 @@ SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg
-Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
+Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
-SetInfo:USG Uncommon

res/cardsfolder/a/acolyte_of_xathrid.txt

@@ -4,5 +4,4 @@ Types:Creature Human Cleric
 PT:0/1
 A:AB$ LoseLife | Cost$ 1 B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SpellDescription$ Target player loses 1 life.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acolyte_of_xathrid.jpg
-Oracle:{1}{B}, {T}: Target player loses 1 life.
+Oracle:{1}{B}, {T}: Target player loses 1 life.
-SetInfo:M10 Common

res/cardsfolder/a/acorn_catapult.txt

@@ -6,5 +6,4 @@ SVar:SquirrelTokenCtrl:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenT
 SVar:SquirrelTokenPlayer:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ TargetedController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature | ConditionCompare$ GE1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_catapult.jpg
-Oracle:{1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
+Oracle:{1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
-SetInfo:COM Rare

res/cardsfolder/a/acorn_harvest.txt

@@ -4,5 +4,4 @@ Types:Sorcery
 K:Flashback 1 G PayLife<3>
 A:SP$ Token | Cost$ 3 G | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 green Squirrel creature tokens onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_harvest.jpg
-Oracle:Put two 1/1 green Squirrel creature tokens onto the battlefield.\nFlashback-{1}{G}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Put two 1/1 green Squirrel creature tokens onto the battlefield.\nFlashback-{1}{G}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
-SetInfo:TOR Common

res/cardsfolder/a/acquire.txt

@@ -3,5 +3,4 @@ ManaCost:3 U U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 U U | Origin$ Library | Destination$ Battlefield | ValidTgts$ Opponent | ChangeType$ Artifact | ChangeNum$ 1 | GainControl$ True | IsCurse$ True | StackDescription$ SpellDescription | SpellDescription$ Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acquire.jpg
-Oracle:Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
+Oracle:Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
-SetInfo:5DN Rare

res/cardsfolder/a/acridian.txt

@@ -4,5 +4,4 @@ Types:Creature Insect
 PT:2/4
 K:Echo:1 G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acridian.jpg
-Oracle:Echo {1}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
+Oracle:Echo {1}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
-SetInfo:USG Common

res/cardsfolder/a/act_of_aggression.txt

@@ -3,5 +3,4 @@ ManaCost:3 PR PR
 Types:Instant
 A:SP$ GainControl | Cost$ 3 PR PR | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls. | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_aggression.jpg
-Oracle:({R/P} can be paid with either {R} or 2 life.)\nGain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
+Oracle:({R/P} can be paid with either {R} or 2 life.)\nGain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
-SetInfo:NPH Uncommon

res/cardsfolder/a/act_of_treason.txt

@@ -3,8 +3,4 @@ ManaCost:2 R
 Types:Sorcery
 A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.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.)
+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.)
-SetInfo:M11 Common
-SetInfo:M10 Uncommon
-SetInfo:GTC Common
-SetInfo:M12 Common

res/cardsfolder/a/active_volcano.txt

@@ -6,6 +6,4 @@ A:SP$ ChangeZone | Cost$ R | ValidTgts$ Island | TgtPrompt$ Select target Island
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/active_volcano.jpg
-Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
+Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
-SetInfo:CHR Common
-SetInfo:LEG Common

res/cardsfolder/a/ad_nauseam.txt

@@ -8,5 +8,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ad_nauseam.jpg
-Oracle:Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times.
+Oracle:Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times.
-SetInfo:ALA Rare

res/cardsfolder/a/adamaro_first_to_desire.txt

@@ -6,5 +6,4 @@ S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$
 SVar:X:Count$InOppHand
 SVar:AntiBuffedBy:Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adamaro_first_to_desire.jpg
-Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
+Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
-SetInfo:SOK Rare

res/cardsfolder/a/adaptive_automaton.txt

@@ -7,5 +7,4 @@ SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputer
 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:Picture:http://www.wizards.com/global/images/magic/general/adaptive_automaton.jpg
-Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.
+Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.
-SetInfo:M12 Rare

res/cardsfolder/a/adaptive_snapjaw.txt

@@ -4,5 +4,4 @@ Types:Creature Lizard Beast
 PT:6/2
 K:Evolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_snapjaw.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.)
+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.)
-SetInfo:GTC Common

res/cardsfolder/a/adarkar_sentinel.txt

@@ -4,5 +4,4 @@ Types:Artifact Creature Soldier
 PT:3/3
 A:AB$ Pump | Cost$ 1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_sentinel.jpg
-Oracle:{1}: Adarkar Sentinel gets +0/+1 until end of turn.
+Oracle:{1}: Adarkar Sentinel gets +0/+1 until end of turn.
-SetInfo:ICE Uncommon

res/cardsfolder/a/adarkar_valkyrie.txt

@@ -8,5 +8,4 @@ A:AB$ Effect | Cost$ T | Name$ Adarkar Valkyrie Effect | ValidTgts$ Creature.Oth
 SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.IsRemembered | Execute$ TrigChangeZone | TriggerDescription$ If the targeted creature of Adarkar Valkyrie dies this turn, return it to the battlefield and you gain control of it.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121196.jpg
-Oracle:Flying, vigilance\n{T}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
+Oracle:Flying, vigilance\n{T}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
-SetInfo:CSP Rare

res/cardsfolder/a/adarkar_wastes.txt

@@ -4,12 +4,6 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
-SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
+SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_wastes.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
+Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
-SetInfo:7ED Rare
-SetInfo:6ED Rare
-SetInfo:9ED Rare
-SetInfo:10E Rare
-SetInfo:5ED Rare
-SetInfo:ICE Rare

res/cardsfolder/a/adarkar_windform.txt

@@ -6,5 +6,4 @@ K:Flying
 A:AB$ Debuff | Cost$ 1 S | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Flying | SpellDescription$ Target creature loses flying until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_windform.jpg
-Oracle:Flying\n{1}{S}: Target creature loses flying until end of turn. ({S} can be paid with one mana from a snow permanent.)
+Oracle:Flying\n{1}{S}: Target creature loses flying until end of turn. ({S} can be paid with one mana from a snow permanent.)
-SetInfo:CSP Uncommon

res/cardsfolder/a/adder_staff_boggart.txt

@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigClash:AB$Clash | Cost$ 0 | WinSubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adder_staff_boggart.jpg
-Oracle:When Adder-Staff Boggart enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Adder-Staff Boggart. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
+Oracle:When Adder-Staff Boggart enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Adder-Staff Boggart. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
-SetInfo:LRW Common

res/cardsfolder/a/addle.txt

@@ -5,5 +5,4 @@ A:SP$ ChooseColor | Cost$ 1 B | Defined$ You | AILogic$ MostProminentInHumanDeck
 SVar:DBRevealDiscard:DB$ Discard | Mode$ RevealYouChoose | NumCards$ 1 | DiscardValid$ Card.ChosenColor | ValidTgts$ Player | TgtPrompt$ Select target player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/addle.jpg
-Oracle:Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
+Oracle:Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
-SetInfo:INV Uncommon

res/cardsfolder/a/admonition_angel.txt

@@ -10,5 +10,4 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile |
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/admonition_angel.jpg
-Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
+Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
-SetInfo:WWK Mythic

res/cardsfolder/a/adun_oakenshield.txt

@@ -4,5 +4,4 @@ Types:Legendary Creature Human Knight
 PT:1/2
 A:AB$ ChangeZone | Cost$ B R G T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl  | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adun_oakenshield.jpg
-Oracle:{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
+Oracle:{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
-SetInfo:LEG Rare

res/cardsfolder/a/advance_scout.txt

@@ -5,5 +5,4 @@ PT:1/1
 K:First Strike
 A:AB$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advance_scout.jpg
-Oracle:First strike\n{W}: Target creature gains first strike until end of turn.
+Oracle:First strike\n{W}: Target creature gains first strike until end of turn.
-SetInfo:TMP Common

res/cardsfolder/a/advanced_hoverguard.txt

@@ -5,5 +5,4 @@ PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ U | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advanced_hoverguard.jpg
-Oracle:Flying\n{U}: Advanced Hoverguard gains shroud until end of turn. (It can't be the target of spells or abilities.)
+Oracle:Flying\n{U}: Advanced Hoverguard gains shroud until end of turn. (It can't be the target of spells or abilities.)
-SetInfo:5DN Common

res/cardsfolder/a/advent_of_the_wurm.txt

@@ -3,5 +3,4 @@ ManaCost:1 G G W
 Types:Instant
 A:SP$ Token | Cost$ 1 G G W | TokenImage$ g 5 5 wurm rtr | TokenName$ Wurm | TokenAmount$ 1 | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample | SpellDescription$ Put a 5/5 green Wurm creature token with trample onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advent_of_the_wurm.jpg
-Oracle:Put a 5/5 green Wurm creature token with trample onto the battlefield.
+Oracle:Put a 5/5 green Wurm creature token with trample onto the battlefield.
-SetInfo:DGM Rare

res/cardsfolder/a/adventurers_guildhouse.txt

@@ -0,0 +1,7 @@
+Name:Adventurers' Guildhouse
+ManaCost:no cost
+Types:Land
+S:Mode$ Continuous | Affected$ Creature.Green+Legendary | AddKeyword$ Bands with Other Legendary Creatures | Description$ Green legendary creatures you control have "bands with other legendary creatures." (Any legendary creatures can attack in a band as long as at least one has "bands with other legendary creatures." Bands are blocked as a group. If at least two legendary creatures you control, one of which has "bands with other legendary creatures," are blocking or being blocked by the same creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/adventurers_guildhouse.jpg
+Oracle:Green legendary creatures you control have "bands with other legendary creatures." (Any legendary creatures can attack in a band as long as at least one has "bands with other legendary creatures." Bands are blocked as a group. If at least two legendary creatures you control, one of which has "bands with other legendary creatures," are blocking or being blocked by the same creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)

res/cardsfolder/a/adventuring_gear.txt

@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Equipped | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adventuring_gear.jpg
-Oracle:Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+Oracle:Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-SetInfo:ZEN Common

res/cardsfolder/a/advice_from_the_fae.txt

@@ -7,5 +7,4 @@ SVar:X:Count$Valid Creature.YouCtrl
 SVar:Y:PlayerCountOther$HighestValid Creature.YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advice_from_the_fae.jpg
-Oracle:({2/U} can be paid with any two mana or with {U}. This card's converted mana cost is 6.)\nLook 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.
+Oracle:({2/U} can be paid with any two mana or with {U}. This card's converted mana cost is 6.)\nLook 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.
-SetInfo:SHM Uncommon

res/cardsfolder/a/advocate_of_the_beast.txt

@@ -0,0 +1,8 @@
+Name:Advocate of the Beast
+ManaCost:2 G
+Types:Creature Elf Shaman
+PT:2/3
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your end step, put a +1/+1 counter on target Beast creature you control.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature.Beast+YouCtrl | TgtPrompt$ Select target beast creature you control | CounterType$ P1P1 | CounterNum$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/advocate_of_the_beast.jpg
+Oracle:At the beginning of your end step, put a +1/+1 counter on target Beast creature you control.

res/cardsfolder/a/aegis_angel.txt

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

res/cardsfolder/a/aegis_of_honor.txt

@@ -0,0 +1,11 @@
+Name:Aegis of Honor
+ManaCost:W
+Types:Enchantment
+A:AB$ Effect | Cost$ 1 | ReplacementEffects$ AegisRedirect | SVars$ AegisDmg,ExileEffect,AegisX | References$ AegisRedirect,AegisDmg,ExileEffect,AegisX | AILogic$ RedirectSpellDamageFromPlayer | Stackable$ False | SpellDescription$ The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
+SVar:AegisRedirect:Event$ DamageDone | ValidTarget$ You | ValidSource$ Instant,Sorcery | IsCombat$ False | ReplaceWith$ AegisDmg | Description$ The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
+SVar:AegisDmg:AB$ DealDamage | Cost$ 0 | Defined$ ReplacedSourceController | DamageSource$ ReplacedSource | NumDmg$ AegisX | SubAbility$ ExileEffect
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:AegisX:ReplaceCount$DamageAmount
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_of_honor.jpg
+Oracle:{1}: The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.

res/cardsfolder/a/aegis_of_the_meek.txt

@@ -3,5 +3,4 @@ ManaCost:3
 Types:Artifact
 A:AB$ Pump | Cost$ 1 T | NumAtt$ 1 | NumDef$ 2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 Creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_of_the_meek.jpg
-Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
+Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
-SetInfo:ICE Rare

res/cardsfolder/a/aeolipile.txt

@@ -3,5 +3,4 @@ ManaCost:2
 Types:Artifact
 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:Picture:http://www.wizards.com/global/images/magic/general/aeolipile.jpg
-Oracle:{1}, {T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
+Oracle:{1}, {T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
-SetInfo:FEM Rare

res/cardsfolder/a/aeon_chronicler.txt

@@ -11,5 +11,4 @@ SVar:X:Count$xPaid
 SVar:Y:Count$InYourHand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeon_chronicler.jpg
-Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X-{X}{3}{U}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{U} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
+Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X-{X}{3}{U}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{U} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
-SetInfo:PLC Rare

res/cardsfolder/a/aerathi_berserker.txt

@@ -4,5 +4,4 @@ Types:Creature Human Berserker
 PT:2/4
 K:Rampage 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerathi_berserker.jpg
-Oracle:Rampage 3 (Whenever this creature becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
+Oracle:Rampage 3 (Whenever this creature becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
-SetInfo:LEG Uncommon

res/cardsfolder/a/aerial_caravan.txt

@@ -7,5 +7,4 @@ A:AB$ Dig | Cost$ 1 U U | DigNum$ 1 | ChangeNum$ All | ChangeValid$ Card | Desti
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played | PumpZone$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_caravan.jpg
-Oracle:Flying\n{1}{U}{U}: Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
+Oracle:Flying\n{1}{U}{U}: Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
-SetInfo:MMQ Rare

res/cardsfolder/a/aerial_maneuver.txt

@@ -3,5 +3,4 @@ ManaCost:1 W
 Types:Instant
 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
-Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
+Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
-SetInfo:GTC Common

res/cardsfolder/a/aerial_predation.txt

@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SubAbility$ NaturalLife | SpellDescription$ Destroy target creature with flying. You gain 2 life
 SVar:NaturalLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_predation.jpg
-Oracle:Destroy target creature with flying. You gain 2 life.
+Oracle:Destroy target creature with flying. You gain 2 life.
-SetInfo:RTR Common