update some cycled cards

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -8970,8 +8970,8 @@ type=Land
 [card]
 name=Bant Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may token(Soldier,Creature Soldier,1/1,white)
-autohand=__CYCLING__({2}{W})
+autohand={2}{W}{cycle}:name(cycling) draw:1 controller
-autohand={2}{W}{cycle}:name(cycle + effect) token(Soldier,Creature Soldier,1/1,white) && draw:1 controller
+autohand=@cycled(this|hand):may token(Soldier,Creature Soldier,1/1,white)
 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}
 type=Creature
@@ -19520,7 +19520,8 @@ type=Sorcery
 name=Choking Tethers
 target=<upto:4>creature
 auto=tap
-autohand={1}{U}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may tap target(creature)])) forever
+autohand={1}{U}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may tap target(creature)
 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}
 type=Instant
@@ -26943,7 +26944,8 @@ type=Enchantment
 name=Death Pulse
 target=creature
 auto=-4/-4
-autohand={1}{B}{B}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may -1/-1 target(creature)])) forever
+autohand={1}{B}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may -1/-1 target(creature)
 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}
 type=Instant
@@ -27471,12 +27473,9 @@ type=Sorcery
 [/card]
 [card]
 name=Decree of Annihilation
-auto=moveTo(exile) all(artifact,creature,land|battlefield)
+auto=moveTo(exile) all(artifact,creature,land|battlefield) && moveTo(exile) all(*|graveyard) && moveTo(exile) all(*|hand)
-auto=moveTo(exile) all(*|mygraveyard)
+autohand={5}{R}{R}{cycle}:name(cycling) draw:1 controller
-auto=moveTo(exile) all(*|opponentgraveyard)
+autohand=@cycled(this|hand):destroy all(land)
-auto=moveTo(exile) all(*|myhand)
-auto=moveTo(exile) all(*|opponenthand)
-autohand={5}{R}{R}{cycle}:name(cycling) destroy all(land) && draw:1 controller
 text=Exile all artifacts, creatures, and lands from the battlefield, all cards from all graveyards, and all cards from all hands. -- Cycling {5}{R}{R} ({5}{R}{R}, Discard this card: Draw a card.) -- When you cycle Decree of Annihilation, destroy all lands.
 mana={8}{R}{R}
 type=Sorcery
@@ -27494,7 +27493,8 @@ type=Sorcery
 name=Decree of Pain
 auto=@movedto(graveyard) from(creature|battlefield):draw:1
 auto=all(creature) bury
-autohand={3}{B}{B}{cycle}:lord(creature) -2/-2 ueot
+autohand={3}{B}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):lord(creature) -2/-2 ueot
 text=Destroy all creatures. They can't be regenerated. Draw a card for each creature destroyed this way. -- Cycling {3}{B}{B} ({3}{B}{B}, Discard this card: Draw a card.) -- When you cycle Decree of Pain, all creatures get -2/-2 until end of turn.
 mana={6}{B}{B}
 type=Sorcery
@@ -27502,8 +27502,8 @@ type=Sorcery
 [card]
 name=Decree of Savagery
 auto=lord(creature|myBattlefield) counter(1/1,4)
-autohand=__CYCLING__({4}{G}{G})
+autohand={4}{G}{G}{cycle}:name(cycling) draw:1 controller
-autohand={4}{G}{G}{cycle}:name(cycling + four counters) counter(1/1,4) target(creature) && draw:1 controller
+autohand=@cycled(this|hand):may counter(1/1,4) target(creature)
 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}
 type=Instant
@@ -27512,7 +27512,8 @@ type=Instant
 name=Decree of Silence
 auto=@movedto(*|opponentstack):all(trigger[to]) transforms((,newability[fizzle])) forever && counter(0/0,1,Depletion) all(this)
 auto=this(counter{0/0.1.Depletion}>2)while sacrifice
-autohand={4}{U}{U}{cycle}:name(cycling) draw:1 && transforms((,newability[may target(*|stack) fizzle])) forever
+autohand={4}{U}{U}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may target(*|stack) fizzle
 text=Whenever an opponent casts a spell, counter that spell and put a depletion counter on Decree of Silence. If there are three or more depletion counters on Decree of Silence, sacrifice it. -- Cycling {4}{U}{U} ({4}{U}{U}, Discard this card: Draw a card.) -- When you cycle Decree of Silence, you may counter target spell.
 mana={6}{U}{U}
 type=Enchantment
@@ -29553,7 +29554,8 @@ toughness=2
 [card]
 name=Dirge of Dread
 auto=lord(creature) fear
-autohand={1}{B}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may fear target(creature)])) forever
+autohand={1}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may fear target(creature)
 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}
 type=Sorcery
@@ -32495,7 +32497,7 @@ toughness=3
 name=Druidic Satchel
 mana={3}
 type=Artifact
-auto={2}{t}::reveal:1 optionone name(Use Satchel) transforms((,newability[all(creature|reveal) create(Saproling:Creature Saproling:1/1:green) controller],newability[all(land|reveal) moveto(mybattlefield)] ,newability[all(-land,-creature|reveal) life:2 controller])) forever optiononeend optiontwo name(Place back on top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
+auto={2}{t}:reveal:1 optionone name(Use Satchel) transforms((,newability[all(creature|reveal) create(Saproling:Creature Saproling:1/1:green) controller],newability[all(land|reveal) moveto(mybattlefield)] ,newability[all(-land,-creature|reveal) life:2 controller])) forever optiononeend optiontwo name(Place back on top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
 text={2}, {T}: Reveal the top card of your library. If it's a creature card, put a 1/1 green Saproling creature token onto the battlefield. If it's a land card, put that card onto the battlefield under your control. If it's a noncreature, nonland card, you gain 2 life.
 [/card]
 [card]
@@ -36750,7 +36752,8 @@ type=Land
 [card]
 name=Esper Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):all(trigger[to]) transforms((,newability[may tap target(*)],newability[may untap target(*)])) forever
-autohand={2}{U}{cycle}:name(cycling) draw:1 && transforms((,newability[may tap target(*)],newability[may untap target(*)])) forever
+autohand={2}{U}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):name(tap or untap) transforms((,newability[may tap target(*)],newability[may untap target(*)])) forever
 text=When you cycle Esper Sojourners or it's put into a graveyard from the battlefield, you may tap or untap target permanent. -- Cycling {2}{U} ({2}{U}, Discard this card: Draw a card.)
 mana={W}{U}{B}
 type=Artifact Creature
@@ -40525,7 +40528,7 @@ subtype=Aura
 name=Firedrinker Satyr
 auto=@damaged(this):damage:thatmuch controller
 auto={1}{R}:1/0 ueot && damage:1 controller
-text=Whenever Firedrinker Satyr is dealt damage, it deals that much damage to you. -- {1}{R}:: Firedrinker Satyr gets +1/+0 until end of turn and deals 1 damage to you. 
+text=Whenever Firedrinker Satyr is dealt damage, it deals that much damage to you. -- {1}{R}: Firedrinker Satyr gets +1/+0 until end of turn and deals 1 damage to you. 
 mana={R}
 type=Creature
 subtype=Satyr Shaman
@@ -44964,7 +44967,8 @@ toughness=4
 [/card]
 [card]
 name=Gempalm Avenger
-autohand={2}{W}{cycle}:name(cycling) all(soldier|mybattlefield) 1/1 && all(soldier|myBattlefield) first strike && draw:1 controller
+autohand={2}{W}{cycle}:name(cycling) draw:1 controller
+autohand=@cycled(this|hand):lord(soldier|battlefield) 1/1 ueot && lord(soldier|battlefield) first strike ueot
 text=Cycling {2}{W} ({2}{W}, Discard this card: Draw a card.) -- When you cycle Gempalm Avenger, Soldier creatures get +1/+1 and gain first strike until end of turn.
 mana={5}{W}
 type=Creature
@@ -44974,7 +44978,8 @@ toughness=5
 [/card]
 [card]
 name=Gempalm Incinerator
-autohand={1}{R}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may damage:type:goblin:mybattlefield target(creature)])) forever
+autohand={1}{R}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may damage:type:goblin:mybattlefield target(creature)
 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}
 type=Creature
@@ -44984,7 +44989,8 @@ toughness=1
 [/card]
 [card]
 name=Gempalm Polluter
-autohand={B}{B}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may life:-type:zombie:battlefield target(player)])) forever
+autohand={B}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may life:-type:zombie:battlefield target(player)
 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}
 type=Creature
@@ -44994,7 +45000,8 @@ toughness=3
 [/card]
 [card]
 name=Gempalm Sorcerer
-autohand={2}{U}{cycle}:name(cycling) lord(creature[wizard]) flying && draw:1 controller
+autohand={2}{U}{cycle}:name(cycling) draw:1 controller
+autohand=@cycled(this|hand):lord(creature[wizard]) flying ueot
 text=Cycling {2}{U} ({2}{U}, Discard this card: Draw a card.) -- When you cycle Gempalm Sorcerer, Wizard creatures gain flying until end of turn.
 mana={2}{U}
 type=Creature
@@ -45004,7 +45011,8 @@ toughness=2
 [/card]
 [card]
 name=Gempalm Strider
-autohand={2}{G}{G}{cycle}:name(cycling) lord(creature[elf]) 2/2 && draw:1 controller
+autohand={2}{G}{G}{cycle}:name(cycling) draw:1 controller
+autohand=@cycled(this|hand):lord(creature[elf]) 2/2 ueot
 text=Cycling {2}{G}{G} ({2}{G}{G}, Discard this card: Draw a card.) -- When you cycle Gempalm Strider, Elf creatures get +2/+2 until end of turn.
 mana={1}{G}
 type=Creature
@@ -50450,7 +50458,8 @@ toughness=4
 [card]
 name=Grixis Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may moveTo(exile) target(*|graveyard)
-autohand={2}{B}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may moveTo(exile) target(*|graveyard)])) forever
+autohand={2}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may moveTo(exile) target(*|graveyard)
 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}
 type=Creature
@@ -52300,7 +52309,7 @@ toughness=4
 [/card]
 [card]
 name=Harvest Hand
-auto=@movedTo(this|graveyard)::all(trigger[to]) transforms((,newability[flip(Scrounged Scythe)],newability[moveto(mybattlefield)])) forever
+auto=@movedTo(this|graveyard):all(trigger[to]) transforms((,newability[flip(Scrounged Scythe)],newability[moveto(mybattlefield)])) forever
 text=When Harvest Hand dies, return it to the battlefield transformed under your control.
 mana={3}
 type=Artifact Creature
@@ -60492,7 +60501,8 @@ type=Land
 [card]
 name=Jund Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may damage:1 target(creature,player)
-autohand={2}{R}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may damage:1 target(*[creature;player])])) forever
+autohand={2}{R}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may damage:1 target(*[creature;player])
 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}
 type=Creature
@@ -64376,7 +64386,9 @@ toughness=2
 [/card]
 [card]
 name=Krosan Tusker
-autohand={2}{G}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may moveTo(myhand) target(land[basic]|myLibrary)])) forever
+aicode=activate target(land[basic]|mylibrary) moveto(myhand)
+autohand=@cycled(this|hand):name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
+autohand={2}{G}{cycle}:name(cycling) draw:1
 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}
 type=Creature
@@ -64593,7 +64605,8 @@ toughness=3
 [/card]
 [card]
 name=Kuldotha Forgemaster
-auto={T}{S(artifact|myBattlefield)}{S(artifact|myBattlefield)}{S(artifact|myBattlefield)}:moveTo(myBattlefield) target(artifact|mylibrary)
+aicode=activate moveTo(myBattlefield) target(artifact|myLibrary)
+auto={T}{S(artifact|myBattlefield)}{S(artifact|myBattlefield)}{S(artifact|myBattlefield)}:name(search card) reveal:plibrarycount optionone name(choose card) target(artifact|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
 text={T}, Sacrifice three artifacts: Search your library for an artifact card and put it onto the battlefield. Then shuffle your library.
 mana={5}
 type=Artifact Creature
@@ -64805,7 +64818,8 @@ type=Artifact
 name=Kyscu Drake
 abilities=flying
 auto={G}:0/1 limit:1
-auto={S}{S(spitting drake|myBattlefield)}:moveTo(myBattlefield) target(viashivan dragon|mylibrary)
+aicode=activate moveTo(myBattlefield) target(viashivan dragon|myLibrary)
+auto={S(kyscu drake|myBattlefield)}{S(spitting drake|myBattlefield)}:name(search card) reveal:plibrarycount optionone name(choose card) target(viashivan dragon|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
 text=Flying -- {G}: Kyscu Drake gets +0/+1 until end of turn. Activate this ability only once each turn. -- Sacrifice Kyscu Drake and a creature named Spitting Drake: Search your library for a card named Viashivan Dragon and put that card onto the battlefield. Then shuffle your library.
 mana={3}{G}
 type=Creature
@@ -65093,7 +65107,8 @@ type=Enchantment
 [card]
 name=Land Grant
 other={0} name(Cast for free)
-auto=moveto(myhand) notatarget(forest|mylibrary)
+aicode=activate target(forest|mylibrary) moveto(myhand)
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>forest|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 otherrestriction=type(land|myhand)~lessthan~1
 autostack=if paid(alternative) then ability$!name(look at opponent hand) notatarget(*|opponenthand) 0/0!$ opponent
 text=If you have no land cards in hand, you may reveal your hand rather than pay Land Grant's mana cost. -- Search your library for a Forest card, reveal that card, and put it into your hand. Then shuffle your library.
@@ -65118,7 +65133,8 @@ type=Artifact
 [/card]
 [card]
 name=Land Tax
-auto=@each my upkeep:if type(land|opponentbattlefield)~morethan~type(land|mybattlefield) then may transforms((,newability[moveTo(myhand) target(<upto:3>land[basic]|mylibrary)])) ueot
+aicode=activate target(<upto:3>land[basic]|mylibrary) moveto(myhand)
+auto=@each my upkeep restriction{control less lands}:name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<upto:3>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, and put them into your hand. If you do, shuffle your library.
 mana={W}
 type=Enchantment
@@ -65660,7 +65676,8 @@ type=Instant
 [/card]
 [card]
 name=Lay of the Land
-auto=moveTo(myHand) notatarget(land[basic]|myLibrary)
+aicode=activate target(land[basic]|mylibrary) moveto(myhand)
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library.
 mana={G}
 type=Sorcery
@@ -66549,7 +66566,8 @@ subtype=Aura
 [card]
 name=Life's Finale
 auto=destroy all(creature)
-auto=target(<upto:3>creature|opponentlibrary) moveTo(ownergraveyard)
+aicode=activate moveto(ownergraveyard) target(<upto:3>creature|targetedpersonslibrary)
+auto=name(target opponent) target(opponent) reveal:type:*:targetedpersonslibrary revealzone(targetedpersonslibrary) optionone name(choose card) target(<upto:3>creature|reveal) moveto(ownergraveyard) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend revealend
 text=Destroy all creatures, then search target opponent's library for up to three creature cards and put them into his or her graveyard. Then that player shuffles his or her library.
 mana={4}{B}{B}
 type=Sorcery
@@ -66581,7 +66599,8 @@ type=Artifact
 [/card]
 [card]
 name=Lifespinner
-auto={S(spirit|myBattlefield)}{S(spirit|myBattlefield)}{S(spirit|myBattlefield)}{T}:moveTo(mybattlefield) target(spirit[legendary]|mylibrary)
+aicode=activate moveTo(myBattlefield) target(spirit[legendary]|myLibrary)
+auto={S(spirit|myBattlefield)}{S(spirit|myBattlefield)}{S(spirit|myBattlefield)}{T}:name(search card) reveal:plibrarycount optionone name(choose card) target(spirit[legendary]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(activate castcard(putinplay))! afterrevealedend revealend
 text={T}, Sacrifice three Spirits: Search your library for a legendary Spirit permanent card and put it onto the battlefield. Then shuffle your library.
 mana={3}{G}
 type=Creature
@@ -66957,7 +66976,8 @@ toughness=4
 [card]
 name=Liliana of the Dark Realms
 auto=counter(0/0,3,loyalty)
-auto={C(0/0,1,Loyalty)}:name(+1: fetch) moveTo(hand) target(swamp|myLibrary)
+aicode=activate target(swamp|mylibrary) moveto(myhand)
+auto={C(0/0,1,Loyalty)}:name(+1: fetch) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>swamp|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 auto={C(0/0,-3,Loyalty)}:name(-3: choose) ability$!choice name(+X/+X) target(creature) type:land:mybattlefield/type:land:mybattlefield ueot _ choice name(-X/-X) target(creature) -type:land:mybattlefield/-type:land:mybattlefield ueot!$ controller
 auto={C(0/0,-6,Loyalty)}:name(-6: emblem) emblem transforms((,newability[lord(swamp|mybattlefield) {T}:add{B}{B}{B}{B}])) forever dontremove
 text=+1: Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library. -- -3: Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control. -- -6: You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'"
@@ -66967,9 +66987,11 @@ subtype=Liliana
 [/card]
 [card]
 name=Liliana Vess
+abilities=hiddenface
 auto=counter(0/0,5,loyalty)
+aicode=activate moveto(mylibrary) and!(moveto(mylibrary))! target(*|mylibrary)
 auto={C(0/0,1,Loyalty)}:name(+1: discard) target(player) ability$!name(discard) target(*|myhand) reject!$ targetedplayer
-auto={C(0/0,-2,Loyalty)}:name(-2: fetch) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
+auto={C(0/0,-2,Loyalty)}:name(-2: fetch) reveal:plibrarycount optionone name(choose card) target(*|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))! afterrevealedend revealend
 auto={C(0/0,-8,Loyalty)}:name(-8: reanimate) moveTo(mybattlefield) all(creature|graveyard)
 text=+1: Target player discards a card. -- -2: Search your library for a card, then shuffle your library and put that card on top of it. -- -8: Put all creature cards in all graveyards onto the battlefield under your control.
 mana={3}{B}{B}
@@ -67069,7 +67091,8 @@ toughness=3
 [/card]
 [card]
 name=Liliana's Shade
-auto=name(fetch) may moveTo(myhand) target(swamp|mylibrary)
+aicode=activate target(swamp|mylibrary) moveto(myhand)
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>swamp|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 auto={B}:1/1
 text=When Liliana's Shade enters the battlefield, you may search your library for a Swamp card, reveal it, put it into your hand, then shuffle your library. -- {B}: Liliana's Shade gets +1/+1 until end of turn.
 mana={2}{B}{B}
@@ -67542,7 +67565,8 @@ type=Land
 [/card]
 [card]
 name=Llanowar Sentinel
-auto=pay({1}{G}) name(search for Llanowar Sentinel) target(Llanowar Sentinel|mylibrary) moveto(mybattlefield)
+aicode=activate moveTo(myBattlefield) target(Llanowar Sentinel|myLibrary)
+auto=pay({1}{G}) name(search card) reveal:plibrarycount optionone name(choose card) target(Llanowar Sentinel|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
 text=When Llanowar Sentinel enters the battlefield, you may pay {1}{G}. If you do, search your library for a card named Llanowar Sentinel and put that card onto the battlefield. Then shuffle your library.
 mana={2}{G}
 type=Creature
@@ -70053,7 +70077,8 @@ type=Sorcery
 [/card]
 [card]
 name=Mana Severance
-auto=notatarget(<anyamount>land|mylibrary) moveTo(exile)
+aicode=activate target(<anyamount>land|mylibrary) moveto(exile)
+auto=name(exile cards) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose cards) target(<anyamount>land|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(exile)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Search your library for any number of land cards and exile them. Then shuffle your library.
 mana={1}{U}
 type=Sorcery
@@ -70280,7 +70305,8 @@ toughness=2
 [/card]
 [card]
 name=Manipulate Fate
-auto=moveTo(exile) notatarget(<3>*|mylibrary)
+aicode=activate target(<3>*|mylibrary) moveto(exile)
+auto=name(exile cards) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose cards) target(<3>*|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(exile)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 auto=draw:1 controller
 text=Search your library for three cards, exile them, then shuffle your library. -- Draw a card.
 mana={1}{U}
@@ -70403,7 +70429,8 @@ subtype=Aura
 [/card]
 [card]
 name=Map the Wastes
-auto=moveTo(myBattlefield) and!(tap(noevent))! notatarget(land[basic]|myLibrary)
+aicode=activate moveTo(myBattlefield) and!(tap(noevent))! target(land[basic]|myLibrary)
+auto=name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
 auto=ability$!name(Bolster) notatarget(creature[toughness=toughness:lowest:creature:mybattlefield]|mybattlefield) counter(1/1,1)!$ controller
 text=Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. -- Bolster 1. (Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)
 mana={2}{G}
@@ -71003,7 +71030,8 @@ toughness=4
 [/card]
 [card]
 name=Marsh Flats
-auto={L}{T}{S}:moveTo(myBattlefield) target(plains,swamp|mylibrary)
+aicode=activate moveTo(myBattlefield) target(*[swamp;plains]|myLibrary)
+auto={L}{T}{S}:name(search card) reveal:plibrarycount optionone name(choose card) target(*[swamp;plains]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveto(ownerbattlefield))! afterrevealedend revealend
 text={T}, Pay 1 life, Sacrifice Marsh Flats: Search your library for a Plains or Swamp card and put it onto the battlefield. Then shuffle your library.
 type=Land
 [/card]
@@ -72339,7 +72367,8 @@ toughness=1
 [/card]
 [card]
 name=Merchant Scroll
-auto=moveTo(myhand) notatarget(instant[blue]|mylibrary)
+aicode=activate target(instant[blue]|mylibrary) moveto(myhand)
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>instant[blue]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Search your library for a blue instant card, reveal that card, and put it into your hand. Then shuffle your library.
 mana={1}{U}
 type=Sorcery
@@ -72634,7 +72663,7 @@ toughness=2
 name=Merrow Harbinger
 abilities=islandwalk
 aicode=activate target(merfolk|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
-auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(merfolk|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(merfolk|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 text=Islandwalk -- When Merrow Harbinger enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
 type=Creature
@@ -78123,7 +78152,8 @@ 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) transforms((,newability[draw:1],newability[may counter(1/1.1) target(creature)])) forever
+autohand={2}{G}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may counter(1/1,1) target(creature)
 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}
 type=Creature
@@ -87903,7 +87933,7 @@ type=Instant
 name=Preyseizer Dragon
 abilities=flying
 auto=may target(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1,2) all(this)
-auto=@combat(attacking) source(this)::target(creature,player) dynamicability<!chargestrike!>
+auto=@combat(attacking) source(this):target(creature,player) dynamicability<!chargestrike!>
 text=Flying -- Devour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.) -- Whenever Preyseizer Dragon attacks, it deals damage to target creature or player equal to the number of +1/+1 counters on Preyseizer Dragon.
 mana={4}{R}{R}
 type=Creature
@@ -88071,7 +88101,8 @@ type=Instant
 name=Primal Boost
 target=creature
 auto=4/4
-autohand={2}{G}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may 1/1 target(creature)])) forever
+autohand={2}{G}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may 1/1 target(creature) ueot
 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}
 type=Instant
@@ -93539,7 +93570,8 @@ type=Sorcery
 [card]
 name=Renewed Faith
 auto=life:6
-autohand={1}{W}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may life:2])) forever
+autohand={1}{W}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may life:2
 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}
 type=Instant
@@ -93836,7 +93868,8 @@ toughness=2
 name=Resounding Roar
 target=creature
 auto=3/3
-autohand={5}{R}{G}{W}{cycle}:name(cycling and six damage to creature) draw:1 && transforms((,newability[target(creature) 6/6])) forever
+autohand={5}{R}{G}{W}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):target(creature) 6/6 ueot
 text=Target creature gets +3/+3 until end of turn. -- Cycling {5}{R}{G}{W} ({5}{R}{G}{W}, Discard this card: Draw a card.) -- When you cycle Resounding Roar, target creature gets +6/+6 until end of turn.
 mana={1}{G}
 type=Instant
@@ -93845,7 +93878,8 @@ type=Instant
 name=Resounding Scream
 target=player
 auto=discard:1
-autohand={5}{U}{B}{R}{cycle}:name(cycling) draw:1 controller && discard:2 opponent
+autohand={5}{U}{B}{R}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):target(player) discard:2
 text=Target player discards a card at random. -- Cycling {5}{U}{B}{R} ({5}{U}{B}{R}, Discard this card: Draw a card.) -- When you cycle Resounding Scream, target player discards two cards at random.
 mana={2}{B}
 type=Sorcery
@@ -93854,7 +93888,8 @@ type=Sorcery
 name=Resounding Silence
 target=creature[attacking]
 auto=moveTo(exile)
-autohand={5}{G}{W}{U}{cycle}:name(cycling and exile) draw:1 && transforms((,newability[target(<upto:2>creature) moveTo(exile)])) forever
+autohand={5}{G}{W}{U}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):target(<upto:2>creature[attacking]) moveTo(exile)
 text=Exile target attacking creature. -- Cycling {5}{G}{W}{U} ({5}{G}{W}{U}, Discard this card: Draw a card.) -- When you cycle Resounding Silence, exile up to two target attacking creatures.
 mana={3}{W}
 type=Instant
@@ -93863,8 +93898,8 @@ type=Instant
 name=Resounding Thunder
 target=creature,player
 auto=damage:3
-autohand={5}{B}{R}{G}{cycle}:name(cycling and six damage to target creature) draw:1 controller && transforms((,newability[target(creature) damage:6])) forever
+autohand={5}{B}{R}{G}{cycle}:name(cycling) draw:1
-autohand={5}{B}{R}{G}{cycle}:name(cycling and six damage to target player) draw:1 controller && transforms((,newability[target(player) damage:6])) forever
+autohand=@cycled(this|hand):target(*[creature;player]) damage:6
 text=Resounding Thunder deals 3 damage to target creature or player. -- Cycling {5}{B}{R}{G} ({5}{B}{R}{G}, Discard this card: Draw a card.) -- When you cycle Resounding Thunder, it deals 6 damage to target creature or player.
 mana={2}{R}
 type=Instant
@@ -93873,7 +93908,8 @@ type=Instant
 name=Resounding Wave
 target=*
 auto=moveTo(ownerhand)
-autohand={5}{W}{U}{B}{cycle}:name(cycling and exile) draw:1 && transforms((,newability[target(<upto:2>*) moveTo(ownerhand)])) forever
+autohand={5}{W}{U}{B}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):target(<2>*) moveTo(ownerhand)
 text=Return target permanent to its owner's hand. -- Cycling {5}{W}{U}{B} ({5}{W}{U}{B}, Discard this card: Draw a card.) -- When you cycle Resounding Wave, return two target permanents to their owners' hands.
 mana={2}{U}
 type=Instant
@@ -107408,7 +107444,8 @@ type=Sorcery
 [card]
 name=Slice and Dice
 auto=damage:4 all(creature)
-autohand={2}{R}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may damage:1 all(creature)])) forever
+autohand={2}{R}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may damage:1 all(creature)
 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}
 type=Sorcery
@@ -108384,7 +108421,8 @@ type=Artifact
 name=Solar Blast
 target=creature,player
 auto=damage:3
-autohand={1}{R}{R}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may damage:1 target(*[creature;player])])) forever
+autohand={1}{R}{R}{cycle}:name(cycling) draw:1
+autohand=@cycled(this|hand):may damage:1 target(*[creature;player])
 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}
 type=Instant
@@ -111756,7 +111794,8 @@ toughness=2
 [card]
 name=Squadron Hawk
 abilities=flying
-auto=moveTo(myhand) target(<upto:3>squadron hawk|mylibrary)
+aicode=activate target(<upto:3>squadron hawk|mylibrary) moveto(myhand)
+auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<upto:3>squadron hawk|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Flying -- When Squardon Hawk enters the battlefield, you may search your library for up to three cards named Squadron Hawk, reveal them, put them into your hand, then shuffle your library.
 mana={1}{W}
 type=Creature
@@ -115100,7 +115139,8 @@ type=Instant
 name=Sunfire Balm
 target=creature,player
 auto=prevent:4
-autohand={1}{W}{cycle}:name(cycling) transforms((,newability[draw:1],newability[may prevent:1 target(*[creature;player])])) forever
+autohand=@cycled(this|hand):may prevent:1 target(*[creature;player])
+autohand={1}{W}{cycle}:name(cycling) draw:1
 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}
 type=Instant

projects/mtg/src/MTGAbility.cpp

@@ -5931,6 +5931,19 @@ int TriggeredAbility::receiveEvent(WEvent * e)
         resolve();
         return 1;
     }
+    WEventCardCycle * cycleCheck = dynamic_cast<WEventCardCycle*>(e);
+    if(cycleCheck && cycleCheck->card == source)
+    {
+        resolve();
+        return 1;
+        //When you cycle this card, first the cycling ability goes on the stack, 
+        //then the triggered ability goes on the stack on top of it. 
+        //The triggered ability will resolve before you draw a card from the cycling ability.
+        //
+        //The cycling ability and the triggered ability are separate. 
+        //If the triggered ability is countered (with Stifle, for example, or if all its targets have become illegal), 
+        //the cycling ability will still resolve and you'll draw a card.
+    }
     WEventZoneChange * stackCheck = dynamic_cast<WEventZoneChange*>(e);
     if(stackCheck && (stackCheck->to == game->currentPlayer->game->stack||stackCheck->to == game->currentPlayer->opponent()->game->stack))
     {