From 73e420626e5aceee80fe86c8eab578a3f9815b64 Mon Sep 17 00:00:00 2001
From: "solo81@web.de" <solo81@web.de@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 25 Sep 2010 21:59:48 +0000
Subject: [PATCH] Fixed several card bug reports from the forum.

---
 projects/mtg/bin/Res/sets/primitives/mtg.txt  |  77 ++-
 projects/mtg/bin/Res/test/_tests.txt          | 518 +-----------------
 .../mtg/bin/Res/test/alabaster_dragon.txt     |  17 +
 3 files changed, 56 insertions(+), 556 deletions(-)
 create mode 100644 projects/mtg/bin/Res/test/alabaster_dragon.txt

diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index f6af233d6..ea52d70a9 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -885,7 +885,7 @@ toughness=6
 [card]
 name=Alabaster Dragon
 auto=flying
-autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) && shuffle
+auto=@movedTo(graveyard) from(this|battlefield):moveto(mylibrary) all(trigger[from]) && shuffle controller
 text=Flying -- When Alabaster Dragon is put into a graveyard from the battlefield, shuffle Alabaster Dragon into its owner's library.
 mana={4}{W}{W}
 type=Creature
@@ -1559,7 +1559,7 @@ toughness=5
 [card]
 name=Angel of Fury
 abilities=flying
-autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) && shuffle
+auto=@movedTo(graveyard) from(this|battlefield):moveto(mylibrary) all(trigger[from]) && shuffle controller
 text=Flying -- When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library.
 mana={4}{W}{W}
 type=Creature
@@ -1866,7 +1866,7 @@ toughness=4
 [card]
 name=Aphetto Vulture
 abilities=flying
-autograveyard=@movedTo(this|graveyard) from(battlefield):may moveto(mylibrary) target(zombie other|mygraveyard)
+auto=@movedTo(graveyard) from(this|battlefield):may moveto(mylibrary) target(zombie other|mygraveyard)
 text=Flying -- When Aphetto Vulture is put into a graveyard from the battlefield, you may put target Zombie card from your graveyard on top of your library.
 mana={4}{B}{B}
 type=Creature
@@ -2779,7 +2779,7 @@ mana={1}
 [card]
 name=Aspect of Mongoose
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=shroud
 text=Enchant creature -- Enchanted creature has shroud. (It can't be the target of spells or abilities.) -- When Aspect of Mongoose is put into a graveyard from the battlefield, return Aspect of Mongoose to its owner's hand.
 mana={1}{G}
@@ -3146,10 +3146,6 @@ toughness=3
 [card]
 name=Avarice Totem
 auto={5}:moveto(mybattlefield) target(*[-land]|opponentbattlefield) && moveto(opponentbattlefield) all(this)
-# Note: The term all(this) is a workaround for a current parser
-# limitation. We cannot chain effects on a target card to effects
-# on "this" - if we do it, the the parser confuses and ignores
-# targets. But we CAN chain "target"ed effects to "all()" effects.
 text={5}: Exchange control of Avarice Totem and target nonland permanent.
 mana={1}
 type=Artifact
@@ -3157,7 +3153,7 @@ type=Artifact
 [card]
 name=Avenging Angel
 auto=flying
-auto=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(mylibrary) notatarget(avenging angel|mygraveyard) && shuffle
+auto=@movedTo(graveyard) from(this|battlefield):moveto(mylibrary) all(trigger[from])
 text=Flying -- When Avenging Angel is put into a graveyard from the battlefield, shuffle Avenging Angel into its owner's library.
 mana={3}{W}{W}
 type=Creature
@@ -6741,7 +6737,7 @@ toughness=3
 [card]
 name=Brilliant Halo
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=1/2
 text=Enchant creature -- Enchanted creature gets +1/+2. -- When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand.
 mana={1}{W}
@@ -8359,7 +8355,7 @@ toughness=3
 [card]
 name=Cessation
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=cantattack
 text=Enchant creature -- Enchanted creature can't attack. -- When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand.
 mana={2}{W}
@@ -12801,7 +12797,7 @@ type=Sorcery
 [card]
 name=Despondency
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=-2/0
 text=Enchant creature -- Enchanted creature gets -2/-0. -- When Despondency is put into a graveyard from the battlefield, return Despondency to its owner's hand.
 mana={1}{B}
@@ -15842,7 +15838,7 @@ toughness=5
 [/card]
 [card]
 name=Endless Cockroaches
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 text=When Endless Cockroaches is put into a graveyard from the battlefield, return Endless Cockroaches to its owner's hand.
 mana={1}{B}{B}
 type=Creature
@@ -16864,7 +16860,7 @@ toughness=3
 [card]
 name=Fallen Ideal
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=flying
 auto={S(creature|myBattlefield)}:2/1
 text=Enchant creature -- Enchanted creature has flying and "Sacrifice a creature: This creature gets +2/+1 until end of turn." -- When Fallen Ideal is put into a graveyard from the battlefield, return Fallen Ideal to its owner's hand.
@@ -17543,7 +17539,7 @@ toughness=2
 [card]
 name=Fiery Mantle
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto={R}:1/0
 text=Enchant creature -- {R}: Enchanted creature gets +1/+0 until end of turn. -- When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand.
 mana={1}{R}
@@ -18814,7 +18810,7 @@ type=Instant
 [card]
 name=Fortitude
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto={S(forest|myBattlefield)}:regenerate
 text=Enchant creature -- Sacrifice a Forest: Regenerate enchanted creature. -- When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand.
 mana={1}{G}
@@ -20346,6 +20342,7 @@ name=Glimmerpost
 auto=foreach(locus|myBattlefield) life:1 controller
 auto={T}:Add{1}
 type=Land
+subtype=Locus
 [/card]
 [card]
 name=Glimmervoid
@@ -20394,7 +20391,7 @@ toughness=2
 [card]
 name=Glint Hawk
 abilities=flying
-auto=aslongas(artifact|myBattlefield) moveTo(graveyard) notatarget(artifact|myBattlefield) oneshot
+auto=aslongas(artifact|myBattlefield) moveTo(ownerhand) notatarget(artifact|myBattlefield) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- When Glint Hawk enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand.
 mana={W}
@@ -21754,6 +21751,14 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Grasp of Darkness
+target=creature
+auto=-4/-4
+text=Target creature gets -4/-4 until end of turn.
+mana={B}{B}
+type=Instant
+[/card]
+[card]
 name=Grassland Crusader
 auto={T}:2/2 target(elf,soldier)
 text={T}: Target Elf or Soldier creature gets +2/+2 until end of turn.
@@ -22139,14 +22144,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Grip of Darkness
-target=creature
-auto=-4/-4
-text=Target creature gets -4/-4 until end of turn.
-mana={B}{B}
-type=Instant
-[/card]
-[card]
 name=Gristle Grinner
 auto=@movedto(creature|myGraveyard):2/2 ueot
 auto=@movedto(creature|opponentGraveyard):2/2 ueot
@@ -29053,7 +29050,7 @@ type=Instant
 [card]
 name=Launch
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=flying
 text=Enchant creature -- Enchanted creature has flying. -- When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand.
 mana={1}{U}
@@ -40553,7 +40550,7 @@ type=Sorcery
 [card]
 name=Rancor
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=2/0
 auto=trample
 text=Enchant creature -- Enchanted creature gets +2/+0 and has trample. -- When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
@@ -42008,8 +42005,8 @@ subtype=Arcane
 [card]
 name=Riddlesmith
 auto=@movedTo(artifact|mystack):may token(-5555556) && draw:1
-text=Whenever you cast an artifact spell, you may have target creature get +2/+0 and gain deathtouch until end of turn.
-mana={1}{B}
+text=Whenever you cast an artifact spell, you may draw a card. If you do, discard a card.
+mana={1}{U}
 type=Creature
 subtype=Human Artificer
 power=2
@@ -45944,7 +45941,7 @@ type=Land
 [card]
 name=Shivan Phoenix
 abilities=flying
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 text=Flying -- When Shivan Phoenix is put into a graveyard from the battlefield, return Shivan Phoenix to its owner's hand.
 mana={4}{R}{R}
 type=Creature
@@ -46856,7 +46853,7 @@ toughness=3
 name=Skinrender
 auto=counter(-1/-1,3) target(creature)
 text=When Skinrender enters the battlefield, put three -1/-1 counters on target creature
-mana={3}{B}{B}
+mana={2}{B}{B}
 type=Creature
 subtype=Zombie
 power=3
@@ -47512,7 +47509,7 @@ toughness=3
 [card]
 name=Sleeper's Guile
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=fear
 text=Enchant creature -- Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.) -- When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand.
 mana={2}{B}
@@ -47742,7 +47739,7 @@ toughness=2
 [card]
 name=Sluggishness
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=cantblock
 text=Enchant creature -- Enchanted creature can't block. -- When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand.
 mana={1}{R}
@@ -49617,7 +49614,7 @@ toughness=3
 name=Spreading Algae
 target=swamp
 auto=@tapped(mytgt):destroy
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 text=Enchant Swamp -- When enchanted land becomes tapped, destroy it. -- When Spreading Algae is put into a graveyard from the battlefield, return Spreading Algae to its owner's hand.
 mana={G}
 type=Enchantment
@@ -52023,7 +52020,7 @@ target=creature
 auto=1/0
 auto=infect
 text=Target creature gets +1/+0 and gains infect until end of turn. (This creature deals damage to creatures in form of -1/-1 counters and to players in form of poison counters.)
-mana={3}{B}
+mana={B}
 type=Instant
 [/card]
 [card]
@@ -55913,7 +55910,7 @@ type=Enchantment
 [/card]
 [card]
 name=Undying Beast
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary)
+auto=@movedTo(graveyard) from(this|battlefield):moveto(mylibrary) all(trigger[from])
 text=When Undying Beast is put into a graveyard from the battlefield, put Undying Beast on top of its owner's library.
 mana={3}{B}
 type=Creature
@@ -55924,7 +55921,7 @@ toughness=2
 [card]
 name=Undying Rage
 target=creature
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 auto=2/2
 auto=cantblock
 text=Enchant creature -- Enchanted creature gets +2/+2 and can't block. -- When Undying Rage is put into a graveyard from the battlefield, return Undying Rage to its owner's hand.
@@ -58052,7 +58049,7 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Volition Reigns
+name=Volition Reins
 target=*
 auto=untap
 alias=1194
@@ -59191,7 +59188,7 @@ toughness=1
 [card]
 name=Weatherseed Treefolk
 abilities=trample
-autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 text=Trample -- When Weatherseed Treefolk is put into a graveyard from the battlefield, return Weatherseed Treefolk to its owner's hand.
 mana={2}{G}{G}{G}
 type=Creature
@@ -61253,7 +61250,7 @@ toughness=2
 [/card]
 [card]
 name=Zodiac Dragon
-autograveyard=@movedTo(this|graveyard) from(battlefield):may moveTo(myhand)
+auto=@movedTo(graveyard) from(this|battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 text=When Zodiac Dragon is put into your graveyard from the battlefield, you may return it to your hand.
 mana={7}{R}{R}
 type=Creature
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 6c7e61a2a..b85a10ee4 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -1,516 +1,2 @@
-########################
-#Generic engine features
-########################
-generic/attacks_each_turn.txt
-generic/cycling.txt
-generic/cycling2.txt
-generic/deathtouch.txt
-generic/doesnotuntap.txt
-generic/doesnotuntap2.txt
-generic/double_strike.txt
-generic/equip_landfall_buff.txt
-generic/equip_reach.txt
-generic/equip_shroud.txt
-generic/equip_shroud2.txt
-generic/equip_wither.txt
-generic/equipment_i252.txt
-generic/exalted.txt
-generic/exalted_i143.txt
-generic/exalted_i310.txt
-generic/fear.txt
-generic/fear_i147.txt
-generic/first_and_double_strike1_i187.txt
-generic/first_and_double_strike2_i187.txt
-generic/first_strike.txt
-generic/first_strike2.txt
-generic/first_strike3.txt
-generic/hybrid_mana.txt
-generic/hybrid_mana_2.txt
-generic/hybrid_mana_3.txt
-generic/kicker.txt
-generic/kicker2.txt
-generic/landwalk.txt
-generic/legendary.txt
-generic/level_up.txt
-generic/level_up2.txt
-generic/lord_counter.txt
-generic/lord_counter_any.txt
-generic/lifelink.txt
-generic/m10_blockers.txt
-generic/m10_blockers2.txt
-generic/must1.txt
-generic/must2.txt
-generic/nofizzle.txt
-generic/oneblocker.txt
-generic/persist.txt
-generic/persist2.txt
-generic/persist3.txt
-generic/phases.txt
-generic/rampage.txt
-generic/rampage2.txt
-generic/rampage3.txt
-generic/rampage_vs_first_strike.txt
-generic/regenerate.txt
-generic/regenerate_wither_i146.txt
-generic/sacrifice.txt
-generic/summoning_sickness.txt
-generic/tap_other_card_as_cost.txt
-generic/targetController_life.txt
-generic/targetController_life2.txt
-generic/targetController_damage.txt
-generic/thisforeach.txt
-generic/tokens.txt
-generic/tokens2.txt
-generic/trample.txt
-generic/trample_vs_indestructible.txt
-generic/trample_vs_multiblock.txt
-generic/triggers_at_movedto_i179.txt
-generic/wither.txt
-########################
-#Specific Cards
-########################
-act_of_treason.txt
-aegis_of_the_meek.txt
-aether_mutation.txt
-aether_flash.txt
-afflict.txt
-akron_legionnaire.txt
-alabaster_leech.txt
-alabaster_leech2.txt
-alluring_siren.txt
-Amugaba.txt
-anarchy.txt
-ancestors_chosen.txt
-angry_mob1.txt
-angry_mob2.txt
-angry_mob3.txt
-angry_mob4.txt
-angry_mob4b.txt
-angry_mob5.txt
-angry_mob7.txt
-animate_artifact.txt
-animate_artifact2.txt
-animate_dead.txt
-animate_dead2.txt
-animate_dead3.txt
-animated_legendaries1_i221.txt
-animated_legendaries2_i221.txt
-animated_legendaries3_i221.txt
-ankh_of_mishra.txt
-arcanis_the_omnipotent.txt
-arcanis_the_omnipotent2.txt
-arcbound.txt
-ardakar_wastes.txt
-ardent_soldier.txt
-argothian_enchantress.txt
-armadillo_cloak.txt
-ascendant_evincar.txt
-ascendant_evincar2.txt
-ascendant_evincar3.txt
-ashen_firebeast.txt
-ashen_firebeast2.txt
-aura_mutation.txt
-avarice_totem.txt
-aven_riftwatcher.txt
-aven_riftwatcher2.txt
-aysen_bureaucrats.txt
-balduvian_conjurer.txt
-baneslayer_angel.txt
-baneslayer_angel2.txt
-barbed_sliver.txt
-basal_sliver.txt
-beacon_of_creation.txt
-beacon_of_destruction.txt
-beacon_of_unrest.txt
-behemoth_sledge.txt
-behemoth_sledge2.txt
-behemoth_sledge3.txt
-behemoth_sledge4.txt
-behemoth_sledge5.txt
-belligerent_hatchling.txt
-benalish_knight.txt
-biorhythm.txt
-black_market.txt
-black_vise.txt
-blessed_wind.txt
-blessed_wine.txt
-blinking_spirit.txt
-blinkmoth_nexus.txt
-bloated_toad1.txt
-bloated_toad2.txt
-bloodfire_colossus.txt
-bloodhall_ooze.txt
-bloodscale_prowler.txt
-body_double.txt
-boggart_arsonists.txt
-borderland_behemoth.txt
-bottle_gnomes.txt
-bottle_gnomes2.txt
-brainstorm.txt
-bramblewood_paragon.txt
-brass_man.txt
-brass_man_i161.txt
-briarhorn.txt
-cage_of_hands.txt
-Call_to_Heel_1.txt
-Call_to_Heel_2.txt
-castle.txt
-cathodion.txt
-celestial_purge.txt
-chainbreaker.txt
-circle_of_protection.txt
-circle_of_protection_i211.txt
-civic_wayfinder.txt
-clone.txt
-clone2.txt
-clone3.txt
-cockatrice.txt
-cockatrice_i228.txt
-colossus_of_sardia1.txt
-colossus_of_sardia2.txt
-composite_golem.txt
-conservator.txt
-control_magic.txt
-control_magic2.txt
-control_magic3.txt
-control_magic4.txt
-corrupt.txt
-counsel_of_the_soratami.txt
-counterspell.txt
-counterspell2.txt
-counterspell3.txt
-counterspell4.txt
-cranial_plating.txt
-creature_bond.txt
-curiosity1_i217.txt
-curiosity2_i217.txt
-crimson_kobolds.txt
-crosis_s_catacombs_1.txt
-crosis_s_catacombs_2.txt
-crumble.txt
-crystal_rod_i172.txt
-dark_banishing.txt
-dauntless_escort.txt
-dauthi_embrace.txt
-death_grasp.txt
-death_ward.txt
-decree_of_justice.txt
-deja_vu.txt
-delusions_of_mediocrity.txt
-dematerialize_flashback.txt
-dingus_egg.txt
-dingus_staff_i153.txt
-divergent_growth.txt
-doomed_necromancer.txt
-double_strike_i145.txt
-double_strike2_i145.txt
-dragon_fodder.txt
-dragon_fodder2.txt
-dragon_whelp_i154.txt
-drain_life.txt
-dream_fracture_i142.txt
-drift_of_the_dead.txt
-dromad_purebred.txt
-dross_harvester.txt
-duskwalker.txt
-dust_corona.txt
-dwarven_warriors.txt
-ebony_horse.txt
-ekundu_cyclops1_i218.txt
-ekundu_cyclops2_i218.txt
-elvish_piper.txt
-elvish_promenade.txt
-emblem_of_the_warmind.txt
-enchanted evening.txt
-enervate.txt
-enchantress_s_presence.txt
-erg_raiders_i157.txt
-explore.txt
-fangren_pathcutter.txt
-farhaven_elf.txt
-farmstead.txt
-fastbond.txt
-fastbond2.txt
-fault_line.txt
-feral_hydra.txt
-fieldmist_borderpost.txt
-fire_tempest.txt
-firebreathing.txt
-fists_of_ironwood.txt
-flagstones.txt
-flame_fusillade_i265.txt
-flare.txt
-fledgling_imp.txt
-fledgling_imp2.txt
-fleshformer.txt
-flowstone_hellion.txt
-flowstone_slide.txt
-fog.txt
-fog_bank.txt
-foratog.txt
-force_of_nature.txt
-force_of_nature2.txt
-force_of_nature3.txt
-fountain_of_youth.txt
-frogmite.txt
-fungus_sliver.txt
-gamble.txt
-gelatinous_generation.txt
-gempalm_avenger.txt
-ghost_warden.txt
-glen_elendra_archmage_i222.txt
-giant_growth.txt
-giant_growth2.txt
-Glimmervoid.txt
-glimpse_the_unthinkable.txt
-gnarled_effigy.txt
-gnat_alley_creeper1.txt
-gnat_alley_creeper2.txt
-goblin_balloon_brigade.txt
-goblin_balloon_brigade2.txt
-goblin_gardener.txt
-goblin_king.txt
-goblin_lackey1.txt
-goblin_lackey2.txt
-goblin_lackey3.txt
-goblin_lackey4.txt
-goblin_offensive.txt
-goblin_razerunners.txt
-golgari_germination_i153.txt
-gravedigger.txt
-gravity_well.txt
-gravity_well2.txt
-great_defender.txt
-hannas_custody.txt
-harpoon_sniper.txt
-hellfire.txt
-helm_of_kaldra1.txt
-holy_day_i226.txt
-hope_charm_i267.txt
-hopping_automaton_i232.txt
-horned_helm.txt
-howl_from_beyond.txt
-howl_of_the_night_pack.txt
-hunting_pack.txt
-hurricane.txt
-hyalopterous_lemure.txt
-hymn_of_rebirth.txt
-hypnotic_specter.txt
-icatian_priest.txt
-imaginary_pet.txt
-immaculate_magistrate.txt
-incinerate.txt
-instill_energy_i166.txt
-iron_will_i270.txt
-ivy_elemental.txt
-jodahs_avenger.txt
-juggernaut.txt
-jump.txt
-juniper_order_ranger.txt
-karns_touch_i233.txt
-keldon_warlord.txt
-keldon_warlord2.txt
-kird_ape.txt
-kjeldoran_frostbeast1.txt
-kjeldoran_frostbeast2_i167.txt
-knight_captain_of_eos_i294.txt
-knight_captain_of_eos_i294_2.txt
-kormus_bell_i301.txt
-krosan_beast.txt
-krosan_beast2.txt
-kraken_eye.txt
-kraken_eye2.txt
-kraken_eye3.txt
-kraken_eye4.txt
-kudzu.txt
-kudzu2.txt
-kudzu_i168.txt
-leveler.txt
-lhurgoyf.txt
-liability.txt
-lifeforce.txt
-lifetap.txt
-lightmine_field1.txt
-lightmine_field2.txt
-living_artifact_i169.txt
-living_lands.txt
-lord_of_the_pit.txt
-lord_of_the_pit2.txt
-martial_coup.txt
-martial_coup2.txt
-master_decoy.txt
-master_of_etherium.txt
-masticore.txt
-masticore2.txt
-maze_of_ith.txt
-meekstone.txt
-memnarch.txt
-memory_erosion.txt
-millstone.txt
-mirri_the_cursed.txt
-mirri_the_cursed2_i284.txt
-misc01.txt
-moat.txt
-mobile_fort.txt
-mortuary.txt
-nantuko_husk.txt
-natural_order.txt
-necrogenesis.txt
-Nevinyrrals_Disk.txt
-Nevinyrrals_Disk2.txt
-nightmare.txt
-northern_paladin.txt
-northern_paladin2.txt
-Nyxathid.txt
-ondu_cleric.txt
-OneDozenEyes.txt
-orcish_artillery.txt
-orcish_lumberjack.txt
-overrun.txt
-paralysis.txt
-paralysis2.txt
-persuasion.txt
-phytohydra.txt
-plague_rats.txt
-plumes_of_peace_i260.txt
-pouncing_jaguar_i425.txt
-promise_of_bunrei_i305.txt
-prosperity.txt
-protomatter_powder.txt
-prowess_of_the_fair.txt
-prowess_of_the_fair2.txt
-prowess_of_the_fair3.txt
-pygmy_troll.txt
-pyknite_i426.txt
-pyroclasm.txt
-quilled_sliver.txt
-rain_of_filth_i206.txt
-rain_of_filth_i283.txt
-rakdos_pit_dragon_WITH_hellbent.txt
-rakdos_pit_dragon_WITHOUT_hellbent.txt
-rampant_growth.txt
-rancor.txt
-ray_of_command.txt
-ray_of_command_i176.txt
-reclusive_wight.txt
-reclusive_wight2.txt
-recover.txt
-regal_force.txt
-resounding_roar.txt
-resurrection.txt
-resuscitate_i210.txt
-righteous_cause.txt
-river_kelpie2_i335.txt
-rockslide_elemental.txt
-rootwalla.txt
-royal_assassin.txt
-sacred_foundry_i275.txt
-safehold_duo.txt
-safe_passage.txt
-samite_healer.txt
-scourge_of_kher_ridges.txt
-scourge_of_kher_ridges2.txt
-scourglass.txt
-scouts_warning.txt
-scute_mob.txt
-sedge_sliver.txt
-seedcradle_witch.txt
-seismic_assault.txt
-seismic_spike_i191.txt
-selesnya_guildmage.txt
-shard_volley.txt
-silver_seraph_i300.txt
-skullcage0_i239.txt
-skullcage1_i239.txt
-skullcage2_i239.txt
-skullcage3_i239.txt
-skullcage4_i239.txt
-skullcage5_i239.txt
-skullcage6_i239.txt
-skullcage7_i239.txt
-skullclamp.txt
-skullclamp2_i439.txt
-shepherd_of_rot.txt
-shivan_hellkite.txt
-shock.txt
-shock2.txt
-siege_gang_commander.txt
-simic_initiate.txt
-slate_of_ancestry.txt
-sleeper_agent.txt
-slith_bloodletter.txt
-sneak_attack.txt
-soulblast.txt
-spark_elemental.txt
-sphinx_summoner.txt
-spirit_link.txt
-spitting_earth.txt
-spoils_of_evil.txt
-spore_frog.txt
-stasis.txt
-steelclad_serpent1.txt
-steelclad_serpent2.txt
-stillmoon_cavalier.txt
-stonebrow2.txt
-stonebrow_i159.txt
-stronghold_discipline.txt
-sword_to_plowshares.txt
-sylvan_scrying_i195.txt
-symbiotic_wurm.txt
-tangle_golem.txt
-tanglesap.txt
-telekinetic_sliver.txt
-terror.txt
-terror2.txt
-thallid.txt
-thellon_of_havenwood.txt
-threaten.txt
-throne_of_bone.txt
-thunder-thrash_elder.txt
-titanic_ultimatum.txt
-tolsimir_wolfblood.txt
-torture.txt
-tranquil_domain.txt
-twinstrike.txt
-twinstrike2.txt
-twinstrike3.txt
-twitch.txt
-underworld_dreams.txt
-unearth1.txt
-unearth2.txt
-unearth3.txt
-unstable_mutation.txt
-unstable_mutation2.txt
-unwilling_recruit.txt
-urzas_lands.txt
-urzas_lands2.txt
-urzas_mine_i287.txt
-vampire_bats.txt
-vampiric_link.txt
-vine_dryad.txt
-volcanic_eruption.txt
-walking_wall.txt
-wall_of_diffusion.txt
-wall_of_diffusion2.txt
-warren_instigator.txt
-welkin_hawk.txt
-whispers_of_the_muse.txt
-white_knight1.txt
-windswept_heath.txt
-wrath_of_god.txt
-wrath_of_god2.txt
-wreak_havoc.txt
-Zombie_Infestation.txt
-zombie_master.txt
-zombify.txt
-########################
-#Momir Tests
-########################
-momir/keldon_warlord.txt
-momir/persist_i304.txt
-momir/overcost.txt
-########################
-#AI Tests
-########################
-#Removed until we can have these tests work on all machines :(
-#ai/goblin_artillery.txt
+alabaster_dragon.txt
+rancor1.txt
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/alabaster_dragon.txt b/projects/mtg/bin/Res/test/alabaster_dragon.txt
new file mode 100644
index 000000000..69d2de6d7
--- /dev/null
+++ b/projects/mtg/bin/Res/test/alabaster_dragon.txt
@@ -0,0 +1,17 @@
+[init]
+firstmain
+[player1]
+inplay:Alabaster Dragon
+hand:Terror
+manapool:{1}{B}
+[player2]
+[do]
+Terror
+Alabaster Dragon
+[assert]
+firstmain
+[player1]
+graveyard:Terror
+library:Alabaster Dragon
+[player2]
+[end]
\ No newline at end of file