J0N4TH4N - removed cards that "draw and discard a card"

projects/mtg/bin/Res/sets/ALA/todo.dat

@@ -720,7 +720,20 @@ type=Instant
 mana={R}{G}{W}
 [/card]
 
-
+[card]
+text={1}{W}, {T}: You gain 5 life.     {1}{U}, {T}: Draw a card, then discard a card.     {1}{B}, {T}: Target creature gets -2/-2 until end of turn.     {1}{R}, {T}: Obelisk of Alara deals 3 damage to target player.     {1}{G}, {T}: Target creature gets +4/+4 until end of turn.
+auto={1}{W}{T}:life:5
+auto={1}{U}{T}:moveto(graveyard) target(*|myhand) && Draw:1
+#Draw a card, then discard a card works but discard happen first, which is incorrect
+auto={1}{B}{T}:-2/-2 target(creature)
+auto={1}{R}{T}:damage:3 target(player)
+auto={1}{G}{T}:4/4 target(creature)
+id=183018
+name=Obelisk of Alara
+rarity=R
+type=Artifact
+mana={6}
+[/card]
 [card]
 text=When Oblivion Ring comes into play, remove another target nonland permanent from the game.      When Oblivion Ring leaves play, return the removed card to play under its owner's control.
 id=174909

projects/mtg/bin/Res/sets/CFX/_cards.dat

@@ -458,19 +458,6 @@ subtype=Elemental
 toughness=7
 [/card]
 [card]
-text={1}{W}, {T}: You gain 5 life.     {1}{U}, {T}: Draw a card, then discard a card.     {1}{B}, {T}: Target creature gets -2/-2 until end of turn.     {1}{R}, {T}: Obelisk of Alara deals 3 damage to target player.     {1}{G}, {T}: Target creature gets +4/+4 until end of turn.
-auto={1}{W}{T}:life:5
-auto={1}{U}{T}:Draw:1
-auto={1}{B}{T}:-2/-2 target(creature)
-auto={1}{R}{T}:damage:3 target(player)
-auto={1}{G}{T}:4/4 target(creature)
-id=183018
-name=Obelisk of Alara
-rarity=R
-type=Artifact
-mana={6}
-[/card]
-[card]
 text=Flying. Deathtouch (Whenever this creature deals damage to a creature, destroy that creature.)  {2}{R}: Pestilent Kathari gains first strike until end of turn.
 auto={2}{R}:first strike
 id=179518

projects/mtg/bin/Res/sets/MOR/_cards.dat

@@ -136,19 +136,6 @@ mana={R}
 type=Instant
 [/card]
 [card]
-name=Inspired Sprite
-mana={U}{3}
-type=Creature
-subtype=Faerie Wizard
-text=Flash. Flying. Whenever you cast a Wizard spell, you may untap Inspired Sprite. {T}: Draw a card, then discard a card.
-abilities=flash,flying
-auto=@movedTo(wizard|mystack):may untap
-auto={T}:draw:1 && moveto(graveyard) target(*|myhand)
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text=Knight creatures you control have double strike.
 id=153279
 auto=lord(creature|mybattlefield) double strike

projects/mtg/bin/Res/sets/MOR/todo.dat

@@ -444,7 +444,20 @@ toughness=1
 text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Ink Dissolver, you may reveal it. If you do, each opponent puts the top three cards of his or her library into his or her graveyard.
 rarity=C
 [/card]
-
+[card]
+name=Inspired Sprite
+mana={U}{3}
+type=Creature
+subtype=Faerie Wizard
+text=Flash. Flying. Whenever you cast a Wizard spell, you may untap Inspired Sprite. {T}: Draw a card, then discard a card.
+abilities=flash,flying
+auto=@movedTo(wizard|mystack):may untap
+auto={T}:draw:1 && moveto(graveyard) target(*|myhand)
+#Draw a card, then discard a card works but discard happen first, which is incorrect
+power=2
+toughness=2
+rarity=U
+[/card]
 
 [card]
 id=152977

projects/mtg/bin/Res/sets/MRD/_cards.dat

@@ -104,7 +104,7 @@ toughness=3
 [/card]
 [card]
 text=When Cathodion is put into a graveyard from the battlefield, add {3} to your mana pool.
-auto=@movedTo(this|graveyard):Add{3}
+auto=@movedTo(this|graveyard) from(battlefield):Add{3}
 id=48195
 name=Cathodion
 rarity=U