Erwan

- bug fix with lords and -color
- added tests

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

@@ -243,6 +243,19 @@ subtype=Hag
 toughness=1
 [/card]
 [card]
+text=Flying     Attacking creatures you control get +2/+0.
+auto=lord(creature[attacking]|myinplay) 2/0 includeself
+abilities=flying
+id=154258
+name=Nobilis of War
+rarity=R
+type=Creature
+mana={RW}{RW}{RW}{RW}{RW}
+power=3
+subtype=Spirit Avatar
+toughness=4
+[/card]
+[card]
 text={1}{BG}: Regenerate Odious Trow.
 auto={1}{BG}:regenerate 
 id=150977
@@ -302,6 +315,19 @@ rarity=R
 type=Land
 [/card]
 [card]
+text={1}, Sacrifice a Scarecrow: Draw a card.     {4}, {T}: Return target artifact creature card from your graveyard to play.
+auto={1}{S(scarecrow|myinplay)}:draw:1
+auto={4}{T}:moveTo(myinplay) target(artifact|mygraveyard)
+id=157979
+name=Scarecrone
+rarity=R
+type=Artifact Creature
+mana={3}
+power=1
+subtype=Scarecrow
+toughness=2
+[/card]
+[card]
 text={3}: Target blue creature gains shroud until end of turn.
 auto={3}:shroud target(creature[blue])
 id=158297
@@ -427,6 +453,17 @@ subtype=Elf Warrior
 toughness=1
 [/card]
 [card]
+target=creature
+text=Remove target creature from the game.
+target=creature
+auto=moveTo(removedfromGame)
+id=151083
+name=Unmake
+rarity=C
+type=Instant
+mana={WB}{WB}{WB}
+[/card]
+[card]
 text={T}: Target red or green creature gets -2/-0 until end of turn.
 auto={T}:-2/0 target(creature[red])
 id=153476

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

@@ -864,18 +864,7 @@ power=2
 subtype=Shapeshifter
 toughness=1
 [/card]
-[card]
-text=Flying     Attacking creatures you control get +2/+0.
-abilities=flying
-id=154258
-name=Nobilis of War
-rarity=R
-type=Creature
-mana={RW}{RW}{RW}{RW}{RW}
-power=3
-subtype=Spirit Avatar
-toughness=4
-[/card]
+
 [card]
 text=Noggle Bandit can't be blocked except by creatures with defender.
 id=157286
@@ -1124,19 +1113,7 @@ rarity=U
 type=Sorcery
 mana={3}{G}{G}
 [/card]
-[card]
-text={1}, Sacrifice a Scarecrow: Draw a card.     {4}, {T}: Return target artifact creature card from your graveyard to play.
-auto={1}{S(scarecrow|myinplay)}:draw:1
-auto={4}{T}:moveTo(myinplay) target(artifact|mygraveyard)
-id=157979
-name=Scarecrone
-rarity=R
-type=Artifact Creature
-mana={3}
-power=1
-subtype=Scarecrow
-toughness=2
-[/card]
+
 [card]
 text=Enchant creature     As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn."     As long as enchanted creature is white, it gets +1/+1 and has lifelink. (Whenever it deals damage, its controller gains that much life.)
 target=creature
@@ -1382,15 +1359,7 @@ power=*
 subtype=Elemental
 toughness=*
 [/card]
-[card]
-target=creature
-text=Remove target creature from the game.
-id=151083
-name=Unmake
-rarity=C
-type=Instant
-mana={WB}{WB}{WB}
-[/card]
+
 [card]
 text=Creatures your opponents control get -1/-0 until end of turn if {U} was spent to play Unnerving Assault, and creatures you control get +1/+0 until end of turn if {R} was spent to play it. (Do both if {U}{R} was spent.)
 id=157416