From fe83b6b4e897d7ed63ad96c47706a607fe4740cc Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew"
 <wagic.the.homebrew@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 12 Nov 2011 12:48:00 +0000
Subject: [PATCH] - moved test for i718 - Added macros for Basic landcycling
 and cycling

---
 .../mtg/bin/Res/sets/primitives/_macros.txt   |  12 ++
 projects/mtg/bin/Res/sets/primitives/mtg.txt  | 200 +++++++++---------
 projects/mtg/bin/Res/test/_tests.txt          |   1 +
 .../test/{bugs => }/vesuva_landlimit_i718.txt |   0
 4 files changed, 113 insertions(+), 100 deletions(-)
 create mode 100644 projects/mtg/bin/Res/sets/primitives/_macros.txt
 rename projects/mtg/bin/Res/test/{bugs => }/vesuva_landlimit_i718.txt (100%)

diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
new file mode 100644
index 000000000..f6b9701b9
--- /dev/null
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -0,0 +1,12 @@
+# Important note:
+# Macros are *global*, it doesn't matter where they are defined
+# Macro names are case insensitive, and the replacement algorithm does an exact match inside a string
+# it means that if you have a macro named MACRO and a macro named MACRO2, you'll run into trouble because MACRO2 will match MACRO
+# Because of that, you need to use a unique delimiter at the beginning and the end of a macro, I personally use "__"
+
+# Standard Cycling
+#AUTO_DEFINE __CYCLING__($cost) $cost{cycle}:name(cycling) draw:1
+
+# Basic Landcycling
+#AUTO_DEFINE __BASIC_LANDCYCLING__($cost) $cost{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 75e6d97cf..bf8a9e783 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -320,7 +320,7 @@ name=Absorb Vis
 target=player
 auto=life:-4
 auto=life:4 controller
-autohand={1}{B}{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+autohand=__BASIC_LANDCYCLING__({1}{B})
 text=Target player loses 4 life and you gain 4 life. -- Basic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={6}{B}
 type=Sorcery
@@ -1070,7 +1070,7 @@ auto=choice name(protection from blue) lord(creature|myBattlefield) protection f
 auto=choice name(protection from black) lord(creature|myBattlefield) protection from black
 auto=choice name(protection from red) lord(creature|myBattlefield) protection from red
 auto=choice name(protection from green) lord(creature|myBattlefield) protection from green
-autohand={W}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({W})
 text=Creatures you control gain protection from the color of your choice until end of turn. -- Cycling {W} ({W}, Discard this card: Draw a card.)
 mana={2}{W}
 type=Instant
@@ -1101,7 +1101,7 @@ type=Legendary Artifact
 [card]
 name=Akroma's Vengeance
 auto=destroy all(artifact,creature,enchantment)
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=Destroy all artifacts, creatures, and enchantments. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={4}{W}{W}
 type=Sorcery
@@ -2276,7 +2276,7 @@ toughness=4
 [card]
 name=Angelsong
 auto=preventAllcombatDamage ueot
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Prevent all combat damage that would be dealt this turn. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Instant
@@ -3942,7 +3942,7 @@ type=Instant
 name=Aura Extraction
 target=enchantment
 auto=moveTo(ownerlibrary)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Put target enchantment on top of its owner's library. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Instant
@@ -5154,7 +5154,7 @@ type=Land
 [card]
 name=Bant Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may token(Soldier,Creature Soldier,1/1,white)
-autohand={2}{W}{cycle}:name(cycle) draw:1
+autohand=__CYCLING__({2}{W})
 autohand={2}{W}:name(cycle + effect) token(Soldier,Creature Soldier,1/1,white) && draw:1 controller
 text=When you cycle Bant Sojourners or it's put into a graveyard from the battlefield, you may put a 1/1 white Soldier creature token onto the battlefield. -- Cycling {2}{W} ({2}{W}, Discard this card: Draw a card.)
 mana={1}{G}{W}{U}
@@ -5351,7 +5351,7 @@ toughness=3
 [/card]
 [card]
 name=Barkhide Mauler
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={4}{G}
 type=Creature
@@ -5428,7 +5428,7 @@ type=Instant
 name=Barren Moor
 auto=tap
 auto={T}:Add {B}
-autohand={B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({B})
 text=Barren Moor enters the battlefield tapped. -- {T}: Add {B} to your mana pool. -- Cycling {B} ({B}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -6763,7 +6763,7 @@ type=Enchantment
 [card]
 name=Blasted Landscape
 auto={T}:Add {1}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text={T}: Add {1} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -7233,7 +7233,7 @@ toughness=5
 [card]
 name=Bloated Toad
 abilities=protection from blue
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Protection from blue -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{G}
 type=Creature
@@ -8886,7 +8886,7 @@ type=Instant
 name=Break Asunder
 target=artifact,enchantment
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target artifact or enchantment. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{G}{G}
 type=Sorcery
@@ -11868,7 +11868,7 @@ type=Sorcery
 name=Choking Tethers
 target=<upto:4>creature
 auto=tap
-autohand={1}{U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{U})
 autohand={1}{U}{cycle}:name(cycling + effect) tap target(creature) && draw:1 controller
 text=Tap up to four target creatures. -- Cycling {1}{U} ({1}{U}, Discard this card: Draw a card.) -- When you cycle Choking Tethers, you may tap target creature.
 mana={3}{U}
@@ -12291,7 +12291,7 @@ subtype=Aura
 name=Claws of Wirewood
 auto=damage:3 all(creature[flying])
 auto=damage:3 all(player)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Claws of Wirewood deals 3 damage to each creature with flying and each player. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{G}
 type=Sorcery
@@ -12333,7 +12333,7 @@ type=Instant
 name=Clear
 target=enchantment
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target enchantment. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Instant
@@ -12673,7 +12673,7 @@ toughness=3
 [card]
 name=Cloud of Faeries
 abilities=flying
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 auto=untap target(<upto:2>land)
 text=Flying -- When Cloud of Faeries enters the battlefield, untap up to two lands. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{U}
@@ -13396,7 +13396,7 @@ type=Instant
 name=Constricting Tendrils
 target=creature
 auto=-3/-0
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Target creature gets -3/-0 until end of turn. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={U}
 type=Instant
@@ -15849,7 +15849,7 @@ toughness=2
 [card]
 name=Darkwatch Elves
 abilities=protection from black
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Protection from black -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{G}
 type=Creature
@@ -16288,7 +16288,7 @@ type=Sorcery
 [card]
 name=Deadshot Minotaur
 auto=damage:3 target(creature[flying])
-autohand={RG}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({RG})
 text=When Deadshot Minotaur enters the battlefield, it deals 3 damage to target creature with flying. -- Cycling {(r/g)} ({(r/g)}, Discard this card: Draw a card.)
 mana={3}{R}{G}
 type=Creature
@@ -16476,7 +16476,7 @@ type=Enchantment
 name=Death Pulse
 target=creature
 auto=-4/-4
-autohand={1}{B}{B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{B}{B})
 autohand={1}{B}{B}{cycle}:name(cycling + effect) -1/-1 target(creature) && draw:1 controller
 text=Target creature gets -4/-4 until end of turn. -- Cycling {1}{B}{B} ({1}{B}{B}, Discard this card: Draw a card.) -- When you cycle Death Pulse, you may have target creature get -1/-1 until end of turn.
 mana={2}{B}{B}
@@ -16735,7 +16735,7 @@ type=Sorcery
 [card]
 name=Decree of Justice
 auto=token(-4514111)*XX
-autohand={2}{W}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{W})
 autohand={X}{2}{W}:name(cycle + effect) token(-4514112)*X && draw:1 controller
 text=Put X 4/4 white Angel creature tokens with flying onto the battlefield. -- Cycling {2}{W} ({2}{W}, Discard this card: Draw a card.) -- When you cycle Decree of Justice, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield.
 mana={X}{X}{2}{W}{W}
@@ -16762,7 +16762,7 @@ color=white
 [card]
 name=Decree of Savagery
 auto=lord(creature|myBattlefield) counter(1/1,4)
-autohand={4}{G}{G}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({4}{G}{G})
 autohand={4}{G}{G}{cycle}:name(cycling + four counters) counter(1/1,4) target(creature) && draw:1 controller
 text=Put four +1/+1 counters on each creature you control. -- Cycling {4}{G}{G} ({4}{G}{G}, Discard this card: Draw a card.) -- When you cycle Decree of Savagery, you may put four +1/+1 counters on target creature.
 mana={7}{G}{G}
@@ -17818,7 +17818,7 @@ toughness=2
 [card]
 name=Dirge of Dread
 auto=lord(creature) fear
-autohand={1}{B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{B})
 autohand={1}{B}:name(cycling + effect) fear target(creature) && draw:1 controller
 text=All creatures gain fear until end of turn. (They can't be blocked except by artifact creatures and/or black creatures.) -- Cycling {1}{B} ({1}{B}, Discard this card: Draw a card.) -- When you cycle Dirge of Dread, you may have target creature gain fear until end of turn.
 mana={2}{B}
@@ -17869,7 +17869,7 @@ subtype=Aura
 [card]
 name=Disciple of Grace
 auto=protection from black
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Protection from black -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Creature
@@ -17890,7 +17890,7 @@ toughness=2
 [card]
 name=Disciple of Law
 auto=protection from red
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Protection from red -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Creature
@@ -17901,7 +17901,7 @@ toughness=2
 [card]
 name=Disciple of Malice
 auto=protection from white
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Protection from white -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{B}
 type=Creature
@@ -18764,7 +18764,7 @@ name=Dragon Wings
 target=creature
 auto=flying
 auto=1/0
-autohand={1}{U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{U})
 autograveyard=@movedto(creature[manacost >=6]|mybattlefield):may all(trigger[to]) retarget
 text=Enchant creature -- Enchanted creature has flying. -- Cycling {1}{U} ({1}{U}, Discard this card: Draw a card.) -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Wings from your graveyard to the battlefield attached to that creature.
 mana={1}{U}
@@ -19269,7 +19269,7 @@ toughness=1
 name=Drifting Djinn
 abilities=flying
 auto=upcost[{1}{U}] sacrifice
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Flying -- At the beginning of your upkeep, sacrifice Drifting Djinn unless you pay {1}{U}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={4}{U}{U}
 type=Creature
@@ -19281,7 +19281,7 @@ toughness=5
 name=Drifting Meadow
 auto=tap
 auto={T}:Add {W}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Drifting Meadow enters the battlefield tapped. -- {T}: Add {W} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -22133,7 +22133,7 @@ subtype=Aura
 name=Essence Fracture
 target=<2>creature
 auto=moveTo(ownerhand)
-autohand={2}{U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{U})
 text=Return two target creatures to their owners' hands. -- Cycling {2}{U} ({2}{U}, Discard this card: Draw a card.)
 mana={3}{U}{U}
 type=Sorcery
@@ -22681,7 +22681,7 @@ type=Sorcery
 name=Expunge
 target=creature[-black;-artifact]
 auto=bury
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target nonartifact, nonblack creature. It can't be regenerated. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{B}
 type=Instant
@@ -22928,7 +22928,7 @@ toughness=1
 name=Fade from Memory
 target=*|graveyard
 auto=moveTo(exile)
-autohand={B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({B})
 text=Exile target card from a graveyard. -- Cycling {B} ({B}, Discard this card: Draw a card.)
 mana={B}
 type=Instant
@@ -23643,7 +23643,7 @@ toughness=5
 name=Fend Off
 target=creature
 auto=0/0 && fog from(mytgt) oneshot
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Prevent all combat damage that would be dealt by target creature this turn. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Instant
@@ -23984,7 +23984,7 @@ type=Instant
 name=Fiery Fall
 target=creature
 auto=damage:5
-autohand={1}{R}{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+autohand=__BASIC_LANDCYCLING__({1}{R})
 text=Fiery Fall deals 5 damage to target creature. -- Basic landcycling {1}{R} ({1}{R}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={5}{R}
 type=Instant
@@ -24571,7 +24571,7 @@ type=Instant
 name=Flame Jet
 target=player
 auto=damage:3
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Flame Jet deals 3 damage to target player. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{R}
 type=Sorcery
@@ -25778,7 +25778,7 @@ toughness=3
 name=Forgotten Cave
 auto=tap
 auto={T}:Add {R}
-autohand={R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({R})
 text=Forgotten Cave enters the battlefield tapped. -- {T}: Add {R} to your mana pool. -- Cycling {R} ({R}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -26995,7 +26995,7 @@ toughness=5
 [/card]
 [card]
 name=Gempalm Incinerator
-autohand={1}{R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{R})
 autohand={1}{R}{cycle}:name(cycling + effect) damage:type:goblin:mybattlefield target(creature) && draw:1 controller
 text=Cycling {1}{R} ({1}{R}, Discard this card: Draw a card.) -- When you cycle Gempalm Incinerator, you may have it deal X damage to target creature, where X is the number of Goblins on the battlefield.
 mana={2}{R}
@@ -27006,7 +27006,7 @@ toughness=1
 [/card]
 [card]
 name=Gempalm Polluter
-autohand={1}{B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{B})
 autohand={1}{B}{cycle}:name(cycling + effect) foreach(zombie|battlefield) life:-1 target(player) && draw:1 controller
 text=Cycling {B}{B} ({B}{B}, Discard this card: Draw a card.) -- When you cycle Gempalm Polluter, you may have target player lose 1 life for each Zombie on the battlefield.
 mana={5}{B}
@@ -27955,7 +27955,7 @@ toughness=2
 name=Glassdust Hulk
 auto=@movedTo(other artifact|myBattlefield):1/1 ueot
 auto=@movedTo(other artifact|myBattlefield):unblockable ueot
-autohand={WU}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({WU})
 text=Whenever another artifact enters the battlefield under your control, Glassdust Hulk gets +1/+1 until end of turn and is unblockable this turn. -- Cycling {(w/u)} ({(w/u)}, Discard this card: Draw a card.)
 mana={3}{W}{U}
 type=Artifact Creature
@@ -27985,7 +27985,7 @@ toughness=1
 name=Gleam of Resistance
 auto=all(creature|myBattlefield) 1/2
 auto=untap all(creature|myBattlefield)
-autohand={1}{W}{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+autohand=__BASIC_LANDCYCLING__({1}{W})
 text=Creatures you control get +1/+2 until end of turn. Untap those creatures. -- Basic landcycling {1}{W} ({1}{W}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={4}{W}
 type=Instant
@@ -30506,7 +30506,7 @@ toughness=4
 [card]
 name=Grixis Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may moveTo(exile) target(*|graveyard)
-autohand={2}{B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{B})
 autohand={2}{B}{cycle}:name(cycling + effect) moveTo(exile) target(*|graveyard) && draw:1 controller
 text=When you cycle Grixis Sojourners or it's put into a graveyard from the battlefield, you may exile target card from a graveyard. -- Cycling {2}{B} ({2}{B}, Discard this card: Draw a card.)
 mana={1}{U}{B}{R}
@@ -33543,7 +33543,7 @@ toughness=3
 [/card]
 [card]
 name=Hundroog
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={6}{G}
 type=Creature
@@ -33774,7 +33774,7 @@ type=Sorcery
 [card]
 name=Hush
 auto=destroy all(enchantment)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy all enchantments. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{G}
 type=Sorcery
@@ -34379,7 +34379,7 @@ type=Sorcery
 name=Improvised Armor
 target=creature
 auto=2/5
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=Enchant creature -- Enchanted creature gets +2/+5. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={3}{W}
 type=Enchantment
@@ -35360,7 +35360,7 @@ toughness=3
 name=Iron Will
 target=creature
 auto=0/4
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Target creature gets +0/+4 until end of turn. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={W}
 type=Instant
@@ -36382,7 +36382,7 @@ type=Land
 [card]
 name=Jund Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may damage:1 target(creature,player)
-autohand={2}{R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{R})
 autohand={2}{R}{cycle}:name(cycling + effect) damage:1 target(creature,player) && draw:1 controller
 text=When you cycle Jund Sojourners or it's put into a graveyard from the battlefield, you may have it deal 1 damage to target creature or player. -- Cycling {2}{R} ({2}{R}, Discard this card: Draw a card.)
 mana={B}{R}{G}
@@ -36454,7 +36454,7 @@ toughness=1
 [card]
 name=Jungle Weaver
 abilities=reach
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Reach (This can block creatures with flying.) -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={5}{G}{G}
 type=Creature
@@ -37417,7 +37417,7 @@ toughness=2
 [card]
 name=Keeneye Aven
 abilities=flying
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Flying -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{U}
 type=Creature
@@ -39032,7 +39032,7 @@ toughness=2
 [/card]
 [card]
 name=Krosan Tusker
-autohand={2}{G}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{G})
 autohand={2}{G}{cycle}:name(cycling + effect) moveTo(myhand) target(land[basic]|myLibrary) && draw:1 controller
 text=Cycling {2}{G} ({2}{G}, Discard this card: Draw a card.) -- When you cycle Krosan Tusker, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle your library.
 mana={5}{G}{G}
@@ -39867,7 +39867,7 @@ type=Instant
 name=Lay Waste
 target=land
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target land. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{R}
 type=Sorcery
@@ -40787,7 +40787,7 @@ target=land
 auto=loseabilities
 auto=losesubtypesof(land)
 auto=transforms((island))
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Enchant land -- Enchanted land is an Island. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{U}
 type=Enchantment
@@ -41196,7 +41196,7 @@ toughness=2
 name=Lonely Sandbar
 auto=tap
 auto={T}:Add {U}
-autohand={U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({U})
 text=Lonely Sandbar enters the battlefield tapped. -- {T}: Add {U} to your mana pool. -- Cycling {U} ({U}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -41711,7 +41711,7 @@ toughness=3
 [card]
 name=Lull
 auto=preventAllcombatDamage ueot
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Prevent all combat damage that would be dealt this turn. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{G}
 type=Instant
@@ -41990,7 +41990,7 @@ type=Sorcery
 [card]
 name=Macetail Hystrodon
 abilities=haste, first strike
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=First strike, haste -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={6}{R}
 type=Creature
@@ -42083,7 +42083,7 @@ subtype=Equipment
 name=Mage's Guile
 target=creature
 auto=shroud
-autohand={U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({U})
 text=Target creature gains shroud until end of turn. (It can't be the target of spells or abilities.) -- Cycling {U} ({U}, Discard this card: Draw a card.)
 mana={1}{U}
 type=Instant
@@ -43209,7 +43209,7 @@ type=Enchantment
 name=Marshaling Cry
 auto=lord(creature|myBattlefield) 1/1
 auto=lord(creature|myBattlefield) vigilance
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 flashback={3}{W}
 text=Creatures you control get +1/+1 and gain vigilance until end of turn. -- Cycling {2} ({2}, Discard this card: Draw a card.) -- Flashback {3}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={1}{W}{W}
@@ -45386,7 +45386,7 @@ toughness=*
 name=Molten Frame
 target=creature[artifact]
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target artifact creature. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{R}
 type=Instant
@@ -45559,7 +45559,7 @@ type=Sorcery
 [card]
 name=Monstrous Carabid
 abilities=mustattack
-autohand={BR}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({BR})
 text=Monstrous Carabid attacks each turn if able. -- Cycling {(b/r)} ({(b/r)}, Discard this card: Draw a card.)
 mana={3}{B}{R}
 type=Creature
@@ -47325,7 +47325,7 @@ type=Land
 [card]
 name=Naya Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may counter(1/1,1) target(creature)
-autohand={2}{G}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{G})
 autohand={2}{G}{cycle}:name(cycling + effect) counter(1/1,1) target(creature) && draw:1 controller
 text=When you cycle Naya Sojourners or it's put into a graveyard from the battlefield, you may put a +1/+1 counter on target creature. -- Cycling {2}{G} ({2}{G}, Discard this card: Draw a card.)
 mana={2}{R}{G}{W}
@@ -51097,7 +51097,7 @@ toughness=1
 [card]
 name=Pendrell Drake
 auto=flying
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Flying -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{U}
 type=Creature
@@ -52979,7 +52979,7 @@ type=Land
 name=Polluted Mire
 auto=tap
 auto={T}:Add {B}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Polluted Mire enters the battlefield tapped. -- {T}: Add {B} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -53178,7 +53178,7 @@ subtype=Aura
 [card]
 name=Power Taint
 auto=teach(creature) upcost[{2}] life:-2 controller
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Enchant enchantment -- At the beginning of the upkeep of enchanted enchantment's controller, that player loses 2 life unless he or she pays {2}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{U}
 type=Enchantment
@@ -53410,7 +53410,7 @@ type=Instant
 name=Primal Boost
 target=creature
 auto=4/4
-autohand={2}{G}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{G})
 autohand={2}{G}{cycle}:name(cycling + effect) 1/1 target(creature) && draw:1 controller
 text=Target creature gets +4/+4 until end of turn. -- Cycling {2}{G} ({2}{G}, Discard this card: Draw a card.) -- When you cycle Primal Boost, you may have target creature get +1/+1 until end of turn.
 mana={2}{G}
@@ -53539,7 +53539,7 @@ toughness=6
 [card]
 name=Primoc Escapee
 abilities=flying
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Flying -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={6}{U}
 type=Creature
@@ -54860,7 +54860,7 @@ toughness=5
 name=Radiant's Judgment
 target=creature[power>=4]
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target creature with power 4 or greater. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{W}
 type=Instant
@@ -55538,7 +55538,7 @@ toughness=4
 name=Rapid Decay
 target=<upto:3>*|graveyard
 auto=moveTo(exile)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Exile up to three target cards from a single graveyard. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{B}
 type=Instant
@@ -56161,7 +56161,7 @@ type=Sorcery
 [card]
 name=Rebuild
 auto=moveTo(ownerhand) all(artifact)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Return all artifacts to their owners' hands. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{U}
 type=Instant
@@ -56597,7 +56597,7 @@ toughness=6
 [card]
 name=Rejuvenate
 auto=life:6
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=You gain 6 life. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={3}{G}
 type=Sorcery
@@ -56728,7 +56728,7 @@ type=Land
 name=Remote Isle
 auto=tap
 auto={T}:Add {U}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Remote Isle enters the battlefield tapped. -- {T}: Add {U} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -56819,7 +56819,7 @@ type=Sorcery
 [card]
 name=Renewed Faith
 auto=life:6
-autohand={1}{W}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{W})
 autohand={1}{W}{cycle}:name(cycling + effect) life:2 && draw:1 controller
 text=You gain 6 life. -- Cycling {1}{W} ({1}{W}, Discard this card: Draw a card.) -- When you cycle Renewed Faith, you may gain 2 life.
 mana={2}{W}
@@ -56948,7 +56948,7 @@ type=Enchantment
 name=Rescind
 target=*
 auto=moveTo(ownerhand)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Return target permanent to its owner's hand. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{U}{U}
 type=Instant
@@ -57503,7 +57503,7 @@ toughness=1
 [/card]
 [card]
 name=Ridge Rannet
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={5}{R}{R}
 type=Creature
@@ -59591,7 +59591,7 @@ toughness=5
 [/card]
 [card]
 name=Sandbar Merfolk
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={U}
 type=Creature
@@ -59601,7 +59601,7 @@ toughness=1
 [/card]
 [card]
 name=Sandbar Serpent
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={4}{U}
 type=Creature
@@ -59971,7 +59971,7 @@ name=Savage Hunger
 target=creature
 auto=1/0
 auto=trample
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Enchant creature -- Enchanted creature gets +1/+0 and has trample. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{G}
 type=Enchantment
@@ -60417,7 +60417,7 @@ type=Land
 name=Scion of Darkness
 abilities=trample
 auto=@combatdamaged(player) from(this):may moveTo(myBattlefield) target(creature|opponentgraveyard)
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=Trample -- Whenever Scion of Darkness deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={5}{B}{B}{B}
 type=Creature
@@ -60647,7 +60647,7 @@ toughness=4
 name=Scrap
 target=artifact
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target artifact. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={2}{R}
 type=Instant
@@ -61173,7 +61173,7 @@ type=Land
 name=Secluded Steppe
 auto=tap
 auto={T}:Add {W}
-autohand={W}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({W})
 text=Secluded Steppe enters the battlefield tapped. -- {T}: Add {W} to your mana pool. -- Cycling {W} ({W}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -62713,7 +62713,7 @@ toughness=2
 [card]
 name=Shimmering Barrier
 auto=defender,first strike
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Defender (This creature can't attack.) -- First strike -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Creature
@@ -63285,7 +63285,7 @@ type=Instant
 name=Sicken
 target=creature
 auto=-1/-1
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Enchant creature -- Enchanted creature gets -1/-1. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={B}
 type=Enchantment
@@ -63410,7 +63410,7 @@ type=Enchantment
 name=Sigil of the Nayan Gods
 target=creature
 auto=foreach(creature|mybattlefield) 1/1
-autohand={GW}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({GW})
 text=Enchant creature -- Enchanted creature gets +1/+1 for each creature you control. -- Cycling {(g/w)} ({(g/w)}, Discard this card: Draw a card.)
 mana={1}{G}{W}
 type=Enchantment
@@ -65133,7 +65133,7 @@ subtype=Aura
 [card]
 name=Slice and Dice
 auto=damage:4 all(creature)
-autohand={2}{R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2}{R})
 autohand={2}{R}{cycle}:name(cycling + effect) damage:1 all(creature) && draw:1 controller
 text=Slice and Dice deals 4 damage to each creature. -- Cycling {2}{R} ({2}{R}, Discard this card: Draw a card.) -- When you cycle Slice and Dice, you may have it deal 1 damage to each creature.
 mana={4}{R}{R}
@@ -65225,7 +65225,7 @@ toughness=1
 name=Slippery Karst
 auto=tap
 auto={T}:Add {G}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Slippery Karst enters the battlefield tapped. -- {T}: Add {G} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -65233,7 +65233,7 @@ type=Land
 name=Slipstream Eel
 abilities=cantattack
 auto=aslongas(island|opponentbattlefield) -cantattack
-autohand={1}{U}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{U})
 text=Slipstream Eel can't attack unless defending player controls an Island. -- Cycling {1}{U} ({1}{U}, Discard this card: Draw a card.)
 mana={5}{U}{U}
 type=Creature
@@ -65473,7 +65473,7 @@ toughness=2
 name=Smoldering Crater
 auto=tap
 auto={T}:Add {R}
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Smoldering Crater enters the battlefield tapped. -- {T}: Add {R} to your mana pool. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -65806,7 +65806,7 @@ toughness=5
 name=Solar Blast
 target=creature,player
 auto=damage:3
-autohand={1}{R}{R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{R}{R})
 autohand={1}{R}{R}{cycle}:name(cycling + effect) damage:1 target(creature,player) && draw:1 controller
 text=Solar Blast deals 3 damage to target creature or player. -- Cycling {1}{R}{R} ({1}{R}{R}, Discard this card: Draw a card.) -- When you cycle Solar Blast, you may have it deal 1 damage to target creature or player.
 mana={3}{R}
@@ -66660,7 +66660,7 @@ toughness=1
 name=Spark Spray
 target=creature,player
 auto=damage:1
-autohand={R}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({R})
 text=Spark Spray deals 1 damage to target creature or player. -- Cycling {R} ({R}, Discard this card: Draw a card.)
 mana={R}
 type=Instant
@@ -68420,7 +68420,7 @@ type=Land
 [card]
 name=Starstorm
 auto=damage:X all(creature)
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3)
 text=Starstorm deals X damage to each creature. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={X}{R}{R}
 type=Instant
@@ -69403,7 +69403,7 @@ toughness=3
 [card]
 name=Street Wraith
 abilities=swampwalk
-autohand={L}{L}{cycle}:draw:1
+autohand=__CYCLING__({L}{L})
 text=Swampwalk -- Cycling - Pay 2 life. (Pay 2 life, Discard this card: Draw a card.)
 mana={3}{B}{B}
 type=Creature
@@ -69985,7 +69985,7 @@ subtype=Arcane
 name=Sunfire Balm
 target=creature,player
 auto=prevent:4
-autohand={1}{W}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{W})
 autohand={1}{W}{cycle}:name(cycling + effect) prevent:1 target(creature,player) && draw:1 controller
 text=Prevent the next 4 damage that would be dealt to target creature or player this turn. -- Cycling {1}{W} ({1}{W}, Discard this card: Draw a card.) -- When you cycle Sunfire Balm, you may prevent the next 1 damage that would be dealt to target creature or player this turn.
 mana={2}{W}
@@ -70483,7 +70483,7 @@ type=Land
 name=Swat
 target=creature[power<=2]
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target creature with power 2 or less. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{B}{B}
 type=Instant
@@ -70712,7 +70712,7 @@ toughness=4
 name=Sylvan Bounty
 target=player
 auto=life:8
-autohand={1}{G}{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+autohand=__BASIC_LANDCYCLING__({1}{G})
 text=Target player gains 8 life. -- Basic landcycling {1}{G} ({1}{G}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={5}{G}
 type=Instant
@@ -74832,7 +74832,7 @@ type=Sorcery
 name=Tranquil Thicket
 auto=tap
 auto={T}:Add {G}
-autohand={G}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({G})
 text=Tranquil Thicket enters the battlefield tapped. -- {T}: Add {G} to your mana pool. -- Cycling {G} ({G}, Discard this card: Draw a card.)
 type=Land
 [/card]
@@ -74948,7 +74948,7 @@ type=Sorcery
 name=Traumatic Visions
 target=*|stack
 auto=fizzle
-autohand={1}{U}{cycle}:name(basic landcycling) moveTo(myhand) target(land[basic]|mylibrary)
+autohand=__BASIC_LANDCYCLING__({1}{U})
 text=Counter target spell. -- Basic landcycling {1}{U} ({1}{U}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={3}{U}{U}
 type=Instant
@@ -76110,7 +76110,7 @@ toughness=4
 [/card]
 [card]
 name=Undead Gladiator
-autohand={1}{B}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({1}{B})
 autograveyard={1}{B}{discard(*|myhand)}:moveTo(myhand) myUpkeepOnly
 text={1}{B}, Discard a card: Return Undead Gladiator from your graveyard to your hand. Activate this ability only during your upkeep. -- Cycling {1}{B} ({1}{B}, Discard this card: Draw a card.)
 mana={1}{B}{B}
@@ -76240,7 +76240,7 @@ subtype=Aura
 name=Unearth
 target=creature[manacost<=3]|mygraveyard
 auto=moveTo(myBattlefield)
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={B}
 type=Sorcery
@@ -77452,7 +77452,7 @@ type=Enchantment
 [card]
 name=Veiled Serpent
 abilities=cantattack
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 auto=aslongas(island|opponentbattlefield) -cantattack
 auto=@movedto(*|opponentstack) once:transforms((removetypes)) forever && transforms((Serpent Creature,setpower=4,settoughness=4)) forever
 text=When an opponent casts a spell, if Veiled Serpent is an enchantment, Veiled Serpent becomes a 4/4 Serpent creature that can't attack unless defending player controls an Island. -- Cycling {2} ({2}, Discard this card: Draw a card.)
@@ -78654,7 +78654,7 @@ toughness=5
 [/card]
 [card]
 name=Viscera Dragger
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 autograveyard={1}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
 text=Cycling {2} ({2}, Discard this card: Draw a card.) -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{B}
@@ -79167,7 +79167,7 @@ subtype=Aura
 name=Volcanic Submersion
 target=artifact,land
 auto=destroy
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Destroy target artifact or land. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={4}{R}
 type=Sorcery
@@ -81927,7 +81927,7 @@ abilities=split second
 name=Wipe Clean
 target=enchantment
 auto=moveto(exile)
-autohand={3}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({3})
 text=Exile target enchantment. -- Cycling {3} ({3}, Discard this card: Draw a card.)
 mana={1}{W}
 type=Instant
@@ -83139,7 +83139,7 @@ subtype=Aura
 [/card]
 [card]
 name=Yoked Plowbeast
-autohand={2}{cycle}:name(cycling) draw:1
+autohand=__CYCLING__({2})
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={5}{W}{W}
 type=Creature
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index a6ca2b3b5..5fcda175b 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -633,6 +633,7 @@ urzas_mine_i287.txt
 vampire_bats.txt
 vampiric_link.txt
 vendetta_TOUGHNESSLIFELOSS.txt
+vesuva_landlimit_i718.txt
 vine_dryad.txt
 volcanic_eruption.txt
 walking_wall.txt
diff --git a/projects/mtg/bin/Res/test/bugs/vesuva_landlimit_i718.txt b/projects/mtg/bin/Res/test/vesuva_landlimit_i718.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/bugs/vesuva_landlimit_i718.txt
rename to projects/mtg/bin/Res/test/vesuva_landlimit_i718.txt