Added more C20 primitives.

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

@@ -985,17 +985,17 @@ toughness=2
 [card]
 name=Reap the Past
 auto=moveTo(exile)
-auto=this(X==0) donothing
-auto=this(X==1) moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==2) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==3) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==4) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==5) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==6) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==7) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==8) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==9) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
-auto=this(X==10) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=0) donothing
+auto=this(X=1) moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=2) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=3) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=4) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=5) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=6) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=7) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=8) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=9) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
+auto=this(X=10) moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand) && moverandom(*) from(mygraveyard) to(myhand)
 text=Return X cards at random from your graveyard to your hand. Exile Reap the Past.
 mana={X}{R}{G}
 type=Sorcery
@@ -1885,4 +1885,21 @@ type=Artifact Creature
 subtype=Construct
 power=*
 toughness=*
+[/card]
+[card]
+name=Astral Drift
+auto=@cycled(*|myHand):may (blink)ueot target(creature)
+autohand=@cycled(this|myHand):may (blink)ueot target(creature)
+autohand=__CYCLING__({2}{W})
+text=Whenever you cycle Astral Drift or cycle another card while Astral Drift is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner’s control at the beginning of the next end step.
+mana={2}{W}
+type=Enchantment
+[/card]
+[card]
+name=Tectonic Reformation
+auto=lord(land|myhand) transform((newability[__CYLCLING__({R})]))
+autohand=__CYCLING__({2})
+text=Each land card in your hand has cycling {R}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
+mana={1}{R}
+type=Enchantment
 [/card]

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

@@ -148,12 +148,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Astral Drift
-text=Whenever you cycle Astral Drift or cycle another card while Astral Drift is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. -- Cycling {2}{W} ({2}{W}, Discard this card: Draw a card.)
-mana={2}{W}
-type=Enchantment
-[/card]
-[card]
 name=Mirrodin Besieged
 text=As Mirrodin Besieged enters the battlefield, choose Mirran or Phyrexian. -- • Mirran — Whenever you cast an artifact spell, create a 1/1 colorless Myr artifact creature token. -- • Phyrexian — At the beginning of your end step, draw a card, then discard a card. Then if there are fifteen or more artifact cards in your graveyard, target opponent loses the game.
 mana={2}{U}
@@ -187,10 +181,4 @@ auto=moveTo(ownerlibrary) && shuffle
 text=Target player puts the top four cards of their library into their graveyard. You shuffle up to four cards from your graveyard into your library. -- Replicate {2}{U}{U} (When you cast this spell, copy it for each time you paid its replicate cost. You may choose new targets for the copies.)
 mana={U}
 type=Sorcery
-[/card]
-[card]
-name=Tectonic Reformation
-text=Each land card in your hand has cycling {R}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
-mana={1}{R}
-type=Enchantment
 [/card]

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

@@ -1,7 +1,7 @@
 grade=unsupported
 [card]
 name=Alexander Clamilton
-text=Whenever you cast a wordy spell, scry 2. (A spell is wordy if it has four or more lines of rules text.) -- 1 -- {R} -- , -- {T} -- : Choose target creature you don't control. Reveal the top card of your library. Alexander Clamilton gets +X/+0 until end of turn, where X is the number of lines of rules text of the revealed card. Alexander Clamilton fights that creature. --
+text=Whenever you cast a wordy spell, scry 2. (A spell is wordy if it has four or more lines of rules text.) -- {1}{R}, {T}: Choose target creature you don't control. Reveal the top card of your library. Alexander Clamilton gets +X/+0 until end of turn, where X is the number of lines of rules text of the revealed card. Alexander Clamilton fights that creature.
 mana={2}{U}
 type=Legendary Creature
 subtype=Clamfolk Advisor Rebel
@@ -10,7 +10,7 @@ toughness=4
 [/card]
 [card]
 name=Syr Cadian, Knight Owl
-text=Knightlifelink (Damage dealt by Knights you control also causes you to gain that much life.) -- {W} -- : Syr Cadian, Knight Owl gains vigilance until end of turn. Activate this ability only from sunrise to sunset. -- {B}: Syr Cadian, Knight Owl gains flying until end of turn. Activate this ability only from sunset to sunrise.
+text=Knightlifelink (Damage dealt by Knights you control also causes you to gain that much life.) -- {W}: Syr Cadian, Knight Owl gains vigilance until end of turn. Activate this ability only from sunrise to sunset. -- {B}: Syr Cadian, Knight Owl gains flying until end of turn. Activate this ability only from sunset to sunrise.
 mana={3}{W}{W}
 type=Legendary Creature
 subtype=Bird Knight
@@ -25,7 +25,7 @@ type=Enchantment
 [/card]
 [card]
 name=Infernius Spawnington III, Esq.
-text=Flying, first strike, trample, haste -- This spell costs -- 3 -- less to cast for each card you've revealed this turn. -- When Infernius Spawnington III, Esq. enters the battlefield, you may say "I'm here." If you do, it deals 3 damage to target player. --
+text=Flying, first strike, trample, haste -- This spell costs {3} less to cast for each card you've revealed this turn. -- When Infernius Spawnington III, Esq. enters the battlefield, you may say "I'm here." If you do, it deals 3 damage to target player.
 mana={10}{B}
 type=Creature
 subtype=Demon Beast Grandchild
@@ -34,7 +34,7 @@ toughness=9
 [/card]
 [card]
 name=Strutting Turkey
-text=When this creature enters the battlefield, -- exile target creature card with converted mana cost 2 or less from your graveyard. If it has augment, combine it with a host you control. Otherwise, put it onto the battlefield.
+text=When this creature enters the battlefield, exile target creature card with converted mana cost 2 or less from your graveyard. If it has augment, combine it with a host you control. Otherwise, put it onto the battlefield.
 mana={3}{W}
 type=Host Creature
 subtype=Bird
@@ -43,7 +43,7 @@ toughness=2
 [/card]
 [card]
 name=Surgeon General Commander
-text=Whenever you augment, enchant, or mutate a creature you control, draw a card. -- {T} -- : Add -- {W} -- , -- {U} -- , -- {B} -- , -- {R} -- , or -- {G} -- . --
+text=Whenever you augment, enchant, or mutate a creature you control, draw a card. -- {T}: Add {W}, {U}, {B}, {R}, or {G}.
 mana={3}{G}
 type=Legendary Creature
 subtype=Wombat Bat Chameleon
@@ -66,7 +66,7 @@ type=Instant
 [/card]
 [card]
 name=Underdome
-text={T} -- : Add -- Colorless -- . -- {T}: Add one mana of any color. Spend this mana only to pay silver-bordered costs.
+text={T}: Add {X}. -- {T}: Add one mana of any color. Spend this mana only to pay silver-bordered costs.
 type=Land
 [/card]
 [card]
@@ -77,7 +77,7 @@ type=Enchantment
 [/card]
 [card]
 name=Bat-
-text=Flying -- At the beginning of each end step, if an opponent lost 3 or more life this turn, -- Augment 1{B} ( 1{B}, Reveal this card from your hand: Combine it with target host. Augment only as a sorcery.)
+text=Flying -- At the beginning of each end step, if an opponent lost 3 or more life this turn, -- Augment {1}{B} ({1}{B}, Reveal this card from your hand: Combine it with target host. Augment only as a sorcery.)
 type=Creature
 subtype=Bat
 power=+1
@@ -94,7 +94,7 @@ toughness=2
 [/card]
 [card]
 name=Abstract Iguanart
-text=Whenever you cast a spell, note the first letter of its artist's name. If that letter wasn't already noted, put a +1/+1 counter on Abstract Iguanart. --
+text=Whenever you cast a spell, note the first letter of its artist's name. If that letter wasn't already noted, put a +1/+1 counter on Abstract Iguanart.
 mana={1}{R}
 type=Creature
 subtype=Art Lizard
@@ -119,7 +119,7 @@ subtype=B.O.B.
 [/card]
 [card]
 name=Pippa, Duchess of Dice
-text=2 -- {G} -- , -- {T} -- : Roll a six-sided die. It becomes a green Die creature token with power and toughness each equal to its result. -- 2 -- {U} -- , -- {T} -- : Reroll any die. -- (Activate this ability only any time it makes sense.) --
+text={2}{G}, {T}: Roll a six-sided die. It becomes a green Die creature token with power and toughness each equal to its result. -- {2}{U}, {T}: Reroll any die. (Activate this ability only any time it makes sense.)
 mana={2}{G}
 type=Legendary Creature
 subtype=Human Noble
@@ -128,7 +128,7 @@ toughness=2
 [/card]
 [card]
 name=Acornelia, Fashionable Filcher
-text=Whenever you cast a spell with a squirrel in its art, you get (an acorn counter) -- . -- Whenever a Squirrel you control enters the battlefield or dies, you get . -- 2 -- {B} -- , Pay X : Target creature gets -X/-X until end of turn. -- {G}, Pay X : Target creature gets +X/+X until end of turn.
+text=Whenever you cast a spell with a squirrel in its art, you get (an acorn counter). -- Whenever a Squirrel you control enters the battlefield or dies, you get. -- {2}{B}, Pay {X} : Target creature gets -X/-X until end of turn. -- {G}, Pay {X} : Target creature gets +X/+X until end of turn.
 mana={3}{B}
 type=Legendary Creature
 subtype=Squirrel

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

@@ -21,15 +21,6 @@ mana={3}
 type=Artifact
 [/card]
 [card]
-name=Novellamental
-text=Flying -- Novellamental can block only creatures with flying.
-mana={1}{U}
-type=Creature
-subtype=Elemental
-power=2
-toughness=1
-[/card]
-[card]
 name=Steel Squirrel
 text=Whenever you roll a 5 or higher on a die, Steel Squirrel gets +X/+X until end of turn, where X is the result. -- {6}: Roll a six-sided die.
 mana={2}
@@ -791,51 +782,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Beast in Show
-text=Trample
-mana={4}{G}{G}
-type=Creature
-subtype=Beast
-power=6
-toughness=4
-[/card]
-[card]
-name=Extremely Slow Zombie
-text=Last strike (This creature deals combat damage after creatures without last strike.)
-mana={1}{B}
-type=Creature
-subtype=Zombie
-power=3
-toughness=3
-[/card]
-[card]
-name=Amateur Auteur
-text=Sacrifice Amateur Auteur: Destroy target enchantment.
-mana={1}{W}
-type=Creature
-subtype=Human
-power=2
-toughness=2
-[/card]
-[card]
-name=Extremely Slow Zombie
-text=Last strike (This creature deals combat damage after creatures without last strike.)
-mana={1}{B}
-type=Creature
-subtype=Zombie
-power=3
-toughness=3
-[/card]
-[card]
-name=Extremely Slow Zombie
-text=Last strike (This creature deals combat damage after creatures without last strike.)
-mana={1}{B}
-type=Creature
-subtype=Zombie
-power=3
-toughness=3
-[/card]
-[card]
 name=Ineffable Blessing (a)
 text=As Ineffable Blessing enters the battlefield, choose Flavorful or Bland. -- • Flavorful — Whenever a creature with flavor text enters the battlefield under your control, draw a card. -- • Bland — Whenever a creature without flavor text enters the battlefield under your control, draw a card.
 mana={1}{G}
@@ -860,15 +806,6 @@ power=0
 toughness=0
 [/card]
 [card]
-name=Novellamental
-text=Flying -- Novellamental can block only creatures with flying.
-mana={1}{U}
-type=Creature
-subtype=Elemental
-power=2
-toughness=1
-[/card]
-[card]
 name=Monkey-
 text=Whenever a nontoken creature you control dies, -- Augment {2}{G} ({2}{G}, Reveal this card from your hand: Combine it with target host. Augment only as a sorcery.)
 type=Creature
@@ -895,15 +832,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Novellamental
-text=Flying -- Novellamental can block only creatures with flying.
-mana={1}{U}
-type=Creature
-subtype=Elemental
-power=2
-toughness=1
-[/card]
-[card]
 name=Half-Squirrel, Half-
 text=Whenever a nontoken creature enters the battlefield, -- Augment {G} ({G}, Reveal this card from your hand: Combine it with target host. Augment only as a sorcery.)
 type=Creature
@@ -912,24 +840,6 @@ power=-1
 toughness=-0
 [/card]
 [card]
-name=Beast in Show
-text=Trample
-mana={4}{G}{G}
-type=Creature
-subtype=Beast
-power=6
-toughness=4
-[/card]
-[card]
-name=Beast in Show
-text=Trample
-mana={4}{G}{G}
-type=Creature
-subtype=Beast
-power=6
-toughness=4
-[/card]
-[card]
 name=Rhino-
 text=Whenever this creature blocks, -- Augment {3}{W} ({3}{W}, Reveal this card from your hand: Combine it with target host. Augment only as a sorcery.)
 type=Creature
@@ -1463,47 +1373,6 @@ power=+1
 toughness=+2
 [/card]
 [card]
-name=Secret Base
-text={T}: Add {1}. -- {T}: Add one mana of any color. Spend this mana only to cast a spell that shares a watermark with Secret Base.
-type=Land
-[/card]
-[card]
-name=Target Minotaur
-text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
-mana={1}{R}
-type=Creature
-subtype=Minotaur Warrior
-power=2
-toughness=1
-[/card]
-[card]
-name=Target Minotaur
-text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
-mana={1}{R}
-type=Creature
-subtype=Minotaur Warrior
-power=2
-toughness=1
-[/card]
-[card]
-name=Amateur Auteur
-text=Sacrifice Amateur Auteur: Destroy target enchantment.
-mana={1}{W}
-type=Creature
-subtype=Human
-power=2
-toughness=2
-[/card]
-[card]
-name=Amateur Auteur
-text=Sacrifice Amateur Auteur: Destroy target enchantment.
-mana={1}{W}
-type=Creature
-subtype=Human
-power=2
-toughness=2
-[/card]
-[card]
 name=Target Minotaur
 text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
 mana={1}{R}
@@ -1916,15 +1785,6 @@ power=0
 toughness=3
 [/card]
 [card]
-name=Target Minotaur
-text=Prowess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)
-mana={1}{R}
-type=Creature
-subtype=Minotaur Warrior
-power=2
-toughness=1
-[/card]
-[card]
 name=Super-Duper Death Ray
 text=Trample (This spell can deal excess damage to its target's controller.) -- Super-Duper Death Ray deals 4 damage to target creature.
 mana={2}{R}