Erwan

-fix issue 161 (brass man can untap outside of upkeep). Use "myUpkeepOnly" keyword. Other keywords such as "myDrawOnly" of course work. Haven't implemented "opponent" yet, is it needed ?

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

@@ -79,7 +79,7 @@ rarity=U
 mana={1}
 type=Artifact Creature
 subtype=Construct
-auto={1}:untap
+auto={1}:untap myUpkeepOnly
 power=1
 toughness=3
 abilities=doesnotuntap

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

@@ -251,7 +251,7 @@ type=Sorcery
 [card]
 text=Brass Man doesn't untap during your untap step.   At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Man.
 id=1099
-auto={1}:untap myTurnOnly
+auto={1}:untap myUpkeepOnly
 name=Brass Man
 rarity=U
 mana={1}

projects/mtg/bin/Res/test/_tests.txt

@@ -116,6 +116,7 @@ borderland_behemoth.txt
 bottle_gnomes.txt
 bottle_gnomes2.txt
 brass_man.txt
+brass_man_i161.txt
 cage_of_hands.txt
 Call_to_Heel_1.txt
 Call_to_Heel_2.txt

projects/mtg/bin/Res/test/brass_man_i161.txt

@@ -1,13 +1,9 @@
 #NAME: Brass Man untapping
 #DESC: Brass Man can untap outside of Upkeep.
-#DESC: To test this, we try to untap him in
-#DESC: secondmain and then cast Assassinate
-#DESC: on him (which should destroy him if
-#DESC: he's still tapped, which he should be).
 [INIT]
 combatattackers
 [PLAYER1]
-inplay:Brass Man,Island,Swamp,Plains,Forest
+inplay:Brass Man,Swamp,Plains,Forest
 hand:Assassinate
 [PLAYER2]
 life:20
@@ -17,10 +13,9 @@ next
 next
 next
 next
-Island
+Swamp
 Brass Man
 choice 0
-Swamp
 Plains
 Forest
 Assassinate
@@ -28,8 +23,7 @@ Brass Man
 [ASSERT]
 secondmain
 [PLAYER1]
-inplay:Island,Swamp,Plains,Forest
-hand:
+inplay:Swamp,Plains,Forest
 graveyard:Brass Man,Assassinate
 [PLAYER2]
 life:19