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

- Ana Sanctuary
- Necra Sanctuary
- Raka Sanctuary
Converted to script:
- Ceta Sanctuary
- Dega Sanctuary

.gitattributes

@@ -228,6 +228,7 @@ res/cardsfolder/a/an_havva_inn.txt svneol=native#text/plain
 res/cardsfolder/a/an_havva_township.txt svneol=native#text/plain
 res/cardsfolder/a/an_zerrin_ruins.txt svneol=native#text/plain
 res/cardsfolder/a/ana_disciple.txt svneol=native#text/plain
+res/cardsfolder/a/ana_sanctuary.txt -text
 res/cardsfolder/a/anaba_ancestor.txt svneol=native#text/plain
 res/cardsfolder/a/anaba_bodyguard.txt svneol=native#text/plain
 res/cardsfolder/a/anaba_shaman.txt svneol=native#text/plain
@@ -339,6 +340,7 @@ res/cardsfolder/a/arc_runner.txt svneol=native#text/plain
 res/cardsfolder/a/arc_slogger.txt svneol=native#text/plain
 res/cardsfolder/a/arc_trail.txt svneol=native#text/plain
 res/cardsfolder/a/arcades_sabboth.txt svneol=native#text/plain
+res/cardsfolder/a/arcane_denial.txt -text
 res/cardsfolder/a/arcane_laboratory.txt -text
 res/cardsfolder/a/arcane_sanctum.txt svneol=native#text/plain
 res/cardsfolder/a/arcane_spyglass.txt svneol=native#text/plain
@@ -1111,6 +1113,7 @@ res/cardsfolder/b/burning_palm_efreet.txt -text
 res/cardsfolder/b/burning_sands.txt -text
 res/cardsfolder/b/burning_shield_askari.txt svneol=native#text/plain
 res/cardsfolder/b/burning_vengeance.txt -text
+res/cardsfolder/b/burnout.txt -text
 res/cardsfolder/b/burr_grafter.txt svneol=native#text/plain
 res/cardsfolder/b/burrenton_bombardier.txt svneol=native#text/plain
 res/cardsfolder/b/burrenton_shield_bearers.txt svneol=native#text/plain
@@ -1165,6 +1168,7 @@ res/cardsfolder/c/caller_of_the_claw.txt svneol=native#text/plain
 res/cardsfolder/c/callous_deceiver.txt svneol=native#text/plain
 res/cardsfolder/c/callous_giant.txt svneol=native#text/plain
 res/cardsfolder/c/callow_jushi_jaraku_the_interloper.txt -text
+res/cardsfolder/c/calming_licid.txt -text
 res/cardsfolder/c/calming_verse.txt svneol=native#text/plain
 res/cardsfolder/c/caltrops.txt svneol=native#text/plain
 res/cardsfolder/c/cancel.txt svneol=native#text/plain
@@ -1596,6 +1600,7 @@ res/cardsfolder/c/conversion_chamber.txt svneol=native#text/plain
 res/cardsfolder/c/conviction.txt svneol=native#text/plain
 res/cardsfolder/c/convincing_mirage.txt svneol=native#text/plain
 res/cardsfolder/c/convolute.txt svneol=native#text/plain
+res/cardsfolder/c/convulsing_licid.txt -text
 res/cardsfolder/c/coordinated_barrage.txt svneol=native#text/plain
 res/cardsfolder/c/copper_carapace.txt svneol=native#text/plain
 res/cardsfolder/c/copper_gnomes.txt svneol=native#text/plain
@@ -1633,6 +1638,7 @@ res/cardsfolder/c/corrupted_harvester.txt svneol=native#text/plain
 res/cardsfolder/c/corrupted_resolve.txt -text
 res/cardsfolder/c/corrupted_roots.txt -text
 res/cardsfolder/c/corrupted_zendikon.txt svneol=native#text/plain
+res/cardsfolder/c/corrupting_licid.txt -text
 res/cardsfolder/c/cosis_ravager.txt svneol=native#text/plain
 res/cardsfolder/c/cosis_trickster.txt svneol=native#text/plain
 res/cardsfolder/c/cosmic_horror.txt svneol=native#text/plain
@@ -2180,6 +2186,7 @@ res/cardsfolder/d/dolmen_gate.txt svneol=native#text/plain
 res/cardsfolder/d/domestication.txt svneol=native#text/plain
 res/cardsfolder/d/dominarias_judgment.txt svneol=native#text/plain
 res/cardsfolder/d/dominate.txt svneol=native#text/plain
+res/cardsfolder/d/dominating_licid.txt -text
 res/cardsfolder/d/domineer.txt svneol=native#text/plain
 res/cardsfolder/d/dominus_of_fealty.txt svneol=native#text/plain
 res/cardsfolder/d/donate.txt svneol=native#text/plain
@@ -2564,6 +2571,7 @@ res/cardsfolder/e/enlisted_wurm.txt svneol=native#text/plain
 res/cardsfolder/e/enlistment_officer.txt svneol=native#text/plain
 res/cardsfolder/e/enormous_baloth.txt svneol=native#text/plain
 res/cardsfolder/e/enrage.txt svneol=native#text/plain
+res/cardsfolder/e/enraging_licid.txt -text
 res/cardsfolder/e/enshrined_memories.txt svneol=native#text/plain
 res/cardsfolder/e/enslave.txt svneol=native#text/plain
 res/cardsfolder/e/enslaved_dwarf.txt svneol=native#text/plain
@@ -3036,6 +3044,7 @@ res/cardsfolder/f/forbidden_alchemy.txt -text
 res/cardsfolder/f/forbidden_lore.txt svneol=native#text/plain
 res/cardsfolder/f/forbidden_orchard.txt svneol=native#text/plain
 res/cardsfolder/f/forbidding_watchtower.txt svneol=native#text/plain
+res/cardsfolder/f/force_bubble.txt -text
 res/cardsfolder/f/force_of_nature.txt svneol=native#text/plain
 res/cardsfolder/f/force_of_savagery.txt svneol=native#text/plain
 res/cardsfolder/f/force_of_will.txt svneol=native#text/plain
@@ -3343,6 +3352,7 @@ res/cardsfolder/g/gleancrawler.txt -text
 res/cardsfolder/g/glen_elendra_archmage.txt svneol=native#text/plain
 res/cardsfolder/g/glen_elendra_liege.txt svneol=native#text/plain
 res/cardsfolder/g/glen_elendra_pranksters.txt svneol=native#text/plain
+res/cardsfolder/g/gliding_licid.txt -text
 res/cardsfolder/g/glimmerdust_nap.txt svneol=native#text/plain
 res/cardsfolder/g/glimmering_angel.txt svneol=native#text/plain
 res/cardsfolder/g/glimmerpoint_stag.txt svneol=native#text/plain
@@ -4022,6 +4032,7 @@ res/cardsfolder/h/hurricane.txt svneol=native#text/plain
 res/cardsfolder/h/hush.txt svneol=native#text/plain
 res/cardsfolder/h/hyalopterous_lemure.txt svneol=native#text/plain
 res/cardsfolder/h/hydra_omnivore.txt svneol=native#text/plain
+res/cardsfolder/h/hydroblast.txt -text
 res/cardsfolder/h/hydromorph_guardian.txt svneol=native#text/plain
 res/cardsfolder/h/hydromorph_gull.txt svneol=native#text/plain
 res/cardsfolder/h/hyena_umbra.txt svneol=native#text/plain
@@ -4191,6 +4202,7 @@ res/cardsfolder/i/instill_infection.txt svneol=native#text/plain
 res/cardsfolder/i/insubordination.txt -text
 res/cardsfolder/i/insurrection.txt svneol=native#text/plain
 res/cardsfolder/i/intangible_virtue.txt -text
+res/cardsfolder/i/interdict.txt -text
 res/cardsfolder/i/intervene.txt svneol=native#text/plain
 res/cardsfolder/i/intimidation.txt svneol=native#text/plain
 res/cardsfolder/i/intimidator_initiate.txt svneol=native#text/plain
@@ -4736,6 +4748,7 @@ res/cardsfolder/l/leatherback_baloth.txt svneol=native#text/plain
 res/cardsfolder/l/leave_no_trace.txt svneol=native#text/plain
 res/cardsfolder/l/leeches.txt svneol=native#text/plain
 res/cardsfolder/l/leeching_bite.txt -text
+res/cardsfolder/l/leeching_licid.txt -text
 res/cardsfolder/l/leechridden_swamp.txt svneol=native#text/plain
 res/cardsfolder/l/leering_emblem.txt svneol=native#text/plain
 res/cardsfolder/l/leering_gargoyle.txt svneol=native#text/plain
@@ -5644,6 +5657,7 @@ res/cardsfolder/n/near_death_experience.txt svneol=native#text/plain
 res/cardsfolder/n/nebuchadnezzar.txt svneol=native#text/plain
 res/cardsfolder/n/neck_snap.txt svneol=native#text/plain
 res/cardsfolder/n/necra_disciple.txt svneol=native#text/plain
+res/cardsfolder/n/necra_sanctuary.txt -text
 res/cardsfolder/n/necratog.txt svneol=native#text/plain
 res/cardsfolder/n/necrite.txt svneol=native#text/plain
 res/cardsfolder/n/necrogen_censer.txt svneol=native#text/plain
@@ -5816,6 +5830,7 @@ res/cardsfolder/n/numai_outcast.txt svneol=native#text/plain
 res/cardsfolder/n/numbing_dose.txt svneol=native#text/plain
 res/cardsfolder/n/numot_the_devastator.txt svneol=native#text/plain
 res/cardsfolder/n/nurturer_initiate.txt svneol=native#text/plain
+res/cardsfolder/n/nurturing_licid.txt -text
 res/cardsfolder/n/nut_collector.txt svneol=native#text/plain
 res/cardsfolder/n/nyxathid.txt svneol=native#text/plain
 res/cardsfolder/o/oaken_brawler.txt svneol=native#text/plain
@@ -6484,6 +6499,7 @@ res/cardsfolder/p/pyre_zombie.txt svneol=native#text/plain
 res/cardsfolder/p/pyretic_ritual.txt svneol=native#text/plain
 res/cardsfolder/p/pyric_salamander.txt svneol=native#text/plain
 res/cardsfolder/p/pyrite_spellbomb.txt svneol=native#text/plain
+res/cardsfolder/p/pyroblast.txt -text
 res/cardsfolder/p/pyroclasm.txt svneol=native#text/plain
 res/cardsfolder/p/pyroclast_consul.txt svneol=native#text/plain
 res/cardsfolder/p/pyrohemia.txt svneol=native#text/plain
@@ -6514,6 +6530,7 @@ res/cardsfolder/q/quest_for_ulas_temple.txt -text svneol=unset#text/plain
 res/cardsfolder/q/questing_phelddagrif.txt svneol=native#text/plain
 res/cardsfolder/q/quick_sliver.txt svneol=native#text/plain
 res/cardsfolder/q/quickchange.txt -text
+res/cardsfolder/q/quickening_licid.txt -text
 res/cardsfolder/q/quicksand.txt svneol=native#text/plain
 res/cardsfolder/q/quicksilver_amulet.txt svneol=native#text/plain
 res/cardsfolder/q/quicksilver_behemoth.txt svneol=native#text/plain
@@ -6583,6 +6600,7 @@ res/cardsfolder/r/rainbow_vale.txt svneol=native#text/plain
 res/cardsfolder/r/raise_dead.txt svneol=native#text/plain
 res/cardsfolder/r/raise_the_alarm.txt svneol=native#text/plain
 res/cardsfolder/r/raka_disciple.txt svneol=native#text/plain
+res/cardsfolder/r/raka_sanctuary.txt -text
 res/cardsfolder/r/rakalite.txt -text
 res/cardsfolder/r/rakdos_augermage.txt svneol=native#text/plain
 res/cardsfolder/r/rakdos_carnarium.txt svneol=native#text/plain
@@ -6633,6 +6651,7 @@ res/cardsfolder/r/rathi_fiend.txt svneol=native#text/plain
 res/cardsfolder/r/rathi_intimidator.txt svneol=native#text/plain
 res/cardsfolder/r/rathi_trapper.txt svneol=native#text/plain
 res/cardsfolder/r/raths_edge.txt svneol=native#text/plain
+res/cardsfolder/r/rats_feast.txt -text
 res/cardsfolder/r/rats_of_rath.txt svneol=native#text/plain
 res/cardsfolder/r/rattleblaze_scarecrow.txt svneol=native#text/plain
 res/cardsfolder/r/ravaged_highlands.txt svneol=native#text/plain
@@ -6674,6 +6693,7 @@ res/cardsfolder/r/razortooth_rats.txt svneol=native#text/plain
 res/cardsfolder/r/razorverge_thicket.txt svneol=native#text/plain
 res/cardsfolder/r/reach_of_branches.txt svneol=native#text/plain
 res/cardsfolder/r/reach_through_mists.txt svneol=native#text/plain
+res/cardsfolder/r/reality_acid.txt -text
 res/cardsfolder/r/reality_anchor.txt svneol=native#text/plain
 res/cardsfolder/r/reality_ripple.txt -text
 res/cardsfolder/r/reality_spasm.txt svneol=native#text/plain
@@ -6830,6 +6850,7 @@ res/cardsfolder/r/return_to_dust.txt svneol=native#text/plain
 res/cardsfolder/r/reveillark.txt svneol=native#text/plain
 res/cardsfolder/r/reveille_squad.txt svneol=native#text/plain
 res/cardsfolder/r/reveka_wizard_savant.txt svneol=native#text/plain
+res/cardsfolder/r/revelation.txt -text
 res/cardsfolder/r/revelsong_horn.txt svneol=native#text/plain
 res/cardsfolder/r/revenant.txt svneol=native#text/plain
 res/cardsfolder/r/reverberate.txt svneol=native#text/plain
@@ -6926,6 +6947,7 @@ res/cardsfolder/r/river_bear.txt svneol=native#text/plain
 res/cardsfolder/r/river_boa.txt svneol=native#text/plain
 res/cardsfolder/r/river_delta.txt svneol=native#text/plain
 res/cardsfolder/r/river_kaijin.txt svneol=native#text/plain
+res/cardsfolder/r/river_kelpie.txt -text
 res/cardsfolder/r/river_merfolk.txt svneol=native#text/plain
 res/cardsfolder/r/river_of_tears.txt -text
 res/cardsfolder/r/riverfall_mimic.txt svneol=native#text/plain
@@ -7322,6 +7344,7 @@ res/cardsfolder/s/seek_the_horizon.txt svneol=native#text/plain
 res/cardsfolder/s/seeker.txt svneol=native#text/plain
 res/cardsfolder/s/seeker_of_skybreak.txt svneol=native#text/plain
 res/cardsfolder/s/seers_sundial.txt svneol=native#text/plain
+res/cardsfolder/s/seers_vision.txt -text
 res/cardsfolder/s/seething_anger.txt svneol=native#text/plain
 res/cardsfolder/s/seething_pathblazer.txt svneol=native#text/plain
 res/cardsfolder/s/seething_song.txt svneol=native#text/plain
@@ -8191,6 +8214,7 @@ res/cardsfolder/s/still_life.txt svneol=native#text/plain
 res/cardsfolder/s/stillmoon_cavalier.txt svneol=native#text/plain
 res/cardsfolder/s/stingerfling_spider.txt svneol=native#text/plain
 res/cardsfolder/s/stinging_barrier.txt svneol=native#text/plain
+res/cardsfolder/s/stinging_licid.txt -text
 res/cardsfolder/s/stingmoggie.txt svneol=native#text/plain
 res/cardsfolder/s/stingscourger.txt svneol=native#text/plain
 res/cardsfolder/s/stinkdrinker_bandit.txt -text
@@ -8328,6 +8352,7 @@ res/cardsfolder/s/sulfuric_vortex.txt svneol=native#text/plain
 res/cardsfolder/s/sulfurous_blast.txt svneol=native#text/plain
 res/cardsfolder/s/sulfurous_springs.txt svneol=native#text/plain
 res/cardsfolder/s/summer_bloom.txt svneol=native#text/plain
+res/cardsfolder/s/summit_apes.txt -text
 res/cardsfolder/s/summon_the_school.txt svneol=native#text/plain
 res/cardsfolder/s/summoners_bane.txt svneol=native#text/plain
 res/cardsfolder/s/summoners_pact.txt svneol=native#text/plain
@@ -8575,6 +8600,7 @@ res/cardsfolder/t/telekinetic_bonds.txt svneol=native#text/plain
 res/cardsfolder/t/telekinetic_sliver.txt svneol=native#text/plain
 res/cardsfolder/t/telemin_performance.txt -text
 res/cardsfolder/t/telepathic_spies.txt svneol=native#text/plain
+res/cardsfolder/t/telepathy.txt -text
 res/cardsfolder/t/teleport.txt svneol=native#text/plain
 res/cardsfolder/t/telethopter.txt svneol=native#text/plain
 res/cardsfolder/t/telimtor.txt svneol=native#text/plain
@@ -8600,6 +8626,7 @@ res/cardsfolder/t/temporal_isolation.txt svneol=native#text/plain
 res/cardsfolder/t/temporal_manipulation.txt svneol=native#text/plain
 res/cardsfolder/t/temporal_spring.txt svneol=native#text/plain
 res/cardsfolder/t/temporary_insanity.txt svneol=native#text/plain
+res/cardsfolder/t/tempting_licid.txt -text
 res/cardsfolder/t/tempting_wurm.txt svneol=native#text/plain
 res/cardsfolder/t/tendo_ice_bridge.txt svneol=native#text/plain
 res/cardsfolder/t/tendrils_of_agony.txt svneol=native#text/plain
@@ -8864,6 +8891,7 @@ res/cardsfolder/t/torrent_of_fire.txt svneol=native#text/plain
 res/cardsfolder/t/torsten_von_ursus.txt svneol=native#text/plain
 res/cardsfolder/t/tortoise_formation.txt svneol=native#text/plain
 res/cardsfolder/t/torture.txt svneol=native#text/plain
+res/cardsfolder/t/torture_chamber.txt -text
 res/cardsfolder/t/tortured_existence.txt svneol=native#text/plain
 res/cardsfolder/t/totem_guide_hartebeest.txt svneol=native#text/plain
 res/cardsfolder/t/totem_speaker.txt svneol=native#text/plain
@@ -8916,6 +8944,7 @@ res/cardsfolder/t/tranquility.txt svneol=native#text/plain
 res/cardsfolder/t/transcendent_master.txt svneol=native#text/plain
 res/cardsfolder/t/transguild_courier.txt svneol=native#text/plain
 res/cardsfolder/t/transluminant.txt svneol=native#text/plain
+res/cardsfolder/t/transmogrifying_licid.txt -text
 res/cardsfolder/t/transmutation.txt svneol=native#text/plain
 res/cardsfolder/t/transmute_artifact.txt -text
 res/cardsfolder/t/trap_digger.txt svneol=native#text/plain
@@ -8952,6 +8981,7 @@ res/cardsfolder/t/tremble.txt svneol=native#text/plain
 res/cardsfolder/t/tremor.txt svneol=native#text/plain
 res/cardsfolder/t/trench_wurm.txt svneol=native#text/plain
 res/cardsfolder/t/trenching_steed.txt svneol=native#text/plain
+res/cardsfolder/t/trepanation_blade.txt -text
 res/cardsfolder/t/trespasser_il_vec.txt svneol=native#text/plain
 res/cardsfolder/t/trespassing_souleater.txt svneol=native#text/plain
 res/cardsfolder/t/tresserhorn_sinks.txt svneol=native#text/plain
@@ -9767,6 +9797,7 @@ res/cardsfolder/w/wolfbriar_elemental.txt svneol=native#text/plain
 res/cardsfolder/w/wolverine_pack.txt svneol=native#text/plain
 res/cardsfolder/w/wonder.txt svneol=native#text/plain
 res/cardsfolder/w/wood_elves.txt svneol=native#text/plain
+res/cardsfolder/w/wood_sage.txt -text
 res/cardsfolder/w/woodcloaker.txt svneol=native#text/plain
 res/cardsfolder/w/wooded_bastion.txt svneol=native#text/plain
 res/cardsfolder/w/wooded_foothills.txt svneol=native#text/plain
@@ -9886,6 +9917,7 @@ res/cardsfolder/z/zealots_en_dal.txt svneol=native#text/plain
 res/cardsfolder/z/zealous_guardian.txt svneol=native#text/plain
 res/cardsfolder/z/zealous_persecution.txt svneol=native#text/plain
 res/cardsfolder/z/zebra_unicorn.txt svneol=native#text/plain
+res/cardsfolder/z/zedruu_the_greathearted.txt -text svneol=unset#text/plain
 res/cardsfolder/z/zektar_shrine_expedition.txt svneol=native#text/plain
 res/cardsfolder/z/zelyon_sword.txt svneol=native#text/plain
 res/cardsfolder/z/zendikar_farguide.txt svneol=native#text/plain
@@ -10016,16 +10048,19 @@ res/images/icons/g_1_4_plant_wall_small.jpg -text
 res/images/icons/notesIcon.png -text svneol=unset#image/png
 res/images/skins/default/bg_match.jpg -text
 res/images/skins/default/bg_splash.jpg -text
+res/images/skins/default/bg_splash.png -text
 res/images/skins/default/bg_texture.jpg -text
 res/images/skins/default/font1.ttf -text
 res/images/skins/default/sprite.png -text
 res/images/skins/rebel/bg_match.jpg -text
 res/images/skins/rebel/bg_splash.jpg -text
+res/images/skins/rebel/bg_splash.png -text
 res/images/skins/rebel/bg_texture.jpg -text
 res/images/skins/rebel/font1.ttf -text
 res/images/skins/rebel/sprite.png -text
 res/images/skins/smith/bg_match.jpg -text
 res/images/skins/smith/bg_splash.jpg -text
+res/images/skins/smith/bg_splash.png -text
 res/images/skins/smith/bg_texture.jpg -text
 res/images/skins/smith/font1.ttf -text
 res/images/skins/smith/sprite.png -text
@@ -10370,6 +10405,7 @@ res/quest/decks/Indiana[!!-~]Jones[!!-~]1.dck -text
 res/quest/decks/Indiana[!!-~]Jones[!!-~]2.dck -text
 res/quest/decks/Indiana[!!-~]Jones[!!-~]3.dck -text
 res/quest/decks/Jabba[!!-~]the[!!-~]Hut[!!-~]3.dck -text
+res/quest/decks/Jabba[!!-~]the[!!-~]Hut[!!-~]4.dck -text
 res/quest/decks/Jack[!!-~]Sparrow[!!-~]1.dck -text
 res/quest/decks/Jack[!!-~]Sparrow[!!-~]2.dck -text
 res/quest/decks/James[!!-~]Bond[!!-~]1.dck -text
@@ -10701,13 +10737,13 @@ src/main/java/forge/IPlayerZone.java svneol=native#text/plain
 src/main/java/forge/ImageCache.java svneol=native#text/plain
 src/main/java/forge/ImagePreviewPanel.java svneol=native#text/plain
 src/main/java/forge/MagicStack.java svneol=native#text/plain
-src/main/java/forge/MatchState.java svneol=native#text/plain
 src/main/java/forge/Move.java svneol=native#text/plain
 src/main/java/forge/MyButton.java svneol=native#text/plain
 src/main/java/forge/MyObservable.java svneol=native#text/plain
 src/main/java/forge/MyRandom.java svneol=native#text/plain
 src/main/java/forge/NameChanger.java svneol=native#text/plain
 src/main/java/forge/Phase.java svneol=native#text/plain
+src/main/java/forge/PhaseHandler.java -text
 src/main/java/forge/PhaseUtil.java svneol=native#text/plain
 src/main/java/forge/Player.java svneol=native#text/plain
 src/main/java/forge/PlayerType.java svneol=native#text/plain
@@ -10884,9 +10920,10 @@ src/main/java/forge/card/trigger/TriggerTurnFaceUp.java svneol=native#text/plain
 src/main/java/forge/card/trigger/TriggerUnequip.java svneol=native#text/plain
 src/main/java/forge/card/trigger/TriggerUntaps.java svneol=native#text/plain
 src/main/java/forge/card/trigger/package-info.java svneol=native#text/plain
-src/main/java/forge/control/ControlAllUI.java -text
 src/main/java/forge/control/ControlHomeUI.java -text
 src/main/java/forge/control/ControlMatchUI.java -text
+src/main/java/forge/control/FControl.java -text
+src/main/java/forge/control/KeyboardShortcuts.java -text
 src/main/java/forge/control/home/ControlConstructed.java -text
 src/main/java/forge/control/home/ControlDraft.java -text
 src/main/java/forge/control/home/ControlQuest.java -text
@@ -10997,6 +11034,7 @@ src/main/java/forge/item/ItemPoolView.java -text
 src/main/java/forge/item/package-info.java -text
 src/main/java/forge/model/BuildInfo.java -text
 src/main/java/forge/model/FGameState.java -text
+src/main/java/forge/model/FMatchState.java svneol=native#text/plain
 src/main/java/forge/model/FModel.java svneol=native#text/plain
 src/main/java/forge/model/MultipleForgeJarsFoundError.java -text
 src/main/java/forge/model/package-info.java svneol=native#text/plain
@@ -11057,6 +11095,7 @@ src/main/java/forge/quest/gui/package-info.java svneol=native#text/plain
 src/main/java/forge/quest/package-info.java svneol=native#text/plain
 src/main/java/forge/view/FView.java svneol=native#text/plain
 src/main/java/forge/view/GuiTopLevel.java -text
+src/main/java/forge/view/Main.java -text
 src/main/java/forge/view/editor/EditorTopLevel.java -text
 src/main/java/forge/view/editor/package-info.java svneol=native#text/plain
 src/main/java/forge/view/home/HomeTopLevel.java -text
@@ -11084,9 +11123,6 @@ src/main/java/forge/view/match/ViewTopLevel.java -text
 src/main/java/forge/view/match/ViewWinLose.java -text
 src/main/java/forge/view/match/package-info.java svneol=native#text/plain
 src/main/java/forge/view/package-info.java svneol=native#text/plain
-src/main/java/forge/view/swing/ApplicationView.java svneol=native#text/plain
-src/main/java/forge/view/swing/Main.java svneol=native#text/plain
-src/main/java/forge/view/swing/package-info.java svneol=native#text/plain
 src/main/java/forge/view/toolbox/CardFaceSymbols.java svneol=native#text/plain
 src/main/java/forge/view/toolbox/CardViewer.java -text
 src/main/java/forge/view/toolbox/DeckLister.java -text
@@ -11147,7 +11183,7 @@ src/test/java/forge/GuiMultipleBlockers4Test.java svneol=native#text/plain
 src/test/java/forge/GuiProgressBarWindowTest.java svneol=native#text/plain
 src/test/java/forge/GuiQuestOptionsTest.java svneol=native#text/plain
 src/test/java/forge/PanelTest.java svneol=native#text/plain
-src/test/java/forge/PhaseTest.java svneol=native#text/plain
+src/test/java/forge/PhaseHandlerTest.java -text
 src/test/java/forge/RunTest.java svneol=native#text/plain
 src/test/java/forge/TinyTest.java svneol=native#text/plain
 src/test/java/forge/card/cardFactory/CardFactoryTest.java svneol=native#text/plain

CHANGES.txt

@@ -1,23 +1,14 @@
-Forge Beta: 01-16-2012 ver 1.2.1 rev 13212
+Forge Beta: 01-20-2012 ver 1.2.2 rev 13318
 
 (Quest icons used created by Teekatas, from his Legendora set http://raindropmemory.deviantart.com)
 
-9919 cards in total.
-
-
-A new branch was created for supporting "Produced$ Any" in mana abilities (Issue 266). Some other bugs/problems with paying mana costs were uncovered and fixed. This work was recently merged into the main trunk.
-
-A new Scriptable Replacement Effects system has been recently added to the SVN. The structure is very similar to Triggers (So there's currently a little code duplication), there is a Handler class, a base class for Replacement effects and subclasses for each event that can be replaced.
+9951 cards in total.
 
 
 Several people have noticed a crash report stating that "Buffers have not been created". We hope to have this fixed in the near future. It has been pointed out that:
 
 "Parts of Swing use EventQueue by themselves, this means your Swing code executes in main thread part executes in EDT and as Swing isn't thread safe this leads to elusive errors like this. One of the reasons of this error is that the frame might not be fully constructed before buffers are created -> race condition between the threads."
 
-Several people have noticed forge slowing down after playing a number of matches without quitting forge in between the matches that are played. The new UI may be involved somehow. We also hope to have this figured out and fixed in the near future. Please be patient in the meanwhile. A recent fix was implemented that should improve the slowdown problem somewhat.
-
-A lot of time and effort have gone into fixing the memory leak problems that were recently noticed and reported to the dev team. Doublestrike and Slapshot deserve our applause and we are very thankful. People should be able to now play long multi match sessions without noticing slow downs and pauses.
-
 
 The Forge archive includes a readme.txt file and we ask that you spend a few minutes reading this file as it contains some information that may prove usefull. We do tend to update this file at times and you should quickly read this file and look for new information for each and every new release. Thank you.
 
@@ -26,354 +17,148 @@ We have changed the archival format used for the Forge distributions from ".zip"
 
 Fixes/Features:
 
-- Cleared out the changes.txt file, is ready for new material.
-- A few CheckStyle fixes.
-- Issue 266: Creating branch for changes for supporting "Produced$ Any" in mana abilities
-- Issue 266: added to manamorphose to produce any mana branch
-- Issue 266: update isBasic method of AbilityMana to account for any mana
-- Renamed the Ore Gorger card txt file as it had an unneeded space character.
-- Issue 266: significantly reworked logic in payManaCost to account for mana sources that produce any color and several other bugs
-- Issue 266: modified City of Brass, Glimmervoid, and Mox Opal to use "Produced$ Any"
-- Issue 266: merged trunk:12895-12901 revisions into branch
-- Issue 266: modified to account for lands that use "Produced$ Any"
-- Issue 266: modified to allow reflected mana to interact with any color sources
-- Issue 266: removed getManaProduced overrides from spells and drawbacks
-- Warren Instigator was missing the Berseker type
-- use constants to show Tabber tabs instead of just using raw numbers everywhere.
-- Fixing Description of Skyrider Trainee
-- if things on the stack have a sourceCard of some kind of land, make sure the stack has a color (brownish; also used for artifacts). This would be for things like the triggered ability of City of Brass.
-- Added a fluff piece to the changes.txt file.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- fix ability cost of Flame Elemental (thanks squee1968)
-- fix missing subability of Green Sun's Zenith (thanks squee1968)
-- gave Soaratmi Savant Flying (thanks squee1968)
-- restored the functionality to show Stack cards in Card Picture/Detail when moused over. This functionality was present in 1.1.8, but was removed in 1.2.0 due to a bug. I confirmed the bug was also present in 1.1.8, so we are no worse off than we were before and there have been complaints on the forum about this in the 1.2.0 UI.
-- in DigUntil resolve, game cannot continue if revealed is empty. This is fixed.
-- add 10E SetInfo to Counsel of the Soratami
-- Issue 266: add color choice logic for future use by AI
-- fix typo in Tourach's Gate
-- Issue 266: changed sorting of mana sources to account of any color mana
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Issue 266: add logic to make ManaNeededToAvoidNegativeEffect mana a mandatory part of the cost for the AI
-- Removing hardcoded references to Mana Pool as a card.
-- Checkstyle
-- merged "Produced$ Any" (Issue 266) feature branch into trunk (Issue #266)
-- Converted City of Brass, Glimmervoid, and Mox Opal to use "Any" mana keyword. Added Manamorphose
-- Added scriptable Replacement Effects. The system and syntax is very similar to the trigger system.For examples see the cards below or the forge.card.replacement package.
-- Converted to script:
-Benevolent Unicorn
-Boon Reflection
-Divine Presence
-Dralnu, Lich Lord
-Fire Servant
-Forethought Amulet
-Furnace of Rath
-Gratuitous Violence
-Lashknife Barrier
-Lichentrope
-Phytohydra
-Pyromancer's Swath
-Sulfuric Vapors
-Sulfuric Vortex
-- Corrected name of Akki Lavarunner / Tok-Tok, Volcano Born
-- Added a fluff piece to the changes.txt file.
-- Checkstyle.
-- Coldsteel Heart is now a Snow Artifact.
-- convert cards to any mana keyword (A-B)
-- convert cards to any mana keyword (C-F)
-- convert cards to any mana keyword (G-K)
-- convert cards to any mana keyword (L-M)
-- convert cards to any mana keyword (N-R)
-- Fixed Remember syntax for Wormfang Behemoth.
-- Make sure to actually run replacement effect checks for creature damage.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Consolidated ReplacementEffect.matchesValid() and Trigger.matchesValid() (Exactly the same method) into AllZoneUtil.matchesValid().
-- Fixed description for Vigor.
-- CheckStyle.
-- CheckStyle.
-- Updated Furnace Dragon and Iname as One to check for 'cast from hand' restriction.
-- Ran Oracle and set info scripts.
+- merged updates from trunk cardsfolder into DKA branch
+- Added the player keyword "Play with your hand revealed."
+- Converted Volrath's Dungeon to script.
+- Fixed Kjeldoran Javelineer.
+- Added some NPE checks to activateManaAbility.
+- Cleared out the changes.txt file, now ready for new material.
+- Fixed errors related to the AI controlling cards like Essence Bottle.
 - CheckStyle.
+- rename Phase.java to PhaseHandler.java (matches other TriggerHandler, etc.) and updated all calling classes. Remade the Phase class as a superclass for Untap, Upkeep, EndOfTurn, EndOfCombat to consolidate some code.
+- Modified keyboard shortcuts algorithms to be less complicated to implement.
+- Moved keyboard shortcut setting UI into home screen.
+- Implemented on-the-fly detach/reattach for modified shortcuts.
+- Put shortcuts into a top-level scope, not only for match UI.
+- Fixed "scale larger" setting to work on-the-fly (no reset required).
+- hook the Dev Mode buttons up to the Skin
+- Fixed "inaccurate life total at before mulligan" bug.
+- Added game type to counter information in Input area.
 - checkstyle
-- checkstyle
-- Add package javadoc
-- Meet George. George is a base class for Triggers and ReplacementEffects. George is content with his job.
-- convert cards to any mana keyword (S-T)
-- convert cards to any mana keyword (U-Z)
+- Optimization: lightweight splash sprite loads before rest of skin (which soon will occur in preload bar).
+- Moved the "forge.view.swing" package into "forge.view".
+- Removed FSkin access from AllZone, all FSkin access now through Singletons.getView().
+- Removed "Random" from the list of themes (it didn't work and there is the button below anyway).
 - Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- fix an observer leak on InputControl
-- checkstyle and javadoc fixes
-- PMD fixes
-- Added CheckThirdSVar and CheckFourthSVar and accompanying parameters to StaticAbility.
-- Added the recent commit logs to changes.txt.
-- Checkstyle: Removed trailing spaces from new CheckSVars
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed Minion Reflector.
-- GUI - remove anything that was checking the unused Constant.Runtime.OLDGUI
-- little javadoc fixes in DeckEditorDraft
-- delte the GuiDisplay class. It is no longer used.
-- fix the Observers leak on MagicStack
-- Stack Instance not resetting Paid Hash before setting new one
-- gut the OldGuiNewGame class. It now contains only static elements related to preferences and loading dynamic game data (which needs to be moved to a different class)
-- fix Hurkyl's Recall (looks like the Java code inadvertently got deleted)
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- delete MenuItemHowToPlay (it is no longer used)
-- consolidate deleteObservers in a deinitMatch method. Hooked this method up in the WinLoseFrame and QuestWinLoseHandler.
-- update some Magic Numbers to constants
-- delete file GuiHomeScreen.java (it is no longer used)
-- update another Magic Number to constant
-- move loadDynamicGameData to Main
-- fix value setting when CardSize radio buttons are selected.
-- remove references to OldGuiNewGame
-- delete OldGuiNewGame
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- more magic number converted to constants in ControlAllUI
-- remove unused function in GuiDisplayUtil
-- Fixed the AI not playing card draw spells, even when the resulting number of cards in hand is lower than 8 cards (it was not considering losing the card used).
-- Fixed Dream Fighter.
-- Fixed Graven Dominator.
-- Little tweak in gainLifeCanPlayAI.
-- Updated evaluateCreature.
-- Little tweaks for the Da Vinci decks.
-- Fixed two scripts.
-- Added some AI checks to make better use of Steel Overseer.
-- Added RemAIDeck:True to Orzhov Pontiff.
-- ran Oracle and Setinfo scripts
-- fixed remove counter trigger on Witherscale Wurm
-- Fixed Vodalian Illusionist.
-- Fixed Predatory Urge.
-- Added the prefix "SVar$" to xCount (formerly only available in AbilityFactory.calculateAmount).
-- Fixed another issue with Conclave's Blessing.
-- Fixed the discarded list of CostDiscard containing all cards twice if the mode is Self, LastDrawn or Random (the cards are added to the list in doDiscard).
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Added the options "LifeYouLostThisTurn" and "LifeOppLostThisTurn" to xCount.
-- Added four missing set infos.
-- Converted the replacement ability of Lich to script.
-- add a Storm counter to the Players panel
-- Fix Furnace of Rath
-- Added Undying keyword.
-- Added Fateful Hour to Count$ (Count$FatefulHour.<Truevalue>.<Falsevalue>) and as a condition to Static Abilities (FatefulHour$ True).
-- Added Count$<Your/Opp>StartingLife.
-- Added FatefulHour trigger parameter.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- CheckStyle.
-- Minor card text fix for Gibbering Descent.
-- Continuous static abilities with "RemoveAllAbilities" will now also remove replacement abilities.
-- Ran Oracle and setInfo scripts
-- Added Damia, Sage of Stone to relevant section in PhaseUtil.java. (I initially thought the draw skip was Keyworded due to Psychic Possession script)
-- Updated two SVars.
-- creating branch for Dark Ascension pre-release scripts
-- Bugfix: "ghost animation" for cards in hand after starting a new game
-- Improved the AI of Echoing Decay.
-- Updated some SVars.
-- Ran set info script.
-- Ran oracle script.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed Chancellor of the Dross.
-- Fixed Chancellor of the Forge.
-- Fixed Chancellor of the Tangle.
-- delete unused class ConstantStringHashMap
-- javadoc and comment fixes in Upkeep.java
-- flesh out javadoc in Untap.java
-- flesh out javadoc in EndCombat.java
-- Little card script updates.
-- Fixed Convoke throwing an error when no creature has been tapped.
-- Fixed icon display in player fields for quest and regular match play.
-- added EYEBALL to counters enumeration list
-- fixing Quest and regular match player avatars. Please be careful to not hard-code Windows-specific things.
-- fix some code that was OS-specific in DeckLister.java
-- move some code to EndOfTurn and flesh out javadoc in EndOfTurn.java
-- adding EnchantedBy check to Player.hasProperty method
-- added STRIFE to counters enum list
-- updated Daybreak Coronet to use the more general AttachedTo. Removed "AllAurasEnchanting" from CardFactoryUtil.xCount method.
-- DKA branch: Updated Falkenrath Aristocrat to use ConditionCheckSVar, and added rarity info to some of the scripts.
-- Improved scripts for Ebon Praetor and for Lyzolda, the Blood Witch
-- Added wasCastFrom<Zone> card property. It is set when the card is moved to the stack and cleared whenever it is moved anywhere else except from the stack to the battlefield(for Myojins,Phage,Iname, Epochrasite etc...)
-- Added wasNotCastFrom<Zone> as well, doi.
-- Added Count$wasCastFrom<Zone>.<truevalue>.<falsevalue>
-- Converted:
-Burning Vengeance
-Coal Stoker
-Dread Cacodemon
-Furnace Dragon
-Hypnox
-Iname as One
-Myojin of Cleansing Fire
-Myojin of Infinite Rage
-Myojin of Life's Web
-Myojin of Night's Reach
-Myojin of Seeing Winds
-Reiver Demon
-- Added Rebound keyword.
-- Fixed wasCastFrom's interaction with tokens.
-- Fixed visual artifacts bug on semi-transparent buttons and panels in home screen.
-- Fixed name (Nomad's Assembly -> Nomads' Assembly)
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Updated two SVars.
-- Updated two SVars (main branch).
-- Removed Sudden Spoiling because it was not 100% functional.
-- CheckStyle.
-- Added the Dr Fate 3 deck.
-- Made Keldon Marauders more AI friendly.
-- Fixed Mishra, Artificer Prodigy.
-- Fixed casting cost on Faithless Looting.
-- Added a spell description field to the CostChange keyword. Converted a few CostChange cards.
-- Refactored ForgePreferences:
-1) Output file entries sorted
-2) Easier to add/remove prefs
-3) Checkstyled and commented
-4) LOC halved
-- Streamlined old, overly explicit phase toggles in ForgePreferences.
-- Small update to ForgePreferences.
-- Minor update to ViewField.
-- Removed internal padding on card picture in match UI.
-- Fixed "no human first turn phase indicator" bug.
-- Minor update to keyboard shortcut saving in dock.
-- Fixed "must restart for dev mode setting" and similar bugs.
-- modifications to allow cards that transform to Auras to attach to a target.
-- Moved ability description into keyword for Glowrider and Thorn of Amethyst
-- If using Alternate-state scripting to create a non-doublefaced, non-flip card (i.e. Licids), use "AlternateMode:<name of other state>" then use AF_SetState's NewState parameter with that name. This is to avoid things confusing them with actual doublefaced cards.
-- Added start button and logo to image sprites in each skin, and updated FSkin and home screen code to match.
-- reduce JTextArea instances in ViewTabber
-- Run static abilities-check after running static triggers but before regular triggers. Fixes Adaptive Automaton+Champion of the Parish type situations. With thanks to Sloth!
-- Let the Deck Editor cope with cards with non-flip, non-doubleface alternate states. (i.e. those damn Licids)
-- further reduce JTextArea instances in ViewTabber (for Combat descriptions)
-- Minor bugfix in ForgePreferences.
-- Bugfix to the bugfix in ForgePreferences.
-- Ran oracle script.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Fixed AI of Copy Artifact and Sculpting Steel.
-- Added a check in checkStateEffects for creatures enchanting something, making them fall off properly. (Licids! *shakes fist*)
-- CheckStyle.
-- Fixed Wormfang Behemoth.
-- Added the player keyword "Skip your draw step." and converted some cards to use it.
-- Memory management debugging in ViewTabber: cleared list of JTextAreas in stack panel to prevent pileups.
-- udpate guava to 11.0.1 (it has some cache fixes that may affect ImageCache)
-- Uploaded quest opponent avatar: Beast. Added to quest-opponent-icons.txt
-- Uncommented download link for Tatsumasa, the Dragon's Fang token.
-- Updated the deck editor color filter icons.
-- try to clean up IMAGE_CACHE at the end of each match. This may help with large memory usage after many matches.
-- Fixed bug preventing full texture paint on keyboard shortcuts screen.
-- Added Attach Drawback. Removed previous changes for Auras in SetState AF.
-- updated Soul Seizer script to Attach drawback
-- Updated quest opponent avatar links.
-- Added a fluff piece to the changes.txt file.
-- Added the Darkseid 3 deck.
-- Added the recent commit logs to changes.txt.
-- Fixed creatures with Deathtouch destroying creatures and dealing damage afterwards.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- clean up a Java warning in AFSetState
-- remove some debug code related to Observers
-- Improved the AI of AF DestroyAll to take permanents with SacMe SVar into account.
-- Changed the default value of "ui.card.overlay" to true.
-- Added trigger mode "Transformed".
-- Hardcoded Sky Swallower will now give away other cards, not self.
-- Fixed Undead Alchemist
-- Update SubAbility for a few of my favorite cards (SVar= is not needed and has not been needed for a long time.)
-- Started adding doTrigger functions to Spell AF's, because canPlayAI is not suited for cases like a spell revealed by a Cascade ability. First AF to test this is AF DealDamage.
-- Added the ability to get LKI copies of a certain state. Fixes Unholy Fiend triggering Village Cannibals and maybe more.
-- Cards should never be tapped outside the battlefield.
-- Added trap type to Arrow Volley Trap
-- Added canPlayFromEffectAI function.
-- Added the recent commit logs to changes.txt.
-- Added canPlayFromEffectAI to AF Pump.
-- Little fix for Cascade.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Added canPlayFromEffectAI to AF Draw and Discard.
-- Removed the hardcoded cascade ability of Bituminous Blast.
-- Changed Ripple to use canPlayFromEffectAI.
-- Changed Fungus Sliver to grant a trigger instead of a keyword.
-- Removed the now unused keyword it used to grant.
-- Temporarily fixing infinite loop in AF Pump, not sure if this is what it should do though.
-- Fixed Equilibrium.
-- CheckStyle.
-- Added the function playSpellAbilityWithoutPayingManaCost to ComputerUtil.
-- Fixed the AI part of Cascade and Ripple skipping payment of non mana costs.
-- fixed problem with Any color mana abilities added through continuous effects e.g. Gemhide Sliver
-- Internalized win/lose frame into match UI using overlay.
-- Fixed icons display for mana overlay setting. Now, icons and counters will show all the time, but title, p/t, and casting cost is toggle-able.
-- Performance enhancement: fonts used in UI are now pre-derived once in skin.
-- Updated the AffectedZone of some continuous static abilities.
-- Added canPlayFromEffectAI to AF Destroy.
-- Cleanup.
-- Changed "removed" to "exiled" for consistency
-- Minor fix to comments in ControlDetail.
-- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
-- Added counter to input area to indicate match #x out of y.
-- Null pointer fix.
-- remove SVar= from SubAbility (Z cards)
-- remove SVar= from SubAbility (Y cards)
-- remove SVar= from SubAbility (U-V cards)
-- remove SVar= from SubAbility (W cards)
-- Added a GameLoss replacement effect.
-- Added YouDrewThisTurn and OppDrewThisTurn to xCount.
-- Forgot to add Lich's Mirror script.
-- Enabled multiple copies of Cascade on a spell.
-- Updated some SVars.
-- little cleanup in GenerateThemeDeck.java
+- A few aesthetic and organizational updates around the Forge initialization process.
+- ControlAllUI renamed to FControl to match project organization.
+- Updated a few quest decks.
+- Converted Cranial Extraction to script.
+- Added AI support to Rebound.
+- Fixed Grozoth.
+- Added canPlayFromEffectAI entries to AF GainLife and LoseLife.
+- Converted Maelstrom Pulse to script.
+- Set all TapsForMana triggers that execute a mana ability to static to conform with rule 605.4a.
+- Converted Erratic Explosion to script.
 - Little fix
-- Fixed cancel button layout bug.
-- Small fix to winlose layout.
-- Small update to FSkin font derivations.
-- fixed ManaCost.isColor() to return true when comparing any size colorless mana cost to a type of "1"
-- fix Crash with Qasali Ambusher
-- Refactored anyChoice to expressChoice. Added logic to make automatic color choices for "Any" keyword mana sources.
-- remove SVar= from SubAbility (T cards)
-- remove SVar= from SubAbility (S cards)
-- remove SVar= from SubAbility (Q-R cards)
-- remove SVar= from SubAbility (P cards)
-- remove SVar= from SubAbility (O cards)
-- remove SVar= from SubAbility (A cards)
-- remove SVar= from SubAbility (B cards)
-- remove SVar= from SubAbility (C cards)
-- remove SVar= from SubAbility (D cards)
-- remove SVar= from SubAbility (E cards)
-- remove SVar= from SubAbility (F cards)
-- remove SVar= from SubAbility (G cards)
-- remove SVar= from SubAbility (H-I cards)
-- remove SVar= from SubAbility (J-L cards)
-- remove SVar= from SubAbility (M cards)
-- remove SVar= from SubAbility (N cards)
-- Small Checkstyle fix
-- remove support for SVar= string in SubAbility. It has not been required for a long time, and now, is no longer supported. All card files have been updated.
-- Fixed font on storm label.
-- Changed QuestMatchState to MatchState (since it has no quest-specific information).
-- Renamed ManaSymbols to more accurate CardFaceSymbols.
+- hook the PhaseLabels up to the skin
+- fix crash when changing skins from Settings
+- fix so that after picking a new skin, you are still on the Settings View instead of on the Constructed View. (Fixes the TODO Doublestrike had in there.)
+- changes to fix issues with zcTriggers for transformed cards
+- Fixed Smoldering Spires.
+- Fixed Cosmic Horror.
+- General fix: DealDamage abilities that targeted "target creature or player" can now target planeswalkers as well, either using TgtCP or implicitly added Planeswalker type.
+- Solved splash swatch switch snafu.
+- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
+- Added AI targeting to AF ChangeZoneAll if origin is library to support the ultimate of Jace, the Mind Sculptor.
+- Fixed rarity for Helvault
+- Added canPlayFromEffectAI to AF Token.
+- use FScrollPane instead of JScrollPane in ViewDraft so it uses the colors of the skin.
+- CheckStyle.
+- Fixed Parallax Dementia. Used Reality Acid tech.
+- Fixed Forethought Amulet.
+- Fixed Reality Acid.
+- Fixed Parallax Dementia.
+- Converted Explosive Revelation to script.
+- Converted Mind Funeral to script. Thanks Sol.
+- Text fix
+- Fixed Helm of the Ghastlord.
+- Included Infect in evaluateCreature.
+- Little fix in the script of Distortion Strike.
+- Added a very hard version of the Jabba the Hut deck.
+- When using Defined$ TargetedController for SpellAbilities, we should use the Spell Activator, not the Spell's Source Card's Controller.
+- fix Crash when Animate Dead is put onto battlefield by things like Show and Tell.
+- Added Burnout (Hydroblast and Pyroblast can be scripted this same way)
+- Ran Oracle and SetInfo scripts
+- Removed the unnecessary code from the matchesValid function.
+- Added "HIDDEN" to some unblockable pumps.
+- Fixed an IndexOutOfBoundsException in getPumpCreatures.
+- Moved draft instructions and licensing information into overlay format.
+- Also, a few performance fixes for classes involved.
+- Redundant scaleLargerThanOriginal method removed from ImageCache, preferences setting used directly instead.
+- First small attempt at "non-sticky" combat panel (needs playtesting).
+- Added the recent commit logs to changes.txt. Preparing for the snapshot build release.
+- Reverted green/red theme on phase labels.
+- Added targeting support to tapAllTrigger AI.
+- Updated some SVars.
+- Codebase organization: 
+1) Moved MatchState from forge package into model package, renamed to FMatchState.
+2) Documented the difference between FMatchState and FGameState.
+- Added Trepanation Blade (and supporting RememberRevealed code to AbilityFactoryReveal)
+- Fixed possible NPE in AbilityFactory.getDefinedSpellAbilities()
+- Cleanup in CardFactorySorceries.java
+- Fixed Illumination.
+- Updated some SVars.
+- Fixed Gravity Well.
+- CheckStyle.
+- Fixed Soul Seizer // Ghastly Haunting script.
+- Fixed Curse of Thirst and Curse of the Pierced Heart after EnchantedPlayer removed from Valid.
+- merged updates (r13217-r13308) from trunk cardsfolder into DKA branch.
+- Converted to script: Ceta Sanctuary and Dega Sanctuary
+- Ran SetInfo and Oracle scripts
+- Small fix
+- Fixed summoning sickness not being cleared on the first turn of the player going second.
 - Added the recent commit logs to changes.txt. Preparing for the beta build and release.
 - Preparing the changes.txt file for the next beta build and release.
 
 
 Added pre-release cards to DKA cardfolder branch:
 
+Afflicted Deserter // Werewolf Ransacker
 Beguiler of Wills
 Chalice of Life // Chalice of Death
+Chant of the Skifsang
+Curse of Bloodletting
 Curse of Thirst
 Drogskol Reaver
 Faithless Looting
 Falkenrath Aristocrat
+Falkenrath Torturer
+Flayer of the Hatebound
 Gather the Townsfolk
 Ghoultree
 Gravecrawler
+Havengul Runebinder
+Headless Skaab
+Helvault
 Hunger of the Howlpack
 Huntmaster of the Fells // Ravager of the Fells
 Increasing Confusion
 Increasing Devotion
 Jar of Eyeballs
 Lambholt Elder // Silverpelt Werewolf
+Lingering Souls
 Loyal Cathar // Unhallowed Cathar
+Markov Blademaster
 Mikaeus, the Unhallowed
 Mondronen Shaman // Tovolar's Magehunter
 Moonveil Dragon
 Nearheath Stalker
+Predator Ooze
 Ravenous Demon // Archdemon of Greed
 Scorned Villager // Moonscarred Werewolf
 Secrets of the Dead
 Sorin, Lord of Innistrad
 Soul Seizer // Ghastly Haunting
 Strangleroot Geist
+Stromkirk Captain
 Thalia, Guardian of Thraben
+Thought Scour
 Thraben Doomsayer
+Tragic Slip
+Vault of the Archangel
 Vorapede
+Warden of the Wall
 Zombie Apocalypse
 
 
@@ -385,84 +170,50 @@ DeadSpeak
 Doublestrike
 Friar Sol
 Hellfish
+Iran
 Jeff Wadsworth
 Marc
-Mark
 Slapshot5
 Sloth
 SoulStorm
-Squee1968
-Xanbie
 ZzzzSleep
 Chris H
 
 
 Added many cards, including:
 
-Akki Lavarunner // Tok-Tok, Volcano-born
-Archmage Ascension
-Bloodchief Ascension
-Carrion Beetles
-Cast Through Time
-Caterwauling Boggart
-Children of Korlis
-Clash of Realities
-Coal Stoker
-Coalition Relic
-Consuming Vapors
-Crescendo of War
-Damia, Sage of Stone
-Deepwood Legate
-Distortion Strike
-Dread Cacodemon
-Emerge Unscathed
-Gravity Well
-Harmonic Sliver
-Hedron-Field Purists
-Hoarding Dragon
-Hypnox
-Karona, False God
-Laboratory Maniac
-Lantern of Insight
-Lich's Mirror
-Luminarch Ascension
-Mesmeric Sliver
-Myojin of Cleansing Fire
-Myojin of Infinite Rage
-Myojin of Life's Web
-Myojin of Night's Reach
-Myojin of Seeing Winds
-Nomads' Assembly
-Obstinate Familiar
-Petrified Wood-Kin
-Phage the Untouchable
-Prey's Vengeance
-Pursuit of Knowledge
-Qasali Ambusher
-Quirion Sentinel
-Rag Dealer
-Rapid Fire
-Reiver Demon
-Runeflare Trap
-Sages of the Anima
-Sivvi's Ruse
-Staggershock
-Sudden Spoiling
-Surreal Memoir
-Survival Cache
-Sygg, River Cutthroat
-Tainted Sigil
-Telekinesis
-Terrarion
-Thought Reflection
-Tin Street Hooligan
-Tomorrow, Azami's Familiar
-Ulasht, the Hate Seed
-Undead Alchemist
-Verdant Embrace
-Vigor
-Virulent Swipe
-Wound Reflection
+Ana Sanctuary
+Arcane Denial
+Burnout
+Calming Licid
+Convulsing Licid
+Corrupting Licid
+Dominating Licid
+Enraging Licid
+Force Bubble
+Gliding Licid
+Hydroblast
+Interdict
+Leeching Licid
+Necra Sanctuary
+Nurturing Licid
+Pyroblast
+Quickening Licid
+Raka Sanctuary
+Rats' Feast
+Reality Acid
+Revelation
+River Kelpie
+Seer's Vision
+Stinging Licid
+Summit Apes
+Telepathy
+Tempting Licid
+Torture Chamber
+Transmogrifying Licid
+Trepanation Blade
+Wood Sage
+Zedruu the Greathearted
 
 
 end

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>forge</artifactId>
     <packaging>jar</packaging>
     <name>Forge</name>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent
         using all of the rules.
@@ -131,8 +131,8 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.2.1</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.2.1</developerConnection>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.2.2</connection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.2.2</developerConnection>
     </scm>
 
     <prerequisites>
@@ -246,7 +246,7 @@
                     </descriptorRefs>
                     <archive>
                         <manifest>
-                            <mainClass>forge.view.swing.Main</mainClass>
+                            <mainClass>forge.view.Main</mainClass>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
@@ -842,7 +842,7 @@
                                     <errTitle>forge</errTitle>
                                     <icon>${configSourceDirectory}/forge.ico</icon>
                                     <classPath>
-                                        <mainClass>forge.view.swing.Main</mainClass>
+                                        <mainClass>forge.view.Main</mainClass>
                                         <addDependencies>false</addDependencies>
                                         <preCp>anything</preCp>
                                     </classPath>
@@ -1012,7 +1012,7 @@
                                         <mkdir dir="${project.build.directory}/res/cardsfolder" />
                                         <zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
                                         <taskdef name="jarbundler" classpathref="maven.runtime.classpath" classname="net.sourceforge.jarbundler.JarBundler" />
-                                        <jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.view.swing.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar">
+                                        <jarbundler dir="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" version="${project.version}" mainclass="forge.view.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" jvmversion="1.6+" vmoptions="-Xmx1024m" shortname="${project.name}" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" jar="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar">
                                             <javafileset dir="${basedir}">
                                                 <include name="*.properties" />
                                                 <include name="res/**" />

res/cardsfolder/a/acidic_sliver.txt

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

res/cardsfolder/a/ana_sanctuary.txt

@@ -0,0 +1,17 @@
+Name:Ana Sanctuary
+ManaCost:2 G
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ1 | Execute$ TrigPumpA | TriggerDescription$ At the beginning of your upkeep, if you control a blue or black permanent, target creature gets +1/+1 until end of turn. If you control a blue permanent and a black permanent, that creature gets +5/+5 until end of turn instead.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigPumpB | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if you control a blue or black permanent, target creature gets +1/+1 until end of turn. If you control a blue permanent and a black permanent, that creature gets +5/+5 until end of turn instead.
+SVar:TrigPumpA:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +1/+1 | NumAtt$ +1 | NumDef$ +1
+SVar:TrigPumpB:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +5/+5 | NumAtt$ +5 | NumDef$ +5
+SVar:Y:Count$Valid Permanent.Blue+YouCtrl/LimitMax.1
+SVar:Z:Count$Valid Permanent.Black+YouCtrl/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ana_sanctuary.jpg
+SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/74.jpg
+Oracle:At the beginning of your upkeep, if you control a blue or black permanent, target creature gets +1/+1 until end of turn. If you control a blue permanent and a black permanent, that creature gets +5/+5 until end of turn instead.
+End

res/cardsfolder/a/arc_lightning.txt

@@ -2,9 +2,9 @@ Name:Arc Lightning
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
-SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2 | SpellDescription$ CARDNAME deals 3 damage divided as you choose among one, two, or three target creatures and/or players.
+SVar:DBDamage2:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_lightning.jpg
 SetInfo:USG|Common|http://magiccards.info/scans/en/us/174.jpg

res/cardsfolder/a/arc_mage.txt

@@ -3,8 +3,8 @@ ManaCost:2 R
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$ DealDamage | Cost$ 2 R T Discard<1/Card> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 2 damage divided as you choose among any number of target creatures and/or players.
-SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1
+A:AB$ DealDamage | Cost$ 2 R T Discard<1/Card> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 2 damage divided as you choose among any number of target creatures and/or players.
+SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arc_mage.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/77.jpg

res/cardsfolder/a/arcane_denial.txt

@@ -0,0 +1,12 @@
+Name:Arcane Denial
+ManaCost:1 U
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep. You draw a card at the beginning of the next turn's upkeep.
+SVar:DBDraw:DB$Draw | NumCards$ 2 | NextUpkeep$ True | Defined$ TargetedController | OptionalDecider$ True | SubAbility$ DBDraw2
+SVar:DBDraw2:DB$Draw | NumCards$ 1 | NextUpkeep$ True | Defined$ You
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_denial.jpg
+SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/32.jpg|2
+Oracle:Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep.\nYou draw a card at the beginning of the next turn's upkeep.
+End

res/cardsfolder/b/barrage_ogre.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Ogre Warrior
 Text:no text
 PT:3/3
-A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | Tgt$ CP | NumDmg$ 2 | SpellDescription$ Barrage Ogre deals 2 damage to target creature or player.
+A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ Barrage Ogre deals 2 damage to target creature or player.
 SVar:Rarity:Uncommon
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barrage_ogre.jpg

res/cardsfolder/b/blazing_torch.txt

@@ -4,7 +4,7 @@ Types:Artifact Equipment
 Text:Equipped creature can't be blocked by Vampires or Zombies.
 K:eqPump 1:HIDDEN CantBeBlockedBy Creature.Vampire,Creature.Zombie
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddAbility$ TorchDamage | Description$ Equipped creature has "T, Sacrifice Blazing Torch: Blazing Torch deals 2 damage to target creature or player."
-SVar:TorchDamage:AB$ DealDamage | Cost$ T Sac<1/Card.Attached+namedBlazing Torch/equipped Blazing Torch> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 2 | DamageSource$ Sacrificed | SpellDescription$ Blazing Torch deals 2 damage to target creature or player.
+SVar:TorchDamage:AB$ DealDamage | Cost$ T Sac<1/Card.Attached+namedBlazing Torch/equipped Blazing Torch> | Tgt$ TgtCP | NumDmg$ 2 | DamageSource$ Sacrificed | SpellDescription$ Blazing Torch deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_torch.jpg
 Oracle:Equipped creature can't be blocked by Vampires or Zombies.\nEquipped creature has "{T}, Sacrifice Blazing Torch: Blazing Torch deals 2 damage to target creature or player."\nEquip {1}

res/cardsfolder/b/blockade_runner.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Merfolk
 Text:no text
 PT:2/2
-A:AB$ Pump | Cost$ U | KW$ Unblockable | SpellDescription$ CARDNAME is unblockable this turn.
+A:AB$ Pump | Cost$ U | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME is unblockable this turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blockade_runner.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/60.jpg

res/cardsfolder/b/bonethorn_valesk.txt

@@ -4,7 +4,7 @@ Types:Creature Beast
 Text:no text
 PT:4/2
 T:Mode$ TurnFaceUp | ValidCard$ Permanent | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a permanent is turned face up, CARDNAME deals 1 damage to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bonethorn_valesk.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/82.jpg

res/cardsfolder/b/bubbling_muck.txt

@@ -3,7 +3,7 @@ ManaCost:B
 Types:Sorcery
 Text:no text
 A:SP$ Effect | Cost$ B | Name$ Bubbling Muck Effect | Triggers$ SwampTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps a Swamp for mana, that player adds B to his or her mana pool (in addition to the mana the land produces).
-SVar:SwampTrigger:Mode$ TapsForMana | ValidCard$ Swamp | Execute$ TrigMana | TriggerDescription$ Whenever a player taps a Swamp for mana, that player adds B to his or her mana pool (in addition to the mana the land produces).
+SVar:SwampTrigger:Mode$ TapsForMana | ValidCard$ Swamp | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps a Swamp for mana, that player adds B to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ B | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/b/burnout.txt

@@ -0,0 +1,13 @@
+Name:Burnout
+ManaCost:1 R
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ 1 R | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SpellDescription$ Counter target spell if it's blue. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBDraw
+SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | Defined$ You
+SVar:X:Targeted$Valid Card.Blue
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/burnout.jpg
+SetInfo:ALL|Uncommon|http://magiccards.info/scans/en/ai/101.jpg
+Oracle:Counter target instant spell if it's blue.\nDraw a card at the beginning of the next turn's upkeep.
+End

res/cardsfolder/c/calming_licid.txt

@@ -0,0 +1,30 @@
+Name:Calming Licid
+ManaCost:2 W
+Types:Creature Licid
+Text:no text
+PT:2/2
+A:AB$ SetState | Cost$ W T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay W to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/calming_licid.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/102.jpg
+Oracle:{W}, {T}: Calming Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {W} to end this effect.\nEnchanted creature can't attack.
+
+ALTERNATE
+
+Name:Calming Licid
+ManaCost:2 W
+Colors:white
+Types:Enchantment Aura
+Text:Enchanted creature can't attack.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Enchanted creature can't attack.
+A:AB$ SetState | Cost$ W | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/c/ceta_sanctuary.txt

@@ -1,7 +1,15 @@
 Name:Ceta Sanctuary
 ManaCost:2 U
 Types:Enchantment
-Text:At the beginning of your upkeep, if you control a red or green permanent, draw a card, then discard a card. If you control a red permanent and a green permanent, instead draw two cards, then discard a card.
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ1 | Execute$ TrigDrawA | TriggerDescription$ At the beginning of your upkeep, if you control a red or green permanent, draw a card, then discard a card. If you control a red permanent and a green permanent, instead draw two cards, then discard a card.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigDrawB | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if you control a red or green permanent, draw a card, then discard a card. If you control a red permanent and a green permanent, instead draw two cards, then discard a card.
+SVar:TrigDrawA:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
+SVar:TrigDrawB:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+SVar:Y:Count$Valid Permanent.Red+YouCtrl/LimitMax.1
+SVar:Z:Count$Valid Permanent.Green+YouCtrl/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://wizards.com/global/images/magic/general/ceta_sanctuary.jpg

res/cardsfolder/c/convulsing_licid.txt

@@ -0,0 +1,30 @@
+Name:Convulsing Licid
+ManaCost:2 R
+Types:Creature Licid
+Text:no text
+PT:2/2
+A:AB$ SetState | Cost$ R T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay R to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/convulsing_licid.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/77.jpg
+Oracle:{R}, {T}: Convulsing Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {R} to end this effect.\nEnchanted creature can't attack.
+
+ALTERNATE
+
+Name:Convulsing Licid
+ManaCost:2 R
+Colors:red
+Types:Enchantment Aura
+Text:Enchanted creature can't block.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't block. | Description$ Enchanted creature can't block.
+A:AB$ SetState | Cost$ R | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/c/corrupting_licid.txt

@@ -0,0 +1,30 @@
+Name:Corrupting Licid
+ManaCost:2 B
+Types:Creature Licid
+Text:no text
+PT:2/2
+A:AB$ SetState | Cost$ B T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay B to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/corrupting_licid.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/4.jpg
+Oracle:{B}, {T}: Corrupting Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {B} to end this effect.\nEnchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)
+
+ALTERNATE
+
+Name:Corrupting Licid
+ManaCost:2 B
+Colors:black
+Types:Enchantment Aura
+Text:Enchanted creature has fear.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Fear | Description$ Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)
+A:AB$ SetState | Cost$ B | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/c/counterbore.txt

@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Instant
 Text:no text
 A:SP$ Counter | Cost$ 3 U U | TargetType$ Spell | ValidTgts$ Card | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Counter target spell. Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles his or her library.
-SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName+YouDontCtrl | Origin$ Graveyard,Hand,Library | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBChangeZoneAll:DB$ChangeZoneAll | ChangeType$ Remembered.sameName | Defined$ TargetedController | Origin$ Graveyard,Hand,Library | Destination$ Exile | Shuffle$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/counterbore.jpg

res/cardsfolder/c/cranial_extraction.txt

@@ -1,7 +1,9 @@
 Name:Cranial Extraction
 ManaCost:3 B
 Types:Sorcery
-Text:Name a nonland card. Search target player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library.
+Text:no text
+A:SP$ NameCard | Cost$ 3 B | Defined$ You | ValidCards$ Card.nonLand | ValidDesc$ nonland | SubAbility$ Exile | SpellDescription$ Name a nonland card. Search target player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library.
+SVar:Exile:DB$ ChangeZoneAll | Origin$ Graveyard,Hand,Library | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card.NamedCard | Shuffle$ True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card80281.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/105.jpg

res/cardsfolder/c/curse_of_oblivion.txt

@@ -3,8 +3,8 @@ ManaCost:3 B
 Types:Enchantment Aura Curse
 Text:Enchant player
 A:SP$ Attach | Cost$ 3 B | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedPlayer | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of enchanted player's upkeep, that player exiles two cards from his or her graveyard.
-SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | DefinedPlayer$ EnchantedPlayer | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ At the beginning of enchanted player's upkeep, that player exiles two cards from his or her graveyard.
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | DefinedPlayer$ Player.EnchantedBy | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 2 | Hidden$ True | Mandatory$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_oblivion.jpg
 SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/95.jpg

res/cardsfolder/c/curse_of_stalked_prey.txt

@@ -1,12 +1,12 @@
-Name:Curse of Stalked Prey
-ManaCost:1 R
-Types:Enchantment Aura Curse
-Text:Enchant player
-A:SP$ Attach | Cost$ 1 R| ValidTgts$ Player | AILogic$ Curse
-T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ EnchantedPlayer | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_stalked_prey.jpg
-SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/136.jpg
-Oracle:Enchant player\nWhenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
+Name:Curse of Stalked Prey
+ManaCost:1 R
+Types:Enchantment Aura Curse
+Text:Enchant player
+A:SP$ Attach | Cost$ 1 R| ValidTgts$ Player | AILogic$ Curse
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player.EnchantedBy | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_stalked_prey.jpg
+SetInfo:ISD|Rare|http://magiccards.info/scans/en/isd/136.jpg
+Oracle:Enchant player\nWhenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
 End

res/cardsfolder/c/curse_of_the_bloody_tome.txt

@@ -1,12 +1,12 @@
-Name:Curse of the Bloody Tome
-ManaCost:2 U
-Types:Enchantment Aura Curse
-Text:Enchant player
-A:SP$ Attach | Cost$ 2 U| ValidTgts$ Player | AILogic$ Curse
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedPlayer | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.
-SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ EnchantedPlayer | NumCards$ 2
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_bloody_tome.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/50.jpg
-Oracle:Enchant player\nAt the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.
+Name:Curse of the Bloody Tome
+ManaCost:2 U
+Types:Enchantment Aura Curse
+Text:Enchant player
+A:SP$ Attach | Cost$ 2 U| ValidTgts$ Player | AILogic$ Curse
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.
+SVar:TrigMill:AB$ Mill | Cost$ 0 | Defined$ Player.EnchantedBy | NumCards$ 2
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_bloody_tome.jpg
+SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/50.jpg
+Oracle:Enchant player\nAt the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.
 End

res/cardsfolder/c/curse_of_the_pierced_heart.txt

@@ -1,12 +1,12 @@
-Name:Curse of the Pierced Heart
-ManaCost:1 R
-Types:Enchantment Aura Curse
-Text:Enchant player
-A:SP$ Attach | Cost$ 1 R | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedPlayer | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of enchanted player's upkeep, CARDNAME deals 1 damage to that player.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ EnchantedPlayer | NumDmg$ 1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_pierced_heart.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/138.jpg
-Oracle:Enchant player\nAt the beginning of enchanted player's upkeep, Curse of the Pierced Heart deals 1 damage to that player.
+Name:Curse of the Pierced Heart
+ManaCost:1 R
+Types:Enchantment Aura Curse
+Text:Enchant player
+A:SP$ Attach | Cost$ 1 R | ValidTgts$ Player | AILogic$ Curse
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of enchanted player's upkeep, CARDNAME deals 1 damage to that player.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ Player.EnchantedBy | NumDmg$ 1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_pierced_heart.jpg
+SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/138.jpg
+Oracle:Enchant player\nAt the beginning of enchanted player's upkeep, Curse of the Pierced Heart deals 1 damage to that player.
 End

res/cardsfolder/c/cursed_scroll.txt

@@ -4,7 +4,7 @@ Types:Artifact
 Text:no text
 A:AB$ NameCard | Cost$ 3 T | Defined$ You | SubAbility$ DBReveal | SpellDescription$ Name a card. Reveal a card at random from your hand. If it's the named card, CARDNAME deals 2 damage to target creature or player.
 SVar:DBReveal:DB$ Reveal | Random$ True | RememberRevealed$ True | Defined$ You | SubAbility$ DBDamage
-SVar:DBDamage:DB$ DealDamage | NumDmg$ 2 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBDamage:DB$ DealDamage | NumDmg$ 2 | Tgt$ TgtCP | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cursed_scroll.jpg

res/cardsfolder/d/dega_sanctuary.txt

@@ -1,7 +1,14 @@
 Name:Dega Sanctuary
 ManaCost:2 W
 Types:Enchantment
-Text:At the beginning of your upkeep, if you control a black or red permanent, you gain 2 life. If you control a black permanent and a red permanent, you gain 4 life instead.
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ1 | Execute$ TrigGainLifeA | TriggerDescription$ At the beginning of your upkeep, if you control a black or red permanent, you gain 2 life. If you control a black permanent and a red permanent, you gain 4 life instead.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigGainLifeB | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if you control a black or red permanent, you gain 2 life. If you control a black permanent and a red permanent, you gain 4 life instead.
+SVar:TrigGainLifeA:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
+SVar:TrigGainLifeB:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 4
+SVar:Y:Count$Valid Permanent.Black+YouCtrl/LimitMax.1
+SVar:Z:Count$Valid Permanent.Red+YouCtrl/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://wizards.com/global/images/magic/general/dega_sanctuary.jpg

res/cardsfolder/d/distortion_strike.txt

@@ -3,7 +3,7 @@ ManaCost:U
 Types:Sorcery
 Text:no text
 K:Rebound
-A:SP$Pump | Cost$ U | Tgt$ TgtC | NumAtt$ 1 | KW$ Unblockable | SpellDescription$ Target creature gets +1/+0 until end of turn and is unblockable this turn.
+A:SP$Pump | Cost$ U | Tgt$ TgtC | NumAtt$ 1 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature gets +1/+0 until end of turn and is unblockable this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/distortion_strike.jpg
 Oracle:Target creature gets +1/+0 until end of turn and is unblockable this turn.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/60.jpg

res/cardsfolder/d/dominating_licid.txt

@@ -0,0 +1,29 @@
+Name:Dominating Licid
+ManaCost:1 U U
+Types:Creature Licid
+Text:no text
+PT:1/1
+A:AB$ SetState | Cost$ 1 U U T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay U to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ GainControl
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dominating_licid.jpg
+SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/30.jpg
+Oracle:{1}{U}{U}, {T}: Dominating Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay  to end this effect.\nYou control enchanted creature.
+
+ALTERNATE
+
+Name:Dominating Licid
+ManaCost:1 U U
+Colors:blue
+Types:Enchantment Aura
+Text:You control enchanted creature.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ GainControl
+A:AB$ SetState | Cost$ U | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/d/dread_cacodemon.txt

@@ -6,7 +6,6 @@ PT:8/8
 T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromHand+Self | Destination$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, destroy all creatures your opponents control, then tap all other creatures you control.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.YouDontCtrl | SubAbility$ DBTapAll
 SVar:DBTapAll:DB$TapAll | ValidCards$ Creature.YouCtrl+Other
-SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_cacodemon.jpg
 SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/79.jpg

res/cardsfolder/d/dream_prowler.txt

@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:1/5
 T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | Execute$ TrigPump | TriggerDescription$ CARDNAME is unblockable as long as it's attacking alone.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Unblockable
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Unblockable
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_prowler.jpg
 SetInfo:STH|Common|http://magiccards.info/scans/en/sh/29.jpg

res/cardsfolder/e/electropotence.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature enters the battlefield under your control, you may pay 2 R.  If you do, that creature deals damage equal to its power to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | DamageSource$ TriggeredCard  | NumDmg$ Damage | TgtPrompt$ Select target creature or player.
+SVar:TrigDamage:AB$DealDamage | Cost$ 2 R | Tgt$ TgtCP | DamageSource$ TriggeredCard  | NumDmg$ Damage
 SVar:Damage:TriggeredCard$CardPower
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/electropotence.jpg

res/cardsfolder/e/elvish_guidance.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds G to his or her mana pool for each Elf on the battlefield (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds G to his or her mana pool for each Elf on the battlefield (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ G | Amount$ X | Defined$ TriggeredCardController
 SVar:X:Count$Valid Elf
 SVar:RemAIDeck:True

res/cardsfolder/e/enraging_licid.txt

@@ -0,0 +1,30 @@
+Name:Enraging Licid
+ManaCost:1 R
+Types:Creature Licid
+Text:no text
+PT:1/1
+A:AB$ SetState | Cost$ R T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay R to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/enraging_licid.jpg
+SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/171.jpg
+Oracle:{R}, {T}: Enraging Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {R} to end this effect.\nEnchanted creature has haste.
+
+ALTERNATE
+
+Name:Enraging Licid
+ManaCost:1 R
+Colors:red
+Types:Enchantment Aura
+Text:Enchanted creature has haste.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Haste | Description$ Enchanted creature has haste.
+A:AB$ SetState | Cost$ R | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/e/erratic_explosion.txt

@@ -1,7 +1,11 @@
 Name:Erratic Explosion
 ManaCost:2 R
 Types:Sorcery
-Text:Choose target creature or player. The computer will randomly choose a nonland card from your library. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player.
+Text:no text
+A:SP$ DigUntil | Cost$ 2 R | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Library | RevealedDestination$ Library | FoundLibraryPosition$ -1 | RevealedLibraryPosition$ -1 | RememberFound$ True | SubAbility$ Damage | SpellDescription$ Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order.
+SVar:Damage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/ons/en-us/card12484.jpg
 SetInfo:ONS|Common|http://magiccards.info/scans/en/on/201.jpg

res/cardsfolder/e/essence_bottle.txt

@@ -5,6 +5,7 @@ Text:no text
 A:AB$ PutCounter | Cost$ 3 T | Defined$ Self | CounterType$ ELIXIR | CounterNum$ 1 | SpellDescription$ Put an elixir counter on CARDNAME.
 A:AB$ GainLife | Cost$ T SubCounter<All/ELIXIR> | Defined$ You | LifeAmount$ X | SpellDescription$ You gain 2 life for each elixir counter removed this way.
 SVar:X:SVar$CostCountersRemoved/Twice
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/essence_bottle.jpg
 SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/276.jpg

res/cardsfolder/e/ethereal_haze.txt

@@ -2,7 +2,7 @@ Name:Ethereal Haze
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Effect | Cost$ W | Name$ Chameleon Ethereal Haze Effect | StaticAbilities$ STPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt by creatures this turn.
+A:SP$ Effect | Cost$ W | Name$ Ethereal Haze Effect | StaticAbilities$ STPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt by creatures this turn.
 SVar:STPrevent:Mode$ PreventDamage | Source$ Creature | Description$ Prevent all damage that would be dealt by creatures this turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ethereal_haze.jpg

res/cardsfolder/e/explosive_revelation.txt

@@ -1,7 +1,11 @@
 Name:Explosive Revelation
 ManaCost:3 R R
 Types:Sorcery
-Text:Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Explosive Revelation deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order.
+Text:no text
+A:SP$ DigUntil | Cost$ 3 R R | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RememberFound$ True | SubAbility$ Damage | SpellDescription$ Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. CARDNAME deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order.
+SVar:Damage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$CardManaCost
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/explosive_revelation.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/143.jpg

res/cardsfolder/e/extra_arms.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 4 R | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature attacks, it deals 2 damage to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | DamageSource$ TriggeredCard | NumDmg$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/extra_arms.jpg
 SetInfo:SCG|Uncommon|http://magiccards.info/scans/en/sc/92.jpg

res/cardsfolder/f/fanning_the_flames.txt

@@ -2,7 +2,7 @@ Name:Fanning the Flames
 ManaCost:X R R
 Types:Sorcery
 Text:no text
-A:SP$ DealDamage | Cost$ X R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
+A:SP$ DealDamage | Cost$ X R R | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
 SVar:Buyback:3
 SVar:X:Count$xPaid
 SVar:Rarity:Uncommon

res/cardsfolder/f/fertile_ground.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant land
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ Any | Amount$ 1 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/f/fire_whip.txt

@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature.YouCtrl | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ ABDamage | Description$ Enchanted creature has "Tap: This creature deals 1 damage to target creature or player."
-SVar:ABDamage:AB$ DealDamage | Cost$ T | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SpellDescription$ This creature deals 1 damage to target creature or player.
+SVar:ABDamage:AB$ DealDamage | Cost$ T | NumDmg$ 1 | Tgt$ TgtCP | SpellDescription$ This creature deals 1 damage to target creature or player.
 A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_whip.jpg

res/cardsfolder/f/flame_fusillade.txt

@@ -4,7 +4,7 @@ Types:Sorcery
 Text:no text
 A:SP$ Effect | Cost$ 3 R | Name$ Flame Fusillade Effect | StaticAbilities$ STDamage | SVars$ ABDamage | SpellDescription$ Until end of turn, permanents you control gain "Tap: This permanent deals 1 damage to target creature or player."
 SVar:STDamage:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddAbility$ ABDamage | Description$ Until end of turn, permanents you control gain "Tap: This permanent deals 1 damage to target creature or player."
-SVar:ABDamage:AB$ DealDamage | Cost$ T | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SpellDescription$ CARDNAME deals 1 damage to target creature or player
+SVar:ABDamage:AB$ DealDamage | Cost$ T | NumDmg$ 1 | Tgt$ TgtCP | SpellDescription$ CARDNAME deals 1 damage to target creature or player
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_fusillade.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/123.jpg

res/cardsfolder/f/force_bubble.txt

@@ -0,0 +1,17 @@
+Name:Force Bubble
+ManaCost:2 W W
+Types:Enchantment
+Text:no text
+R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ Counters | Description$ If damage would be dealt to you, put that many depletion counters on CARDNAME instead.
+SVar:Counters:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ DEPLETION | CounterNum$ X
+T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Card.Self+counters_GE4_DEPLETION | Execute$ TrigSac | TriggerDescription$ When there are four or more depletion counters on CARDNAME, sacrifice it.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ At the beginning of each end step, remove all depletion counters from CARDNAME.
+SVar:TrigRemoveCounter: AB$ RemoveCounter | Cost$ 0 | CounterType$ DEPLETION | CounterNum$ All
+SVar:X:ReplaceCount$DamageAmount
+SVar:All:Count$CardCounters.DEPLETION
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/force_bubble.jpg
+SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/14.jpg
+Oracle:If damage would be dealt to you, put that many depletion counters on Force Bubble instead.\nWhen there are four or more depletion counters on Force Bubble, sacrifice it.\nAt the beginning of each end step, remove all depletion counters from Force Bubble.
+End

res/cardsfolder/f/forethought_amulet.txt

@@ -2,7 +2,7 @@ Name:Forethought Amulet
 ManaCost:5
 Types:Artifact
 Text:no text
-R:Event$ DamageDone | ValidTarget$ Creature,Player | DamageAmount$ GE3 | ReplaceWith$ Dmg2 | Description$ If an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead.
+R:Event$ DamageDone | ValidTarget$ You | DamageAmount$ GE3 | ReplaceWith$ Dmg2 | Description$ If an instant or sorcery source would deal 3 or more damage to you, it deals 2 damage to you instead.
 SVar:Dmg2:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 2
 K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 3
 SVar:RemRandomDeck:True

res/cardsfolder/f/form_of_the_dragon.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 S:Mode$ Continuous | Affected$ Creature.withoutFlying+YouDontCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures without flying can't attack you.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 5 damage to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 5
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 5
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigLife | TriggerDescription$ At the beginning of each end step, your life total becomes 5.
 SVar:TrigLife:AB$SetLife | Cost$ 0 | Defined$ You | LifeAmount$ 5
 SVar:Rarity:Rare

res/cardsfolder/f/furnace_of_rath.txt

@@ -2,7 +2,7 @@ Name:Furnace of Rath
 ManaCost:1 R R R
 Types:Enchantment
 Text:no text
-R:Event$ DamageDone | ValidSource$ Card | ValidTarget$ Card.Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
+R:Event$ DamageDone | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead.
 SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE

res/cardsfolder/g/gauntlet_of_might.txt

@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 S:Mode$ Continuous | Affected$ Creature.Red | AddPower$ 1 | AddToughness$ 1 | Description$ Red creatures get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana |TriggerZones$ Battlefield | TriggerDescription$ Whenever a Mountain is tapped for mana, its controller adds R to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Mountain | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a Mountain is tapped for mana, its controller adds R to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ R | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare

res/cardsfolder/g/glassdust_hulk.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:3/4
 K:Cycling:WU
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn and is unblockable this turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ Unblockable
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ HIDDEN Unblockable
 SVar:BuffedBy:Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glassdust_hulk.jpg

res/cardsfolder/g/gliding_licid.txt

@@ -0,0 +1,30 @@
+Name:Gliding Licid
+ManaCost:2 U
+Types:Creature Licid
+Text:no text
+PT:2/2
+A:AB$ SetState | Cost$ U T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay U to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gliding_licid.jpg
+SetInfo:STH|Uncommon|http://magiccards.info/scans/en/sh/31.jpg
+Oracle:{U}, {T}: Glidinging Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {U} to end this effect.\nEnchanted creature has flying.
+
+ALTERNATE
+
+Name:Gliding Licid
+ManaCost:2 U
+Colors:blue
+Types:Enchantment Aura
+Text:Enchanted creature has flying.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
+A:AB$ SetState | Cost$ U | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/g/gravity_well.txt

@@ -2,7 +2,7 @@ Name:Gravity Well
 ManaCost:1 G G
 Types:Enchantment
 Text:no text
-T:Mode$ Attacks | ValidCard$ Creature.withFlying | Execute$ Debuff | TriggerDescription$ Whenever a creature with flying attacks, it loses flying until end of turn.
+T:Mode$ Attacks | ValidCard$ Creature.withFlying | Execute$ Debuff | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature with flying attacks, it loses flying until end of turn.
 SVar:Debuff:AB$Debuff | Cost$ 0 | Defined$ TriggeredAttacker | Keywords$ Flying
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gravity_well.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/185.jpg

res/cardsfolder/g/grozoth.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:9/9
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for any number of cards that have converted mana cost 9, reveal them, and put them into your hand. If you do, shuffle your library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.cmcLE9 | ChangeNum$ X
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.cmcEQ9 | ChangeNum$ X
 A:AB$ Debuff | Cost$ 4 | Keywords$ Defender | Defined$ Self | SpellDescription$ CARDNAME loses defender until end of turn.
 K:Transmute:1 U U
 SVar:X:Count$InYourLibrary

res/cardsfolder/g/gulf_squid.txt

@@ -1,13 +1,13 @@
-Name:Gulf Squid
-ManaCost:3 U
-Types:Creature Squid Beast
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all lands target player controls.
-SVar:TrigTapAll:AB$ TapAll | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land
-SVar:RemRandomDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gulf_squid.jpg
-SetInfo:PCY|Common|http://magiccards.info/scans/en/pr/35.jpg
-Oracle:When Gulf Squid enters the battlefield, tap all lands target player controls.
+Name:Gulf Squid
+ManaCost:3 U
+Types:Creature Squid Beast
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all lands target player controls.
+SVar:TrigTapAll:AB$ TapAll | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land
+SVar:PlayMain1:TRUE
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gulf_squid.jpg
+SetInfo:PCY|Common|http://magiccards.info/scans/en/pr/35.jpg
+Oracle:When Gulf Squid enters the battlefield, tap all lands target player controls.
 End

res/cardsfolder/h/halimar_excavator.txt

@@ -8,7 +8,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O
 SVar:TrigMill:AB$Mill | Cost$ 0 | ValidTgts$ Player | NumCards$ X | TgtPrompt$ Select a target player. | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:BuffedBy:Ally
-SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/halimar_excavator.jpg
 SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/29.jpg

res/cardsfolder/h/hand_of_the_praetors.txt

@@ -7,6 +7,7 @@ K:Infect
 S:Mode$ Continuous | Affected$ Creature.withInfect+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control with infect get +1/+1.
 T:Mode$ SpellCast | ValidCard$ Creature.withInfect+YouCtrl | Execute$ TrigPoison | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with infect, target player gets a poison counter.
 SVar:TrigPoison:AB$Poison | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | Num$ 1
+SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hand_of_the_praetors.jpg
 SetInfo:SOM|Rare|http://magiccards.info/scans/en/som/66.jpg

res/cardsfolder/h/harabaz_druid.txt

@@ -6,7 +6,6 @@ PT:0/1
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | SpellDescription$ Add X mana of any one color to your mana pool, where X is the number of Allies you control.
 SVar:X:Count$Valid Ally.YouCtrl
 SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harabaz_druid.jpg
 SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/105.jpg

res/cardsfolder/h/harvester_druid.txt

@@ -4,7 +4,6 @@ Types:Creature Human Druid
 Text:no text
 PT:1/1
 A:AB$ ManaReflected | Cost$ T | ColorOrType$ Color | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add to your mana pool one mana of any color that a land you control could produce.
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harvester_druid.jpg
 SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/120.jpg

res/cardsfolder/h/hatchet_bully.txt

@@ -4,7 +4,7 @@ Types:Creature Goblin Warrior
 Text:no text
 PT:3/3
 A:AB$ PutCounter | Cost$ 2 R T | CounterType$ M1M1 | CounterNum$ 1 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage | SpellDescription$ Put a -1/-1 counter on a creature you control: CARDNAME deals 2 damage to target creature or player.
-SVar:DBDamage:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2
+SVar:DBDamage:DB$DealDamage | Tgt$ TgtCP | NumDmg$ 2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hatchet_bully.jpg
 SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/54.jpg

res/cardsfolder/h/hatching_plans.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 Text:no text
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw three cards.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredCardController | NumCards$ 3
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:SacMe:5
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hatching_plans.jpg

res/cardsfolder/h/helm_of_the_ghastlord.txt

@@ -4,12 +4,13 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 UB | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Blue | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ BlueTrigger | AddSVar$ TrigDraw | Description$ As long as enchanted creature is blue, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, draw a card."
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Black | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ BlackTrigger | AddSVar$ TrigDiscard | Description$ As long as enchanted creature is black, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, that player discards a card."
-SVar:BlueTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever this creature deals damage to an opponent, draw a card
-SVar:BlackTrigger:Mode$ DamageDone | ValidSource$ Card.self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever this creature deals damage to an opponent, that player discards a card.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Blue | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ BlueTrigger | AddSVar$ HelmTrigDraw | Description$ As long as enchanted creature is blue, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, draw a card."
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Black | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ BlackTrigger | AddSVar$ HelmTrigDiscard | Description$ As long as enchanted creature is black, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, that player discards a card."
+SVar:BlueTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ HelmTrigDraw | TriggerDescription$ Whenever this creature deals damage to an opponent, draw a card
+SVar:BlackTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ HelmTrigDiscard | TriggerDescription$ Whenever this creature deals damage to an opponent, that player discards a card.
+SVar:HelmTrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1
+SVar:HelmTrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose
+SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/helm_of_the_ghastlord.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/166.jpg

res/cardsfolder/h/high_tide.txt

@@ -3,7 +3,7 @@ ManaCost:U
 Types:Instant
 Text:no text
 A:SP$ Effect | Cost$ U | Name$ High Tide Effect | Triggers$ IslandTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
-SVar:IslandTrigger:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | TriggerDescription$ Whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
+SVar:IslandTrigger:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ U | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/h/hikari_twilight_guardian.txt

@@ -1,16 +1,16 @@
-Name:Hikari, Twilight Guardian
-ManaCost:3 W W
-Types:Legendary Creature Spirit
-Text:no text
-PT:4/4
-K:Flying
-T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may exile CARDNAME. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig
-SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
-SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Exile | Destination$ Battlefield
-SVar:RemRandomDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hikari_twilight_guardian.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/12.jpg
-Oracle:Flying\nWhenever you cast a Spirit or Arcane spell, you may exile Hikari, Twilight Guardian. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
+Name:Hikari, Twilight Guardian
+ManaCost:3 W W
+Types:Legendary Creature Spirit
+Text:no text
+PT:4/4
+K:Flying
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may exile CARDNAME. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig
+SVar:DelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Exile | Destination$ Battlefield
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hikari_twilight_guardian.jpg
+SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/12.jpg
+Oracle:Flying\nWhenever you cast a Spirit or Arcane spell, you may exile Hikari, Twilight Guardian. If you do, return it to the battlefield under its owner's control at the beginning of the next end step.
 End

res/cardsfolder/h/holy_light.txt

@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Instant
 Text:no text
 A:SP$ PumpAll | Cost$ 2 W | ValidCards$ Creature.nonWhite | IsCurse$ True | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Nonwhite creatures get -1/-1 until end of turn.
-SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/holy_light.jpg
 SetInfo:DRK|Common|http://magiccards.info/scans/en/dk/83.jpg

res/cardsfolder/h/honden_of_infinite_rage.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Legendary Enchantment Shrine
 Text:no text
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals damage to target creature or player equal to the number of Shrines you control.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ X
 SVar:X:Count$TypeYouCtrl.Shrine
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/honden_of_infinite_rage.jpg

res/cardsfolder/h/horror_of_horrors.txt

@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Enchantment
 Text:no text
 A:AB$ Regenerate | ValidTgts$ Creature.Black | TgtPrompt$ Select target black creature | Cost$ Sac<1/Swamp> | SpellDescription$ Regenerate target black creature.
-SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horror_of_horrors.jpg
 SetInfo:9ED|Uncommon|http://magiccards.info/scans/en/9e/140.jpg

res/cardsfolder/h/hunting_triad.txt

@@ -5,7 +5,6 @@ Text:no text
 #This may look funny, but it works correctly AFAICT from my testing.
 A:SP$ Token | Cost$ 3 G | TokenAmount$ 3 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put three 1/1 green Elf Warrior creature tokens onto the battlefield.
 A:AB$ PutCounter | Cost$ 3 G Discard<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 3 | ActivationZone$ Hand | PrecostDesc$ Reinforce 3 - | SpellDescription$ Put three +1/+1 counters on target creature.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_triad.jpg
 SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/127.jpg

res/cardsfolder/h/hydroblast.txt

@@ -0,0 +1,15 @@
+Name:Hydroblast
+ManaCost:U
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | PrecostDesc$ Choose one -  | SpellDescription$ Counter target spell if it's red;
+A:SP$ Destroy | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | ConditionDefined$ Targeted | ConditionPresent$ Card.Red | ConditionCompare$ GE1 | SpellDescription$  or destroy target permanent if it's red.
+SVar:X:Targeted$Valid Card.Red
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hydroblast.jpg
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/94.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/72.jpg
+Oracle:Choose one - Counter target spell if it's red; or destroy target permanent if it's red.
+End

res/cardsfolder/i/illumination.txt

@@ -1,17 +1,11 @@
 Name:Illumination
 ManaCost:W W
 Types:Instant
-Text:(NOTE: This spell is rather buggy and should not be used at this time. When cast, it would cause a NPE. As a temporary fix, this card no longer has a drawback.)
-#
-# When Targeted can handle SpellAbilities along with Cards, this can be converted to the New SubAbilities
-# May also need a check in TgtCardManaCost to convert from SA to Card
-#
-A:SP$ Counter | Cost$ W W | TargetType$ Spell | TgtPrompt$ Select target Artifact or Enchantment spell | ValidTgts$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.
-# | SubAbility$ DBGainLife
-# SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X
-# SVar:X:Count$TgtCardManaCost
-SVar:RemRandomDeck:True
-SVar:Rarity:None
+Text:no text
+A:SP$ Counter | Cost$ W W | TargetType$ Spell | TgtPrompt$ Select target Artifact or Enchantment spell | ValidTgts$ Artifact,Enchantment | SubAbility$ DBGainLife | SpellDescription$ Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.
+SVar:DBGainLife:DB$ GainLife | Defined$ TargetedController | LifeAmount$ X
+SVar:X:Targeted$CardManaCost
+SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/illumination.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/225.jpg
 Oracle:Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.

res/cardsfolder/i/illusory_demon.txt

@@ -6,7 +6,7 @@ PT:4/3
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ When you cast a spell, sacrifice CARDNAME.
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | SacValid$ Self
-SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/illusory_demon.jpg
 SetInfo:ARB|Uncommon|http://magiccards.info/scans/en/arb/21.jpg

res/cardsfolder/i/imaginary_pet.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:4/4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if you have a card in hand, return CARDNAME to its owner's hand.
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand
-SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imaginary_pet.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/81.jpg

res/cardsfolder/i/infernal_kirin.txt

@@ -7,7 +7,6 @@ K:Flying
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidControllingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target player reveals his or her hand and discards all cards with that spell's converted mana cost.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Player | Mode$ RevealDiscardAll | DiscardValid$ Card.cmcEQX
 SVar:X:TriggeredCard$CardManaCost
-SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_kirin.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/72.jpg

res/cardsfolder/i/infused_arrows.txt

@@ -1,15 +1,14 @@
-Name:Infused Arrows
-ManaCost:4
-Types:Artifact
-Text:no text
-K:Sunburst
-#ChosenX SVar created by Cost payment
-A:AB$ Pump | Cost$ T SubCounter<X/CHARGE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -ChosenX | NumDef$ -ChosenX | SpellDescription$ Target creature gets -X/-X until end of turn.
-SVar:X:XChoice
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infused_arrows.jpg
-SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/133.jpg
-Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\n{T}, Remove X charge counters from Infused Arrows: Target creature gets -X/-X until end of turn.
+Name:Infused Arrows
+ManaCost:4
+Types:Artifact
+Text:no text
+K:Sunburst
+#ChosenX SVar created by Cost payment
+A:AB$ Pump | Cost$ T SubCounter<X/CHARGE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -ChosenX | NumDef$ -ChosenX | SpellDescription$ Target creature gets -X/-X until end of turn.
+SVar:X:XChoice
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/infused_arrows.jpg
+SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/133.jpg
+Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\n{T}, Remove X charge counters from Infused Arrows: Target creature gets -X/-X until end of turn.
 End

res/cardsfolder/i/ink_dissolver.txt

@@ -3,7 +3,6 @@ ManaCost:1 U
 Types:Creature Merfolk Wizard
 Text:Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Ink Dissolver, you may reveal it. If you do, each opponent puts the top three cards of his or her library into his or her graveyard.
 PT:2/1
-SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ink_dissolver.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/36.jpg

res/cardsfolder/i/ink_eyes_servant_of_oni.txt

@@ -7,7 +7,6 @@ A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked> | CostDesc
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control.
 SVar:TrigAnimate:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.YouDontCtrl | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control.
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
-SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ink_eyes_servant_of_oni.jpg
 SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/71.jpg

res/cardsfolder/i/inspired_sprite.txt

@@ -9,7 +9,7 @@ T:Mode$ SpellCast | ValidCard$ Wizard.YouCtrl | TriggerZones$ Battlefield | Opti
 A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
-SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inspired_sprite.jpg
 SetInfo:MOR|Uncommon|http://magiccards.info/scans/en/mt/37.jpg

res/cardsfolder/i/interdict.txt

@@ -0,0 +1,13 @@
+Name:Interdict
+ManaCost:1 U
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ 1 U | TargetType$ Activated | TgtPrompt$ Select target activated ability from an artifact, creature, enchantment, or land. | RememberTargets$ True | ForgetOtherTargets$ True | ValidTgts$ Artifact,Creature,Enchantment,Land | ForgetOtherTargets$ True | SubAbility$ DBEffect | SpellDescription$ Counter target activated ability from an artifact, creature, enchantment, or land. That permanent's activated abilities can't be activated this turn. (Mana abilities can't be targeted.)
+SVar:DBEffect:DB$ Effect | Name$ Interdict Effect | StaticAbilities$ STCantBeActivated | RememberObjects$ Remembered | SubAbility$ DBDraw
+SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Permanent.IsRemembered
+SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/interdict.jpg
+SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/69.jpg
+Oracle:Counter target activated ability from an artifact, creature, enchantment, or land. That permanent's activated abilities can't be activated this turn. (Mana abilities can't be targeted.)\nDraw a card.
+End

res/cardsfolder/i/inundate.txt

@@ -3,7 +3,6 @@ ManaCost:3 U U U
 Types:Sorcery
 Text:no text
 A:SP$ ChangeZoneAll | Cost$ 3 U U U | ChangeType$ Creature.nonBlue | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all nonblue creatures to their owners' hands.
-SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inundate.jpg
 SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/25.jpg

res/cardsfolder/i/ivory_giant.txt

@@ -6,7 +6,7 @@ PT:3/4
 K:Suspend:5:W
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When Ivory Giant enters the battlefield, tap all nonwhite creatures.
 SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Creature.nonWhite
-SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ivory_giant.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/24.jpg

res/cardsfolder/i/ixidors_will.txt

@@ -4,7 +4,6 @@ Types:Instant
 Text:no text
 A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | SpellDescription$ Counter target spell unless its controller pays 2 for each Wizard on the battlefield.
 SVar:X:Count$TypeYouCtrl.Wizard/Twice
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ixidors_will.jpg

res/cardsfolder/j/jangling_automaton.txt

@@ -5,6 +5,7 @@ Text:no text
 PT:3/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap all creatures defending player controls.
 SVar:TrigUntap:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.YouDontCtrl
+SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jangling_automaton.jpg
 SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/151.jpg

res/cardsfolder/k/kird_ape.txt

@@ -5,6 +5,7 @@ Text:no text
 PT:1/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+2 as long as you control a Forest.
 SVar:X:Count$Valid Forest.YouCtrl
+SVar:BuffedBy:Forest
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kird_ape.jpg
 SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/160.jpg

res/cardsfolder/k/kjeldoran_javelineer.txt

@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Soldier
 Text:no text
 PT:1/2
-K:Cumulative upkeep:W
+K:Cumulative upkeep:1
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the number of age counters on it to target attacking or blocking creature.
 SVar:X:Count$CardCounters.AGE
 SVar:RemAIDeck:True

res/cardsfolder/k/kuldotha_flamefiend.txt

@@ -4,10 +4,10 @@ Types:Creature Elemental
 Text:no text
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, you may sacrifice an artifact. If you do, CARDNAME deals 4 damage divided as you choose among any number of target creatures and/or players.
-SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2
-SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
-SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
-SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/Artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (1) | NumDmg$ 1 | SubAbility$ DBDamage2
+SVar:DBDamage2:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (2) | NumDmg$ 1 | SubAbility$ DBDamage3
+SVar:DBDamage3:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (3) | NumDmg$ 1 | SubAbility$ DBDamage4
+SVar:DBDamage4:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player (4) | NumDmg$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kuldotha_flamefiend.jpg

res/cardsfolder/l/leeching_licid.txt

@@ -0,0 +1,31 @@
+Name:Leeching Licid
+ManaCost:1 B
+Types:Creature Licid
+Text:At the beginning of the upkeep of enchanted creature's controller, CARDNAME deals 1 damage to that player.
+PT:1/1
+A:AB$ SetState | Cost$ B T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay B to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/leeching_licid.jpg
+SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/35.jpg
+Oracle:{B}, {T}: Leeching Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {B} to end this effect.\nAt the beginning of the upkeep of enchanted creature's controller, Leeching Licid deals 1 damage to that player.
+
+ALTERNATE
+
+Name:Leeching Licid
+ManaCost:1 B
+Colors:black
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Curse
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of the upkeep of enchanted creature's controller, CARDNAME deals 1 damage to that player.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ EnchantedController | NumDmg$ 1
+A:AB$ SetState | Cost$ B | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/l/lightning_surge.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Sorcery
 Text:no text
 K:Flashback 5 R R
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SubAbility$ DBDamage | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
+A:SP$ DealDamage | Cost$ 3 R R | Tgt$ TgtCP | NumDmg$ 4 | SubAbility$ DBDamage | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | NoPrevention$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | SpellDescription$ Threshold - If seven or more cards are in your graveyard, instead CARDNAME deals 6 damage to that creature or player and the damage can't be prevented.
 SVar:X:Count$InYourYard
 SVar:Rarity:Rare

res/cardsfolder/m/ma_chao_western_warrior.txt

@@ -5,7 +5,7 @@ Text:no text
 PT:3/3
 K:Horsemanship
 T:Mode$ Attacks | ValidCard$ Card.Self | Alone$ True | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks alone, it's unblockable this combat.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Unblockable
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ HIDDEN Unblockable | UntilEndOfCombat$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ma_chao_western_warrior.jpg
 SetInfo:PTK|Rare|http://magiccards.info/scans/en/p3k/116.jpg

res/cardsfolder/m/maelstrom_pulse.txt

@@ -1,7 +1,10 @@
 Name:Maelstrom Pulse
 ManaCost:1 B G
 Types:Sorcery
-Text:Destroy target nonland permanent and all other permanents with the same name as that permanent.
+Text:no text
+A:SP$ Destroy | Cost$ 1 B G | ValidTgts$ Permanent.nonland | TgtPrompt$ Select target nonland permanent | RememberTargets$ True | SubAbility$ DestroyAll | SpellDescription$ Destroy target nonland permanent and all other permanents with the same name as that permanent.
+SVar:DestroyAll:DB$ DestroyAll | ValidCards$ Remembered.sameName | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/maelstrom_pulse.jpg
 SetInfo:ARB|Rare|http://magiccards.info/scans/en/arb/92.jpg

res/cardsfolder/m/magma_burst.txt

@@ -2,7 +2,7 @@ Name:Magma Burst
 ManaCost:3 R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If CARDNAME was kicked, it deals 3 damage to another target creature or player.
+A:SP$ DealDamage | Cost$ 3 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player. If CARDNAME was kicked, it deals 3 damage to another target creature or player.
 A:SP$ DealDamage | Cost$ 3 R Sac<2/Land> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target creature or player | NumDmg$ 3 | TargetUnique$ True | SubAbility$ DBKicker | CostDesc$ Kicker-Sacrifice two lands. | SpellDescription$ (You may sacrifice two lands in addition to any other costs as you cast this spell.)
 SVar:DBKicker:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select another target creature or player | NumDmg$ 3 | TargetUnique$ True
 SVar:Rarity:Common

res/cardsfolder/m/magmatic_force.txt

@@ -4,7 +4,7 @@ Types:Creature Elemental
 Text:no text
 PT:7/7
 T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each upkeep, CARDNAME deals 3 damage to target creature or player.
-SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player,Planeswalker.YouDontCtrl | TgtPrompt$ Select target creature or player | NumDmg$ 3
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magmatic_force.jpg
 SetInfo:COM|Rare|http://magiccards.info/scans/en/cmd/128.jpg

res/cardsfolder/m/mind_funeral.txt

@@ -1,7 +1,8 @@
 Name:Mind Funeral
 ManaCost:1 U B
 Types:Sorcery
-Text:Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard.
+Text:no text
+A:SP$ DigUntil | Cost$ 1 U B | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 4 | Valid$ Land | ValidDescription$ land | RevealedDestination$ Graveyard | SpellDescription$ Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_funeral.jpg
 SetInfo:ARB|Uncommon|http://magiccards.info/scans/en/arb/26.jpg

res/cardsfolder/m/miraris_wake.txt

@@ -3,7 +3,7 @@ ManaCost:3 G W
 Types:Enchantment
 Text:no text
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control get +1/+1.
-T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
+T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced.
 SVar:TrigMana:AB$ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/miraris_wake.jpg

res/cardsfolder/n/necra_sanctuary.txt

@@ -0,0 +1,17 @@
+Name:Necra Sanctuary
+ManaCost:2 B
+Types:Enchantment
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ1 | Execute$ TrigLoseLifeA | TriggerDescription$ At the beginning of your upkeep, if you control a green or white permanent, target player loses 1 life. If you control a green permanent and a white permanent, that player loses 3 life instead.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigLoseLifeB | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, if you control a green or white permanent, target player loses 1 life. If you control a green permanent and a white permanent, that player loses 3 life instead.
+SVar:TrigLoseLifeA:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player to lose life | LifeAmount$ 1
+SVar:TrigLoseLifeB:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player to lose life | LifeAmount$ 3
+SVar:Y:Count$Valid Permanent.Green+YouCtrl/LimitMax.1
+SVar:Z:Count$Valid Permanent.White+YouCtrl/LimitMax.1
+SVar:X:SVar$Y/Plus.Z
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/necra_sanctuary.jpg
+SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/45.jpg
+Oracle:At the beginning of your upkeep, if you control a green or white permanent, target player loses 1 life. If you control a green permanent and a white permanent, that player loses 3 life instead.
+End

res/cardsfolder/n/nirkana_revenant.txt

@@ -4,7 +4,7 @@ Types:Creature Vampire Shade
 Text:no text
 PT:4/4
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | TriggerDescription$ Whenever you tap a Swamp for mana, add B to your mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever you tap a Swamp for mana, add B to your mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ B | Amount$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Mythic

res/cardsfolder/n/nurturing_licid.txt

@@ -0,0 +1,30 @@
+Name:Nurturing Licid
+ManaCost:1 G
+Types:Creature Licid
+Text:no text
+PT:1/1
+A:AB$ SetState | Cost$ G T | Defined$ Self | NewState$ Alternate | SubAbility$ DBAttach | SpellDescription$ CARDNAME loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay G to end this effect.
+SVar:DBAttach:DB$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+#If the value of AlternateMode isn't Flip or DoubleFaced, it will be the name of the state defined below, so you can switch to it with SetState+NewState$.The name of the first state defined is always "Original".
+AlternateMode:Alternate
+
+#Shared
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nurturing_licid.jpg
+SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/136.jpg
+Oracle:{G}, {T}: Nurturing Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {G} to end this effect./n{G}: Regenerate enchanted creature.
+
+ALTERNATE
+
+Name:Nurturing Licid
+ManaCost:1 G
+Colors:green
+Types:Enchantment Aura
+Text:G: Regenerate enchanted creature.
+K:Enchant creature
+A:SP$ Attach | Cost$ 0 | ValidTgts$ Creature | AILogic$ Pump
+A:AB$ Regenerate | Cost$ G | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
+A:AB$ SetState | Cost$ G | Defined$ Self | NewState$ Original | SpellDescription$ End this effect.
+
+End

res/cardsfolder/o/orcish_cannonade.txt

@@ -2,7 +2,7 @@ Name:Orcish Cannonade
 ManaCost:1 R R
 Types:Instant
 Text:no text
-A:SP$ DealDamage | Cost$ 1 R R | Tgt$ CP | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you. Draw a card.
+A:SP$ DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you. Draw a card.
 SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DB2
 SVar:DB2:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True

res/cardsfolder/o/overgrowth.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds G G to his or her mana pool (in addition to the mana the land produces).
+T:Mode$ TapsForMana | ValidCard$ Card.AttachedBy | Execute$ TrigMana | Static$ True | TriggerDescription$ Whenever enchanted land is tapped for mana, its controller adds G G to his or her mana pool (in addition to the mana the land produces).
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ G | Amount$ 2 | Defined$ TriggeredCardController
 SVar:RemAIDeck:True
 SVar:Rarity:Common

res/cardsfolder/p/parallax_dementia.txt

@@ -6,9 +6,8 @@ K:Enchant creature
 K:Fading:1
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 2 | Description$ Enchanted creature gets +3/+2.
-# The trigger part of this will not work until an issue with Auras and LastKnownInfo is sorted out. TODO
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME leaves the battlefield, destroy enchanted creature. That creature can't be regenerated.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | Defined$ Enchanted | NoRegen$ True
+SVar:TrigDestroy:AB$DestroyAll | Cost$ 0 | ValidCards$ Triggered.EnchantedBy | NoRegen$ True
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/parallax_dementia.jpg

res/cardsfolder/p/psionic_entity.txt

@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Illusion
 Text:no text
 PT:2/2
-A:AB$ DealDamage | Cost$ T | Tgt$ CP | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to itself.
+A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to itself.
 SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Rare

res/cardsfolder/p/psionic_sliver.txt

@@ -4,7 +4,7 @@ Types:Creature Sliver
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ DamageOther | AddSVar$ DBDamageSelf | Description$ All Sliver creatues have "tap: This creature deals 2 damage to target creature or player and 3 damage to itself."
-SVar:DamageOther:AB$DealDamage | Cost$ T | Tgt$ CP | NumDmg$ 2 | SubAbility$ DBDamageSelf | SpellDescription$ This creature deals 2 damage to target creature or player and 3 damage to itself.
+SVar:DamageOther:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 2 | SubAbility$ DBDamageSelf | SpellDescription$ This creature deals 2 damage to target creature or player and 3 damage to itself.
 SVar:DBDamageSelf:DB$DealDamage | NumDmg$ 3 | Defined$ Self
 SVar:BuffedBy:Sliver
 SVar:Rarity:Rare

res/cardsfolder/p/puncture_blast.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Instant
 Text:no text
 K:Wither
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SpellDescription$ Puncture Blast deals 3 damage to target creature or player.
+A:SP$ DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ Puncture Blast deals 3 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/puncture_blast.jpg
 SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/60.jpg

res/cardsfolder/p/pyroblast.txt

@@ -0,0 +1,15 @@
+Name:Pyroblast
+ManaCost:R
+Types:Instant
+Text:no text
+A:SP$ Counter | Cost$ R | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | PrecostDesc$ Choose one -  | SpellDescription$ Counter target spell if it's blue;
+A:SP$ Destroy | Cost$ R | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | ConditionDefined$ Targeted | ConditionPresent$ Card.Blue | ConditionCompare$ GE1 | SpellDescription$  or destroy target permanent if it's blue.
+SVar:X:Targeted$Valid Card.Blue
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/pyroblast.jpg
+SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/262.jpg
+SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/213.jpg
+Oracle:Choose one - Counter target spell if it's blue; or destroy target permanent if it's blue.
+End