update/fix some card codes

also add some missing cards from THS block

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

@@ -1445,7 +1445,7 @@ toughness=1
 [card]
 name=Agent of the Fates
 abilities=deathtouch
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice !$ opponent
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice !$ opponent
 text=Deathtouch. -- Heroic - Whenever you cast a spell that targets Agent of the Fates, each opponent sacrifices a creature. 
 mana={1}{B}{B}
 type=Creature
@@ -1914,7 +1914,7 @@ toughness=1
 [/card]
 [card]
 name=Akroan Conscriptor
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):name(gain control of target creature until end of turn) target(other creature|battlefield) moveTo(mybattlefield) and!( transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot )!
 text=Heroic — Whenever you cast a spell that targets Akroan Conscriptor, gain control of another target creature until end of turn. Untap that creature. It gains haste until end of turn.
 mana={4}{R}
 type=Creature
@@ -1924,7 +1924,7 @@ toughness=2
 [/card]
 [card]
 name=Akroan Crusader
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):token(Soldier,Creature Soldier,1/1,red,haste) controller
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):token(Soldier,Creature Soldier,1/1,red,haste) controller
 text=Heroic — Whenever you cast a spell that targets Akroan Crusader, put a 1/1 red Soldier creature token with haste onto the battlefield.
 mana={R}
 type=Creature
@@ -1966,8 +1966,8 @@ toughness=1
 [/card]
 [card]
 name=Akroan Line Breaker
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):2/0 ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):2/0 ueot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):intimidate ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):intimidate ueot
 text=Heroic — Whenever you cast a spell that targets Akroan Line Breaker, Akroan Line Breaker gets +2/+0 and gains intimidate until end of turn.
 mana={2}{R}
 type=Creature
@@ -2010,7 +2010,7 @@ toughness=2
 [card]
 name=Akroan Skyguard
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 text=Flying. -- Heroic -- Whenever you cast a spell that targets Akroan Skyguard, put a +1/+1 counter on Akroan Skyguard.
 mana={1}{W}
 type=Creature
@@ -3071,8 +3071,8 @@ toughness=2
 [card]
 name=Anax and Cymede
 abilities=first strike,vigilance
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):all(creature|myBattlefield) 1/1 ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):all(creature|myBattlefield) 1/1 ueot
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):all(creature|mybattlefield) trample ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):all(creature|mybattlefield) trample ueot
 text=Heroic - Whenever you cast a spell that targets Anax and Cymede, creatures you control get +1/+1 and gain trample until end of turn. 
 mana={1}{R}{W}
 type=Legendary Creature
@@ -4000,7 +4000,7 @@ type=Enchantment
 [/card]
 [card]
 name=Anthousa, Setessan Hero
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):target(<upto:3>land) transforms((Creature Warrior,setpower=2,settoughness=2)) ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):target(<upto:3>land) transforms((Creature Warrior,setpower=2,settoughness=2)) ueot
 text=Heroic - Whenever you cast a spell that targets Anthoussa, Setessan Hero, up to three target lands you control each become 2/2 Warrior creatures until end of turn. They're still lands. 
 mana={3}{G}{G}
 type=Legendary Creature
@@ -4489,7 +4489,7 @@ toughness=1
 [card]
 name=Arboria
 auto=lord(creature) transforms((,newability[@each my beginofturn restriction{lastturn(*[-token]|mystack;mybattlefield)~morethan~0}:canattack ueot],cantattack))
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Creatures can't attack a player unless that player cast a spell or put a nontoken permanent onto the battlefield during his or her last turn.
 mana={2}{G}{G}
 type=World Enchantment
@@ -5165,7 +5165,7 @@ toughness=2
 [/card]
 [card]
 name=Arena Athlete
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):cantblock target(creature|opponentbattlefield) ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):cantblock target(creature|opponentbattlefield) ueot
 text=Heroic - Whenever you cast a spell that targets Arena Athlete, target creature an opponent controls can't block this turn. 
 mana={1}{R}
 type=Creature
@@ -5982,7 +5982,7 @@ type=Sorcery
 [/card]
 [card]
 name=Ashiok's Adept
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):ability$!name(discard) reject notatarget(*|myhand)!$ opponent
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):ability$!name(discard) reject notatarget(*|myhand)!$ opponent
 text=Heroic -- Whenever you cast a spell that targets Ashiok's Adept, each opponent discards a card.
 mana={2}{B}
 type=Creature
@@ -9316,7 +9316,7 @@ toughness=2
 [/card]
 [card]
 name=Battlewise Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1) && name(Scry) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && name(Scry) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
 text=Heroic — Whenever you cast a spell that targets Battlewise Hoplite, put a +1/+1 counter on Battlewise Hoplite, then scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={W}{U}
 type=Creature
@@ -11767,7 +11767,7 @@ toughness=2
 [/card]
 [card]
 name=Bloodcrazed Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 auto=@counteradded(1/1) from(this):counter(1/1,-1) target(creature|opponentbattlefield)
 text=Heroic — Whenever you cast a spell that targets Bloodcrazed Hoplite, put a +1/+1 counter on it. -- Whenever a +1/+1 counter is placed on Bloodcrazed Hoplite, remove a +1/+1 counter from target creature an opponent controls.
 mana={1}{B}
@@ -12757,7 +12757,7 @@ name=Boiling Earth
 other={6}{R} name(Awaken)
 auto=damage:1 all(creature|opponentbattlefield)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Boiling Earth deals 1 damage to each creature your opponents control. -- Awaken 4?{6}{R} (If you cast this spell for {6}{R}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Boiling Earth deals 1 damage to each creature your opponents control. -- Awaken 4-{6}{R} (If you cast this spell for {6}{R}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{R}
 type=Sorcery
 [/card]
@@ -15858,7 +15858,7 @@ mana={3}
 type=Artifact
 [/card]
 [card]
-name=Calvary Pegasus
+name=Cavalry Pegasus
 abilities=flying
 auto=@combat(attacking) source(this):all(human[attacking]) flying ueot
 text=Flying. -- Whenever Cavalry Pegasus attacks, each attacking Human gains flying until end of turn.
@@ -17281,7 +17281,7 @@ toughness=2
 [/card]
 [card]
 name=Centaur Battlemaster
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,3)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,3)
 text=Heroic - Whenever you cast a spell that targets Centaur Battlemaster, put three +1/+1 counters on Centaur Battlemaster. 
 mana={3}{G}{G}
 type=Creature
@@ -18103,7 +18103,7 @@ type=Instant
 name=Chaosphere
 auto=lord(creature[flying]) cloud
 auto=lord(creature[-flying]) reach
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Creatures with flying can block only creatures with flying. -- Creatures without flying have reach. (They can block creatures with flying.)
 mana={2}{R}
 type=World Enchantment
@@ -18766,7 +18766,7 @@ type=Instant
 [card]
 name=Chorus of the Tides
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1) && name(Scry) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && name(Scry) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(mylibrary) optiononeend optiontwo name(put on bottom) target(<1>*|reveal) bottomoflibrary optiontwoend revealend
 text=Flying -- Heroic — Whenever you cast a spell that targets Chorus of the Tides, scry 1. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={3}{U}
 type=Creature
@@ -20201,7 +20201,7 @@ target=creature|battlefield
 auto=moveto(ownerhand)
 other={4}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=Return target creature to its owner's hand. -- Awaken 3?{4}{U} (If you cast this spell for {4}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Return target creature to its owner's hand. -- Awaken 3-{4}{U} (If you cast this spell for {4}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={U}
 type=Sorcery
 [/card]
@@ -20290,7 +20290,7 @@ name=Coastal Discovery
 auto=draw:2 controller
 other={5}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Draw two cards. -- Awaken 4?{5}{U} (If you cast this spell for {5}{U}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Draw two cards. -- Awaken 4-{5}{U} (If you cast this spell for {5}{U}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={3}{U}
 type=Sorcery
 [/card]
@@ -20876,7 +20876,7 @@ subtype=Aura
 [card]
 name=Concordant Crossroads
 auto=lord(creature) haste
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=All creatures have haste.
 mana={G}
 type=World Enchantment
@@ -25317,8 +25317,8 @@ type=Enchantment
 [card]
 name=Dawnbringer Charioteers
 abilities=flying,lifelink
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
-text=Flying, lifelink -- Heroic ?- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
+text=Flying, lifelink -- Heroic -- Whenever you cast a spell that targets Dawnbringer Charioteers, put a +1/+1 counter on Dawnbringer Charioteers.
 mana={2}{W}{W}
 type=Creature
 subtype=Human Soldier
@@ -28410,6 +28410,16 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Disciple of Phenax
+auto=target(player) reveal:type:manab:mybattlefield revealzone(targetedpersonshand) optionone choice name(choose Discards) target(<1>*|reveal) moveto(ownerhand) and!(reject)! optiononeend optiontwo all(*|reveal) moveto(ownerhand) optiontwoend revealend
+text=When Disciple of Phenax enters the battlefield, target player reveals a number of cards from his or her hand equal to your devotion to black. You choose one of them. That player discards that card. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.)
+mana={2}{B}{B}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=3
+[/card]
+[card]
 name=Disciple of Tevesh Szat
 auto={T}:-1/-1 target(creature)
 auto={4}{B}{B}{T}{S}:-6/-6 target(creature)
@@ -32101,7 +32111,7 @@ target=*|battlefield
 auto=counter(1/1,2)
 other={6}{G} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Put two +1/+1 counters on target permanent. -- Awaken 4?{6}{G} (If you cast this spell for {6}{G}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Put two +1/+1 counters on target permanent. -- Awaken 4-{6}{G} (If you cast this spell for {6}{G}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{G}
 type=Sorcery
 [/card]
@@ -33107,7 +33117,7 @@ toughness=3
 [/card]
 [card]
 name=Elite Skirmisher
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):may tap target(creature)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):may tap target(creature)
 text=Heroic -- Whenever you cast a spell that targets Elite Skirmisher, you may tap target creature.
 mana={2}{W}
 type=Creature
@@ -34138,7 +34148,7 @@ target=opponent
 auto=preventallcombatdamage from(creature|targetedpersonsbattlefield)
 other={4}{W} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.2)],newability[haste])) forever
-text=Prevent all combat damage that would be dealt this turn by creatures target opponent controls. -- Awaken 2?{4}{W} (If you cast this spell for {4}{W}, also put two +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Prevent all combat damage that would be dealt this turn by creatures target opponent controls. -- Awaken 2-{4}{W} (If you cast this spell for {4}{W}, also put two +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={2}{W}
 type=Instant
 [/card]
@@ -34805,6 +34815,19 @@ mana={5}
 type=Artifact
 [/card]
 [card]
+name=Ephara, God of the Polis
+abilities=indestructible
+auto=@each upkeep restriction{lastturn(other creature|mybattlefield)~morethan~0}:draw:1 controller
+auto=this(variable{azorius}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{azorius}>6) transforms((Legendary Enchantment Creature))
+text=Indestructible -- As long as your devotion to white and blue is less than seven, Ephara isn't a creature. -- At the beginning of each upkeep, if you had another creature enter the battlefield under your control last turn, draw a card.
+mana={2}{W}{U}
+type=Legendary Enchantment Creature
+subtype=God
+power=6
+toughness=5
+[/card]
+[card]
 name=Ephara's Enlightenment
 target=creature
 auto=counter(1/1,1)
@@ -34991,11 +35014,14 @@ toughness=1
 name=Erebos, God of the Dead
 abilities=indestructible,nolifegainopponent
 auto={1}{B}{L:2}:Draw:1 controller
-auto=this(variable{type:manab}>4) transforms((Creature,setpower=5,settoughness=7))
+auto=this(variable{type:manab}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{type:manab}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to black is less than five, Erebos isn't a creature. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.) -- Your opponents can't gain life. -- {1}{B}, Pay 2 life: Draw a card.
 mana={3}{B}
-type=Legendary Enchantment
+type=Legendary Enchantment Creature
 subtype=God
+power=5
+toughness=7
 [/card]
 [card]
 name=Erebos's Emissary
@@ -36453,7 +36479,7 @@ type=Artifact
 name=Eye of Singularity
 auto=all(*[-basic]|battlefield) transforms((,newability[bury all(other *[share!name!])])) ueot
 auto=@movedTo(*[-basic]|battlefield):all(trigger[to]) transforms((,newability[bury all(other *[share!name!])])) ueot
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=When Eye of Singularity enters the battlefield, destroy each permanent with the same name as another permanent, except for basic lands. They can't be regenerated. -- Whenever a permanent other than a basic land enters the battlefield, destroy all other permanents with that name. They can't be regenerated.
 type=World Enchantment
 mana={3}{W}
@@ -36586,7 +36612,7 @@ type=Enchantment
 [card]
 name=Fabled Hero
 abilities=double strike
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 text=Double strike. -- Heroic - Whenever you cast a spell that targets Fabled Hero, put a +1/+1 counter on Fabled Hero. 
 mana={1}{W}{W}
 type=Creature
@@ -37604,7 +37630,7 @@ type=Enchantment
 [/card]
 [card]
 name=Favored Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1) && preventAllDamage to(this) ueot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) && preventAllDamage to(this) ueot
 text=Heroic - Whenever you cast a spell that targets Favored Hoplite, put a +1/+1 counter on Favored Hoplite and prevent all damage that would be dealt to it this turn.
 mana={W}
 type=Creature
@@ -37822,6 +37848,16 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Felhide Spiritbinder
+auto=@untapped(this) restriction{type(creature)~morethan~1}:pay({1}{R}) target(other creature) clone and!( transforms((Enchantment,newability[haste],newability[@each my endofturn:moveto(exile)])) oneshot )!
+text=Inspired — Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, put a token onto the battlefield that's a copy of another target creature except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step.
+mana={3}{R}
+type=Creature
+subtype=Minotaur Shaman
+power=3
+toughness=4
+[/card]
+[card]
 name=Felidar Cub
 auto={S}:destroy target(enchantment|battlefield)
 text=Sacrifice Felidar Cub: Destroy target enchantment.
@@ -41102,9 +41138,9 @@ name=Forsaken Wastes
 abilities=nolifegain,nolifegainopponent
 auto=@each my upkeep:life:-1 controller
 auto=@each opponent upkeep:life:-1 opponent
-auto=@targeted(this) from(*|mystack):life:-5 controller
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):life:-5 controller
-auto=@targeted(this) from(*|opponentstack):life:-5 opponent
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|opponentcastingzone):life:-5 opponent
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Players can't gain life. -- At the beginning of each player's upkeep, that player loses 1 life. -- Whenever Forsaken Wastes becomes the target of a spell, that spell's controller loses 5 life.
 mana={2}{B}
 type=World Enchantment
@@ -41345,8 +41381,8 @@ type=Instant
 [card]
 name=Fractured Loyalty
 target=creature
-auto=teach(creature) transforms((,newability[@targeted(this) from(*|opponentbattlefield):moveto(opponentbattlefield) all(this)],newability[@targeted(this) from(*|opponenthand):moveto(opponentbattlefield) all(this)],newability[@targeted(this) from(*|opponentstack):moveto(opponentbattlefield) all(this)],newability[@targeted(this) from(*|opponentgraveyard):moveto(opponentbattlefield) all(this)]))
+auto=teach(creature) transforms((,newability[@targeted(this) from(*|opponentzones):moveto(opponentbattlefield) all(this)]))
-auto=teach(creature) transforms((,newability[@targeted(this) from(*|mybattlefield):moveto(mybattlefield) all(this)],newability[@targeted(this) from(*|myhand):moveto(mybattlefield) all(this)],newability[@targeted(this) from(*|mystack):moveto(mybattlefield) all(this)],newability[@targeted(this) from(*|mygraveyard):moveto(mybattlefield) all(this)]))
+auto=teach(creature) transforms((,newability[@targeted(this) from(*|myzones):moveto(mybattlefield) all(this)]))
 text=Enchant creature -- Whenever enchanted creature becomes the target of a spell or ability, that spell or ability's controller gains control of that creature. (This effect lasts indefinitely.)
 mana={1}{R}
 type=Enchantment
@@ -44798,6 +44834,15 @@ mana={G}
 type=Sorcery
 [/card]
 [card]
+name=Glimpse the Sun God
+target=<prex>creature
+auto=tap
+auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Tap X target creatures. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={X}{W}
+type=Instant
+[/card]
+[card]
 name=Glimpse the Unthinkable
 target=player
 auto=deplete:10
@@ -46392,6 +46437,18 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Gods Willing
+target=creature|mybattlefield
+auto=choice name(green) transforms((,newability[protection from green],newability[scry:1 scrycore delayed dontshow donothing scrycoreend scryend])) ueot
+auto=choice name(red) transforms((,newability[protection from red],newability[scry:1 scrycore delayed dontshow donothing scrycoreend scryend])) ueot
+auto=choice name(blue) transforms((,newability[protection from blue],newability[scry:1 scrycore delayed dontshow donothing scrycoreend scryend])) ueot
+auto=choice name(black) transforms((,newability[protection from black],newability[scry:1 scrycore delayed dontshow donothing scrycoreend scryend])) ueot
+auto=choice name(white) transforms((,newability[protection from white],newability[scry:1 scrycore delayed dontshow donothing scrycoreend scryend])) ueot
+text=Target creature you control gains protection from the color of your choice until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={W}
+type=Instant
+[/card]
+[card]
 name=Gods' Eye, Gate to the Reikai
 auto={T}:Add{1}
 auto=@movedto(this|mygraveyard) from(Battlefield):token(Spirit,Creature Spirit,1/1)
@@ -47498,7 +47555,7 @@ toughness=3
 [card]
 name=Gravity Sphere
 auto=lord(creature) -flying
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=All creatures lose flying.
 mana={2}{R}
 type=World Enchantment
@@ -51178,11 +51235,14 @@ name=Heliod, God of the Sun
 abilities=indestructible
 auto=lord(other creature|mybattlefield) vigilance
 auto={2}{W}{W}:token(Cleric,Creature Enchantment Cleric,2/1,white) controller
-auto=this(variable{type:manaw}>4) transforms((Creature,setpower=5,settoughness=6))
+auto=this(variable{type:manaw}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{type:manaw}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to white is less than five, Heliod isn't a creature. (Each {W} in the mana costs of permanents you control counts toward your devotion to white.) -- Other creatures you control have vigilance. -- {2}{W}{W}: Put a 2/1 white Cleric enchantment creature token onto the battlefield.
 mana={3}{W}
-type=Legendary Enchantment
+type=Legendary Enchantment Creature
 subtype=God
+power=5
+toughness=6
 [/card]
 [card]
 name=Heliod's Emissary
@@ -51715,7 +51775,7 @@ toughness=3
 [card]
 name=Hero of Iroas
 auto=lord(aura|mycastingzone) altercost(colorless,-1)
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 text=Aura spells you cast cost 1 less to cast. -- Heroic -- Whenever you cast a spell that targets Hero of Iroas, put a +1/+1 counter on Hero of Iroas.
 mana={1}{W}
 type=Creature
@@ -52910,6 +52970,17 @@ power=3
 toughness=1
 [/card]
 [card]
+name=Horizon Scholar
+abilities=flying
+auto=scry:2 scrycore delayed dontshow donothing scrycoreend scryend
+text=Flying -- When Horizon Scholar enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+mana={5}{U}
+type=Creature
+subtype=Sphinx
+power=4
+toughness=4
+[/card]
+[card]
 name=Horizon Seed
 auto=@movedTo(arcane,spirit|mystack):regenerate target(creature)
 text=Whenever you cast a Spirit or Arcane spell, regenerate target creature.
@@ -54869,7 +54940,7 @@ auto=@movedto(instant[manacost=13]|stack):all(trigger[to]) transforms((,newabili
 auto=@movedto(instant[manacost=14]|stack):all(trigger[to]) transforms((,newability[pay[[{14}]] name(pay 14 mana) donothing?fizzle])) forever
 auto=@movedto(instant[manacost=15]|stack):all(trigger[to]) transforms((,newability[pay[[{15}]] name(pay 15 mana) donothing?fizzle])) forever
 auto=@movedto(instant[manacost=16]|stack):all(trigger[to]) transforms((,newability[pay[[{16}]] name(pay 16 mana) donothing?fizzle])) forever
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Whenever a player casts an instant spell, counter it unless that player pays {X}, where X is its converted mana cost.
 mana={2}{U}
 type=World Enchantment
@@ -61298,7 +61369,7 @@ toughness=3
 name=Koskun Falls
 auto=upcost[{T(creature|mybattlefield)}] sacrifice
 auto=lord(creature|opponentbattlefield) transforms((,newability[attackcost:2]))
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=At the beginning of your upkeep, sacrifice Koskun Falls unless you tap an untapped creature you control. -- Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
 mana={2}{B}{B}
 type=World Enchantment
@@ -62225,7 +62296,7 @@ toughness=2
 [/card]
 [card]
 name=Labyrinth Champion
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):damage:2 target(creature,player)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):damage:2 target(creature,player)
 text=Heroic - Whenever you cast a spell that targets Labyrinth Champion, Labyrinth Champion deals 2 damage to target creature or player. 
 mana={3}{R}
 type=Creature
@@ -62360,8 +62431,8 @@ toughness=2
 [/card]
 [card]
 name=Lagonna-Band Trailblazer
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
-text=Heroic ?- Whenever you cast a spell that targets  Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
+text=Heroic -- Whenever you cast a spell that targets  Lagonna-Band Trailblazer, put a +1/+1 counter on Lagonna-Band Trailblazer.
 mana={W}
 type=Creature
 subtype=Centaur Scout
@@ -63374,7 +63445,7 @@ toughness=1
 [/card]
 [card]
 name=Leonin Iconoclast
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):destroy target(Creature[enchantment]|opponentbattlefield)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):destroy target(Creature[enchantment]|opponentbattlefield)
 text=Heroic — Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
 mana={3}{W}
 type=Creature
@@ -64597,7 +64668,7 @@ type=Enchantment
 [/card]
 [card]
 name=Living Plane
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 auto=lord(land) becomes(Creature,1/1)
 text=All lands are 1/1 creatures that are still lands.
 mana={2}{G}{G}
@@ -69084,6 +69155,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Meletis Astronomer
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):reveal:3 optionone name(put in hand) notatarget(<1>*[enchantment]|reveal) moveto(ownerhand) optiononeend optiontwo notatarget(<3>*|reveal) bottomoflibrary optiontwoend revealend
+text=Heroic — Whenever you cast a spell that targets Meletis Astronomer, look at the top three cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+mana={1}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=3
+[/card]
+[card]
 name=Melira, Sylvok Outcast
 abilities=poisonshroud
 auto=countershroud(-1/-1)creature|mybattlefield
@@ -69475,7 +69556,7 @@ toughness=2
 [card]
 name=Mercurial Pretender
 auto=may copy NotATarget(creature) and!( transforms((,newability[{2}{U}{U}:moveto(ownerhand)])) forever )!
-text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains ?{2}{U}{U}: Return this creature to its owner?s hand.? 
+text=You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand." 
 mana={4}{U}
 type=Creature
 subtype=Shapeshifter
@@ -71023,7 +71104,7 @@ other={5}{B} name(Awaken)
 target=opponent
 auto=ability$!name(discard 2) notatarget(<2>*|myhand) reject!$ targetedplayer
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=Target opponent discards two cards. -- Awaken 3?{5}{B} (If you cast this spell for {5}{B}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Target opponent discards two cards. -- Awaken 3-{5}{B} (If you cast this spell for {5}{B}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={3}{B}
 type=Sorcery
 [/card]
@@ -74137,7 +74218,7 @@ toughness=1
 name=Mystic Decree
 auto=lord(creature) -islandwalk
 auto=lord(creature) -flying
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=All creatures lose flying and islandwalk.
 mana={2}{U}{U}
 type=World Enchantment
@@ -75470,6 +75551,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Nessian Game Warden
+auto=name(Look at My top cards) reveal:type:forest:mybattlefield optionone name(Get a Card) target(creature|reveal) moveto(myhand) optiononeend optiontwo all(*|reveal) bottomoflibrary optiontwoend revealend
+text=When Nessian Game Warden enters the battlefield, look at the top X cards of your library, where X is the number of Forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+mana={3}{G}{G}
+type=Creature
+subtype=Beast
+power=4
+toughness=5
+[/card]
+[card]
 name=Nest Invader
 auto=token(Eldrazi Spawn,Creature Eldrazi Spawn,0/1) and!( transforms((,newability[{S}:Add{1}])) forever )!
 text=When Nest Invader enters the battlefield, put a 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add {1} to your mana pool."
@@ -75543,7 +75634,7 @@ toughness=1
 [card]
 name=Nether Void
 auto=@movedto(*|stack):all(trigger[to]) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) forever
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Whenever a player casts a spell, counter it unless its controller pays {3}.
 mana={3}{B}
 type=World Enchantment
@@ -77318,11 +77409,14 @@ name=Nylea, God of the Hunt
 abilities=indestructible
 auto=lord(other creature|mybattlefield) trample
 auto={3}{G}:2/2 target(creature) ueot
-auto=this(variable{type:manag}>4) transforms((Creature,setpower=6,settoughness=6))
+auto=this(variable{type:manag}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{type:manag}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to green is less than five, Nylea isn't a creature. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.) -- Other creatures you control have trample. -- {3}{G}: Target creature gets +2/+2 until end of turn.
 mana={3}{G}
-type=Legendary Enchantment
+type=Legendary Enchantment Creature
 subtype=God
+power=6
+toughness=6
 [/card]
 [card]
 name=Nylea's Disciple
@@ -78312,6 +78406,16 @@ mana={1}{U}
 type=Sorcery
 [/card]
 [card]
+name=Omenspeaker
+auto=scry:2 scrycore delayed dontshow donothing scrycoreend scryend
+text=When Omenspeaker enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+mana={1}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=3
+[/card]
+[card]
 name=Omnath, Locus of Rage
 auto=@movedTo(land|myBattlefield):token(Elemental,Creature Elemental,5/5,red,green) controller
 auto=@movedto(Elemental|graveyard) from(mybattlefield):damage:3 target(creature,player)
@@ -78397,7 +78501,7 @@ name=Ondu Rising
 auto=emblem transforms((,newability[@combat(attacking) source(creature|mybattlefield):all(trigger[to]) lifelink ueot])) ueot
 other={4}{W} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Whenever a creature attacks this turn, it gains lifelink until end of turn. -- Awaken 4?{4}{W} (If you cast this spell for {4}{W}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Whenever a creature attacks this turn, it gains lifelink until end of turn. -- Awaken 4-{4}{W} (If you cast this spell for {4}{W}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{W}
 type=Sorcery
 [/card]
@@ -80637,7 +80741,7 @@ auto=turns:+1 controller
 auto=moveTo(exile)
 other={6}{U}{U}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.6)],newability[haste])) forever
-text=Take an extra turn after this one. Exile Part the Waterveil. -- Awaken 6?{6}{U}{U}{U} (If you cast this spell for {6}{U}{U}{U}, also put six +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Take an extra turn after this one. Exile Part the Waterveil. -- Awaken 6-{6}{U}{U}{U} (If you cast this spell for {6}{U}{U}{U}, also put six +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={4}{U}{U}
 type=Sorcery
 [/card]
@@ -81615,7 +81719,7 @@ toughness=4
 [/card]
 [card]
 name=Phalanx Leader
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1) all(creature|mybattlefield)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1) all(creature|mybattlefield)
 text=Heroic - Whenever you cast a spell that targets Phalanx Leader, put a+1/+1 counter on each creature you control. 
 mana={W}{W}
 type=Creature
@@ -81889,6 +81993,19 @@ power=2
 toughness=0
 [/card]
 [card]
+name=Pharika, God of Affliction
+abilities=indestructible
+auto={B}{G}:target(creature|graveyard) moveto(exile) and!( makecardt(Snake:Creature Snake Enchantment:1/1:deathtouch:black:green) targetcontroller )!
+auto=this(variable{golgari}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{golgari}>6) transforms((Legendary Enchantment Creature))
+text=Indestructible -- As long as your devotion to black and green is less than seven, Pharika isn't a creature. -- {B}{G}: Exile target creature card from a graveyard. Its owner puts a 1/1 black and green Snake enchantment creature token with deathtouch onto the battlefield.
+mana={1}{B}{G}
+type=Legendary Enchantment Creature
+subtype=God
+power=5
+toughness=5
+[/card]
+[card]
 name=Pharika's Chosen
 abilities=deathtouch
 text=Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)
@@ -81973,8 +82090,8 @@ toughness=5
 [/card]
 [card]
 name=Pheres-Band Thunderhoof
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,2)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
-text=Heroic ?- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
+text=Heroic -- Whenever you cast a spell that targets Pheres-Band Thunderhoof, put two +1/+1 counters on Pheres-Band Thunderhoof.
 mana={4}{G}
 type=Creature
 subtype=Centaur Warrior
@@ -82693,7 +82810,7 @@ toughness=3
 [/card]
 [card]
 name=Pillar Tombs of Aku
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 auto=@each my upkeep restriction{type(creature|mybattlefield)~lessthan~2}:sacrifice && life:-5 controller
 auto=@each opponent upkeep restriction{type(creature|opponentbattlefield)~morethan~0}:ability$!choice name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice _ choice name(life loss and sacrifice Tombs) sacrifice all(mystored) && life:-5!$ opponent
 auto=@each opponent upkeep restriction{type(creature|opponentbattlefield)~lessthan~1}:sacrifice && life:-5 opponent
@@ -83233,7 +83350,7 @@ name=Planar Outburst
 auto=destroy all(creature[-land]|battlefield)
 other={5}{W}{W}{W} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Destroy all nonland creatures. -- Awaken 4?{5}{W}{W}{W} (If you cast this spell for {5}{W}{W}{W}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Destroy all nonland creatures. -- Awaken 4-{5}{W}{W}{W} (If you cast this spell for {5}{W}{W}{W}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={3}{W}{W}
 type=Sorcery
 [/card]
@@ -84067,6 +84184,17 @@ mana={U}
 type=Sorcery
 [/card]
 [card]
+name=Prescient Chimera
+abilities=flying
+auto=@movedTo(instant,sorcery|mystack):scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Flying -- Whenever you cast an instant or sorcery spell, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={3}{U}{U}
+type=Creature
+subtype=Chimera
+power=3
+toughness=4
+[/card]
+[card]
 name=Presence of Gond
 target=creature
 auto=teach(creature) {T}:token(Elf Warrior, Creature Elf Warrior,1/1,green)
@@ -84862,6 +84990,18 @@ power=10
 toughness=10
 [/card]
 [card]
+name=Prognostic Sphinx
+abilities=flying
+auto={D(*|myhand)}:opponentshroud && tap
+auto=@combat(attacking) source(this):scry:3 scrycore delayed dontshow donothing scrycoreend scryend
+text=Flying -- Discard a card: Prognostic Sphinx gains hexproof until end of turn. Tap it. -- Whenever Prognostic Sphinx attacks, scry 3. (Look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+mana={3}{U}{U}
+type=Creature
+subtype=Sphinx
+power=3
+toughness=5
+[/card]
+[card]
 name=Promise of Bunrei
 auto=@movedto(graveyard) from(creature|myBattlefield):token(Spirit,Creature Spirit,1/1)*4
 auto=@movedto(graveyard) from(creature|myBattlefield):bury
@@ -84942,6 +85082,17 @@ mana={3}{U}{R}
 type=Instant
 [/card]
 [card]
+name=Prophetic Flamespeaker
+abilities=double strike,trample
+auto=@combatdamaged(player) from(this):reveal:1 optionone all(*|reveal) moveto(exile) and!( transforms((,newability[canplayfromexile])) ueot)! optiononeend revealend
+text=Double strike, trample -- Whenever Prophetic Flamespeaker deals combat damage to a player, exile the top card of your library. You may play it this turn.
+mana={1}{R}{R}
+type=Creature
+subtype=Human Shaman
+power=1
+toughness=3
+[/card]
+[card]
 name=Prophetic Prism
 auto=draw:1
 auto={1}{T}:add{W}
@@ -85599,11 +85750,14 @@ name=Purphoros, God of the Forge
 abilities=indestructible
 auto=@movedto(other creature|mybattlefield):damage:2 opponent
 auto={2}{R}:all(creature|mybattlefield) 1/0 ueot
-auto=this(variable{type:manar}>4) transforms((Creature,setpower=6,settoughness=5))
+auto=this(variable{type:manar}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{type:manar}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to red is less than five, Purphoros isn't a creature. Whenever another creature enters the battlefield under your control, Purphoros deals 2 damage to each opponent. -- {2}{R}: Creatures you control get +1/+0 until end of turn.
 mana={3}{R}
-type=Legendary Enchantment
+type=Legendary Enchantment Creature
 subtype=God
+power=6
+toughness=5
 [/card]
 [card]
 name=Purphoros's Emissary
@@ -88397,6 +88551,18 @@ power=2
 toughness=5
 [/card]
 [card]
+name=Reaper of the Wilds
+auto=@movedTo(graveyard) from(other creature|battlefield):scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+auto={B}:deathtouch ueot
+auto={1}{G}:opponentshroud ueot
+text=Whenever another creature dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- {B}: Reaper of the Wilds gains deathtouch until end of turn. -- {1}{G}: Reaper of the Wilds gains hexproof until end of turn.
+mana={2}{B}{G}
+type=Creature
+subtype=Gorgon
+power=4
+toughness=5
+[/card]
+[card]
 name=Reap
 target=opponent
 auto=moveto(ownerhand) target(<upto:type:*[black]:targetedpersonsbattlefield>*|mygraveyard)
@@ -91060,6 +91226,14 @@ mana={5}{U}
 type=Sorcery
 [/card]
 [card]
+name=Rise of Eagles
+auto=makecardt(Bird:Creature Bird Enchantment:2/2:flying:blue)*2
+auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Put two 2/2 blue Bird enchantment creature tokens with flying onto the battlefield. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={4}{U}{U}
+type=Sorcery
+[/card]
+[card]
 name=Rise of the Dark Realms
 auto=moveTo(myBattlefield) all(creature|mygraveyard)
 auto=moveTo(myBattlefield) all(creature|opponentgraveyard)
@@ -91154,7 +91328,7 @@ name=Rising Miasma
 auto=all(creature|battlefield) -2/-2 ueot
 other={5}{B}{B} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=All creatures get -2/-2 until end of turn. -- Awaken 3?{5}{B}{B} (If you cast this spell for {5}{B}{B}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=All creatures get -2/-2 until end of turn. -- Awaken 3-{5}{B}{B} (If you cast this spell for {5}{B}{B}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={3}{B}
 type=Sorcery
 [/card]
@@ -91699,7 +91873,7 @@ target=creature|battlefield
 auto=moveto(ownerlibrary)
 other={4}{W}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Put target creature on top of its owner's library. -- Awaken 4?{4}{W}{U} (If you cast this spell for {4}{W}{U}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Put target creature on top of its owner's library. -- Awaken 4-{4}{W}{U} (If you cast this spell for {4}{W}{U}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{W}{U}
 type=Sorcery
 [/card]
@@ -92167,7 +92341,7 @@ toughness=2
 [card]
 name=Rotfeaster Maggot
 auto=moveTo(exile) target(creature|graveyard) and!( dynamicability<!mytgt toughnesslifegain srccontroller!> )!
-text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card?s toughness. 
+text=When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card's toughness. 
 mana={4}{B}
 type=Creature
 subtype=Insect
@@ -92517,7 +92691,7 @@ target=creature,planeswalker
 auto=destroy
 other={5}{B}{B} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.4)],newability[haste])) forever
-text=Destroy target creature or planeswalker. -- Awaken 4?{5}{B}{B} (If you cast this spell for {5}{B}{B}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Destroy target creature or planeswalker. -- Awaken 4-{5}{B}{B} (If you cast this spell for {5}{B}{B}, also put four +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{B}{B}
 type=Sorcery
 [/card]
@@ -92846,7 +93020,7 @@ auto=tap
 auto=frozen
 other={4}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=Tap target creature. It doesn't untap during its controller's next untap step. -- Awaken 3?{4}{U} (If you cast this spell for {4}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Tap target creature. It doesn't untap during its controller's next untap step. -- Awaken 3-{4}{U} (If you cast this spell for {4}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={U}
 type=Sorcery
 [/card]
@@ -94507,8 +94681,8 @@ toughness=1
 [/card]
 [card]
 name=Satyr Hoplite
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
-text=Heroic ?- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
+text=Heroic -- Whenever you cast a spell that targets Satyr Hoplite, put a +1/+1 counter on Satyr Hoplite.
 mana={R}
 type=Creature
 subtype=Satyr Soldier
@@ -95095,7 +95269,7 @@ target=*|stack
 auto=fizzle
 other={4}{U}{U} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=Counter target spell. -- Awaken 3?{4}{U}{U} (If you cast this spell for {4}{U}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Counter target spell. -- Awaken 3-{4}{U}{U} (If you cast this spell for {4}{U}{U}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={1}{U}{U}
 type=Instant
 [/card]
@@ -95625,6 +95799,14 @@ mana={3}{W}{W}
 type=Artifact
 [/card]
 [card]
+name=Scouring Sands
+auto=damage:1 all(creature|opponentbattlefield)
+auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Scouring Sands deals 1 damage to each creature your opponents control. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={1}{R}
+type=Sorcery
+[/card]
+[card]
 name=Scout the Borders
 auto=reveal:5 optionone name(Get creature or land) target(creature,land|reveal) moveto(myhand) optiononeend optiontwo name(put in grave) all(*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=Reveal the top five cards of your library. You may put a creature or land card from among them into your hand. Put the rest into your graveyard.
@@ -96149,6 +96331,15 @@ text={T}: Add {C} to your mana pool. ({C} represents colorless mana.) -- {2}{C},
 type=Land
 [/card]
 [card]
+name=Sea God's Revenge
+target=<upto:3>creature|opponentbattlefield
+auto=moveto(ownerhand)
+auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Return up to three target creatures your opponents control to their owners' hands. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={5}{U}
+type=Sorcery
+[/card]
+[card]
 name=Sea Kings' Blessing
 target=<anyamount>creature
 auto=transforms((,blue)) ueot
@@ -97700,7 +97891,7 @@ toughness=3
 [card]
 name=Serra Aviary
 auto=lord(creature[flying]) 1/1
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Creatures with flying get +1/+1.
 mana={3}{W}
 type=World Enchantment
@@ -97920,7 +98111,7 @@ type=Sorcery
 [/card]
 [card]
 name=Setessan Battle Priest
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):life:2 controller
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):life:2 controller
 text=Heroic - Whenever you cast a spell that targets Setessan Battle Priest, you gain 2 life. 
 mana={1}{W}
 type=Creature
@@ -97941,7 +98132,7 @@ toughness=2
 [/card]
 [card]
 name=Setessan Oathsworn
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,2)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
 text=Heroic -- Whenever you cast a spell that targets Setessan Oathsworn, put two +1/+1 counters on Setessan Oathsworn.
 mana={1}{G}{G}
 type=Creature
@@ -98669,7 +98860,7 @@ target=creature[tapped]|battlefield
 auto=destroy
 other={5}{W} name(Awaken)
 auto=if paid(alternative) then target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
-text=Destroy target tapped creature. -- Awaken 3?{5}{W} (If you cast this spell for {5}{W}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
+text=Destroy target tapped creature. -- Awaken 3-{5}{W} (If you cast this spell for {5}{W}, also put three +1/+1 counters on target land you control and it becomes a 0/0 Elemental creature with haste. It's still a land.)
 mana={2}{W}
 type=Sorcery
 [/card]
@@ -107607,7 +107798,7 @@ toughness=4
 [/card]
 [card]
 name=Staunch-Hearted Warrior
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,2)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,2)
 text=Heroic - Whenever you cast a spell that targets Staunch-Hearted Warrior, put two +1/+1 counters on Staunch-Hearted Warrior. 
 mana={3}{G}
 type=Creature
@@ -108737,7 +108928,7 @@ toughness=3
 name=Storm World
 auto=@each opponent upkeep:damage:0 && if type(*|opponenthand)~equalto~3 then damage:1 opponent && if type(*|opponenthand)~equalto~2 then damage:2 opponent && if type(*|opponenthand)~equalto~1 then damage:3 opponent && if type(*|opponenthand)~equalto~0 then damage:4 opponent
 auto=@each my upkeep:damage:0 && if type(*|myhand)~equalto~3 then damage:1 controller && if type(*|myhand)~equalto~2 then damage:2 controller && if type(*|myhand)~equalto~1 then damage:3 controller && if type(*|myhand)~equalto~0 then damage:4 controller
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=At the beginning of each player's upkeep, Storm World deals X damage to that player, where X is 4 minus the number of cards in his or her hand.
 mana={R}
 type=World Enchantment
@@ -109806,6 +109997,15 @@ mana={1}{B}{B}
 type=Instant
 [/card]
 [card]
+name=Sudden Storm
+target=<upto:2>creature
+auto=freeze
+auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
+text=Tap up to two target creatures. Those creatures don't untap during their controllers' next untap steps. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+mana={3}{U}
+type=Instant
+[/card]
+[card]
 name=Sudden Strength
 target=creature
 auto=3/3
@@ -112787,7 +112987,7 @@ type=Artifact
 name=Teferi's Realm
 auto=@each my upkeep:ability$!choice name(artifact) phaseout all(artifact) _ choice name(creature) phaseout all(creature) _ choice name(land) phaseout all(land) _ choice name(non-aura enchantment) phaseout all(enchantment[aura]) !$ controller
 auto=@each opponent upkeep:ability$!choice name(artifact) phaseout all(artifact) _ choice name(creature) phaseout all(creature) _ choice name(land) phaseout all(land) _ choice name(non-aura enchantment) phaseout all(enchantment[aura]) !$ opponent
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=At the beginning of each player's upkeep, that player chooses artifact, creature, land, or non-Aura enchantment. All nontoken permanents of that type phase out. (While they're phased out, they're treated as though they don't exist. Each one phases in before its controller untaps during his or her next untap step.)
 mana={1}{U}{U}
 type=World Enchantment
@@ -113721,7 +113921,7 @@ toughness=2
 [/card]
 [card]
 name=Tethmos High Priest
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):moveTo(mybattlefield) target(creature[manacost<=2]|mygraveyard)
 text=Heroic — Whenever you cast a spell that targets Tethmos High Priest, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
 mana={2}{W}
 type=Creature
@@ -114021,11 +114221,14 @@ name=Thassa, God of the Sea
 abilities=Indestructible
 auto={1}{u}:target(creature|mybattlefield) unblockable ueot
 auto=@each my upkeep:scry:1 scrycore delayed dontshow donothing scrycoreend scryend
-auto=this(variable{type:manau} >4) transforms((Creature,setpower=5,settoughness=5))
+auto=this(variable{type:manau}<5) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{type:manau}>4) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to blue is less than five, Thassa isn't a creature. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) -- At the beginning of your upkeep, scry 1. -- {1}{U}: Target creature you control can't be blocked this turn.
 mana={2}{U}
-type=Legendary Enchantment
+type=Legendary Enchantment Creature
 subtype=God
+power=5
+toughness=5
 [/card]
 [card]
 name=Thassa's Bounty
@@ -114114,7 +114317,7 @@ type=Land
 name=The Abyss
 auto=@each opponent upkeep:ability$!name(bury creature) notatarget(creature[-artifact]|mybattlefield) bury !$ opponent
 auto=@each my upkeep:notatarget(creature[-artifact]|mybattlefield) bury
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.
 mana={3}{B}
 type=World Enchantment
@@ -116544,7 +116747,7 @@ name=Tombstone Stairwell
 auto=cumulativeupcost[{1}{B}] sacrifice
 auto=@each upkeep:foreach(creature|mygraveyard) token(Tombspawn,Creature Zombie,2/2,unearth,haste,black) && foreach(creature|opponentgraveyard) token(Tombspawn,Creature Zombie,2/2,unearth,haste,black) opponent
 auto=@movedto(this|nonbattlezone) from(battlefield):bury all(Tombspawn)
-auto=@movedTo(enchantment[world]|battlefield):sacrifice all(this)
+auto=@movedTo(other enchantment[world]|battlefield):sacrifice all(this)
 text=Cumulative upkeep {1}{B} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) -- At the beginning of each upkeep, if Tombstone Stairwell is on the battlefield, each player puts a 2/2 black Zombie creature token with haste named Tombspawn onto the battlefield for each creature card in his or her graveyard. -- At the beginning of each end step or when Tombstone Stairwell leaves the battlefield, destroy all tokens put onto the battlefield with Tombstone Stairwell. They can't be regenerated.
 mana={2}{B}{B}
 type=World Enchantment
@@ -118439,7 +118642,7 @@ toughness=1
 [/card]
 [card]
 name=Triton Cavalry
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):may moveTo(ownerhand) target(enchantment|battlefield) 
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):may moveTo(ownerhand) target(enchantment|battlefield) 
 text=Heroic — Whenever you cast a spell that targets Triton Cavalry, you may return target enchantment to its owner's hand.
 mana={3}{U}
 type=Creature
@@ -118449,7 +118652,7 @@ toughness=4
 [/card]
 [card]
 name=Triton Fortune Hunter
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):draw:1 controller
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):draw:1 controller
 text=Heroic - Whenever you cast a spell that targets Triton Fortune Hunter, draw a card. 
 mana={2}{U}
 type=Creature
@@ -121376,7 +121579,7 @@ type=Sorcery
 [card]
 name=Vanguard of Brimaz
 abilities=vigilance
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):token(Cat Soldier,Creature Cat Soldier,1/1,white,vigilance) controller
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):token(Cat Soldier,Creature Cat Soldier,1/1,white,vigilance) controller
 text=Vigilance -- Heroic -- Whenever you cast a spell that targets Vanguard of Brimaz, put a 1/1 white Cat Soldier creature token with vigilance onto the battlefield.
 mana={W}{W}
 type=Creature
@@ -126099,7 +126302,7 @@ toughness=1
 [card]
 name=War-Wing Siren
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 text=Flying -- Heroic -- Whenever you cast a spell that targets War-Wing Siren, put a +1/+1 counter on War-Wing Siren.
 mana={2}{U}
 type=Creature
@@ -126361,7 +126564,7 @@ type=Sorcery
 [/card]
 [card]
 name=Wavecrash Triton
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):target(creature|opponentbattlefield) transforms((,newability[tap],newability[frozen])) oneshot
 text=Heroic — Whenever you cast a spell that targets Wavecrash Triton, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 mana={2}{U}
 type=Creature
@@ -128296,7 +128499,7 @@ subtype=Shapeshifter
 [card]
 name=Wingsteed Rider
 abilities=flying
-auto=@targeted(this) from(*[instant;sorcery;enchantment]|myhand,mygraveyard):counter(1/1,1)
+auto=@targeted(this) from(*[instant;sorcery;enchantment]|mycastingzone):counter(1/1,1)
 text=Flying. -- Heroic -- Whenever you cast a spell that targets Wingsteed Rider, put a +1/+1 counter on Wingsteed Rider.
 mana={1}{W}{W}
 type=Creature
@@ -129868,6 +130071,17 @@ power=6
 toughness=5
 [/card]
 [card]
+name=Xenagos, the Reveler
+auto=counter(0/0,3,loyalty)
+auto={C(0/0,1,Loyalty)}:name(+1: Red/Green Mana) foreach(creature|mybattlefield) ability$! choice add{R} _ choice add{G} !$ controller
+auto={C(0/0,0,Loyalty)}:name(0: Satyr token) token(Satyr,Creature Satyr,2/2,haste,green,red)
+auto={C(0/0,-6,Loyalty)}:name(-6: Exile Cards) reveal:7 revealzone(mylibrary) optionone target(<anyamount>creature,land|reveal) moveto(mybattlefield) and!( all(*[-land;-creature]|reveal) moveto(ownerexile) )! optiononeend optiontwo all(*|reveal) moveto(ownerexile) optiontwoend revealend
+text=+1: Add X mana in any combination of {R} and/or {G} to your mana pool, where X is the number of creatures you control. -- 0: Put a 2/2 red and green Satyr creature token with haste onto the battlefield. -- -6: Exile the top seven cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield.
+mana={2}{R}{G}
+type=Planeswalker
+subtype=Xenagos
+[/card]
+[card]
 name=Xenograft
 auto=chooseatype lord(creature|mybattlefield) transforms((chosentype)) chooseend
 text=As Xenograft enters the battlefield, choose a creature type. Each creature you control is the chosen type in addition to its other types.