Erwan

- Triggers made more generic in the parser

projects/mtg/bin/Res/sets/10E/_cards.dat

@@ -1305,6 +1305,23 @@ subtype=Human Barbarian
 toughness=1
 [/card]
 [card]
+text=Lands you control have "{T}: Add one mana of any color to your mana pool."
+auto=lord(land|myinplay) {T}: add{G}
+auto=lord(land|myinplay) {T}: add{R}
+auto=lord(land|myinplay) {T}: add{U}
+auto=lord(land|myinplay) {T}: add{B}
+auto=lord(land|myinplay) {T}: add{W}
+id=130500
+name=Joiner Adept
+rarity=R
+color=Green
+type=Creature
+mana={1}{G}
+power=2
+subtype=Elf Druid
+toughness=1
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
 auto={T}:Add {1}
 auto={T}:Add {R} && Damage 1 controller
@@ -2819,6 +2836,17 @@ subtype=Wolf
 toughness=1
 [/card]
 [card]
+text=You may tap or untap target artifact, creature, or land.     Draw a card.
+auto=may untap target(artifact,creature,land)
+auto=draw:1
+id=136286
+name=Twitch
+rarity=C
+color=Blue
+type=Instant
+mana={2}{U}
+[/card]
+[card]
 text=Flash (You may play this spell any time you could play an instant.)  Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature gets +2/+2 and attacks each turn if able.
 abilities=flash
 target=creature

projects/mtg/bin/Res/sets/10E/todo.dat

@@ -494,18 +494,7 @@ color=Red
 type=Instant
 mana={1}{R}
 [/card]
-[card]
-text=Lands you control have "{T}: Add one mana of any color to your mana pool."
-id=130500
-name=Joiner Adept
-rarity=R
-color=Green
-type=Creature
-mana={1}{G}
-power=2
-subtype=Elf Druid
-toughness=1
-[/card]
+
 [card]
 text=Karplusan Strider can't be the target of blue or black spells.
 id=129911
@@ -1219,15 +1208,7 @@ color=Blue
 type=Instant
 mana={U}{U}
 [/card]
-[card]
-text=You may tap or untap target artifact, creature, or land.     Draw a card.
-id=136286
-name=Twitch
-rarity=C
-color=Blue
-type=Instant
-mana={2}{U}
-[/card]
+
 [card]
 text=Whenever an opponent draws a card, Underworld Dreams deals 1 damage to him or her.
 id=129779

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

@@ -2098,17 +2098,7 @@ toughness=4
 text=Flash (You may play this spell any time you could play an instant.) Creature cards you own that aren't in play have flash. Each opponent can play spells only any time he or she could play a sorcery.
 rarity=R
 [/card]
-[card]
-id=111085
-name=Telekinetic Sliver
-mana={2}{U}{U}
-type=Creature
-subtype=Sliver
-power=2
-toughness=2
-text=All Slivers have "{T}: Tap target permanent."
-rarity=U
-[/card]
+
 
 [card]
 id=106654