reverting r4569. This fixes Flare, and potentially other cards using the same mechanism

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

@@ -1509,7 +1509,7 @@ type=Artifact
 [card]
 name=Aleatory
 auto=flipacoin winability target(creature) 1/1 winabilityend flipend
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 restriction=blockersonly
 text=Cast Aleatory only during combat after blockers are declared. -- Flip a coin. If you win the flip, target creature gets +1/+1 until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{R}
@@ -3191,7 +3191,7 @@ toughness=7
 [card]
 name=Arcane Denial
 target=*|stack
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 auto=target(*|stack) transforms((,newability[fizzle],newability[phaseaction[upkeep once] draw:2 controller])) forcedalive
 text=Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep. -- You draw a card at the beginning of the next turn's upkeep.
 mana={1}{U}
@@ -5670,7 +5670,7 @@ toughness=1
 name=Balduvian Rage
 target=creature[attacking]
 auto=X/0
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target attacking creature gets +X/+0 until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={X}{R}
 type=Instant
@@ -7272,7 +7272,7 @@ type=Sorcery
 [card]
 name=Bestial Fury
 target=creature
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 auto=@combat(blocked,turnlimited) source(mytgt):transforms((,trample,newability[4/0])) ueot
 text=Enchant creature -- When Bestial Fury enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Whenever enchanted creature becomes blocked, it gets +4/+0 and gains trample until end of turn.
 mana={2}{R}
@@ -7936,8 +7936,8 @@ type=Sorcery
 [/card]
 [card]
 name=Blessed Wine
+auto=@next upkeep:draw:1
 auto=life:1
-auto=phaseaction[upkeep once] draw:1 controller
 text=You gain 1 life. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{W}
 type=Instant
@@ -9542,7 +9542,7 @@ type=Artifact
 name=Bone Harvest
 target=<anyamount>creature|mygraveyard
 auto=moveTo(mylibrary)
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Put any number of target creature cards from your graveyard on top of your library. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{B}
 type=Instant
@@ -11131,7 +11131,7 @@ type=Enchantment
 name=Burnout
 target=instant|stack
 auto=teach(instant[blue]) fizzle
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1
 text=Counter target instant spell if it's blue. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{R}
 type=Instant
@@ -12155,7 +12155,7 @@ toughness=2
 [card]
 name=Carrier Pigeons
 abilities=flying
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1
 text=Flying -- When Carrier Pigeons enters the battlefield, draw a card at the beginning of the next turn's upkeep.
 mana={3}{W}
 type=Creature
@@ -14402,7 +14402,7 @@ toughness=2
 name=Clairvoyance
 target=player
 auto=target(*|targetedpersonshand) 0/0 ueot
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Look at target player's hand. -- Draw a card at the beginning of the next turn's upkeep.
 mana={U}
 type=Instant
@@ -25429,7 +25429,7 @@ type=Sorcery
 name=Enervate
 target=artifact,creature,land
 auto=tap
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Tap target artifact, creature, or land. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{U}
 type=Instant
@@ -27875,7 +27875,7 @@ toughness=1
 name=Feral Instinct
 target=creature
 auto=1/1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target creature gets +1/+1 until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{G}
 type=Instant
@@ -28123,7 +28123,7 @@ type=Enchantment
 name=Fevered Strength
 target=Creature
 auto=2/0
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target creature gets +2/+0 until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{B}
 type=Instant
@@ -29029,7 +29029,7 @@ toughness=2
 name=Flare
 target=creature,player
 auto=damage:1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Flare deals 1 damage to target creature or player. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{R}
 type=Instant
@@ -30062,7 +30062,7 @@ toughness=1
 [card]
 name=Foresight
 auto=moveTo(exile) notatarget(<3>*|mylibrary)
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Search your library for three cards, exile them, then shuffle your library. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{U}
 type=Sorcery
@@ -30296,7 +30296,7 @@ type=Artifact
 name=Foxfire
 target=creature[attacking]
 auto=untap && fog to(mytgt) oneshot && fog from(mytgt) oneshot
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{G}
 type=Instant
@@ -34895,7 +34895,7 @@ toughness=6
 name=Gravebind
 target=creature
 auto=cantregen
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target creature can't be regenerated this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={B}
 type=Instant
@@ -37243,7 +37243,7 @@ type=Instant
 name=Headstone
 target=*|graveyard
 auto=moveto(exile)
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Exile target card from a graveyard. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{B}
 type=Instant
@@ -37252,7 +37252,7 @@ type=Instant
 name=Heal
 target=creature,player
 auto=prevent:1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Prevent the next 1 damage that would be dealt to target creature or player this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={W}
 type=Instant
@@ -40772,7 +40772,7 @@ type=Instant
 name=Infuse
 target=artifact,creature,land
 auto=untap
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Untap target artifact, creature, or land. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{U}
 type=Instant
@@ -41000,7 +41000,7 @@ type=Enchantment
 [card]
 name=Insolence
 target=creature
-auto=@tapped(mytgt):damage:2 targetController
+alias=1218
 text=Enchant creature -- Whenever enchanted creature becomes tapped, Insolence deals 2 damage to that creature's controller.
 mana={2}{R}
 type=Enchantment
@@ -42208,7 +42208,7 @@ auto=choice name(becomes a island) transforms((,newability[loseabilities],newabi
 auto=choice name(becomes a swamp) transforms((,newability[loseabilities],newability[losesubtypesof(land)])) ueot && transforms((swamp)) ueot
 auto=choice name(becomes a mountain) transforms((,newability[loseabilities],newability[losesubtypesof(land)])) ueot && transforms((mountain)) ueot
 auto=choice name(becomes a forest) transforms((,newability[loseabilities],newability[losesubtypesof(land)])) ueot && transforms((forest)) ueot
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target land becomes the basic land type of your choice until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{U}
 type=Instant
@@ -42356,7 +42356,7 @@ subtype=Aura
 [/card]
 [card]
 name=Jolt
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 auto=may tap target(artifact,creature,land)
 auto=may untap target(artifact,creature,land)
 text=You may tap or untap target artifact, creature, or land. -- Draw a card at the beginning of the next turn's upkeep.
@@ -45589,7 +45589,7 @@ toughness=1
 name=Krovikan Fetish
 target=creature
 auto=1/1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Enchant creature -- When Krovikan Fetish enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Enchanted creature gets +1/+1.
 mana={2}{B}
 type=Enchantment
@@ -45609,7 +45609,7 @@ toughness=*
 [card]
 name=Krovikan Plague
 target=creature[-Wall]|myBattlefield
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 auto=teach(creature) {T}:damage:1 target(creature,player) && all(this) counter(0/-1,1)
 text=Enchant non-Wall creature you control -- When Krovikan Plague enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Enchanted creature has "{T}: Put a -0/-1 counter on this creature, and Krovikan Plague deals 1 damage to target creature or player."
 mana={2}{B}
@@ -46304,7 +46304,7 @@ subtype=Aura
 name=Lat-Nam's Legacy
 target=*|myHand
 auto=moveto(mylibrary) && shuffle
-auto=phaseaction[upkeep once] draw:2 controller
+auto=@next upkeep:draw:2 controller
 text=Shuffle a card from your hand into your library. If you do, draw two cards at the beginning of the next turn's upkeep.
 mana={1}{U}
 type=Instant
@@ -47275,7 +47275,7 @@ type=Instant
 name=Lightning Blow
 target=creature
 auto=first strike
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target creature gains first strike until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{W}
 type=Instant
@@ -49711,7 +49711,7 @@ type=Sorcery
 [card]
 name=Mana Short
 target=player
-auto=all(land|targetedpersonsbattlefield) tap && removemana(*) targetedplayer
+alias=1209
 text=Tap all lands target player controls and empty his or her mana pool.
 mana={2}{U}
 type=Instant
@@ -51892,7 +51892,7 @@ type=Sorcery
 name=Mind Ravel
 target=player
 auto=ability$!name(discard) target(*|myhand) reject!$ targetedplayer
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target player discards a card. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{B}
 type=Sorcery
@@ -54752,7 +54752,7 @@ type=Land
 name=Mystic Melting
 target=artifact,enchantment
 auto=destroy
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Destroy target artifact or enchantment. -- Draw a card at the beginning of the next turn's upkeep.
 mana={3}{G}
 type=Instant
@@ -59096,7 +59096,7 @@ toughness=6
 name=Panic
 target=creature
 auto=cantblock
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 restriction=attackersonly
 text=Cast Panic only during combat before blockers are declared. -- Target creature can't block this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={R}
@@ -63299,7 +63299,7 @@ toughness=1
 [/card]
 [card]
 name=Pyknite
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1
 text=When Pyknite enters the battlefield, draw a card at the beginning of the next turn's upkeep.
 mana={2}{G}
 type=Creature
@@ -65061,7 +65061,7 @@ type=Instant
 name=Ray of Erasure
 target=player
 auto=deplete:1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target player puts the top card of his or her library into his or her graveyard. -- Draw a card at the beginning of the next turn's upkeep.
 mana={U}
 type=Instant
@@ -66133,7 +66133,7 @@ toughness=3
 [card]
 name=Renewal
 auto=moveTo(myHand) target(land[basic]|myLibrary)
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=As an additional cost to cast Renewal, sacrifice a land. -- Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{G}{S(land|mybattlefield)}
 type=Sorcery
@@ -67435,7 +67435,7 @@ type=Sorcery
 name=Ritual of Steel
 target=creature
 auto=0/2
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Enchant creature -- When Ritual of Steel enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Enchanted creature gets +0/+2.
 mana={2}{W}
 type=Enchantment
@@ -68105,7 +68105,7 @@ power=6
 toughness=5
 [/card]
 [card]
-name=Rot Wolf
+name=Rot Wulf
 abilities=infect
 auto=@vampired(creature) from(this):may draw:1
 text=Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.) -- Whenever a creature dealt damage by Rot Wolf this turn is put into a graveyard, you may draw a card.
@@ -68915,9 +68915,10 @@ toughness=1
 [/card]
 [card]
 name=Sacrifice
-auto=thisforeach(variable{storedmanacost}) add{B}
+target=creature|myBattlefield
+alias=1176
 text=As an additional cost to cast Sacrifice, sacrifice a creature. -- Add to your mana pool an amount of black mana equal to the sacrificed creature's converted mana cost.
-mana={B}{S(creature|mybattlefield)}
+mana={B}
 type=Instant
 [/card]
 [card]
@@ -76505,7 +76506,7 @@ toughness=2
 name=Solfatara
 target=player
 auto=maxPlay(land)-99
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target player can't play land cards this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{R}
 type=Instant
@@ -77046,7 +77047,7 @@ type=Sorcery
 name=Soul Rend
 target=creature
 auto=teach(creature[white]) bury
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Destroy target creature if it's white. A creature destroyed this way can't be regenerated. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{B}
 type=Instant
@@ -81740,7 +81741,7 @@ type=Instant
 name=Swift Maneuver
 target=creature,player
 auto=prevent:2
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Prevent the next 2 damage that would be dealt to target creature or player this turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{W}
 type=Instant
@@ -83307,7 +83308,7 @@ type=Artifact
 name=Telim'Tor's Edict
 target=*|myBattlefield
 auto=moveTo(myexile)
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Exile target permanent you own or control. -- Draw a card at the beginning of the next turn's upkeep.
 mana={R}
 type=Instant
@@ -86187,7 +86188,7 @@ type=Instant
 name=Touch of Death
 target=player
 auto=damage:1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 auto=life:1 controller
 text=Touch of Death deals 1 damage to target player. You gain 1 life. -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{B}
@@ -86212,8 +86213,8 @@ type=Enchantment
 [card]
 name=Touch of Vitae
 target=creature
-auto=haste ueot && transforms((,newability[{0}:untap limit:1])) ueot
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1
+alias=1252
 text=Until end of turn, target creature gains haste and "{0}: Untap this creature. Activate this ability only once." -- Draw a card at the beginning of the next turn's upkeep.
 mana={2}{G}
 type=Instant
@@ -88682,7 +88683,7 @@ toughness=2
 name=Updraft
 target=creature
 auto=flying
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Target creature gains flying until end of turn. -- Draw a card at the beginning of the next turn's upkeep.
 mana={1}{U}
 type=Instant
@@ -89350,7 +89351,7 @@ name=Vampirism
 target=creature
 auto=foreach(other creature|myBattlefield) 1/1
 auto=lord(other creature|myBattlefield) -1/-1
-auto=phaseaction[upkeep once] draw:1 controller
+auto=@next upkeep:draw:1 controller
 text=Enchant creature -- When Vampirism enters the battlefield, draw a card at the beginning of the next turn's upkeep. -- Enchanted creature gets +1/+1 for each other creature you control. -- Other creatures you control get -1/-1.
 mana={1}{B}
 type=Enchantment