Erwan

-fix issue 287 (urza's mine)

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

@@ -366,123 +366,64 @@ mana={1}
 type=Artifact
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
 id=1080
-name=Urza's Mine
+primitive=Urza's Mine
 rarity=C
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power-Plant|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Mine
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
 id=1081
-name=Urza's Mine
-rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power-Plant|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Mine
+primitive=Urza's Mine
+rarity=C
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
 id=1082
-name=Urza's Mine
+primitive=Urza's Mine
 rarity=C
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power-Plant|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Mine
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
 id=1083
-name=Urza's Mine
-rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power-Plant|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Mine
+primitive=Urza's Mine
+rarity=C
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
 id=1084
-name=Urza's Power Plant
+primitive=Urza's Power Plant
 rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Mine|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Power-Plant
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
 id=1085
-name=Urza's Power Plant
-rarity=C
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Mine|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Power-Plant
+primitive=Urza's Power Plant
+rarity=U
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
 id=1086
-name=Urza's Power Plant
-rarity=C
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Mine|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Power-Plant
+primitive=Urza's Power Plant
+rarity=U
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
 id=1087
-name=Urza's Power Plant
+primitive=Urza's Power Plant
 rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Mine|myinplay)aslongas(Urza's Tower|myinplay){T}:add{2}
-subtype=Urza's Power-Plant
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
 id=1088
-name=Urza's Tower
+primitive=Urza's Tower
 rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Mine|myinplay){T}:add{3}
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
 id=1089
-name=Urza's Tower
+primitive=Urza's Tower
 rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Mine|myinplay){T}:add{3}
-subtype=Urza's Tower
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
 id=1090
-name=Urza's Tower
-rarity=C
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Mine|myinplay){T}:add{3}
-subtype=Urza's Tower
+primitive=Urza's Tower
+rarity=U
 [/card]
 [card]
-text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
 id=1091
-name=Urza's Tower
+primitive=Urza's Tower
 rarity=U
-type=Land
-auto={T}:add {1}
-auto=aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Mine|myinplay){T}:add{3}
-subtype=Urza's Tower
 [/card]
 [card]
 text=Defender (This creature can't attack.)   First strike

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

@@ -16,4 +16,24 @@ mana={1}{B}{B}
 power=1
 subtype=Human Assassin
 toughness=1
+[/card]
+[card]
+text={T} Add {1} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {2} to your mana pool instead.
+name=Urza's Mine
+type=Land
+auto={T}:add {1} && aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Tower|myinplay) add{1}
+subtype=Urza's Mine
+[/card]
+[card]
+text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Tower, add {2} to your mana pool instead.
+name=Urza's Power Plant
+type=Land
+auto={T}:add {1} && aslongas(Urza's Mine|myinplay)aslongas(Urza's Tower|myinplay) add{1}
+subtype=Urza's Power-Plant
+[/card]
+[card]
+text={T} Add {1} to your mana pool. If you control an Urza's Mine and an Urza's Power-Plant, add {3} to your mana pool instead.
+name=Urza's Tower
+type=Land
+auto={T}:add {1} && aslongas(Urza's Power Plant|myinplay)aslongas(Urza's Mine|myinplay) add{2}
 [/card]

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

@@ -387,6 +387,7 @@ unstable_mutation2.txt
 unwilling_recruit.txt
 urzas_lands.txt
 urzas_lands2.txt
+urzas_mine_i287.txt
 vampire_bats.txt
 vampiric_link.txt
 volcanic_eruption.txt

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

@@ -10,12 +10,10 @@ inplay:Urza's Mine,Urza's Power Plant,Urza's Tower,Deserted Temple
 [PLAYER2]
 [DO]
 Urza's Tower
-choice 1
 Deserted Temple
 choice 1
 Urza's Tower
 Urza's Tower
-choice 1
 [ASSERT]
 firstmain
 [PLAYER1]

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

@@ -0,0 +1,17 @@
+#DESC: See http://code.google.com/p/wagic/issues/detail?id=287
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Urza's Mine,1090,Urza's Power Plant
+hand:1091
+[PLAYER2]
+[DO]
+1091
+Urza's Mine
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Urza's Mine,1090,Urza's Power Plant,1091
+manapool:{2}
+[PLAYER2]
+[END]