merge latest trunk

2025-11-20 04:38:00 +00:00 · 2013-03-04 04:02:25 +00:00
parent 03bb325489 46fa85528f
commit 4fab537404
150 changed files with 2550 additions and 1186 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1489,6 +1489,7 @@ res/cardsfolder/c/carnival_hellsteed.txt -text
 res/cardsfolder/c/carnival_of_souls.txt svneol=native#text/plain
 res/cardsfolder/c/carnivorous_plant.txt svneol=native#text/plain
 res/cardsfolder/c/carnophage.txt svneol=native#text/plain
+res/cardsfolder/c/carpet_of_flowers.txt -text
 res/cardsfolder/c/carrier_pigeons.txt svneol=native#text/plain
 res/cardsfolder/c/carrion.txt svneol=native#text/plain
 res/cardsfolder/c/carrion_ants.txt svneol=native#text/plain
@@ -2387,6 +2388,7 @@ res/cardsfolder/d/deadwood_treefolk.txt svneol=native#text/plain
 res/cardsfolder/d/dearly_departed.txt -text
 res/cardsfolder/d/death_baron.txt svneol=native#text/plain
 res/cardsfolder/d/death_bomb.txt svneol=native#text/plain
+res/cardsfolder/d/death_by_dragons.txt -text
 res/cardsfolder/d/death_charmer.txt svneol=native#text/plain
 res/cardsfolder/d/death_cloud.txt svneol=native#text/plain
 res/cardsfolder/d/death_cultist.txt svneol=native#text/plain
@@ -2611,6 +2613,7 @@ res/cardsfolder/d/diamond_valley.txt svneol=native#text/plain
 res/cardsfolder/d/didgeridoo.txt svneol=native#text/plain
 res/cardsfolder/d/diligent_farmhand.txt svneol=native#text/plain
 res/cardsfolder/d/diluvian_primordial.txt -text
+res/cardsfolder/d/dimensional_breach.txt -text
 res/cardsfolder/d/diminish.txt svneol=native#text/plain
 res/cardsfolder/d/diminishing_returns.txt svneol=native#text/plain
 res/cardsfolder/d/dimir_aqueduct.txt svneol=native#text/plain
@@ -3299,6 +3302,7 @@ res/cardsfolder/e/ethersworn_canonist.txt -text
 res/cardsfolder/e/ethersworn_shieldmage.txt -text
 res/cardsfolder/e/etherwrought_page.txt -text svneol=unset#text/plain
 res/cardsfolder/e/eunuchs_intrigues.txt -text
+res/cardsfolder/e/eureka.txt -text
 res/cardsfolder/e/evacuation.txt svneol=native#text/plain
 res/cardsfolder/e/evaporate.txt svneol=native#text/plain
 res/cardsfolder/e/evasive_action.txt svneol=native#text/plain
@@ -3465,6 +3469,7 @@ res/cardsfolder/f/fastbond.txt svneol=native#text/plain
 res/cardsfolder/f/fatal_attraction.txt svneol=native#text/plain
 res/cardsfolder/f/fatal_blow.txt svneol=native#text/plain
 res/cardsfolder/f/fatal_frenzy.txt svneol=native#text/plain
+res/cardsfolder/f/fatal_lore.txt -text
 res/cardsfolder/f/fatal_mutation.txt svneol=native#text/plain
 res/cardsfolder/f/fatestitcher.txt svneol=native#text/plain
 res/cardsfolder/f/fathom_mage.txt -text
@@ -3491,6 +3496,7 @@ res/cardsfolder/f/feed_the_pack.txt -text
 res/cardsfolder/f/feedback.txt svneol=native#text/plain
 res/cardsfolder/f/feedback_bolt.txt svneol=native#text/plain
 res/cardsfolder/f/feeding_frenzy.txt svneol=native#text/plain
+res/cardsfolder/f/feeding_grounds.txt -text
 res/cardsfolder/f/feeling_of_dread.txt -text
 res/cardsfolder/f/feint.txt -text
 res/cardsfolder/f/feldons_cane.txt svneol=native#text/plain
@@ -4946,6 +4952,7 @@ res/cardsfolder/h/hope_charm.txt svneol=native#text/plain
 res/cardsfolder/h/hopping_automaton.txt svneol=native#text/plain
 res/cardsfolder/h/horde_of_boggarts.txt -text
 res/cardsfolder/h/horde_of_notions.txt svneol=native#text/plain
+res/cardsfolder/h/horizon_boughs.txt -text
 res/cardsfolder/h/horizon_canopy.txt svneol=native#text/plain
 res/cardsfolder/h/horizon_drake.txt svneol=native#text/plain
 res/cardsfolder/h/horizon_seed.txt -text
@@ -5049,6 +5056,7 @@ res/cardsfolder/h/hydrosurge.txt -text
 res/cardsfolder/h/hyena_umbra.txt svneol=native#text/plain
 res/cardsfolder/h/hymn_of_rebirth.txt svneol=native#text/plain
 res/cardsfolder/h/hymn_to_tourach.txt svneol=native#text/plain
+res/cardsfolder/h/hypergenesis.txt -text
 res/cardsfolder/h/hyperion_blacksmith.txt svneol=native#text/plain
 res/cardsfolder/h/hypersonic_dragon.txt -text
 res/cardsfolder/h/hypervolt_grasp.txt svneol=native#text/plain
@@ -5968,6 +5976,7 @@ res/cardsfolder/l/liability.txt svneol=native#text/plain
 res/cardsfolder/l/liberate.txt svneol=native#text/plain
 res/cardsfolder/l/liberated_dwarf.txt svneol=native#text/plain
 res/cardsfolder/l/library_of_alexandria.txt svneol=native#text/plain
+res/cardsfolder/l/library_of_lat_nam.txt -text
 res/cardsfolder/l/library_of_leng.txt -text
 res/cardsfolder/l/lich.txt svneol=native#text/plain
 res/cardsfolder/l/lich_lord_of_unx.txt svneol=native#text/plain
@@ -6037,6 +6046,7 @@ res/cardsfolder/l/lim_dul_the_necromancer.txt svneol=native#text/plain
 res/cardsfolder/l/lim_duls_cohort.txt svneol=native#text/plain
 res/cardsfolder/l/lim_duls_high_guard.txt svneol=native#text/plain
 res/cardsfolder/l/lim_duls_paladin.txt -text
+res/cardsfolder/l/lim_duls_vault.txt -text
 res/cardsfolder/l/limestone_golem.txt svneol=native#text/plain
 res/cardsfolder/l/limited_resources.txt -text
 res/cardsfolder/l/lin_sivvi_defiant_hero.txt svneol=native#text/plain
@@ -6676,6 +6686,7 @@ res/cardsfolder/m/mischievous_poltergeist.txt svneol=native#text/plain
 res/cardsfolder/m/mischievous_quanar.txt -text
 res/cardsfolder/m/misers_cage.txt svneol=native#text/plain
 res/cardsfolder/m/misery_charm.txt svneol=native#text/plain
+res/cardsfolder/m/misfortune.txt -text
 res/cardsfolder/m/misfortunes_gain.txt svneol=native#text/plain
 res/cardsfolder/m/misguided_rage.txt svneol=native#text/plain
 res/cardsfolder/m/mishra.txt -text
@@ -14214,9 +14225,9 @@ src/main/java/forge/gui/GuiChoose.java -text
 src/main/java/forge/gui/GuiDialog.java -text
 src/main/java/forge/gui/GuiDisplayUtil.java svneol=native#text/plain
 src/main/java/forge/gui/GuiImportPicture.java svneol=native#text/plain
-src/main/java/forge/gui/GuiInput.java svneol=native#text/plain
 src/main/java/forge/gui/GuiProgressBarWindow.java svneol=native#text/plain
 src/main/java/forge/gui/GuiUtils.java svneol=native#text/plain
+src/main/java/forge/gui/InputProxy.java svneol=native#text/plain
 src/main/java/forge/gui/ListChooser.java svneol=native#text/plain
 src/main/java/forge/gui/MultiLineLabel.java svneol=native#text/plain
 src/main/java/forge/gui/MultiLineLabelUI.java svneol=native#text/plain
@@ -14530,7 +14541,6 @@ src/main/java/forge/view/arcane/package-info.java svneol=native#text/plain
 src/main/java/forge/view/arcane/util/Animation.java svneol=native#text/plain
 src/main/java/forge/view/arcane/util/CardPanelMouseListener.java svneol=native#text/plain
 src/main/java/forge/view/arcane/util/GlowText.java svneol=native#text/plain
-src/main/java/forge/view/arcane/util/UI.java svneol=native#text/plain
 src/main/java/forge/view/arcane/util/package-info.java svneol=native#text/plain
 src/main/java/forge/view/package-info.java svneol=native#text/plain
 src/main/resources/proxy-template.ftl -text
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,217 +1,36 @@
-Forge Beta: 03-01-2013 ver 1.3.9
+Forge Beta: 03-##-2013 ver 1.3.10


-12193 cards in total.
+12### cards in total.


 Release Notes:

-You can now cast cards for it's miracle cost without getting a crash. Blocking with a creature was not resetting after combat and this would prevent this creature from blocking in subsequent turns, now fixed.

-Work continues on the quest worlds format and a new world based on Ravnica is coming along nicely.
-
-Added a 'copy to clipboard' button on WinLose screen so players can easily copy the game log.
-
-Find-as-you-type is now implemented for Deck Editor tables.  Just start typing while the table has focus and the next card with a matching string in its name will be highlighted.  If more than one card matches, hit Enter to select the next matching card.  A popup panel will appear with the search string so you know what you are searching for.  If no cards match the string, the string will be highlighted in red.  Normally, if you hit the spacebar while a card is selected in one table, the card will be moved to the other table (catalog/deck).  When the popup is displayed, space characters are interpreted as part of the search string.  Find-as-you-type mode is automatically exited after 5 seconds of inactivity, or hit Escape to exit find-as-you-type mode immediately.
-
-The Deck Editor has also gained some hotkey and context menu abilities.  R-click on a card (or a group of selected cards) for a list of actions and keyboard shortcuts.  In particular, you can now transfer cards 4 at a time using the keyboard and interact with the sideboard from anywhere.  Also remember that you can jump to the other table with the arrow keys and jump to the text filter with ctrl/cmd+f.  From the text filter, you can jump down to the tables by pressing enter.
-
-In recent weeks people had noticed that the computer was picking the weakest cards in Draft mode rather than the strongest cards. This left the AI with a draft mode deck that was suboptimal. The computer should now pick the strongest cards rather than the weakest cards.
-
-Work was also done on making the UI more keyboard-friendly.  For example, the OK button should now stay focused during matches, so you can advance through the stages by hitting Enter without having to go over and click the button all the time.  If you find the button is losing focus, please report it as a bug.
-
-Gatecrash Guild Sealed game mode has been added. To use it, start a new Sealed Mode Game, select "Block / Set" and "Gatecrash Guild Sealed". Select the first (default) configuration in the "Choose Set Combination" dialog, and when asked to pick your boosters, choose the guild you want twice (once for the guild-specific booster, and then for the extra promo cards). 
-The following cards are not included in the guild boosters of this game mode because they are not currently implemented in Forge: Bane Alley Broker, Bioshift, Killing Glare, Simic Manipulator.
-
-All Traditional sets are now up to 85% complete. Standard Format is supported at 99.19%. We are now at under 800 unsupported cards that are missing from Forge.
-
-A person reported "Love the game but I seem to be having a problem using a draft pool to start a quest. It works for sealed for me but when I select the draft deck option it's always blank even if I have one or several drafts completed." This should now be fixed and draft decks should now show up in quest start combobox.
-
-Several of the exiting sound files were changed and a handful of new sounds were added to the /res/sound/ folder.
-
-Our snapshot and beta releases should now display the correct SVN revision number in the title bar. This should allow people to file a bug report with the correct SVN revision number.


 New Cards:

-Archery Training
-Aurelia's Fury
-Aven Shrine
-Barrin's Spite
-Battletide Alchemist
-Bioshift
-Blind Seer
-Blinding Powder
-Bloom Tender
-Bomb Squad
-Bounty of the Hunt
-Builder's Bane
-Cabal Shrine
-Cannibalize
-Cephalid Shrine
-Chant of Vitu-Ghazi
-Chaoslace
-Charm Peddler
-Circle of Despair
-Cleansing Meditation
-Common Cause
-Conflagrate
-Conjurer's Ban
-Cornered Market
-Covenant of Minds
-Crashing Boars
-Crush Underfoot
-Cryptic Gateway
-Deathlace
-Deepwood Elder
-Desecrator Hag
-Disruption Aura
-Duplicity
-Dwarven Shrine
-Eight-and-a-Half-Tails
-Embolden
-Endemic Plague
-Epochrasite
-Ersatz Gnomes
-Eye for an Eye
-Eye of Singularity
-Eye of Yawgmoth
-Feint
-Fiery Bombardment
-Fiery Justice
-Fire and Brimstone
-Fire Covenant
-Flash
-Flickerform
-Forbidden Crypt
-Forked Lightning
-Frostwielder
-Game Preserve
-Gargantuan Gorilla
-Ghosts of the Innocent
-Glamer Spinners
-Guard Dogs
-Hail of Arrows
-Heartseeker
-Heroic Defiance
-Hint of Insanity
-Holistic Wisdom
-Infectious Rage
-Infernal Harvest
-Invoke Prejudice
-Jaded Response
-Jaws of Stone
-Killing Glare
-Knollspine Invocation
-Knowledge Exploitation
-Kumano's Blessing
-Kumano's Pupils
-Kumano, Master Yamabushi
-Leonin Bola
-Library of Leng
-Lifelace
-Light from Within
-Lightning Dart
-Living Inferno
-Magmatic Core
-Mana Vapors
-Marble Priest
-Mark of Eviction
-Martyr's Cause
-Memory Crystal
-Meteor Shower
-Mirror Golem
-Mist of Stagnation
-Mist of Stagnation
-Moonlace
-Moonring Mirror
-Nantuko Shrine
-Not of This World
-Pendrell Flux
-Phosphorescent Feast
-Phyrexian Purge
-Pious Kitsune
-Plague Boiler
-Planeswalker's Mischief
-Pledge of Loyalty
-Pollen Remedy
-Protean Hulk
-Psychic Allergy
-Purelace
-Purgatory
-Quenchable Fire
-Rally the Horde
-Razia's Purification
-Razor Boomerang
-Reincarnation
-Reins of the Vinesteed
-Remedy
-Retribution
-Reverent Mantra
-Reviving Vapors
-Reweave
-Rite of Ruin
-Rock Slide
-Rolling Thunder
-Sabertooth Cobra
-Samite Elder
-Sapphire Drake
-Searing Rays
-Serra's Hymn
-Shambling Swarm
-Shared Animosity
-Shuriken
-Simic Guildmage
-Sphinx Ambassador
-Spike Cannibal
-Spoils of War
-Struggle for Sanity
-Sunforger
-Surestrike Trident
-Tainted Pact
-Takeno, Samurai General
-Talara's Bane
-Talruum Piper
-Temporal Extortion
-Thelon of Havenwood
-Thought Gorger
-Thoughtlace
-Thran Tome
-Unforge
-Vodalian Mystic
-Volcanic Wind
-Warren Weirding
-Winnow
-Worldpurge
+Dimensional Breach
+Lim-Dul's Vault
+Eureka
+Hypergenesis


 New Phenomenons:

-Chaotic AEther
-Planewide Disaster
+


 New Planes:

-Aretopolis
-Undercity Reaches
+Feeding Grounds
+Horizon Boughs


 New Vanguard Avatars:

-Arcanis the Omnipotent Avatar
-Bosh, Iron Golem Avatar
-Figure of Destiny Avatar
-Haakon Stromgald Scourge Avatar
-Jaya Ballard Avatar
-Maro Avatar
-Master of the Wild Hunt Avatar
-Necropotence Avatar
-Sisters of Stone Death Avatar
-Stuffy Doll Avatar
-Two Headed Giant of Foriys Avatar
-Vampire Nocturnus Avatar
-Viridian Zealot Avatar
+


 Known Issues:
@@ -222,8 +41,6 @@ Several people have noticed that the cards displayed on the battlefield will fai

 Some time was spent turning the static ETB triggers into the proper ETB replacement effects they should be, mainly to interact correctly with each other. This work is not yet finished. As a result there is currently some inconsistencies with "Enters the battlefield with counters" (Not incredibly noticeable).

-It seems like the front face of double faced cards aren't triggering properly, but the back face and single faced cards are.
-
 A recent contribution to the code base should fix some of the bugs that people noticed with cloning type abilities. At this time there are two remaining issues that we hope will be addressed in the near future.

 1. Leave play triggers don't work correct for clones.
@@ -240,21 +57,7 @@ Some people use the Windows application 7zip. This utility can be found at http:

 Contributors to This Release:

-Agetian
-Asepetci
-Foreroes
-Gos
-Hellfish
-Marc
-Max
-Myk
-Rooger
-RumbleBBU
-Serrasmurf
-Sloth
-Sol
-Swordshine
-Chris H
+


 (Quest icons used created by Teekatas, from his Legendora set http://raindropmemory.deviantart.com)
--- a/README.txt
+++ b/README.txt
@@ -496,6 +496,27 @@ The "Full catalog view" button appears to the left of the "Buy Card" button. Tog

 Multibuy: By selecting any number of items and hitting space (or selecting the "Buy Card" or "Sell Card" buttons), a player can buy one of everything selected.

+Find-as-you-type is now implemented for Deck Editor tables. Just start typing while the table has focus and the next card with a matching string in its name will be highlighted. If more than one card matches, hit Enter to select the next matching card. A popup panel will appear with the search string so you know what you are searching for. If no cards match the string, the string will be highlighted in red. Normally, if you hit the spacebar while a card is selected in one table, the card will be moved to the other table (catalog/deck). When the popup is displayed, space characters are interpreted as part of the search string. Find-as-you-type mode is automatically exited after 5 seconds of inactivity, or hit Escape to exit find-as-you-type mode immediately.
+
+The Deck Editor has also gained some hotkey and context menu abilities. R-click on a card (or a group of selected cards) for a list of actions and keyboard shortcuts. In particular, you can now transfer cards 4 at a time using the keyboard and interact with the sideboard from anywhere. Also remember that you can jump to the other table with the arrow keys and jump to the text filter with ctrl/cmd+f. From the text filter, you can jump down to the tables by pressing enter.
+
+
+The Game Log:
+
+Added a 'copy to clipboard' button on WinLose screen so players can easily copy the game log.
+
+
+The UI more keyboard-friendly:
+
+Work was also done on making the UI more keyboard-friendly. For example, the OK button should now stay focused during matches, so you can advance through the stages by hitting Enter without having to go over and click the button all the time. If you find the button is losing focus, please report it as a bug.
+
+
+Gatecrash Guild Sealed game mode:
+
+Gatecrash Guild Sealed game mode has been added. To use it, start a new Sealed Mode Game, select "Block / Set" and "Gatecrash Guild Sealed". Select the first (default) configuration in the "Choose Set Combination" dialog, and when asked to pick your boosters, choose the guild you want twice (once for the guild-specific booster, and then for the extra promo cards). 
+
+The following cards are not included in the guild boosters of this game mode because they are not currently implemented in Forge: Bane Alley Broker, Bioshift, Killing Glare, Simic Manipulator.
+

 Our Lawyers Made Us Do This:

--- a/res/blockdata/blocks.txt
+++ b/res/blockdata/blocks.txt
@@ -1,53 +1,53 @@
-Index:0|Set0:LEA|Name:Alpha|DraftPacks:3|LandSetCode:LEA|SealedPacks:6
-Index:1|Set0:LEB|Name:Beta|DraftPacks:3|LandSetCode:LEB|SealedPacks:6
-Index:2|Set0:2ED|Name:Unlimited|DraftPacks:3|LandSetCode:2ED|SealedPacks:6
-Index:3|Set0:ARN|Name:Arabian Nights|DraftPacks:5|LandSetCode:2ED|SealedPacks:9
-Index:4|Set0:ATQ|Name:Antiquities|DraftPacks:5|LandSetCode:2ED|SealedPacks:9
-Index:5|Set0:3ED|Name:Revised|DraftPacks:3|LandSetCode:3ED|SealedPacks:6
-Index:6|Set0:LEG|Name:Legends|DraftPacks:3|LandSetCode:3ED|SealedPacks:6
-Index:7|Set0:DRK|Name:The Dark|DraftPacks:5|LandSetCode:3ED|SealedPacks:9
-Index:8|Set0:FEM|Name:Fallen Empires|DraftPacks:5|LandSetCode:3ED|SealedPacks:9
-Index:9|Set0:4ED|Name:Fourth Edition|DraftPacks:3|LandSetCode:4ED|SealedPacks:6
+Set0:LEA|Name:Alpha|DraftPacks:3|LandSetCode:LEA|SealedPacks:6
+Set0:LEB|Name:Beta|DraftPacks:3|LandSetCode:LEB|SealedPacks:6
+Set0:2ED|Name:Unlimited|DraftPacks:3|LandSetCode:2ED|SealedPacks:6
+Set0:ARN|Name:Arabian Nights|DraftPacks:5|LandSetCode:2ED|SealedPacks:9
+Set0:ATQ|Name:Antiquities|DraftPacks:5|LandSetCode:2ED|SealedPacks:9
+Set0:3ED|Name:Revised|DraftPacks:3|LandSetCode:3ED|SealedPacks:6
+Set0:LEG|Name:Legends|DraftPacks:3|LandSetCode:3ED|SealedPacks:6
+Set0:DRK|Name:The Dark|DraftPacks:5|LandSetCode:3ED|SealedPacks:9
+Set0:FEM|Name:Fallen Empires|DraftPacks:5|LandSetCode:3ED|SealedPacks:9
+Set0:4ED|Name:Fourth Edition|DraftPacks:3|LandSetCode:4ED|SealedPacks:6

-Index:10|Set0:ICE|Set1:ALL|Set2:CSP|Name:Ice Age|DraftPacks:3|LandSetCode:ICE|SealedPacks:6
-Index:11|Set0:HML|Name:Homelands|DraftPacks:5|LandSetCode:4ED|SealedPacks:9
-Index:12|Set0:MIR|Set1:VIS|Set2:WTH|Name:Mirage|DraftPacks:3|LandSetCode:MIR|SealedPacks:6
-Index:13|Set0:5ED|Name:Fifth Edition|DraftPacks:3|LandSetCode:5ED|SealedPacks:6
-Index:14|Set0:POR|Name:Portal|DraftPacks:3|LandSetCode:POR|SealedPacks:6
-Index:15|Set0:TMP|Set1:STH|Set2:EXO|Name:Tempest|DraftPacks:3|LandSetCode:TMP|SealedPacks:6
-Index:16|Set0:PO2|Name:Portal Second Age|DraftPacks:3|LandSetCode:PO2|SealedPacks:6
-Index:17|Set0:USG|Set1:ULG|Set2:UDS|Name:Urza|DraftPacks:3|LandSetCode:USG|SealedPacks:6
-Index:18|Set0:6ED|Name:Sixth Edition|DraftPacks:3|LandSetCode:6ED|SealedPacks:6
-Index:19|Set0:PTK|Name:Portal Three Kingdoms|DraftPacks:5|LandSetCode:PTK|SealedPacks:9
+Set0:ICE|Set1:ALL|Set2:CSP|Name:Ice Age|DraftPacks:3|LandSetCode:ICE|SealedPacks:6
+Set0:HML|Name:Homelands|DraftPacks:5|LandSetCode:4ED|SealedPacks:9
+Set0:MIR|Set1:VIS|Set2:WTH|Name:Mirage|DraftPacks:3|LandSetCode:MIR|SealedPacks:6
+Set0:5ED|Name:Fifth Edition|DraftPacks:3|LandSetCode:5ED|SealedPacks:6
+Set0:POR|Name:Portal|DraftPacks:3|LandSetCode:POR|SealedPacks:6
+Set0:TMP|Set1:STH|Set2:EXO|Name:Tempest|DraftPacks:3|LandSetCode:TMP|SealedPacks:6
+Set0:PO2|Name:Portal Second Age|DraftPacks:3|LandSetCode:PO2|SealedPacks:6
+Set0:USG|Set1:ULG|Set2:UDS|Name:Urza|DraftPacks:3|LandSetCode:USG|SealedPacks:6
+Set0:6ED|Name:Sixth Edition|DraftPacks:3|LandSetCode:6ED|SealedPacks:6
+Set0:PTK|Name:Portal Three Kingdoms|DraftPacks:5|LandSetCode:PTK|SealedPacks:9

-Index:20|Set0:MMQ|Set1:NMS|Set2:PCY|Name:Masques|DraftPacks:3|LandSetCode:MMQ|SealedPacks:6
-Index:21|Set0:INV|Set1:PLS|Set2:APC|Name:Invasion|DraftPacks:3|LandSetCode:INV|SealedPacks:6
-Index:22|Set0:7ED|Name:Seventh Edition|DraftPacks:3|LandSetCode:7ED|SealedPacks:6
-Index:23|Set0:ODY|Set1:TOR|Set2:JUD|Name:Odyssey|DraftPacks:3|LandSetCode:ODY|SealedPacks:6
-Index:24|Set0:ONS|Set1:LGN|Set2:SCG|Name:Onslaught|DraftPacks:3|LandSetCode:ONS|SealedPacks:6
-Index:25|Set0:8ED|Name:Eighth Edition|DraftPacks:3|LandSetCode:8ED|SealedPacks:6
-Index:26|Set0:MRD|Set1:DST|Set2:5DN|Name:Mirrodin|DraftPacks:3|LandSetCode:MRD|SealedPacks:6
-Index:27|Set0:CHK|Set1:BOK|Set2:SOK|Name:Kamigawa|DraftPacks:3|LandSetCode:CHK|SealedPacks:6
-Index:28|Set0:9ED|Name:Ninth Edition|DraftPacks:3|LandSetCode:9ED|SealedPacks:6
-Index:29|Set0:RAV|Set1:GPT|Set2:DIS|Name:Ravnica|DraftPacks:3|LandSetCode:RAV|SealedPacks:6
+Set0:MMQ|Set1:NMS|Set2:PCY|Name:Masques|DraftPacks:3|LandSetCode:MMQ|SealedPacks:6
+Set0:INV|Set1:PLS|Set2:APC|Name:Invasion|DraftPacks:3|LandSetCode:INV|SealedPacks:6
+Set0:7ED|Name:Seventh Edition|DraftPacks:3|LandSetCode:7ED|SealedPacks:6
+Set0:ODY|Set1:TOR|Set2:JUD|Name:Odyssey|DraftPacks:3|LandSetCode:ODY|SealedPacks:6
+Set0:ONS|Set1:LGN|Set2:SCG|Name:Onslaught|DraftPacks:3|LandSetCode:ONS|SealedPacks:6
+Set0:8ED|Name:Eighth Edition|DraftPacks:3|LandSetCode:8ED|SealedPacks:6
+Set0:MRD|Set1:DST|Set2:5DN|Name:Mirrodin|DraftPacks:3|LandSetCode:MRD|SealedPacks:6
+Set0:CHK|Set1:BOK|Set2:SOK|Name:Kamigawa|DraftPacks:3|LandSetCode:CHK|SealedPacks:6
+Set0:9ED|Name:Ninth Edition|DraftPacks:3|LandSetCode:9ED|SealedPacks:6
+Set0:RAV|Set1:GPT|Set2:DIS|Name:Ravnica|DraftPacks:3|LandSetCode:RAV|SealedPacks:6

-Index:30|Set0:CSP|Name:Coldsnap|DraftPacks:3|LandSetCode:9ED|SealedPacks:6
-Index:31|Set0:TSP|Set1:PLC|Set2:FUT|Name:Time Spiral|DraftPacks:3|LandSetCode:TSP|SealedPacks:6
-Index:32|Set0:10E|Name:Tenth Edition|DraftPacks:3|LandSetCode:10E|SealedPacks:6
-Index:33|Set0:LRW|Set1:MOR|Name:Lorwyn|DraftPacks:3|LandSetCode:LRW|SealedPacks:6
-Index:34|Set0:SHM|Set1:EVE|Name:Shadowmoor|DraftPacks:3|LandSetCode:SHM|SealedPacks:6
-Index:35|Set0:ALA|Set1:CFX|Set2:ARB|Name:Shards of Alara|DraftPacks:3|LandSetCode:ALA|SealedPacks:6
-Index:36|Set0:M10|Name:Magic 2010|DraftPacks:3|LandSetCode:M10|SealedPacks:6
-Index:37|Set0:ZEN|Set1:WWK|Name:Zendikar|DraftPacks:3|LandSetCode:ZEN|SealedPacks:6
-Index:38|Set0:ROE|Name:Rise of the Eldrazi|DraftPacks:3|LandSetCode:ROE|SealedPacks:6
-Index:39|Set0:M11|Name:Magic 2011|DraftPacks:3|LandSetCode:M11|SealedPacks:6
+Set0:CSP|Name:Coldsnap|DraftPacks:3|LandSetCode:9ED|SealedPacks:6
+Set0:TSP|Set1:PLC|Set2:FUT|Name:Time Spiral|DraftPacks:3|LandSetCode:TSP|SealedPacks:6
+Set0:10E|Name:Tenth Edition|DraftPacks:3|LandSetCode:10E|SealedPacks:6
+Set0:LRW|Set1:MOR|Name:Lorwyn|DraftPacks:3|LandSetCode:LRW|SealedPacks:6
+Set0:SHM|Set1:EVE|Name:Shadowmoor|DraftPacks:3|LandSetCode:SHM|SealedPacks:6
+Set0:ALA|Set1:CFX|Set2:ARB|Name:Shards of Alara|DraftPacks:3|LandSetCode:ALA|SealedPacks:6
+Set0:M10|Name:Magic 2010|DraftPacks:3|LandSetCode:M10|SealedPacks:6
+Set0:ZEN|Set1:WWK|Name:Zendikar|DraftPacks:3|LandSetCode:ZEN|SealedPacks:6
+Set0:ROE|Name:Rise of the Eldrazi|DraftPacks:3|LandSetCode:ROE|SealedPacks:6
+Set0:M11|Name:Magic 2011|DraftPacks:3|LandSetCode:M11|SealedPacks:6

-Index:40|Set0:SOM|Set1:MBS|Set2:NPH|Name:Scars of Mirrodin|DraftPacks:3|LandSetCode:SOM|SealedPacks:6
-Index:41|Set0:M12|Name:Magic 2012|DraftPacks:3|LandSetCode:M12|SealedPacks:6
-Index:42|Set0:ISD|Set1:DKA|Name:Innistrad|DraftPacks:3|LandSetCode:ISD|SealedPacks:6
-Index:43|Set0:AVR|Name:Avacyn Restored|DraftPacks:3|LandSetCode:AVR|SealedPacks:6
-Index:44|Set0:M13|Name:Magic 2013|DraftPacks:3|LandSetCode:M13|SealedPacks:6
-Index:45|Set0:RTR|Name:Return to Ravnica|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
-Index:46|Set0:RTR|Set1:RTR|Set2:RTR|Set3:RTR|Set4:RTR|Meta0:CHOOSE1/CUBE/RtRGuildAzorius/Azorius Guild;CUBE/RtRGuildIzzet/Izzet Guild;CUBE/RtRGuildRakdos/Rakdos Guild;CUBE/RtRGuildGolgari/Golgari Guild;CUBE/RtRGuildSelesnya/Selesnya Guild/GUILD|Meta1:CHOOSE1/CUBE/RtRPromoAzorius/Azorius Guild;CUBE/RtRPromoIzzet/Izzet Guild;CUBE/RtRPromoRakdos/Rakdos Guild;CUBE/RtRPromoGolgari/Golgari Guild;CUBE/RtRPromoSelesnya/Selesnya Guild/PROMO|Name:Return to Ravnica Guild Sealed|DraftPacks:3|LandSetCode:RTR|SealedPacks:7
-Index:47|Set0:GTC|Name:Gatecrash|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
-Index:48|Set0:GTC|Set1:GTC|Set2:GTC|Set3:GTC|Set4:GTC|Meta0:CHOOSE1/CUBE/GtcGuildBoros/Boros Guild;CUBE/GtcGuildDimir/Dimir Guild;CUBE/GtcGuildGruul/Gruul Guild;CUBE/GtcGuildOrzhov/Orzhov Guild;CUBE/GtcGuildSimic/Simic Guild/GUILD|Meta1:CHOOSE1/CUBE/GtcPromoBoros/Boros Guild;CUBE/GtcPromoDimir/Dimir Guild;CUBE/GtcPromoGruul/Gruul Guild;CUBE/GtcPromoOrzhov/Orzhov Guild;CUBE/GtcPromoSimic/Simic Guild/PROMO|Name:Gatecrash Guild Sealed|DraftPacks:3|LandSetCode:RTR|SealedPacks:7
+Set0:SOM|Set1:MBS|Set2:NPH|Name:Scars of Mirrodin|DraftPacks:3|LandSetCode:SOM|SealedPacks:6
+Set0:M12|Name:Magic 2012|DraftPacks:3|LandSetCode:M12|SealedPacks:6
+Set0:ISD|Set1:DKA|Name:Innistrad|DraftPacks:3|LandSetCode:ISD|SealedPacks:6
+Set0:AVR|Name:Avacyn Restored|DraftPacks:3|LandSetCode:AVR|SealedPacks:6
+Set0:M13|Name:Magic 2013|DraftPacks:3|LandSetCode:M13|SealedPacks:6
+Set0:RTR|Name:Return to Ravnica|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
+Set0:RTR|Set1:RTR|Set2:RTR|Set3:RTR|Set4:RTR|Meta0:CHOOSE1/CUBE/RtRGuildAzorius/Azorius Guild;CUBE/RtRGuildIzzet/Izzet Guild;CUBE/RtRGuildRakdos/Rakdos Guild;CUBE/RtRGuildGolgari/Golgari Guild;CUBE/RtRGuildSelesnya/Selesnya Guild/GUILD|Meta1:CHOOSE1/CUBE/RtRPromoAzorius/Azorius Guild;CUBE/RtRPromoIzzet/Izzet Guild;CUBE/RtRPromoRakdos/Rakdos Guild;CUBE/RtRPromoGolgari/Golgari Guild;CUBE/RtRPromoSelesnya/Selesnya Guild/PROMO|Name:Return to Ravnica Guild Sealed|DraftPacks:3|LandSetCode:RTR|SealedPacks:7
+Set0:GTC|Name:Gatecrash|DraftPacks:3|LandSetCode:RTR|SealedPacks:6
+Set0:GTC|Set1:GTC|Set2:GTC|Set3:GTC|Set4:GTC|Meta0:CHOOSE1/CUBE/GtcGuildBoros/Boros Guild;CUBE/GtcGuildDimir/Dimir Guild;CUBE/GtcGuildGruul/Gruul Guild;CUBE/GtcGuildOrzhov/Orzhov Guild;CUBE/GtcGuildSimic/Simic Guild/GUILD|Meta1:CHOOSE1/CUBE/GtcPromoBoros/Boros Guild;CUBE/GtcPromoDimir/Dimir Guild;CUBE/GtcPromoGruul/Gruul Guild;CUBE/GtcPromoOrzhov/Orzhov Guild;CUBE/GtcPromoSimic/Simic Guild/PROMO|Name:Gatecrash Guild Sealed|DraftPacks:3|LandSetCode:RTR|SealedPacks:7
--- a/res/blockdata/setdata.txt
+++ b/res/blockdata/setdata.txt
@@ -1,97 +1,97 @@
-Index:0|Code2:MBP|Code3:MBP|Type:Other|Name:Media Insert Promo|Alias:PRO
-Index:1|Code2:A|Code3:LEA|Type:Core|Name:Limited Edition Alpha
-Index:2|Code2:B|Code3:LEB|Type:Core|Name:Limited Edition Beta
-Index:3|Code2:U|Code3:2ED|Type:Core|Border:White|Name:Unlimited Edition
-Index:4|Code2:AN|Code3:ARN|Type:Expansion|Name:Arabian Nights
-Index:5|Code2:AQ|Code3:ATQ|Type:Expansion|Name:Antiquities
-Index:6|Code2:R|Code3:3ED|Type:Core|Border:White|Name:Revised Edition
-Index:7|Code2:LG|Code3:LEG|Type:Expansion|Name:Legends
-Index:8|Code2:DK|Code3:DRK|Type:Expansion|Name:The Dark
-Index:9|Code2:FE|Code3:FEM|Type:Expansion|Name:Fallen Empires
+Code2:MBP|Code3:MBP|Type:Other|Name:Media Insert Promo|Alias:PRO
+Code2:A|Code3:LEA|Type:Core|Name:Limited Edition Alpha
+Code2:B|Code3:LEB|Type:Core|Name:Limited Edition Beta
+Code2:U|Code3:2ED|Type:Core|Border:White|Name:Unlimited Edition
+Code2:AN|Code3:ARN|Type:Expansion|Name:Arabian Nights
+Code2:AQ|Code3:ATQ|Type:Expansion|Name:Antiquities
+Code2:R|Code3:3ED|Type:Core|Border:White|Name:Revised Edition
+Code2:LG|Code3:LEG|Type:Expansion|Name:Legends
+Code2:DK|Code3:DRK|Type:Expansion|Name:The Dark
+Code2:FE|Code3:FEM|Type:Expansion|Name:Fallen Empires

-Index:10|Code2:4E|Code3:4ED|Type:Core|Border:White|Name:Fourth Edition
-Index:11|Code2:IA|Code3:ICE|Type:Expansion|Name:Ice Age
-Index:12|Code2:CH|Code3:CHR|Type:Reprint|Border:White|Name:Chronicles
-Index:13|Code2:HL|Code3:HML|Type:Expansion|Name:Homelands
-Index:14|Code2:AL|Code3:ALL|Type:Expansion|Name:Alliances
-Index:15|Code2:MI|Code3:MIR|Type:Expansion|Name:Mirage
-Index:16|Code2:VI|Code3:VIS|Type:Expansion|Name:Visions
-Index:17|Code2:5E|Code3:5ED|Type:Core|Border:White|Name:Fifth Edition
-Index:18|Code2:PT|Code3:POR|Type:Starter|Name:Portal
-Index:19|Code2:WL|Code3:WTH|Type:Expansion|Name:Weatherlight
+Code2:4E|Code3:4ED|Type:Core|Border:White|Name:Fourth Edition
+Code2:IA|Code3:ICE|Type:Expansion|Name:Ice Age
+Code2:CH|Code3:CHR|Type:Reprint|Border:White|Name:Chronicles
+Code2:HL|Code3:HML|Type:Expansion|Name:Homelands
+Code2:AL|Code3:ALL|Type:Expansion|Name:Alliances
+Code2:MI|Code3:MIR|Type:Expansion|Name:Mirage
+Code2:VI|Code3:VIS|Type:Expansion|Name:Visions
+Code2:5E|Code3:5ED|Type:Core|Border:White|Name:Fifth Edition
+Code2:PT|Code3:POR|Type:Starter|Name:Portal
+Code2:WL|Code3:WTH|Type:Expansion|Name:Weatherlight

-Index:20|Code2:TE|Code3:TMP|Type:Expansion|Name:Tempest
-Index:21|Code2:SH|Code3:STH|Type:Expansion|Name:Stronghold
-Index:22|Code2:EX|Code3:EXO|Type:Expansion|Name:Exodus
-Index:23|Code2:P2|Code3:PO2|Type:Starter|Name:Portal Second Age|Alias:P02
-Index:24|Code2:US|Code3:USG|Type:Expansion|Name:Urza's Saga
-Index:25|Code2:UL|Code3:ULG|Type:Expansion|Name:Urza's Legacy
-Index:26|Code2:6E|Code3:6ED|Type:Core|Border:White|Name:Classic (Sixth Edition)
-Index:27|Code2:UD|Code3:UDS|Type:Expansion|Name:Urza's Destiny
-Index:28|Code2:P3|Code3:PTK|Type:Starter|Border:White|Name:Portal Three Kingdoms
-Index:29|Code2:ST|Code3:S99|Type:Starter|Border:White|Name:Starter 1999
+Code2:TE|Code3:TMP|Type:Expansion|Name:Tempest
+Code2:SH|Code3:STH|Type:Expansion|Name:Stronghold
+Code2:EX|Code3:EXO|Type:Expansion|Name:Exodus
+Code2:P2|Code3:PO2|Type:Starter|Name:Portal Second Age|Alias:P02
+Code2:US|Code3:USG|Type:Expansion|Name:Urza's Saga
+Code2:UL|Code3:ULG|Type:Expansion|Name:Urza's Legacy
+Code2:6E|Code3:6ED|Type:Core|Border:White|Name:Classic (Sixth Edition)
+Code2:UD|Code3:UDS|Type:Expansion|Name:Urza's Destiny
+Code2:P3|Code3:PTK|Type:Starter|Border:White|Name:Portal Three Kingdoms
+Code2:ST|Code3:S99|Type:Starter|Border:White|Name:Starter 1999

-Index:30|Code2:MM|Code3:MMQ|Type:Expansion|Name:Mercadian Masques
-Index:31|Code2:NE|Code3:NMS|Type:Expansion|Name:Nemesis|Alias:NEM
-Index:32|Code2:S2K|Code3:S00|Type:Starter|Border:White|Name:Starter 2000
-Index:33|Code2:PY|Code3:PCY|Type:Expansion|Name:Prophecy
-Index:34|Code2:IN|Code3:INV|Type:Expansion|Name:Invasion
-Index:35|Code2:PS|Code3:PLS|Type:Expansion|Name:Planeshift
-Index:36|Code2:7E|Code3:7ED|Type:Core|Border:White|Name:Seventh Edition
-Index:37|Code2:AP|Code3:APC|Type:Expansion|Name:Apocalypse
-Index:38|Code2:OD|Code3:ODY|Type:Expansion|Name:Odyssey
-Index:39|Code2:TO|Code3:TOR|Type:Expansion|Name:Torment
+Code2:MM|Code3:MMQ|Type:Expansion|Name:Mercadian Masques
+Code2:NE|Code3:NMS|Type:Expansion|Name:Nemesis|Alias:NEM
+Code2:S2K|Code3:S00|Type:Starter|Border:White|Name:Starter 2000
+Code2:PY|Code3:PCY|Type:Expansion|Name:Prophecy
+Code2:IN|Code3:INV|Type:Expansion|Name:Invasion
+Code2:PS|Code3:PLS|Type:Expansion|Name:Planeshift
+Code2:7E|Code3:7ED|Type:Core|Border:White|Name:Seventh Edition
+Code2:AP|Code3:APC|Type:Expansion|Name:Apocalypse
+Code2:OD|Code3:ODY|Type:Expansion|Name:Odyssey
+Code2:TO|Code3:TOR|Type:Expansion|Name:Torment

-Index:40|Code2:JU|Code3:JUD|Type:Expansion|Name:Judgment
-Index:41|Code2:ON|Code3:ONS|Type:Expansion|Name:Onslaught
-Index:42|Code2:LE|Code3:LGN|Type:Expansion|Name:Legions
-Index:43|Code2:SC|Code3:SCG|Type:Expansion|Name:Scourge
-Index:44|Code2:8E|Code3:8ED|Type:Core|Border:White|Name:Core Set - Eighth Edition
-Index:45|Code2:MR|Code3:MRD|Type:Expansion|Name:Mirrodin
-Index:46|Code2:DS|Code3:DST|Type:Expansion|Name:Darksteel
-Index:47|Code2:FD|Code3:5DN|Type:Expansion|Name:Fifth Dawn
-Index:48|Code2:CHK|Code3:CHK|Type:Expansion|Name:Champions of Kamigawa
-Index:49|Code2:BOK|Code3:BOK|Type:Expansion|Name:Betrayers of Kamigawa
+Code2:JU|Code3:JUD|Type:Expansion|Name:Judgment
+Code2:ON|Code3:ONS|Type:Expansion|Name:Onslaught
+Code2:LE|Code3:LGN|Type:Expansion|Name:Legions
+Code2:SC|Code3:SCG|Type:Expansion|Name:Scourge
+Code2:8E|Code3:8ED|Type:Core|Border:White|Name:Core Set - Eighth Edition
+Code2:MR|Code3:MRD|Type:Expansion|Name:Mirrodin
+Code2:DS|Code3:DST|Type:Expansion|Name:Darksteel
+Code2:FD|Code3:5DN|Type:Expansion|Name:Fifth Dawn
+Code2:CHK|Code3:CHK|Type:Expansion|Name:Champions of Kamigawa
+Code2:BOK|Code3:BOK|Type:Expansion|Name:Betrayers of Kamigawa

-Index:50|Code2:SOK|Code3:SOK|Type:Expansion|Name:Saviors of Kamigawa
-Index:51|Code2:9E|Code3:9ED|Type:Core|Border:White|Name:Core Set - Ninth Edition
-Index:52|Code2:RAV|Code3:RAV|Type:Expansion|Name:Ravnica: City of Guilds
-Index:53|Code2:GP|Code3:GPT|Type:Expansion|Name:Guildpact
-Index:54|Code2:DIS|Code3:DIS|Type:Expansion|Name:Dissension
-Index:55|Code2:CS|Code3:CSP|Type:Expansion|Name:Coldsnap
-Index:56|Code2:TSP|Code3:TSP|Type:Expansion|Name:Time Spiral
-Index:57|Code2:TSB|Code3:TSB|Type:Expansion|Name:Time Spiral Timeshifted
-Index:58|Code2:PLC|Code3:PLC|Type:Expansion|Name:Planar Chaos
-Index:59|Code2:FUT|Code3:FUT|Type:Expansion|Name:Future Sight
+Code2:SOK|Code3:SOK|Type:Expansion|Name:Saviors of Kamigawa
+Code2:9E|Code3:9ED|Type:Core|Border:White|Name:Core Set - Ninth Edition
+Code2:RAV|Code3:RAV|Type:Expansion|Name:Ravnica: City of Guilds
+Code2:GP|Code3:GPT|Type:Expansion|Name:Guildpact
+Code2:DIS|Code3:DIS|Type:Expansion|Name:Dissension
+Code2:CS|Code3:CSP|Type:Expansion|Name:Coldsnap
+Code2:TSP|Code3:TSP|Type:Expansion|Name:Time Spiral
+Code2:TSB|Code3:TSB|Type:Expansion|Name:Time Spiral Timeshifted
+Code2:PLC|Code3:PLC|Type:Expansion|Name:Planar Chaos
+Code2:FUT|Code3:FUT|Type:Expansion|Name:Future Sight

-Index:60|Code2:10E|Code3:10E|Type:Core|Name:Core Set - Tenth Edition
-Index:61|Code2:LRW|Code3:LRW|Type:Expansion|Name:Lorwyn
-Index:62|Code2:MOR|Code3:MOR|Type:Expansion|Name:Morningtide
-Index:63|Code2:SHM|Code3:SHM|Type:Expansion|Name:Shadowmoor
-Index:64|Code2:EVE|Code3:EVE|Type:Expansion|Name:Eventide|Alias:EVT
-Index:65|Code2:ALA|Code3:ALA|Type:Expansion|Name:Shards of Alara
-Index:66|Code2:CFX|Code3:CFX|Type:Expansion|Name:Conflux|Alias:CON
-Index:67|Code2:ARB|Code3:ARB|Type:Expansion|Name:Alara Reborn
-Index:68|Code2:M10|Code3:M10|Type:Core|Name:Magic 2010
-Index:69|Code2:ZEN|Code3:ZEN|Type:Expansion|Name:Zendikar
+Code2:10E|Code3:10E|Type:Core|Name:Core Set - Tenth Edition
+Code2:LRW|Code3:LRW|Type:Expansion|Name:Lorwyn
+Code2:MOR|Code3:MOR|Type:Expansion|Name:Morningtide
+Code2:SHM|Code3:SHM|Type:Expansion|Name:Shadowmoor
+Code2:EVE|Code3:EVE|Type:Expansion|Name:Eventide|Alias:EVT
+Code2:ALA|Code3:ALA|Type:Expansion|Name:Shards of Alara
+Code2:CFX|Code3:CFX|Type:Expansion|Name:Conflux|Alias:CON
+Code2:ARB|Code3:ARB|Type:Expansion|Name:Alara Reborn
+Code2:M10|Code3:M10|Type:Core|Name:Magic 2010
+Code2:ZEN|Code3:ZEN|Type:Expansion|Name:Zendikar

-Index:70|Code2:WWK|Code3:WWK|Type:Expansion|Name:Worldwake
-Index:71|Code2:ROE|Code3:ROE|Type:Expansion|Name:Rise of the Eldrazi
-Index:72|Code2:M11|Code3:M11|Type:Core|Name:Magic 2011
-Index:73|Code2:SOM|Code3:SOM|Type:Expansion|Name:Scars of Mirrodin
-Index:74|Code2:MBS|Code3:MBS|Type:Expansion|Name:Mirrodin Besieged
-Index:75|Code2:NPH|Code3:NPH|Type:Expansion|Name:New Phyrexia
-Index:76|Code2:COM|Code3:COM|Type:Other|Name:Commander
-Index:77|Code2:M12|Code3:M12|Type:Core|Name:Magic 2012
-Index:78|Code2:ISD|Code3:ISD|Type:Expansion|Name:Innistrad
-Index:79|Code2:DKA|Code3:DKA|Type:Expansion|Name:Dark Ascension
+Code2:WWK|Code3:WWK|Type:Expansion|Name:Worldwake
+Code2:ROE|Code3:ROE|Type:Expansion|Name:Rise of the Eldrazi
+Code2:M11|Code3:M11|Type:Core|Name:Magic 2011
+Code2:SOM|Code3:SOM|Type:Expansion|Name:Scars of Mirrodin
+Code2:MBS|Code3:MBS|Type:Expansion|Name:Mirrodin Besieged
+Code2:NPH|Code3:NPH|Type:Expansion|Name:New Phyrexia
+Code2:COM|Code3:COM|Type:Other|Name:Commander
+Code2:M12|Code3:M12|Type:Core|Name:Magic 2012
+Code2:ISD|Code3:ISD|Type:Expansion|Name:Innistrad
+Code2:DKA|Code3:DKA|Type:Expansion|Name:Dark Ascension

-Index:80|Code2:AVR|Code3:AVR|Type:Expansion|Name:Avacyn Restored
-Index:81|Code2:PC2|Code3:PC2|Type:Other|Name:Planechase 2012 Edition
-Index:82|Code2:M13|Code3:M13|Type:Core|Name:Magic 2013
-Index:83|Code2:RTR|Code3:RTR|Type:Expansion|Name:Return to Ravnica
-Index:84|Code2:GTC|Code3:GTC|Type:Expansion|Name:Gatecrash
+Code2:AVR|Code3:AVR|Type:Expansion|Name:Avacyn Restored
+Code2:PC2|Code3:PC2|Type:Other|Name:Planechase 2012 Edition
+Code2:M13|Code3:M13|Type:Core|Name:Magic 2013
+Code2:RTR|Code3:RTR|Type:Expansion|Name:Return to Ravnica
+Code2:GTC|Code3:GTC|Type:Expansion|Name:Gatecrash

-Index:86|Code2:VAN|Code3:VAN|Type:Other|Name:Vanguard
-Index:87|Code2:ARC|Code3:ARC|Type:Other|Name:Archenemy
-Index:88|Code2:HOP|Code3:HOP|Type:Other|Name:Planechase
+Code2:VAN|Code3:VAN|Type:Other|Name:Vanguard
+Code2:ARC|Code3:ARC|Type:Other|Name:Archenemy
+Code2:HOP|Code3:HOP|Type:Other|Name:Planechase
--- a/res/cardsfolder/c/carpet_of_flowers.txt
+++ b/res/cardsfolder/c/carpet_of_flowers.txt
@@ -0,0 +1,18 @@
+Name:Carpet of Flowers
+ManaCost:G
+Types:Enchantment
+T:Mode$ Phase | Phase$ Main1,Main2 | ValidPlayer$ You | CheckSVar$ CarpetX | SVarCompare$ EQ0 | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
+SVar:TrigMana:AB$ Pump | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent, you may add X mana, where X is the number of Islands target opponent controls | RememberObjects$ Targeted | SubAbility$ ChooseNumber
+SVar:ChooseNumber:DB$ ChooseNumber | Min$ 0 | Max$ NumManaMax | References$ NumManaMax | ListTitle$ Choose the amount of mana | SubAbility$ DBMana
+SVar:DBMana:DB$ Mana | Amount$ X | Produced$ Any | SubAbility$ CheckPlus
+SVar:CheckPlus:DB$ StoreSVar | SVar$ CarpetX | Type$ Number | Expression$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+T:Mode$ Phase | Phase$ End of Turn | Execute$ TrigReset | Static$ True
+SVar:TrigReset:AB$ StoreSVar | Cost$ 0 | SVar$ CarpetX | Type$ Number | Expression$ 0
+SVar:X:Count$ChosenNumber
+SVar:NumManaMax:Count$Valid Island.RememberedPlayerCtrl
+SVar:CarpetX:Number$0
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/carpet_of_flowers.jpg
+SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/240.jpg
+Oracle:At the beginning of each of your main phases, if you haven't added mana to your mana pool with this ability this turn, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
--- a/res/cardsfolder/d/death_by_dragons.txt
+++ b/res/cardsfolder/d/death_by_dragons.txt
@@ -0,0 +1,8 @@
+Name:Death by Dragons
+ManaCost:4 R R
+Types:Sorcery
+A:SP$ Token | Cost$ 4 R R | ValidTgts$ Player | TgtPrompt$ Select target player who would not get a token | AITgts$ Opponent | RememberTargets$ True | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ Player.IsNotRemembered | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | StackDescription$ SpellDescription | SubAbility$ DBCleanup | SpellDescription$ Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/death_by_dragons.jpg
+SetInfo:COM|Uncommon|http://magiccards.info/scans/en/cmd/118.jpg
+Oracle:Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield.
--- a/res/cardsfolder/d/dimensional_breach.txt
+++ b/res/cardsfolder/d/dimensional_breach.txt
@@ -0,0 +1,16 @@
+Name:Dimensional Breach
+ManaCost:5 W W
+Types:Sorcery
+A:SP$ ChangeZoneAll | Cost$ 5 W W | ChangeType$ Permanent | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile all permanents. For as long as any of those cards remain exiled, at the beginning of each player's upkeep, that player returns one of the exiled cards he or she owns to the battlefield.
+SVar:DBEffect:DB$ Effect | Name$ Dimensional Breach Effect | Triggers$ TrigUpkeep,TrigCleanup | SVars$ BreachReturn,BreachCleanup,MoveChosen,BreachX | RememberObjects$ Remembered | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ BreachReturn | TriggerZones$ Command | TriggerController$ TriggeredPlayer | CheckSVar$ BreachX | SVarCompare$ GE1 | TriggerDescription$ At the beginning of each player's upkeep, that player returns one of the exiled cards he or she owns to the battlefield.
+SVar:BreachReturn:AB$ ChooseCard | Cost$ 0 | Defined$ TriggeredPlayer | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose a card to return to the battlefield | Choices$ Card.IsRemembered+ActivePlayerCtrl | ChoiceZone$ Exile | SubAbility$ MoveChosen
+SVar:MoveChosen:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ ChosenCard | ForgetChanged$ True
+SVar:TrigCleanup:Mode$ Always | CheckSVar$ BreachX | SVarCompare$ EQ0 | Static$ True | Execute$ BreachCleanup | TriggerZones$ Command
+SVar:BreachCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:BreachX:Count$ValidExile Card.IsRemembered
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dimensional_breach.jpg
+SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/9.jpg
+Oracle:Exile all permanents. For as long as any of those cards remain exiled, at the beginning of each player's upkeep, that player returns one of the exiled cards he or she owns to the battlefield.
--- a/res/cardsfolder/e/elvish_spirit_guide.txt
+++ b/res/cardsfolder/e/elvish_spirit_guide.txt
@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Creature Elf Spirit
 PT:2/2
 A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ G | ActivationZone$ Hand | SpellDescription$ Add G to your mana pool.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_spirit_guide.jpg
 SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/69.jpg
--- a/res/cardsfolder/e/eureka.txt
+++ b/res/cardsfolder/e/eureka.txt
@@ -0,0 +1,22 @@
+Name:Eureka
+ManaCost:2 G G
+Types:Sorcery
+A:SP$ Repeat | Cost$ 2 G G | RepeatSubAbility$ ResetCheck | RepeatCheckSVar$ NumPlayerGiveup | RepeatSVarCompare$ LTTotalPlayer | SubAbility$ DBChangeZoneAll | StackDescription$ SpellDescription | SpellDescription$ Starting with you, each player may put a permanent card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
+SVar:ResetCheck:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBRepeatChoice
+SVar:DBRepeatChoice:DB$ RepeatEach | RepeatSubAbility$ DBChoice | RepeatPlayers$ Player
+SVar:DBChoice:DB$ GenericChoice | Choices$ DBCheckHand,DBNoChange | Defined$ Player.IsRemembered
+SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | ChoiceDescription$ Choose a permanent to put onto the battlefield
+SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Permanent.IsNotRemembered+RememberedPlayerCtrl | ChoiceZone$ Hand | Amount$ 1 | RememberChosen$ True | Mandatory$ True | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ GE1
+SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ChoiceDescription$ Do not put a permanent onto the battlefield
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ FinalReset
+SVar:FinalReset:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumPlayerGiveup:Number$0
+SVar:TotalPlayer:PlayerCountPlayers$Amount
+SVar:CheckHand:Count$ValidHand Permanent.IsNotRemembered+RememberedPlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NeedsToPlayVar:Y GE1
+SVar:Y:Count$ValidHand Permanent.YouCtrl+cmcGE5
+SVar:Picture:http://www.wizards.com/global/images/magic/general/eureka.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/99.jpg
+Oracle:Starting with you, each player may put a permanent card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
--- a/res/cardsfolder/f/fatal_lore.txt
+++ b/res/cardsfolder/f/fatal_lore.txt
@@ -0,0 +1,11 @@
+Name:Fatal Lore
+ManaCost:2 B B
+Types:Sorcery
+A:SP$ Charm | Cost$ 2 B B | Chooser$ Opponent | Choices$ DrawThree,DestroyAndDraw | SpellDescription$ An opponent chooses one - You draw three cards; or you destroy up to two target creatures that opponent controls and that player draws up to three cards. Those creatures can't be regenerated.
+SVar:DrawThree:DB$ Draw | NumCards$ 3 | Defined$ You | SpellDescription$ You draw three cards.
+SVar:DestroyAndDraw:DB$ Destroy | ValidTgts$ Creature.ChosenCtrl | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 2 | NoRegen$ True | SpellDescription$ You destroy up to two target creatures that opponent controls and that player draws up to three cards. Those creatures can't be regenerated. | SubAbility$ ChooserDraws
+SVar:ChooserDraws:DB$ Draw | NumCards$ 3 | Defined$ ChosenPlayer
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/fatal_lore.jpg
+SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/7.jpg
+Oracle:An opponent chooses one - You draw three cards; or you destroy up to two target creatures that opponent controls and that player draws up to three cards. Those creatures can't be regenerated.
--- a/res/cardsfolder/f/feeding_grounds.txt
+++ b/res/cardsfolder/f/feeding_grounds.txt
@@ -0,0 +1,13 @@
+Name:Feeding Grounds
+ManaCost:no cost
+Types:Plane Muraganda
+S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Card.Green | Type$ Spell | Amount$ 1 | Description$ Green spells cost 1 less to cast.
+S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Card.Red | Type$ Spell | Amount$ 1 | Description$ Red spells cost 1 less to cast.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ DBPutCounter | TriggerDescription$ Whenever you roll Chaos, put X +1/+1 counters on target creature, where X is that creature's converted mana cost.
+T:Mode$ PlanarDice | Result$ Planeswalk | TriggerZones$ Command | Execute$ RolledWalk | Secondary$ True | TriggerDescription$ Whenever you roll Planeswalk, put this card on the bottom of its owner's planar deck face down, then move the top card of your planar deck off that planar deck and turn it face up
+SVar:RolledWalk:AB$ Planeswalk | Cost$ 0
+SVar:DBPutCounter:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Targeted$CardManaCost
+SVar:Picture:http://www.wizards.com/global/images/magic/general/feeding_grounds.jpg
+SetInfo:HOP|Common|http://magiccards.info/extras/plane/planechase/feeding-grounds.jpg
+Oracle:Red spells cost {1} less to cast.\nGreen spells cost {1} less to cast.\nWhenever you roll {C}, put X +1/+1 counters on target creature, where X is that creature's converted mana cost.
--- a/res/cardsfolder/g/grisly_spectacle.txt
+++ b/res/cardsfolder/g/grisly_spectacle.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Destroy | Cost$ 2 B B | ValidTgts$ Creature.nonArtifact | TgtPrompt$ Select target nonartifact creature | SubAbility$ DBMill | SpellDescription$ Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard.
 SVar:DBMill:DB$ Mill | NumCards$ X | Defined$ TargetedController | References$ X
 SVar:X:Targeted$CardPower
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grisly_spectacle.jpg
 SetInfo:GTC|Common|http://magiccards.info/scans/en/gtc/66.jpg
--- a/res/cardsfolder/g/gruul_charm.txt
+++ b/res/cardsfolder/g/gruul_charm.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Charm | Cost$ R G | Choices$ CantBlockEffect,DBGainCtrl,DmgAll | CharmNum$ 1 | SpellDescription$ Choose one - Creatures without flying can't block this turn; or gain control of all permanents you own; or Gruul Charm deals 3 damage to each creature with flying.
 SVar:CantBlockEffect:DB$ Effect | Name$ Gruul Charm Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ Creatures without flying can't block this turn.
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures without flying can't block this turn.
-SVar:DBGainCtrl:DB$ GainControl | Cost$ R | AllValid$ Permanent.YouOwn | SpellDescription$ Gain control of all permanents you own.
+SVar:DBGainCtrl:DB$ GainControl | AllValid$ Permanent.YouOwn | SpellDescription$ Gain control of all permanents you own.
 SVar:DmgAll:DB$ DamageAll | NumDmg$ 3 | ValidCards$ Creature.withFlying | ValidDescription$ each creature with flying. | SpellDescription$ CARDNAME deals 3 damage to each creature with flying.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_charm.jpg
--- a/res/cardsfolder/h/hecatomb.txt
+++ b/res/cardsfolder/h/hecatomb.txt
@@ -8,6 +8,8 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 A:AB$ DealDamage | Cost$ tapXType<1/Swamp> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Creats GE4
+SVar:Creats:Count$Valid Creature.YouCtrl
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hecatomb.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/29.jpg
--- a/res/cardsfolder/h/horizon_boughs.txt
+++ b/res/cardsfolder/h/horizon_boughs.txt
@@ -0,0 +1,11 @@
+Name:Horizon Boughs
+ManaCost:no cost
+Types:Plane Pyrulea
+S:Mode$ Continuous | EffectZone$ Command | Affected$ Permanent | AddHiddenKeyword$ CARDNAME untaps during each other player's untap step. | Description$ All permanents untap during each player's untap step.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ DBFetch | TriggerDescription$ Whenever you roll Chaos, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle your library.
+T:Mode$ PlanarDice | Result$ Planeswalk | TriggerZones$ Command | Execute$ RolledWalk | Secondary$ True | TriggerDescription$ Whenever you roll Planeswalk, put this card on the bottom of its owner's planar deck face down, then move the top card of your planar deck off that planar deck and turn it face up
+SVar:RolledWalk:AB$ Planeswalk | Cost$ 0
+SVar:DBFetch:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 3
+SVar:Picture:http://www.wizards.com/global/images/magic/general/horizon_boughs.jpg
+SetInfo:HOP|Common|http://magiccards.info/extras/plane/planechase/horizon-boughs.jpg
+Oracle:All permanents untap during each player's untap step.\nWhenever you roll {C}, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle your library.
--- a/res/cardsfolder/h/hypergenesis.txt
+++ b/res/cardsfolder/h/hypergenesis.txt
@@ -0,0 +1,24 @@
+Name:Hypergenesis
+ManaCost:no cost
+Types:Sorcery
+Colors:green
+K:Suspend:3:1 G G
+A:SP$ Repeat | Cost$ 0 | RepeatSubAbility$ ResetCheck | RepeatCheckSVar$ NumPlayerGiveup | RepeatSVarCompare$ LTTotalPlayer | SubAbility$ DBChangeZoneAll | StackDescription$ SpellDescription | SpellDescription$ Starting with you, each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
+SVar:ResetCheck:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBRepeatChoice
+SVar:DBRepeatChoice:DB$ RepeatEach | RepeatSubAbility$ DBChoice | RepeatPlayers$ Player
+SVar:DBChoice:DB$ GenericChoice | Choices$ DBCheckHand,DBNoChange | Defined$ Player.IsRemembered
+SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | ChoiceDescription$ Choose an artifact, creature, enchantment, or land card from your hand onto the battlefield
+SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Artifact.IsNotRemembered+RememberedPlayerCtrl,Creature.IsNotRemembered+RememberedPlayerCtrl,Enchantment.IsNotRemembered+RememberedPlayerCtrl,Land.IsNotRemembered+RememberedPlayerCtrl | ChoiceZone$ Hand | Amount$ 1 | RememberChosen$ True | Mandatory$ True | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ GE1
+SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ChoiceDescription$ Do not put an artifact, creature, enchantment, or land card from your hand onto the battlefield
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ FinalReset
+SVar:FinalReset:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NumPlayerGiveup:Number$0
+SVar:TotalPlayer:PlayerCountPlayers$Amount
+SVar:CheckHand:Count$ValidHand Artifact.IsNotRemembered+RememberedPlayerCtrl,Creature.IsNotRemembered+RememberedPlayerCtrl,Enchantment.IsNotRemembered+RememberedPlayerCtrl,Land.IsNotRemembered+RememberedPlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NeedsToPlayVar:Y GE1
+SVar:Y:Count$ValidHand Permanent.YouCtrl+cmcGE5
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hypergenesis.jpg
+SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/201.jpg
+Oracle:Sorcery\nSuspend 3- {1}{G}{G} (Rather than cast this card from your hand, pay {1}{G}{G} and exile it with three 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.)\nStarting with you, each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
--- a/res/cardsfolder/j/jovens_tools.txt
+++ b/res/cardsfolder/j/jovens_tools.txt
@@ -2,7 +2,6 @@ Name:Joven's Tools
 ManaCost:6
 Types:Artifact
 A:AB$ Pump | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't be blocked except by Walls. | SpellDescription$ Target creature can't be blocked this turn except by Walls.
-SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jovens_tools.jpg
 SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/133.jpg
--- a/res/cardsfolder/l/library_of_lat_nam.txt
+++ b/res/cardsfolder/l/library_of_lat_nam.txt
@@ -0,0 +1,11 @@
+Name:Library of Lat-Nam
+ManaCost:4 U
+Types:Sorcery
+A:SP$ Charm | Cost$ 4 U | Chooser$ Opponent | Choices$ SlowDraw,Tutor | SpellDescription$ An opponent chooses one - You draw three cards at the beginning of the next turn's upkeep; or you search your library for a card, put that card into your hand, then shuffle your library.
+SVar:SlowDraw:DB$ Draw | NumCards$ 3 | Defined$ You | NextUpkeep$ True | SpellDescription$ You draw three cards at the beginning of the next turn's upkeep
+SVar:Tutor:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ You search your library for a card, put that card into your hand, then shuffle your library.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/library_of_lat_nam.jpg
+SetInfo:6ED|Rare|http://magiccards.info/scans/en/6e/78.jpg
+SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/47.jpg
+Oracle:An opponent chooses one - You draw three cards at the beginning of the next turn's upkeep; or you search your library for a card, put that card into your hand, then shuffle your library.
--- a/res/cardsfolder/l/lim_duls_vault.txt
+++ b/res/cardsfolder/l/lim_duls_vault.txt
@@ -0,0 +1,17 @@
+Name:Lim-Dul's Vault
+ManaCost:U B
+Types:Instant
+A:SP$ Dig | Cost$ U B | DigNum$ 5 | NoMove$ True | SubAbility$ DBRepeat | RememberRevealed$ True | StackDescription$ SpellDescription | SpellDescription$ Look at the top five cards of your library. As many times as you choose, you may pay 1 life, put those cards on the bottom of your library in any order, then look at the top five cards of your library. Then shuffle your library and put the last cards you looked at this way on top of it in any order.
+SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ CheckLifePaid | RepeatCheckSVar$ LifePaid | RepeatSVarCompare$ EQ0 | SubAbility$ DBShuffle | StackDescription$ None
+SVar:CheckLifePaid:DB$ StoreSVar | SVar$ LifePaid | Type$ Number | Expression$ 1 | UnlessPayer$ You | UnlessCost$ PayLife<1> | UnlessResolveSubs$ WhenPaid | UnlessAI$ Never | SubAbility$ DBResetRem | StackDescription$ No move
+SVar:DBResetRem:DB$ Cleanup | ClearRemembered$ True | SubAbility$ GoToBottom
+SVar:GoToBottom:DB$ Dig | DigNum$ 5 | ChangeNum$ All | DestinationZone$ Library | LibraryPosition$ -1 | NoLooking$ True | SubAbility$ DBLookAgain | StackDescription$ None
+SVar:DBLookAgain:DB$ Dig | DigNum$ 5 | NoMove$ True | RememberRevealed$ True | StackDescription$ None
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.IsRemembered | ChangeNum$ 5 | SubAbility$ DBReset | Hidden$ True | SelectPrompt$ Pick 1 on the top of library | Mandatory$ True | NoReveal$ True | StackDescription$ None
+SVar:DBReset:DB$ StoreSVar | SVar$ LifePaid | Type$ Number | Expression$ 0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:LifePaid:Number$0
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lim_duls_vault.jpg
+SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/190.jpg
+Oracle:Look at the top five cards of your library. As many times as you choose, you may pay 1 life, put those cards on the bottom of your library in any order, then look at the top five cards of your library. Then shuffle your library and put the last cards you looked at this way on top of it in any order.
--- a/res/cardsfolder/m/misfortune.txt
+++ b/res/cardsfolder/m/misfortune.txt
@@ -0,0 +1,13 @@
+Name:Misfortune
+ManaCost:1 B R G
+Types:Sorcery
+A:SP$ Charm | Cost$ 1 B R G | Chooser$ Opponent | Choices$ Fortune,Misfortune | SpellDescription$ An opponent chooses one - You put a +1/+1 counter on each creature you control and gain 4 life; or you put a -1/-1 counter on each creature that player controls and Misfortune deals 4 damage to him or her.
+SVar:Fortune:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife | SpellDescription$ Put a +1/+1 counter on each creature you control. You gain 4 life. | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 4
+SVar:Misfortune:DB$ PutCounterAll | ValidCards$ Creature.ChosenCtrl | CounterType$ M1M1 | CounterNum$ 1 | SubAbility$ DBLoseLife | SpellDescription$ you put a -1/-1 counter on each creature that player controls and Misfortune deals 4 damage to him or her. | SubAbility$ DBDamage
+SVar:DBDamage:DB$ DealDamage | Defined$ ChosenPlayer | NumDmg$ 4
+SVar:ChooserDraws:DB$ Draw | NumCards$ 3 | Defined$ ChosenPlayer
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/misfortune.jpg
+SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/194.jpg
+Oracle:An opponent chooses one - You put a +1/+1 counter on each creature you control and gain 4 life; or you put a -1/-1 counter on each creature that player controls and Misfortune deals 4 damage to him or her.
--- a/res/cardsfolder/r/ratcatcher.txt
+++ b/res/cardsfolder/r/ratcatcher.txt
@@ -6,7 +6,6 @@ PT:4/4
 K:Fear
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may search your library for a Rat card, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.Rat | ChangeNum$ 1
-SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ratcatcher.jpg
 SetInfo:DIS|Rare|http://magiccards.info/scans/en/di/52.jpg
--- a/res/cardsfolder/s/shardless_agent.txt
+++ b/res/cardsfolder/s/shardless_agent.txt
@@ -3,6 +3,7 @@ ManaCost:1 G U
 Types:Artifact Creature Human Rogue
 PT:2/2
 K:Cascade
+SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shardless_agent.jpg
 SetInfo:PC2|Uncommon|http://magiccards.info/scans/en/pc2/104.jpg
--- a/res/cardsfolder/s/show_and_tell.txt
+++ b/res/cardsfolder/s/show_and_tell.txt
@@ -2,6 +2,8 @@ Name:Show and Tell
 ManaCost:2 U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 U | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature,Artifact,Enchantment,Land | DefinedPlayer$ Player | ChangeNum$ 1 | SpellDescription$ Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
+SVar:NeedsToPlayVar:Y GE1
+SVar:Y:Count$ValidHand Permanent.YouCtrl+cmcGE4
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/show_and_tell.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/96.jpg
--- a/res/cardsfolder/s/simian_spirit_guide.txt
+++ b/res/cardsfolder/s/simian_spirit_guide.txt
@@ -3,7 +3,6 @@ ManaCost:2 R
 Types:Creature Ape Spirit
 PT:2/2
 A:AB$ Mana | Cost$ ExileFromHand<1/CARDNAME> | Produced$ R | ActivationZone$ Hand | SpellDescription$ Add R to your mana pool.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simian_spirit_guide.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/122.jpg
--- a/res/cardsfolder/s/soldevi_golem.txt
+++ b/res/cardsfolder/s/soldevi_golem.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Golem
 PT:5/3
 K:CARDNAME doesn't untap during your untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You  | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may untap target tapped creature an opponent controls. If you do, untap CARDNAME.
-SVar:TrigUntap:AB$ Untap | Cost$ 0 | ValidTgts$ Creature.| SubAbility$ DBCleanup+tapped | TgtPrompt$ Select target tapped creature an opponent controls | SubAbility$ DBUntap
+SVar:TrigUntap:AB$ Untap | Cost$ 0 | ValidTgts$ Creature.OppCtrl+tapped | TgtPrompt$ Select target tapped creature an opponent controls | SubAbility$ DBUntap
 SVar:DBUntap:DB$ Untap | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
--- a/res/cardsfolder/v/varchilds_crusader.txt
+++ b/res/cardsfolder/v/varchilds_crusader.txt
@@ -2,7 +2,7 @@ Name:Varchild's Crusader
 ManaCost:3 R
 Types:Creature Human Knight
 PT:3/2
-A:AB$ Pump | Cost$ 0 | KW$ CARDNAME can't be blocked except by Walls. & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME can't be blocked except by Walls. & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/varchilds_crusader.jpg
--- a/res/cardsfolder/w/wormfang_turtle.txt
+++ b/res/cardsfolder/w/wormfang_turtle.txt
@@ -2,10 +2,12 @@ Name:Wormfang Turtle
 ManaCost:2 U
 Types:Creature Nightmare Turtle Beast
 PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile a land you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChooseExile | TriggerDescription$ When CARDNAME enters the battlefield, exile a land you control.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | TargetMin$ 1 | ValidTgts$ Land.YouCtrl | TgtPrompt$ Choose target land you control | RememberTargets$ True | ForgetOtherTargets$ True
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
+SVar:TrigChooseExile:AB$ ChooseCard | Cost$ 0 | Choices$ Land.YouCtrl | Mandatory$ True | Amount$ 1 | ChoiceTitle$ Choose a land to exile | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ChosenCard | RememberChanged$ True
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wormfang_turtle.jpg
 SetInfo:JUD|Uncommon|http://magiccards.info/scans/en/ju/60.jpg
--- a/res/quest/duels/Boromir
+++ b/res/quest/duels/Boromir
@@ -7,7 +7,7 @@ Description=UG Show and Tell deck with huge creatures
 Icon=Boromir.jpg
 Deck Type=constructed
 [main]
-4 Misty Rainforest
+3 Misty Rainforest
 4 Tropical Island
 3 Polluted Delta
 3 Scalding Tarn
@@ -19,6 +19,7 @@ Deck Type=constructed
 1 Mox Pearl
 1 Mox Ruby
 1 Mox Sapphire
+1 Sol Ring
 1 Ancestral Recall
 1 Time Walk
 4 Show and Tell
@@ -26,7 +27,7 @@ Deck Type=constructed
 2 Lure of Prey
 2 Defense of the Heart
 4 Personal Tutor
-1 Autochthon Wurm
+1 Worldspine Wurm
 4 Empyrial Archangel
 3 Woodfall Primus
 4 Progenitus
--- a/res/quest/world/ravnica/challenges/quest4001.dck
+++ b/res/quest/world/ravnica/challenges/quest4001.dck
@@ -0,0 +1,34 @@
+[quest]
+id=4001
+OpponentName=Trostani
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Temple Garden|RAV
+Credit Reward=200
+AIExtras=Loxodon Gatekeeper
+[metadata]
+Name=quest4001
+Title=Ramp it up
+Difficulty=hard
+Description=Always one step behind..
+Icon=Trostani.jpg
+Deck Type=constructed
+[main]
+3 Angel of Serenity|RTR
+3 Armada Wurm|RTR
+4 Birds of Paradise|RAV
+3 Carven Caryatid|RAV
+4 Civic Wayfinder|RAV
+4 Condemn|DIS
+4 Faith's Fetters|RAV
+4 Farseek|RAV
+10 Forest|RTR
+8 Plains|RTR
+4 Selesnya Guildgate|RTR
+4 Temple Garden|RTR
+3 Trostani, Selesnya's Voice|RTR
+2 Worldspine Wurm|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4002.dck
+++ b/res/quest/world/ravnica/challenges/quest4002.dck
@@ -0,0 +1,34 @@
+[quest]
+id=4002
+OpponentName=Rakdos, Lord of Riots
+AILife=40
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Blood Crypt|DIS
+Credit Reward=200
+HumanExtras=Pariah's Shield|Rakdos Signet
+AIExtras=Rakdos, Lord of Riots
+[metadata]
+Name=quest4002
+Title=Rakdos, Lord of Riots
+Difficulty=hard
+Description=Big Fellas
+Icon=Rakdos.jpg
+Deck Type=constructed
+[main]
+4 Blood Crypt|RTR
+4 Char|RAV
+4 Crypt Champion|DIS
+4 Dark Confidant|RAV
+2 Hellkite Tyrant|GTC
+4 Hellraiser Goblin|GTC
+2 Lord of the Void|GTC
+9 Mountain|RTR
+2 Molten Primordial|GTC
+2 Sepulchral Primordial|GTC
+4 Rakdos Guildgate|RTR
+4 Seal of Fire|DIS
+2 Smog Elemental|GTC
+9 Swamp|RTR
+4 Rakdos's Return|RTR
+[sideboard]
--- a/res/quest/world/ravnica/challenges/quest4003.dck
+++ b/res/quest/world/ravnica/challenges/quest4003.dck
@@ -0,0 +1,38 @@
+[quest]
+id=4001
+OpponentName=Isperia
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;duplicate card;Hallowed Fountain|DIS
+Credit Reward=200
+HumanExtras=Leyline of the Meek|Drowned Rusalka
+AIExtras=Dovescape
+[metadata]
+Name=quest4003
+Title=Isperia
+Difficulty=hard
+Description=The dove from above
+Icon=Iseria.jpg
+Deck Type=constructed
+[main]
+1 Angel of Serenity|RTR
+4 Azorius Guildgate|RTR
+4 Cyclonic Rift|RTR
+3 Droning Bureaucrats|GPT
+2 Faith's Fetters|RAV
+4 Hallowed Fountain|RTR
+9 Island|RTR
+1 Isperia, Supreme Judge|RTR
+3 Jace, Architect of Thought|RTR
+9 Plains|RTR
+3 Pride of the Clouds|DIS
+4 Sphinx's Revelation|RTR
+4 Supreme Verdict|RTR
+3 Twilight Drover|RAV
+4 Veteran Armorer|RAV
+1 Diluvian Primordial|GTC
+1 Grand Arbiter Augustin IV|DIS
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4004.dck
+++ b/res/quest/world/ravnica/challenges/quest4004.dck
@@ -0,0 +1,39 @@
+[quest]
+id=4004
+OpponentName=Ghost Council
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Godless Shrine|GPT
+Credit Reward=200
+AIExtras=Debtors' Knell
+[metadata]
+Name=quest4004
+Title=Ghost Council
+Difficulty=hard
+Description=Whether it's heaven or hell, those who believe can live forever
+Icon=Ghost Council.jpg
+Deck Type=constructed
+[main]
+2 Angel of Despair|COM
+2 Basilica Guards|GTC
+4 Condemn|DIS
+1 Deathpact Angel|GTC
+4 Delirium Skeins|DIS
+2 Dimir House Guard|RAV
+2 Volatile Rig|RTR
+2 Ghost Council of Orzhova|GPT
+4 Godless Shrine|GTC
+4 High Priest of Penance|GTC
+2 Last Gasp|RAV
+2 Merciless Eviction|GTC
+4 Mortify|GPT
+2 Obzedat, Ghost Council|GTC
+4 Orzhov Guildgate|GTC
+8 Plains|RTR
+1 Skeletal Vampire|GPT
+8 Swamp|RTR
+2 Underworld Connections|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4005.dck
+++ b/res/quest/world/ravnica/challenges/quest4005.dck
@@ -0,0 +1,35 @@
+[quest]
+id=4005
+OpponentName=Aurelia
+AILife=20
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Sacred Foundry|RAV
+Credit Reward=200
+AIExtras=Assemble the Legion
+[metadata]
+Name=quest4005
+Title=Aurelia
+Difficulty=hard
+Description=Ein, Zwei, Polizei
+Icon=Aurelia.jpg
+Deck Type=constructed
+[main]
+2 Angel of Serenity|RTR
+4 Boros Guildgate|GTC
+4 Concordia Pegasus|RTR
+4 Faith's Fetters|RAV
+3 Firemane Angel|RAV
+2 Foundry Champion|GTC
+4 Lightning Helix|RAV
+2 Seal of Fire|DIS
+4 Mizzium Mortars|RTR
+8 Mountain|RTR
+8 Plains|RTR
+4 Sacred Foundry|GTC
+4 Stoic Ephemera|DIS
+3 Sunhome Guildmage|GTC
+4 Wakestone Gargoyle|DIS
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4006.dck
+++ b/res/quest/world/ravnica/challenges/quest4006.dck
@@ -0,0 +1,35 @@
+[quest]
+id=4006
+OpponentName=Lazav
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Watery Grave|RAV
+Credit Reward=200
+HumanExtras=Dimir Doppelganger
+AIExtras=Szadek, Lord of Secrets
+[metadata]
+Name=quest4006
+Title=Lazav
+Difficulty=hard
+Description=Milldly annoying..
+Icon=Lazav.jpg
+Deck Type=constructed
+[main]
+4 Darkblast|RAV
+4 Last Gasp|RAV
+4 Dimir Guildgate|GTC
+4 Glimpse the Unthinkable|RAV
+8 Island|RTR
+2 Mind Grind|GTC
+4 Muddle the Mixture|RAV
+2 Psychic Spiral|RTR
+4 Remand|RAV
+4 Compulsive Research|RAV
+4 Spell Snare|DIS
+8 Swamp|RTR
+4 Watery Grave|GTC
+4 Wight of Precinct Six|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4007.dck
+++ b/res/quest/world/ravnica/challenges/quest4007.dck
@@ -0,0 +1,35 @@
+[quest]
+id=4007
+OpponentName=Momir Vig
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Breeding Pool|DIS
+Credit Reward=200
+HumanExtras=Vigean Hydropon|Thrull Parasite
+AIExtras=Momir Vig, Simic Visionary|Doubling Season
+[metadata]
+Name=quest4007
+Title=Momir Vig
+Difficulty=hard
+Description=Double trouble
+Icon=Momir.jpg
+Deck Type=constructed
+[main]
+4 Breeding Pool|GTC
+4 Brushstrider|RTR
+4 Cloudfin Raptor|GTC
+4 Drakewing Krasis|GTC
+4 Elusive Krasis|GTC
+4 Experiment One|GTC
+9 Forest|RTR
+9 Island|RTR
+2 Simic Guildgate|GTC
+2 Remand|RAV
+3 Shambleshark|GTC
+3 Simic Charm|GTC
+4 Spell Snare|DIS
+4 Zameck Guildmage|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4008.dck
+++ b/res/quest/world/ravnica/challenges/quest4008.dck
@@ -0,0 +1,37 @@
+[quest]
+id=4008
+OpponentName=Borborygmos
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=99 Pit Fight;2 multicolor rares;Stomping Ground|GPT
+Credit Reward=200
+HumanExtras=Crown of Convergence|Martial Law
+AIExtras=Guild Feud
+[metadata]
+Name=quest4008
+Title=Borborygmos
+Difficulty=hard
+Description=Fightclub anyone?
+Icon=Borborygmos.jpg
+Deck Type=constructed
+[main]
+4 Domri Rade|GTC
+4 Birds of Paradise|M12
+2 Borborygmos|GPT
+2 Borborygmos Enraged|GTC
+4 Carven Caryatid|RAV
+8 Forest|RTR
+4 Gruul Guildgate|GTC
+2 Gruul Ragebeast|GTC
+4 Indrik Stomphowler|DIS
+2 Molten Primordial|GTC
+8 Mountain|RTR
+4 Sprouting Phytohydra|DIS
+4 Stomping Ground|GTC
+2 Sylvan Primordial|GTC
+4 Wasteland Viper|GTC
+2 Worldspine Wurm|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4009.dck
+++ b/res/quest/world/ravnica/challenges/quest4009.dck
@@ -0,0 +1,35 @@
+[quest]
+id=4009
+OpponentName=Niv-Mizzet
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Steam Vents|GPT
+Credit Reward=200
+HumanExtras=Minister of Impediments 
+AIExtras=Goblin Electromancer|Guttersnipe
+[metadata]
+Name=quest4009
+Title=Niv-Mizzet
+Difficulty=hard
+Description=Instant karma is gonna get you
+Icon=Niv-Mizzet.jpg
+Deck Type=constructed
+[main]
+4 Cackling Flames|DIS
+4 Char|RAV
+4 Compulsive Research|RAV
+2 Cyclonic Rift|RTR
+4 Electrolyze|COM
+4 Train of Thought|GPT
+3 Goblin Electromancer|RTR
+3 Guttersnipe|RTR
+8 Island|RTR
+4 Izzet Guildgate|RTR
+4 Pyromatics|GPT
+4 Mizzium Mortars|RTR
+8 Mountain|RTR
+4 Steam Vents|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/challenges/quest4010.dck
+++ b/res/quest/world/ravnica/challenges/quest4010.dck
@@ -0,0 +1,37 @@
+[quest]
+id=4010
+OpponentName=Jarad
+AILife=30
+Repeat=true
+Wins=20
+Card Reward=2 multicolor rares;Overgrown Tomb|RAV
+Credit Reward=200
+HumanExtras=Trained Caracal 
+AIExtras=Jarad, Golgari Lich Lord|Savra, Queen of the Golgari
+[metadata]
+Name=quest4010
+Title=Jarad
+Difficulty=hard
+Description=Glorified Sacrifice
+Icon=Jarad.jpg
+Deck Type=constructed
+[main]
+4 Abrupt Decay|RTR
+4 Birds of Paradise|M12
+2 Crypt Champion|DIS
+3 Dimir House Guard|RAV
+1 Drooling Groodion|RAV
+6 Forest|RTR
+4 Golgari Guildgate|RTR
+2 Golgari Guildmage|COM
+4 Grave-Shell Scarab|RAV
+4 Grisly Salvage|RTR
+4 Overgrown Tomb|RTR
+4 Plagued Rusalka|GPT
+4 Putrefy|RAV
+4 Shambling Shell|RAV
+4 Skeletal Vampire|GPT
+6 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Agrus
+++ b/res/quest/world/ravnica/duels/Agrus
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Agrus 2
+Title=Agrus
+Icon=Agrus.jpg
+Difficulty=medium
+Description=Ein, Zwei, Polizei
+Deck Type=constructed
+[main]
+4 Ash Zealot|RTR
+2 Boros Charm|GTC
+4 Boros Elite|GTC
+4 Boros Recruit|RAV
+2 Five-Alarm Fire|GTC
+4 Foundry Street Denizen|GTC
+4 Legion Loyalist|GTC
+4 Lightning Helix|RAV
+10 Mountain|RTR
+8 Plains|RTR
+2 Proclamation of Rebirth|DIS
+4 Sacred Foundry|GTC
+4 Seal of Fire|DIS
+2 Skyknight Legionnaire|GTC
+2 Wojek Halberdiers|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Aurelia
+++ b/res/quest/world/ravnica/duels/Aurelia
@@ -0,0 +1,26 @@
+[duel]
+[metadata]
+Name=Aurelia 2
+Title=Aurelia 2
+Icon=Aurelia.jpg
+Difficulty=medium
+Description=Ein, Zwei, Polizei
+Deck Type=constructed
+[main]
+2 Angel of Serenity|RTR
+4 Boros Guildgate|GTC
+4 Concordia Pegasus|RTR
+4 Faith's Fetters|RAV
+3 Firemane Angel|RAV
+4 Foundry Champion|GTC
+4 Lightning Helix|RAV
+4 Mizzium Mortars|RTR
+8 Mountain|RTR
+8 Plains|RTR
+4 Sacred Foundry|GTC
+4 Stoic Ephemera|DIS
+3 Sunhome Guildmage|GTC
+4 Wakestone Gargoyle|DIS
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Aurelia
+++ b/res/quest/world/ravnica/duels/Aurelia
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Aurelia 3
+Title=Aurelia 3
+Icon=Aurelia.jpg
+Difficulty=hard
+Description=Ein, Zwei, Polizei
+Deck Type=constructed
+[main]
+4 Ash Zealot|RTR
+4 Boros Charm|GTC
+4 Boros Elite|GTC
+4 Boros Guildgate|GTC
+2 Boros Reckoner|GTC
+2 Demonfire|DIS
+3 Firemane Avenger|GTC
+3 Flame-Kin Zealot|RAV
+4 Lightning Helix|RAV
+8 Mountain|RTR
+8 Plains|RTR
+4 Precinct Captain|RTR
+4 Sacred Foundry|GTC
+4 Seal of Fire|DIS
+3 Wojek Halberdiers|GTC
+[sideboard]
+[planes]
+[schemes]
+
--- a/res/quest/world/ravnica/duels/Azorius2006
+++ b/res/quest/world/ravnica/duels/Azorius2006
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Azorius2006 1
+Title=Azorius 2006
+Icon=Azorius-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+2 Azorius First-Wing|DIS
+1 Azorius Guildmage|DIS
+3 Beacon Hawk|DIS
+2 Benevolent Ancestor|RAV
+1 Faith's Fetters|RAV
+1 Halcyon Glaze|RAV
+10 Island|RTR
+1 Isperia the Inscrutable|DIS
+2 Minister of Impediments|DIS
+4 Mistral Charger|DIS
+2 Ocular Halo|DIS
+1 Paladin of Prahv|DIS
+1 Palliation Accord|DIS
+13 Plains|RTR
+2 Plumes of Peace|DIS
+1 Prahv, Spires of Order|DIS
+1 Sinstriker's Will|GPT
+2 Sky Hussar|DIS
+4 Stoic Ephemera|DIS
+1 To Arms!|GPT
+4 Wakestone Gargoyle|DIS
+1 Zephyr Spirit|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Azorius2012
+++ b/res/quest/world/ravnica/duels/Azorius2012
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Azorius2012 1
+Title=Azorius 2012
+Icon=Azorius-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+1 Archon of the Triumvirate|RTR
+2 Arrest|RTR
+2 Azorius Arrester|RTR
+1 Azorius Guildgate|RTR
+1 Azorius Justiciar|RTR
+2 Azorius Keyrune|RTR
+2 Bazaar Krovod|RTR
+4 Concordia Pegasus|RTR
+2 Dramatic Rescue|RTR
+1 Inaction Injunction|RTR
+12 Island|RTR
+3 Lyev Skyknight|RTR
+1 New Prahv Guildmage|RTR
+12 Plains|RTR
+1 Righteous Authority|RTR
+1 Skyline Predator|RTR
+1 Soulsworn Spirit|RTR
+3 Stealer of Secrets|RTR
+3 Swift Justice|RTR
+1 Tablet of the Guilds|RTR
+2 Trained Caracal|RTR
+2 Vassal Soul|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Bep
+++ b/res/quest/world/ravnica/duels/Bep
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Bep van Klaveren 3
+Title=Bep van Klaveren
+Icon=Bep.jpg
+Difficulty=hard
+Description=The Dutch Windmill
+Deck Type=constructed
+[main]
+2 Darkblast|RAV
+4 Dimir Guildgate|GTC
+4 Glimpse the Unthinkable|RAV
+8 Island|RTR
+4 Grisly Spectacle|GTC
+2 Mind Grind|GTC
+4 Muddle the Mixture|RAV
+2 Psychic Spiral|RTR
+4 Remand|RAV
+4 Dimir Infiltrator|RAV
+8 Swamp|RTR
+4 Watery Grave|GTC
+2 Paranoid Delusions|GTC
+4 Wight of Precinct Six|GTC
+4 Compulsive Research|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Borborygmos
+++ b/res/quest/world/ravnica/duels/Borborygmos
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Borborygmos 2
+Title=Borborygmos 2
+Icon=Borborygmos.jpg
+Difficulty=medium
+Description=Temper, Temper
+Deck Type=constructed
+[main]
+4 Gyre Sage|GTC
+4 Birds of Paradise|M12
+2 Borborygmos|GPT
+1 Borborygmos Enraged|GTC
+4 Carven Caryatid|RAV
+8 Forest|RTR
+2 Gruul Ragebeast|GTC
+4 Farseek|RAV
+4 Gruul Guildgate|GTC
+2 Indrik Stomphowler|DIS
+1 Molten Primordial|GTC
+8 Mountain|RTR
+4 Ground Assault|GTC
+2 Sprouting Phytohydra|DIS
+4 Stomping Ground|GTC
+1 Sylvan Primordial|GTC
+4 Wasteland Viper|GTC
+1 Worldspine Wurm|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Borborygmos
+++ b/res/quest/world/ravnica/duels/Borborygmos
@@ -0,0 +1,25 @@
+[duel]
+[metadata]
+Name=Borborygmos 3
+Title=Borborygmos 3
+Icon=Borborygmos.jpg
+Difficulty=hard
+Description=Temper, Temper
+Deck Type=constructed
+[main]
+4 Burning-Tree Emissary|GTC
+4 Burning-Tree Shaman|GPT
+4 Char|RAV
+2 Demonfire|DIS
+4 Experiment One|GTC
+12 Forest|M10
+4 Ghor-Clan Rampager|GTC
+4 Giant Solifuge|GPT
+8 Mountain|RTR
+2 Scab-Clan Mauler|GPT
+4 Domri Rade|GTC
+4 Stomping Ground|GTC
+4 Wasteland Viper|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Boros2005.dck
+++ b/res/quest/world/ravnica/duels/Boros2005.dck
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Boros2005 1
+Title=Boros 2005
+Icon=Boros-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+1 Agrus Kos, Wojek Veteran|RAV
+2 Bathe in Light|COM
+1 Boros Guildmage|COM
+3 Boros Recruit|RAV
+2 Boros Swiftblade|RAV
+1 Cyclopean Snare|RAV
+4 Dogpile|RAV
+2 Flame-Kin Zealot|RAV
+2 Greater Forgeling|RAV
+4 Lightning Helix|RAV
+11 Mountain|RTR
+2 Nightguard Patrol|RAV
+2 Ordruun Commando|RAV
+12 Plains|RTR
+3 Skyknight Legionnaire|GTC
+1 Sunhome, Fortress of the Legion|RAV
+3 Thundersong Trumpeter|RAV
+2 Viashino Slasher|RAV
+2 War-Torch Goblin|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Boros2013.dck
+++ b/res/quest/world/ravnica/duels/Boros2013.dck
@@ -0,0 +1,38 @@
+[duel]
+[metadata]
+Name=Boros2013 1
+Title=Boros 2013
+Icon=Boros-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+1 Act of Treason|GTC
+2 Aerial Maneuver|GTC
+1 Armored Transport|GTC
+3 Arrows of Justice|GTC
+1 Bomber Corps|GTC
+3 Boros Elite|GTC
+1 Boros Guildgate|GTC
+2 Boros Keyrune|GTC
+1 Court Street Denizen|GTC
+2 Daring Skyjek|GTC
+3 Ember Beast|GTC
+1 Firefist Striker|GTC
+1 Firemane Avenger|GTC
+2 Fortress Cyclops|GTC
+1 Foundry Champion|GTC
+1 Mark for Death|GTC
+12 Mountain|RTR
+1 Mugging|GTC
+1 Ordruun Veteran|GTC
+12 Plains|RTR
+1 Righteous Charge|GTC
+1 Shielded Passage|GTC
+2 Skyknight Legionnaire|GTC
+1 Sunhome Guildmage|GTC
+2 Warmind Infantry|GTC
+3 Wojek Halberdiers|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Caprio
+++ b/res/quest/world/ravnica/duels/Caprio
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=Caprio 2
+Title=Caprio
+Icon=Caprio.jpg
+Difficulty=medium
+Description=Catch me if you can..
+Deck Type=constructed
+[main]
+4 Compulsive Research|RAV
+4 Cyclonic Rift|RTR
+4 Muddle the Mixture|RAV
+4 Dimir Guildgate|GTC
+1 Duskmantle Seer|GTC
+4 Hunted Horror|RAV
+4 Hunted Phantasm|RAV
+4 Illness in the Ranks|GTC
+8 Island|RTR
+1 Jace, Architect of Thought|RTR
+4 Hatching Plans|GPT
+4 Leyline of Singularity|GPT
+1 Mimeofacture|GPT
+1 Stinkweed Imp|RAV
+1 Dimir House Guard|RAV
+8 Swamp|RTR
+4 Watery Grave|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Der
+++ b/res/quest/world/ravnica/duels/Der
@@ -0,0 +1,25 @@
+[duel]
+[metadata]
+Name=Der Rattenfanger von Hameln 2
+Title=Der Rattenfanger von Hameln
+Icon=Hameln.jpg
+Difficulty=medium
+Description=Ratata
+Deck Type=constructed
+[main]
+4 Blood Crypt|RTR
+4 Drainpipe Vermin|RTR
+4 Gobhobbler Rats|DIS
+4 Gutter Skulk|GTC
+4 Hellhole Rats|DIS
+8 Mountain|RTR
+4 Ogre Slumlord|GTC
+4 Pack Rat|RTR
+4 Rakdos Guildgate|RTR
+4 Ratcatcher|DIS
+4 Seal of Fire|DIS
+4 Last Gasp|RAV
+8 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Ghost
+++ b/res/quest/world/ravnica/duels/Ghost
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Ghost Council 2
+Title=Ghost Council 2
+Icon=Ghost Council.jpg
+Difficulty=medium
+Description=Whether it's heaven or hell, those who believe can live forever
+Deck Type=constructed
+[main]
+3 Blind Hunter|GPT
+1 Blind Obedience|GTC
+4 Castigate|GPT
+4 Cry of Contrition|GPT
+4 Drainpipe Vermin|RTR
+2 Ghost Council of Orzhova|GPT
+4 Godless Shrine|GTC
+4 Orzhov Guildgate|GTC
+4 Orzhov Euthanist|GPT
+1 Orzhova, the Church of Deals|GPT
+4 Plagued Rusalka|GPT
+7 Plains|RTR
+2 Proclamation of Rebirth|DIS
+8 Swamp|RTR
+4 Syndic of Tithes|GTC
+4 Thrull Parasite|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Ghost
+++ b/res/quest/world/ravnica/duels/Ghost
@@ -0,0 +1,32 @@
+[duel]
+[metadata]
+Name=Ghost Council 3
+Title=Ghost Council 3
+Icon=Ghost Council.jpg
+Difficulty=hard
+Description=Whether it's heaven or hell, those who believe can live forever
+Deck Type=constructed
+[main]
+2 Angel of Despair|COM
+2 Basilica Guards|GTC
+3 Condemn|M11
+2 Crypt Ghast|GTC
+1 Deathpact Angel|GTC
+2 Debtors' Knell|GPT
+1 Dimir House Guard|RAV
+4 Godless Shrine|GTC
+4 High Priest of Penance|GTC
+3 Last Gasp|RAV
+2 Merciless Eviction|GTC
+4 Mortify|COM
+2 Obzedat, Ghost Council|GTC
+2 Order of the Stars|GPT
+4 Orzhov Guildgate|GTC
+8 Plains|RTR
+1 Skeletal Vampire|GPT
+2 Stinkweed Imp|RAV
+8 Swamp|RTR
+3 Underworld Connections|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Golgari2005
+++ b/res/quest/world/ravnica/duels/Golgari2005
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Golgari2005 1
+Title=Golgari 2005
+Icon=Golgari-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+3 Darkblast|RAV
+2 Drooling Groodion|RAV
+2 Elves of Deep Shadow|RAV
+1 Elvish Skysweeper|RAV
+12 Forest|RTR
+2 Golgari Brownscale|RAV
+1 Golgari Grave-Troll|RAV
+1 Golgari Guildmage|COM
+2 Golgari Rotwurm|RAV
+3 Greater Mossdog|RAV
+2 Infectious Host|RAV
+2 Last Gasp|RAV
+1 Moldervine Cloak|RAV
+1 Necromantic Thirst|RAV
+2 Putrefy|RAV
+2 Recollect|10E
+1 Rolling Spoil|RAV
+1 Savra, Queen of the Golgari|RAV
+2 Shambling Shell|RAV
+2 Stinkweed Imp|RAV
+12 Swamp|RTR
+1 Vigor Mortis|RAV
+2 Woodwraith Strangler|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Gruul2006
+++ b/res/quest/world/ravnica/duels/Gruul2006
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Gruul2006 1
+Title=Gruul 2006
+Icon=Gruul-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+1 Battering Wurm|GPT
+3 Beastmaster's Magemark|GPT
+3 Bloodscale Prowler|GPT
+1 Borborygmos|GPT
+2 Dowsing Shaman|PC2
+2 Dryad Sophisticate|GPT
+3 Fencer's Magemark|GPT
+2 Fists of Ironwood|COM
+12 Forest|RTR
+2 Gatherer of Graces|GPT
+1 Gruul Guildmage|GPT
+1 Gruul Nodorog|GPT
+2 Gruul Scrapper|GPT
+1 Indentured Oaf|RAV
+11 Mountain|RTR
+1 Scab-Clan Mauler|GPT
+1 Scorched Rusalka|GPT
+1 Skarrg, the Rage Pits|PC2
+2 Skarrgan Skybreaker|GPT
+2 Sparkmage Apprentice|M10
+3 Streetbreaker Wurm|GPT
+1 Wild Cantor|GPT
+1 Wildsize|GPT
+1 Wurmweaver Coil|GPT
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Isperia
+++ b/res/quest/world/ravnica/duels/Isperia
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=Isperia 2
+Title=Isperia 2
+Icon=Isperia.jpg
+Difficulty=medium
+Description=Fly baby
+Deck Type=constructed
+[main]
+4 Azorius Charm|RTR
+2 Azorius Herald|DIS
+2 Civic Saber|RTR
+4 Compulsive Research|RAV
+4 Dramatic Rescue|RTR
+4 Hallowed Fountain|RTR
+4 Azorius Guildgate|RTR
+8 Island|RTR
+4 Lyev Skyknight|RTR
+4 Mistral Charger|DIS
+8 Plains|RTR
+2 Pride of the Clouds|DIS
+2 Snapping Drake|RAV
+2 Skymark Roc|RTR
+4 Spell Snare|DIS
+1 Azorius Guildmage|DIS
+1 New Prahv Guildmage|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Isperia
+++ b/res/quest/world/ravnica/duels/Isperia
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Isperia 3
+Title=Isperia 3
+Icon=Isperia.jpg
+Difficulty=hard
+Description=a tiny bit controllish
+Deck Type=constructed
+[main]
+2 Angel of Serenity|RTR
+2 Azorius Charm|RTR
+4 Azorius Guildgate|RTR
+1 Cerulean Sphinx|RAV
+3 Compulsive Research|RAV
+2 Condemn|M11
+3 Court Hussar|DIS
+2 Detention Sphere|RTR
+2 Faith's Fetters|RAV
+4 Hallowed Fountain|RTR
+9 Island|RTR
+2 Azorius Herald|DIS
+2 Jace, Architect of Thought|RTR
+2 Muddle the Mixture|RAV
+9 Plains|RTR
+1 Pride of the Clouds|DIS
+4 Remand|RAV
+2 Sphinx's Revelation|RTR
+4 Supreme Verdict|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Izzet2012
+++ b/res/quest/world/ravnica/duels/Izzet2012
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Izzet2012 1
+Title=Izzet 2012
+Icon=Izzet-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+3 Annihilating Fire|RTR
+2 Blistercoil Weird|RTR
+1 Blustersquall|RTR
+3 Cobblebrute|RTR
+1 Downsize|RTR
+2 Electrickery|RTR
+1 Explosive Impact|RTR
+2 Goblin Electromancer|RTR
+2 Goblin Rally|RTR
+2 Guttersnipe|RTR
+1 Hypersonic Dragon|RTR
+12 Island|RTR
+1 Izzet Guildgate|RTR
+2 Izzet Keyrune|RTR
+2 Sparkmage Apprentice|RAV
+2 Surveilling Sprite|RAV
+1 Mizzium Mortars|RTR
+12 Mountain|RTR
+1 Nivix Guildmage|RTR
+1 Pursuit of Flight|RTR
+3 Runewing|RTR
+1 Teleportal|RTR
+1 Tenement Crasher|RTR
+1 Thoughtflare|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Jarad
+++ b/res/quest/world/ravnica/duels/Jarad
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Jarad 2
+Title=Jarad
+Icon=Jarad.jpg
+Difficulty=medium
+Description=Dead? Undead? Make up your mind!
+Deck Type=constructed
+[main]
+3 Bloodbond March|RAV
+4 Darkblast|RAV
+3 Dimir House Guard|RAV
+4 Elves of Deep Shadow|RAV
+8 Forest|RTR
+2 Golgari Grave-Troll|RAV
+4 Golgari Guildgate|RTR
+4 Grisly Salvage|RTR
+1 Jarad's Orders|RTR
+3 Jarad, Golgari Lich Lord|RTR
+4 Lotleth Troll|RTR
+4 Overgrown Tomb|RTR
+4 Slitherhead|RTR
+4 Stinkweed Imp|RAV
+8 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Kraj
+++ b/res/quest/world/ravnica/duels/Kraj
@@ -0,0 +1,26 @@
+[duel]
+[metadata]
+Name=Kraj 3
+Title=Experiment Kraj
+Icon=Kraj.jpg
+Difficulty=hard
+Description=Darwin, eat your heart out
+Deck Type=constructed
+[main]
+4 Breeding Pool|GTC
+4 Brushstrider|RTR
+4 Cloudfin Raptor|GTC
+4 Drakewing Krasis|GTC
+4 Elusive Krasis|GTC
+4 Experiment One|GTC
+9 Forest|RTR
+9 Island|RTR
+2 Simic Guildgate|GTC
+2 Remand|RAV
+3 Shambleshark|GTC
+3 Simic Charm|GTC
+4 Spell Snare|DIS
+4 Zameck Guildmage|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Lyzolda
+++ b/res/quest/world/ravnica/duels/Lyzolda
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Lyzolda 2
+Title=Lyzolda 2
+Icon=Lyzolda.jpg
+Difficulty=medium
+Description=Big Fellas
+Deck Type=constructed
+[main]
+2 Bloodfray Giant|RTR
+2 Carnival Hellsteed|RTR
+2 Cobblebrute|RTR
+3 Desecration Demon|RTR
+3 Guild Feud|RTR
+2 Hammerfist Giant|RAV
+1 Hellhole Rats|DIS
+3 Hellraiser Goblin|GTC
+1 Hunted Dragon|RAV
+4 Last Gasp|RAV
+1 Lord of the Void|GTC
+10 Mountain|RTR
+4 Rakdos Guildgate|RTR
+4 Rakdos Keyrune|RTR
+4 Seal of Fire|DIS
+1 Smog Elemental|GTC
+1 Stalking Vengeance|DIS
+2 Street Spasm|RTR
+10 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Lyzolda
+++ b/res/quest/world/ravnica/duels/Lyzolda
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=Lyzolda 3
+Title=Lyzolda 3
+Icon=Lyzolda.jpg
+Difficulty=hard
+Description=Burn, burn, yes you're gonna burn
+Deck Type=constructed
+[main]
+4 Ash Zealot|RTR
+4 Blood Crypt|RTR
+4 Char|RAV
+4 Dark Confidant|RAV
+2 Demonfire|DIS
+2 Foundry Street Denizen|GTC
+2 Gore-House Chainwalker|RTR
+4 Hellhole Flailer|RTR
+9 Mountain|RAV
+2 Rakdos Guildgate|RTR
+4 Rakdos Cackler|RTR
+4 Rakdos Shred-Freak|RTR
+4 Seal of Fire|DIS
+3 Skullcrack|GTC
+1 Rakdos Guildmage|DIS
+1 Rix Maadi Guildmage|RTR
+9 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Niv-Mizzet
+++ b/res/quest/world/ravnica/duels/Niv-Mizzet
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Niv-Mizzet 3
+Title=Niv-Mizzet 3
+Icon=Niv-Mizzet.jpg
+Difficulty=hard
+Description=Instant karma is gonna get you
+Deck Type=constructed
+[main]
+4 Compulsive Research|RAV
+1 Diluvian Primordial|GTC
+4 Electrolyze|COM
+4 Frostburn Weird|RTR
+4 Spell Snare|DIS
+2 Hypersonic Dragon|RTR
+9 Island|RTR
+4 Izzet Guildgate|RTR
+3 Jace, Architect of Thought|RTR
+4 Mizzium Mortars|RTR
+9 Mountain|RTR
+2 Niv-Mizzet, Dracogenius|RTR
+1 Niv-Mizzet, the Firemind|GPT
+4 Remand|RAV
+4 Steam Vents|RTR
+3 Steamcore Weird|GPT
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Orzhov2006
+++ b/res/quest/world/ravnica/duels/Orzhov2006
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Orzhov2006 1
+Title=Orzhov 2006
+Icon=Orzhov-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+2 Agent of Masks|GPT
+1 Belfry Spirit|GPT
+2 Blind Hunter|GPT
+2 Castigate|GPT
+2 Hissing Miasma|GPT
+2 Infectious Host|RAV
+2 Mortify|COM
+2 Mourning Thrull|GPT
+2 Orzhov Euthanist|GPT
+1 Orzhov Guildmage|COM
+1 Orzhova, the Church of Deals|GPT
+2 Ostiary Thrull|GPT
+2 Pillory of the Sleepless|GPT
+4 Plagued Rusalka|GPT
+11 Plains|RTR
+2 Poisonbelly Ogre|GPT
+2 Shrieking Grotesque|GPT
+1 Skeletal Vampire|GPT
+2 Souls of the Faultless|GPT
+2 Strands of Undeath|RAV
+12 Swamp|RTR
+1 Teysa, Orzhov Scion|GPT
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Rakdos
+++ b/res/quest/world/ravnica/duels/Rakdos
@@ -0,0 +1,25 @@
+[duel]
+[metadata]
+Name=Rakdos the defiler 2
+Title=Rakdos the Defiler
+Icon=Rakdos.jpg
+Difficulty=medium
+Description=Blood, Sweat & Tears
+Deck Type=constructed
+[main]
+4 Blood Crypt|RTR
+4 Char|RAV
+4 Dreadbore|RTR
+4 Grave Betrayal|RTR
+4 Mizzium Mortars|RTR
+9 Mountain|RTR
+4 Rakdos Guildgate|RTR
+4 Rakdos's Return|RTR
+9 Swamp|RTR
+4 Underworld Connections|RTR
+4 Wight of Precinct Six|GTC
+4 Mind Rot|RTR
+2 Seal of Fire|DIS
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Savra
+++ b/res/quest/world/ravnica/duels/Savra
@@ -0,0 +1,26 @@
+[duel]
+[metadata]
+Name=Savra 3
+Title=Savra
+Icon=Savra.jpg
+Difficulty=hard
+Description=Controllish
+Deck Type=constructed
+[main]
+4 Abrupt Decay|RTR
+4 Birds of Paradise|M12
+4 Last Gasp|RAV
+2 Elves of Deep Shadow|RAV
+8 Forest|RTR
+4 Golgari Guildgate|RTR
+3 Dreg Mangler|RTR
+4 Overgrown Tomb|RTR
+4 Putrefy|RAV
+4 Skeletal Vampire|GPT
+8 Swamp|RTR
+3 Trestle Troll|RTR
+4 Underworld Connections|RTR
+4 Vraska the Unseen|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Selesnya2005
+++ b/res/quest/world/ravnica/duels/Selesnya2005
@@ -0,0 +1,32 @@
+[duel]
+[metadata]
+Name=Selesnya2005 1
+Title=Selesnya 2005
+Icon=Selesnya-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+2 Centaur Safeguard|RAV
+2 Conclave Phalanx|RAV
+1 Conclave's Blessing|RAV
+1 Dowsing Shaman|RAV
+4 Elvish Skysweeper|RAV
+4 Fists of Ironwood|RAV
+12 Forest|M10
+12 Forest|RTR
+3 Gather Courage|RAV
+11 Plains|RTR
+3 Root-Kin Ally|RAV
+2 Scatter the Seeds|RAV
+1 Scion of the Wild|RAV
+2 Selesnya Evangel|RAV
+1 Selesnya Guildmage|RAV
+4 Siege Wurm|RAV
+1 Tolsimir Wolfblood|RAV
+4 Transguild Courier|DIS
+1 Vitu-Ghazi, the City-Tree|RAV
+1 Watchwolf|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Selesnya2012
+++ b/res/quest/world/ravnica/duels/Selesnya2012
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Selesnya2012 1
+Title=Selesnya 2012
+Icon=Selesnya-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+1 Axebane Stag|RTR
+1 Brushstrider|RTR
+2 Call of the Conclave|RTR
+4 Centaur Healer|RTR
+3 Centaur's Herald|RTR
+2 Chorus of Might|RTR
+1 Coursers' Accord|RTR
+1 Druid's Deliverance|RTR
+2 Eyes in the Skies|RTR
+12 Forest|RTR
+1 Grove of the Guardian|RTR
+1 Heroes' Reunion|RTR
+2 Phantom General|RTR
+11 Plains|RTR
+1 Risen Sanctuary|RTR
+1 Rootborn Defenses|RTR
+2 Rubbleback Rhino|RTR
+2 Savage Surge|RTR
+1 Selesnya Guildgate|RTR
+2 Selesnya Keyrune|RTR
+3 Seller of Songbirds|RTR
+2 Trostani's Judgment|RTR
+1 Vitu-Ghazi Guildmage|RTR
+1 Wayfaring Temple|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Simic2013
+++ b/res/quest/world/ravnica/duels/Simic2013
@@ -0,0 +1,37 @@
+[duel]
+[metadata]
+Name=Simic2013 1
+Title=Simic 2013
+Icon=Simic-precon.jpg
+Difficulty=easy
+Description=Precon deck
+Deck Type=constructed
+[main]
+2 Adaptive Snapjaw|GTC
+2 Cloudfin Raptor|GTC
+4 Crocanura|GTC
+1 Crowned Ceratok|GTC
+2 Drakewing Krasis|GTC
+1 Elusive Krasis|GTC
+3 Agoraphobia|GTC
+1 Fathom Mage|GTC
+2 Forced Adaptation|GTC
+12 Forest|RTR
+1 Frilled Oculus|GTC
+1 Hindervines|GTC
+13 Island|RTR
+1 Ivy Lane Denizen|GTC
+4 Kraken Hatchling|M13
+1 Leyline Phantom|GTC
+1 Merfolk of the Depths|GTC
+1 Sapphire Drake|GTC
+2 Shambleshark|GTC
+1 Simic Guildgate|GTC
+2 Simic Keyrune|GTC
+1 Sleep|M13
+2 Unexpected Results|GTC
+1 Urban Evolution|GTC
+1 Zameck Guildmage|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Sisters
+++ b/res/quest/world/ravnica/duels/Sisters
@@ -0,0 +1,26 @@
+[duel]
+[metadata]
+Name=Sisters of Stone Death 3
+Title=Sisters of Stone Death
+Icon=Sisters of Stone Death.jpg
+Difficulty=hard
+Description=Some creatures that really want to eat you
+Deck Type=constructed
+[main]
+4 Birds of Paradise|M12
+3 Deadbridge Goliath|RTR
+3 Desecration Demon|RTR
+4 Dreg Mangler|RTR
+4 Elves of Deep Shadow|RAV
+8 Forest|RTR
+4 Golgari Guildgate|RTR
+4 Abrupt Decay|RTR
+4 Lotleth Troll|RTR
+4 Overgrown Tomb|RTR
+3 Sewer Shambler|RTR
+3 Shambling Shell|RAV
+4 Slitherhead|RTR
+8 Swamp|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Sus
+++ b/res/quest/world/ravnica/duels/Sus
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Sus Antigoon 2
+Title=Sus Antigoon
+Icon=Sus Antigoon.jpg
+Difficulty=medium
+Description=Your Ghost
+Deck Type=constructed
+[main]
+1 Clinging Darkness|RAV
+2 Dark Confidant|RAV
+4 Dutiful Thrull|GTC
+4 Ethereal Armor|RTR
+2 Gift of Orzhova|GTC
+4 Godless Shrine|GTC
+4 Grim Roustabout|RTR
+1 Guardian's Magemark|GPT
+1 Necromancer's Magemark|GPT
+4 Orzhov Guildgate|GTC
+4 Pillory of the Sleepless|GPT
+8 Plains|RTR
+2 Precinct Captain|RTR
+4 Shadow Lance|GPT
+2 Sphere of Safety|RTR
+1 Stab Wound|RTR
+8 Swamp|RTR
+4 Underworld Connections|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Szadek
+++ b/res/quest/world/ravnica/duels/Szadek
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Szadek 2
+Title=Szadek
+Icon=Szadek.jpg
+Difficulty=medium
+Description=Lucipher
+Deck Type=constructed
+[main]
+2 Cyclonic Rift|RTR
+2 Daggerdrome Imp|RTR
+4 Last Gasp|RAV
+4 Dimir Guildgate|GTC
+4 Dimir Infiltrator|RAV
+8 Island|RTR
+2 Last Thoughts|GTC
+2 Muddle the Mixture|RAV
+4 Cloudfin Raptor|GTC
+2 Remand|RAV
+4 Shadow Slice|GTC
+2 Stolen Identity|GTC
+2 Surveilling Sprite|RAV
+8 Swamp|RTR
+2 Thrill-Kill Assassin|RTR
+2 Undercity Plague|GTC
+4 Watery Grave|GTC
+2 Deathcult Rogue|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Teysa
+++ b/res/quest/world/ravnica/duels/Teysa
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Teysa 2
+Title=Teysa
+Icon=Teysa.jpg
+Difficulty=medium
+Description=Please let me play my combo
+Deck Type=constructed
+[main]
+4 Belfry Spirit|GPT
+2 Blind Hunter|GPT
+2 Dimir House Guard|RAV
+4 Eyes in the Skies|RTR
+2 Ghost Council of Orzhova|GPT
+4 Godless Shrine|GTC
+4 Knight Watch|GTC
+2 Ogre Slumlord|GTC
+4 Orzhov Guildgate|GTC
+8 Plains|RTR
+4 Precinct Captain|RTR
+4 Skeletal Vampire|GPT
+8 Swamp|RTR
+4 Teysa, Orzhov Scion|GPT
+4 Twilight Drover|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Token
+++ b/res/quest/world/ravnica/duels/Token
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Token 2
+Title=Token
+Icon=Token.jpg
+Difficulty=medium
+Description=Tokens'r'us
+Deck Type=constructed
+[main]
+4 Birds of Paradise|RAV
+4 Call of the Conclave|RTR
+2 Collective Blessing|RTR
+4 Fists of Ironwood|RAV
+7 Forest|RTR
+4 Glare of Subdual|RAV
+2 Hour of Reckoning|RAV
+4 Leyline of the Meek|GPT
+7 Plains|RTR
+4 Scatter the Seeds|RAV
+4 Seed Spark|RAV
+4 Selesnya Charm|RTR
+4 Selesnya Guildgate|RTR
+4 Temple Garden|RTR
+2 Vitu-Ghazi, the City-Tree|RAV
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Tolsimir
+++ b/res/quest/world/ravnica/duels/Tolsimir
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Tolsimir 2
+Title=Tolsimir
+Icon=Tolsimir.jpg
+Difficulty=medium
+Description=Creatures'r'us
+Deck Type=constructed
+[main]
+4 Call of the Conclave|RTR
+4 Centaur Healer|RTR
+4 Dryad Militant|RTR
+8 Forest|RTR
+3 Giant Growth|RTR
+4 Loxodon Hierarch|RAV
+4 Loxodon Smiter|RTR
+8 Plains|RTR
+2 Selesnya Guildmage|RAV
+4 Selesnya Guildgate|RTR
+4 Temple Garden|RTR
+2 Tolsimir Wolfblood|RAV
+4 Vinelasher Kudzu|RAV
+4 Watchwolf|RAV
+1 Vitu-Ghazi Guildmage|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Trostani
+++ b/res/quest/world/ravnica/duels/Trostani
@@ -0,0 +1,33 @@
+[duel]
+[metadata]
+Name=Trostani 2
+Title=Trostani
+Icon=Trostani.jpg
+Difficulty=medium
+Description=Ramp it up
+Deck Type=constructed
+[main]
+1 Angel of Serenity|RTR
+1 Armada Wurm|RTR
+1 Autochthon Wurm|RAV
+4 Birds of Paradise|RAV
+1 Blazing Archon|RAV
+4 Carven Caryatid|RAV
+4 Civic Wayfinder|RAV
+4 Gyre Sage|GTC
+4 Farseek|RAV
+10 Forest|RTR
+1 Luminate Primordial|GTC
+1 Oathsworn Giant|RAV
+1 Palisade Giant|RTR
+8 Plains|RTR
+1 Primordial Sage|RAV
+2 Selesnya Keyrune|RTR
+4 Selesnya Guildgate|RTR
+1 Sylvan Primordial|GTC
+4 Temple Garden|RTR
+2 Trostani, Selesnya's Voice|RTR
+1 Worldspine Wurm|RTR
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Ulasht
+++ b/res/quest/world/ravnica/duels/Ulasht
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Ulasht 2
+Title=Ulasht
+Icon=Ulasht.jpg
+Difficulty=medium
+Description=Temper, Temper
+Deck Type=constructed
+[main]
+2 Burning-Tree Emissary|GTC
+8 Forest|RTR
+4 Ghor-Clan Rampager|GTC
+10 Mountain|RTR
+4 Mugging|GTC
+2 Razortip Whip|GTC
+4 Scab-Clan Mauler|GPT
+4 Seal of Fire|DIS
+2 Skarrg, the Rage Pits|PC2
+2 Skarrgan Firebird|GPT
+4 Skarrgan Pit-Skulk|GPT
+2 Skarrgan Skybreaker|GPT
+4 Stomping Ground|GTC
+4 Wasteland Viper|GTC
+2 Ulasht, the Hate Seed|GPT
+2 Domri Rade|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/ravnica/duels/Zegana
+++ b/res/quest/world/ravnica/duels/Zegana
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Zegana 3
+Title=Zegana
+Icon=Zegana.jpg
+Difficulty=hard
+Description=Darwin, eat your heart out
+Deck Type=constructed
+[main]
+4 Birds of Paradise|M12
+4 Breeding Pool|GTC
+2 Civic Wayfinder|10E
+2 Coiling Oracle|DIS
+4 Crocanura|GTC
+4 Experiment One|GTC
+4 Farseek|M13
+5 Forest|RTR
+4 Island|RTR
+2 Master Biomancer|GTC
+2 Mystic Genesis|GTC
+1 Novijen, Heart of Progress|DIS
+3 Patagia Viper|DIS
+4 Prime Speaker Zegana|GTC
+4 Simic Charm|GTC
+4 Simic Guildgate|GTC
+3 Trygon Predator|DIS
+2 Vigean Hydropon|DIS
+2 Zameck Guildmage|GTC
+[sideboard]
+[planes]
+[schemes]
--- a/res/quest/world/shandalar/duels/Sorcerer
+++ b/res/quest/world/shandalar/duels/Sorcerer
@@ -11,6 +11,7 @@ Deck Type=constructed
 3 Brass Man|ARN
 4 Giant Strength|4ED
 4 Goblin Balloon Brigade|4ED
+4 Goblin Digging Team|DRK
 3 Hurr Jackal|ARN
 3 Immolation|LEG
 4 Lightning Bolt|2ED
@@ -18,5 +19,4 @@ Deck Type=constructed
 4 Mons's Goblin Raiders|3ED
 20 Mountain|4ED
 4 Sisters of the Flame|DRK
-4 Winds of Change|4ED
 [sideboard]
--- a/res/quest/world/shandalar/duels/Sorcerer
+++ b/res/quest/world/shandalar/duels/Sorcerer
@@ -9,6 +9,7 @@ Deck Type=constructed
 [main]
 3 Ali Baba|ARN
 3 Ankh of Mishra|LEB
+4 Black Vise|LEB
 4 Giant Strength|4ED
 4 Goblin Balloon Brigade|4ED
 3 Hurr Jackal|ARN
@@ -19,5 +20,4 @@ Deck Type=constructed
 16 Mountain|4ED
 4 Sisters of the Flame|DRK
 4 Strip Mine|ATQ
-4 Winds of Change|4ED
 [sideboard]
--- a/res/quest/world/shandalar/duels/Sorceress
+++ b/res/quest/world/shandalar/duels/Sorceress
@@ -7,17 +7,18 @@ Difficulty=easy
 Description=Pumpable Red weenies with Dwarven Warriors and Meekstone.
 Deck Type=constructed
 [main]
+1 Artifact Blast|ATQ
 3 Ball Lightning|4ED
 4 Bird Maiden|ARN
-4 Blood Lust|LEG
 2 Dragon Whelp|4ED
 4 Dwarven Warriors|LEB
+1 Eternal Warrior|LEG
 4 Firebreathing|4ED
 2 Hurloon Minotaur|LEB
 4 Hurr Jackal|ARN
 3 Iron Star|LEB
-2 Meekstone|LEB
+4 Meekstone|LEB
+4 Mons's Goblin Raiders|3ED
 23 Mountain|4ED
 2 Shatter|4ED
-3 The Brute|LEG
 [sideboard]
--- a/res/quest/world/shandalar/duels/Sorceress
+++ b/res/quest/world/shandalar/duels/Sorceress
@@ -9,7 +9,6 @@ Deck Type=constructed
 [main]
 3 Ball Lightning|4ED
 4 Bird Maiden|ARN
-4 Blood Lust|LEG
 3 Dragon Whelp|4ED
 4 Dwarven Warriors|LEB
 2 Fire Drake|CHR
@@ -17,7 +16,8 @@ Deck Type=constructed
 2 Hurloon Minotaur|LEB
 4 Hurr Jackal|ARN
 3 Iron Star|LEB
-2 Meekstone|LEB
+2 Lightning Bolt|2ED
+4 Meekstone|LEB
 23 Mountain|4ED
 2 Shatter|4ED
 [sideboard]
--- a/res/quest/world/shandalar/duels/Summoner
+++ b/res/quest/world/shandalar/duels/Summoner
@@ -8,17 +8,17 @@ Description=Big Green creatures with a splash of White.
 Deck Type=constructed
 [main]
 4 Birds of Paradise|4ED
-1 Channel|4ED
 2 Colossus of Sardia|4ED
 2 Disenchant|4ED
 3 Force of Nature|2ED
-20 Forest|4ED
+16 Forest|4ED
 3 Giant Growth|2ED
-2 Healing Salve|2ED
-3 Holy Strength|2ED
+1 Healing Salve|2ED
 4 Hurricane|4ED
 4 Plains|4ED
 4 Radjan Spirit|4ED
+4 Savannah|LEB
 4 Spirit Link|LEG
+4 Swords to Plowshares|LEB
 4 War Mammoth|2ED
 [sideboard]
--- a/res/quest/world/shandalar/duels/Summoner
+++ b/res/quest/world/shandalar/duels/Summoner
@@ -7,23 +7,23 @@ Difficulty=very hard
 Description=Big Green creatures with a splash of White.
 Deck Type=constructed
 [main]
-1 Channel|LEB
-1 Colossus of Sardia|ATQ
+4 Birds of Paradise|4ED
 4 Desert Twister|4ED
 2 Disenchant|4ED
-2 Flying Carpet|ARN
 3 Force of Nature|LEB
-13 Forest|4ED
-3 Giant Growth|2ED
-2 Healing Salve|2ED
-2 Holy Strength|4ED
+11 Forest|4ED
 4 Hurricane|4ED
 4 Llanowar Elves|2ED
-1 Mox Emerald|LEB
-1 Mox Pearl|LEB
-3 Plains|4ED
-3 Radjan Spirit|LEG
+1 Mox Emerald|2ED
+1 Mox Jet|2ED
+1 Mox Pearl|2ED
+1 Mox Ruby|2ED
+1 Mox Sapphire|2ED
+4 Plains|4ED
 4 Savannah|LEB
-4 Spirit Link|LEG
+4 Serra Angel|LEB
+1 Sol Ring|LEB
+2 Su-Chi|ATQ
+4 Swords to Plowshares|LEB
 4 War Mammoth|LEB
 [sideboard]
--- a/res/quest/world/shandalar/duels/Thought
+++ b/res/quest/world/shandalar/duels/Thought
@@ -7,17 +7,17 @@ Difficulty=hard
 Description=Big Blue fliers and effects to impede opponent's progress.
 Deck Type=constructed
 [main]
+4 Air Elemental|LEB
 2 Control Magic|LEB
+3 Counterspell|LEB
 2 Energy Flux|4ED
-3 Feedback|LEB
 4 Ghost Ship|DRK
 4 Giant Tortoise|ARN
 22 Island|4ED
 2 Mahamoti Djinn|LEB
-4 Mana Short|LEB
 4 Phantom Monster|LEB
 4 Power Sink|4ED
 4 Psychic Venom|LEB
 2 Time Elemental|LEG
-3 Twiddle|LEB
+3 Unsummon|LEB
 [sideboard]
--- a/res/quest/world/shandalar/duels/Thought
+++ b/res/quest/world/shandalar/duels/Thought
@@ -7,19 +7,18 @@ Difficulty=very hard
 Description=Big Blue fliers and effects to impede opponent's progress.
 Deck Type=constructed
 [main]
+4 Air Elemental|LEB
 1 Ancestral Recall|LEB
-2 Control Magic|LEB
-2 Energy Flux|4ED
+4 Control Magic|LEB
 4 Ghost Ship|DRK
 4 Giant Tortoise|ARN
 22 Island|4ED
-2 Mahamoti Djinn|LEB
-4 Mana Short|LEB
+4 Mahamoti Djinn|LEB
+4 Mana Drain|LEG
 1 Mox Sapphire|LEB
 4 Phantom Monster|LEB
 4 Power Sink|4ED
-4 Psychic Venom|LEB
 1 Sol Ring|LEB
 2 Time Elemental|LEG
-3 Twiddle|LEB
+1 Time Walk|LEB
 [sideboard]
--- a/res/quest/world/worlds.txt
+++ b/res/quest/world/worlds.txt
@@ -1,3 +1,4 @@
 Name:Main world
 Name:Shandalar|Dir:shandalar|Sets:2ED, ARN, ATQ, 3ED, LEG, DRK, 4ED|Banned:Chaos Orb; Falling Star
 Name:Jamuraa|Dir:jamuraa|Sets:5ED, ARN, MIR, VIS, WTH|Banned:Chaos Orb; Falling Star
+Name:Ravnica|Dir:ravnica|Sets:RAV, GPT, DIS, RTR, GTC|Banned:Chaos Orb; Falling Star
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6876,10 +6876,6 @@ public class Card extends GameEntity implements Comparable<Card> {
                    for (final Object rem : source.getRemembered()) {
                        if (rem instanceof Card) {
                            final Card card = (Card) rem;
-                            System.out.println(this + " vs " + card);
-                            System.out.println(this.getOwner().equals(card.getOwner()));
-                            System.out.println(this.getOwner());
-                            System.out.println(card.getOwner());
                            if (!this.getOwner().equals(card.getOwner())) {
                                return false;
                            }
--- a/src/main/java/forge/card/BoosterData.java
+++ b/src/main/java/forge/card/BoosterData.java
@@ -180,7 +180,7 @@ public class BoosterData {
         * @see forge.util.StorageReaderFile#read(java.lang.String)
         */
        @Override
-        protected BoosterData read(String line) {
+        protected BoosterData read(String line, int i) {
            final FileSection section = FileSection.parse(line, ":", "|");
            int nC = section.getInt("Commons", 0);
            int nU = section.getInt("Uncommons", 0);
--- a/src/main/java/forge/card/CardBlock.java
+++ b/src/main/java/forge/card/CardBlock.java
@@ -229,11 +229,11 @@ public final class CardBlock implements Comparable<CardBlock> {
         * @see forge.util.StorageReaderFile#read(java.lang.String)
         */
        @Override
-        protected CardBlock read(String line) {
+        protected CardBlock read(String line, int i) {
            final String[] sParts = line.trim().split("\\|");

            String name = null;
-            int index = -1;
+            int index = 1+i;
            final List<CardEdition> sets = new ArrayList<CardEdition>(9); // add support for up to 9 different sets in a block!
            final ArrayList<MetaSet> metas = new ArrayList<MetaSet>();
            CardEdition landSet = null;
@@ -245,8 +245,6 @@ public final class CardBlock implements Comparable<CardBlock> {
                final String key = kv[0].toLowerCase();
                if ("name".equals(key)) {
                    name = kv[1];
-                } else if ("index".equals(key)) {
-                    index = Integer.parseInt(kv[1]);
                } else if ("set0".equals(key) || "set1".equals(key) || "set2".equals(key) || "set3".equals(key)
                        || "set4".equals(key) || "set5".equals(key) || "set6".equals(key) || "set7".equals(key)
                        || "set8".equals(key)) {
--- a/src/main/java/forge/card/CardEdition.java
+++ b/src/main/java/forge/card/CardEdition.java
@@ -208,9 +208,9 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
        }

        @Override
-        protected CardEdition read(String line) {
+        protected CardEdition read(String line, int i) {
            FileSection section = FileSection.parse(line, ":", "|");
-            int    index = section.getInt("index", -1);
+            int    index = 1+i;
            String code2 = section.get("code2");
            String code  = section.get("code3");
            String type  = section.get("type");
--- a/src/main/java/forge/card/FatPackData.java
+++ b/src/main/java/forge/card/FatPackData.java
@@ -57,7 +57,7 @@ public class FatPackData {
         * @see forge.util.StorageReaderFile#read(java.lang.String)
         */
        @Override
-        protected FatPackData read(String line) {
+        protected FatPackData read(String line, int i) {
            final FileSection section = FileSection.parse(line, ":", "|");
            int nBoosters = section.getInt("Boosters", 0);
            int nLand = section.getInt("BasicLands", 0);
--- a/src/main/java/forge/card/FormatCollection.java
+++ b/src/main/java/forge/card/FormatCollection.java
@@ -93,7 +93,7 @@ public final class FormatCollection extends StorageView<GameFormat> {
         * @see forge.util.StorageReaderFile#read(java.lang.String)
         */
        @Override
-        protected GameFormat read(String line) {
+        protected GameFormat read(String line, int i) {
            final List<String> sets = new ArrayList<String>(); // default: all sets allowed
            final List<String> bannedCards = new ArrayList<String>(); // default:
            // nothing
@@ -101,7 +101,7 @@ public final class FormatCollection extends StorageView<GameFormat> {

            FileSection section = FileSection.parse(line, ":", "|");
            String name = section.get("name");
-            int index = section.getInt("index", 0);
+            int index = 1 + i;
            String strSets = section.get("sets");
            if ( null != strSets ) {
                sets.addAll(Arrays.asList(strSets.split(", ")));
--- a/src/main/java/forge/card/ability/AbilityUtils.java
+++ b/src/main/java/forge/card/ability/AbilityUtils.java
@@ -143,7 +143,6 @@ public class AbilityUtils {
                final Object crd = root.getTriggeringObject(defined.substring(9));
                if (crd instanceof Card) {
                    c = Singletons.getModel().getGame().getCardState((Card) crd);
-                    c = (Card) crd;
                } else if (crd instanceof List<?>) {
                    for (final Card cardItem : (List<Card>) crd) {
                        cards.add(cardItem);
@@ -1110,6 +1109,8 @@ public class AbilityUtils {
                if (paid) {
                    unpaidCommand = paidCommand;
                }
+                ability.setActivatingPlayer(payer);
+                ability.setTarget(sa.getTarget());
                GameActionUtil.payCostDuringAbilityResolve(payer, ability, cost, paidCommand, unpaidCommand, sa, game);
                waitForInput = true; // wait for the human input
                break; // multiple human players are not supported
--- a/src/main/java/forge/card/ability/SpellAbilityAi.java
+++ b/src/main/java/forge/card/ability/SpellAbilityAi.java
@@ -84,6 +84,12 @@ public abstract class SpellAbilityAi {
        if (sa.getRestrictions().getPlaneswalker() && Singletons.getModel().getGame().getPhaseHandler().is(PhaseType.MAIN2)) {
            return true;
        }
+        if (sa.isTrigger()) {
+            return true;
+        }
+        if (sa.isSpell() && !sa.isBuyBackAbility()) {
+            return false;
+        }
        
        PhaseHandler phase = Singletons.getModel().getGame().getPhaseHandler();
        return phase.is(PhaseType.END_OF_TURN) && phase.getNextTurn().equals(ai);
--- a/src/main/java/forge/card/ability/ai/AttachAi.java
+++ b/src/main/java/forge/card/ability/ai/AttachAi.java
@@ -25,6 +25,7 @@ import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.card.staticability.StaticAbility;
 import forge.game.ai.ComputerUtilCard;
+import forge.game.ai.ComputerUtilCost;
 import forge.game.ai.ComputerUtilMana;
 import forge.game.phase.CombatUtil;
 import forge.game.phase.PhaseHandler;
@@ -46,7 +47,13 @@ public class AttachAi extends SpellAbilityAi {
        final Card source = sa.getSourceCard();

        if (abCost != null) {
-            // No Aura spells have Additional Costs
+            // AI currently disabled for these costs
+            if (!ComputerUtilCost.checkSacrificeCost(ai, abCost, source)) {
+                return false;
+            }
+            if (!ComputerUtilCost.checkLifeCost(ai, abCost, source, 4, null)) {
+                return false;
+            }
        }

        // prevent run-away activations - first time will always return true
@@ -991,10 +998,12 @@ public class AttachAi extends SpellAbilityAi {
        if (!CardUtil.isStackingKeyword(keyword) && card.hasKeyword(keyword)) {
            return false;
        }
-        final boolean evasive = (keyword.endsWith("Unblockable") || keyword.equals("Fear")
+        final boolean evasive = (keyword.equals("Unblockable") || keyword.equals("Fear")
                || keyword.equals("Intimidate") || keyword.equals("Shadow")
                || keyword.equals("Flying") || keyword.equals("Horsemanship")
-                || keyword.endsWith("walk"));
+                || keyword.endsWith("walk") || keyword.equals("CARDNAME can't be blocked except by Walls.")
+                || keyword.equals("All creatures able to block CARDNAME do so.")
+                || keyword.equals("CARDNAME can't be blocked by more than one creature."));
        // give evasive keywords to creatures that can attack and deal damage
        if (evasive) {
            if (card.getNetCombatDamage() <= 0
--- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
+++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java
@@ -294,8 +294,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
            }
        }

-        chance &= (r.nextFloat() < .8);
-
        final AbilitySub subAb = sa.getSubAbility();
        chance &= subAb == null || subAb.getAi().chkDrawbackWithSubs(ai, subAb);

@@ -747,7 +745,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                    }
                }
                // Blink permanents with ETB triggers
-                else if (sa.isAbility() && (sa.getPayCosts() != null) && SpellAbilityAi.playReusable(ai, sa)) {
+                else if (SpellAbilityAi.playReusable(ai, sa)) {
                    aiPermanents = CardLists.filter(aiPermanents, new Predicate<Card>() {
                        @Override
                        public boolean apply(final Card c) {
@@ -1319,8 +1317,9 @@ public class ChangeZoneAi extends SpellAbilityAi {
            player.shuffle();
        }

-        if ((!ZoneType.Battlefield.equals(destination) && !"Card".equals(type) && !defined)
-                || (sa.hasParam("Reveal") && !fetched.isEmpty())) {
+        if (((!ZoneType.Battlefield.equals(destination) && !"Card".equals(type) && !defined)
+                || (sa.hasParam("Reveal") && !fetched.isEmpty()))
+                && !sa.hasParam("NoReveal")) {
            final String picked = player + " picked:";
            if (fetched.size() > 0) {
                GuiChoose.one(picked, fetched);
--- a/src/main/java/forge/card/ability/ai/CharmAi.java
+++ b/src/main/java/forge/card/ability/ai/CharmAi.java
@@ -4,11 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

-import forge.card.ability.SpellAbilityAi;
-import forge.card.ability.effects.CharmEffect;
+import org.apache.commons.lang.math.RandomUtils;
+import forge.card.ability.SpellAbilityAi;import forge.card.ability.effects.CharmEffect;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 import forge.game.player.AIPlayer;
+import forge.game.player.Player;
 import forge.util.MyRandom;

 public class CharmAi extends SpellAbilityAi {
@@ -22,7 +23,7 @@ public class CharmAi extends SpellAbilityAi {
        boolean timingRight = sa.isTrigger(); //is there a reason to play the charm now?

        List<AbilitySub> chooseFrom = CharmEffect.makePossibleOptions(sa);
-        List<AbilitySub> chosenList = chooseOptionsAi(ai, timingRight, chooseFrom, num, min);
+        List<AbilitySub> chosenList = chooseOptionsAi(ai, timingRight, chooseFrom, num, min, false);

        if (chosenList == null || chosenList.isEmpty()) {
            return false;
@@ -32,9 +33,17 @@ public class CharmAi extends SpellAbilityAi {
        return r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn());
    }

-    public static List<AbilitySub> chooseOptionsAi(final AIPlayer ai, boolean playNow, List<AbilitySub> choices, int num, int min) {
+    public static List<AbilitySub> chooseOptionsAi(final AIPlayer ai, boolean playNow, List<AbilitySub> choices, int num, int min, boolean opponentChoser) {
        List<AbilitySub> chosenList = new ArrayList<AbilitySub>();

+        if (opponentChoser) {
+            // This branch is for "An Opponent chooses" Charm spells from Alliances
+            // Current just choose the first available spell, which seem generally less disastrous for the AI.
+            //return choices.subList(0, 1);
+            return choices.subList(1, choices.size());
+        }
+        
+        
        for (int i = 0; i < num; i++) {
            AbilitySub thisPick = null;
            for (SpellAbility sub : choices) {
@@ -57,4 +66,9 @@ public class CharmAi extends SpellAbilityAi {
        }
        return chosenList.size() >= min ? chosenList : null;
    }
+    
+    public static Player determineOpponentChooser(AIPlayer ai, SpellAbility sa, List<Player> opponents) {
+        return opponents.get(RandomUtils.nextInt(opponents.size()));
+    }
+    
 }
--- a/src/main/java/forge/card/ability/ai/ControlGainAi.java
+++ b/src/main/java/forge/card/ability/ai/ControlGainAi.java
@@ -77,6 +77,13 @@ public class ControlGainAi extends SpellAbilityAi {

        // if Defined, then don't worry about targeting
        if (tgt == null) {
+            if (sa.hasParam("AllValid")) {
+                List<Card> tgtCards = ai.getOpponent().getCardsIn(ZoneType.Battlefield);
+                tgtCards = AbilityUtils.filterListByType(tgtCards, sa.getParam("AllValid"), sa);
+                if (tgtCards.isEmpty()) {
+                    return false;
+                }
+            }
            return true;
        } else {
            tgt.resetTargets();
--- a/src/main/java/forge/card/ability/ai/CounterAi.java
+++ b/src/main/java/forge/card/ability/ai/CounterAi.java
@@ -80,7 +80,7 @@ public class CounterAi extends SpellAbilityAi {
            if (toPay <= usableManaSources) {
                // If this is a reusable Resource, feel free to play it most of
                // the time
-                if (!sa.getPayCosts().isReusuableResource() || sa.isSpell()) {
+                if (!SpellAbilityAi.playReusable(ai,sa)) {
                    return false;
                }
            }
@@ -148,7 +148,7 @@ public class CounterAi extends SpellAbilityAi {
                if (toPay <= usableManaSources) {
                    // If this is a reusable Resource, feel free to play it most
                    // of the time
-                    if (!sa.getPayCosts().isReusuableResource() || (MyRandom.getRandom().nextFloat() < .4)) {
+                    if (!SpellAbilityAi.playReusable(ai,sa) || (MyRandom.getRandom().nextFloat() < .4)) {
                        return false;
                    }
                }
--- a/Show More
+++ b/Show More