Improved AI: now it can plays cards using alternative cost too, fixed thisturn restriction in some primitives.

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

@@ -142,6 +142,7 @@ toughness=5
 name=Abolish
 target=artifact,enchantment
 other={D(plains|myhand)} name(Discard a Plains)
+otherrestriction=type(plains|myhand)~morethan~0
 auto=destroy
 text=You may discard a Plains card rather than pay Abolish's mana cost. -- Destroy target artifact or enchantment.
 mana={1}{W}{W}
@@ -8609,7 +8610,7 @@ type=Artifact
 name=Baloth Cage Trap
 auto=token(Beast,Creature Beast,4/4,green)
 other={1}{G}
-otherrestriction=type(artifact[fresh]|opponentbattlefield)~morethan~0
+otherrestriction=thisturn(artifact|opponentbattlefield)~morethan~0
 text=If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost. -- Put a 4/4 green Beast creature token onto the battlefield.
 mana={3}{G}{G}
 type=Instant
@@ -50816,7 +50817,7 @@ toughness=1
 name=Groundswell
 target=creature
 auto=2/2
-auto=aslongas(land[fresh]|mybattlefield) 2/2
+auto=if thisturn(land|mybattlefield)~morethan~0 then 2/2
 text=Target creature gets +2/+2 until end of turn. -- Landfall - If you had a land enter the battlefield under your control this turn, that creature gets +4/+4 until end of turn instead.
 mana={G}
 type=Instant
@@ -65765,7 +65766,7 @@ target=<2>land
 auto=destroy
 auto=damage:4 all(creature)
 other={3}{R}{R}
-otherrestriction=type(land[fresh]|opponentbattlefield)~morethan~1
+otherrestriction=thisturn(land|opponentbattlefield)~morethan~1
 text=If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost. -- Destroy two target lands. Lavaball Trap deals 4 damage to each creature.
 mana={6}{R}{R}
 type=Instant
@@ -77563,7 +77564,7 @@ text=Whenever you cast an artifact spell, you may pay {1}. If you do, put a 1/1
 [card]
 name=Mysteries of the Deep
 auto=draw:2
-auto=aslongas(land[fresh]|mybattlefield) draw:1
+auto=if thisturn(land|mybattlefield)~morethan~0 then draw:1
 text=Draw two cards. -- Landfall - If you had a land enter the battlefield under your control this turn, draw three cards instead.
 mana={4}{U}
 type=Instant
@@ -81091,7 +81092,7 @@ type=Legendary Enchantment
 [card]
 name=Oath of Chandra
 auto=damage:3 target(creature|opponentbattlefield)
-auto=@each endofturn:if type(planeswalker[fresh]|mybattlefield)~morethan~0 then damage:2 opponent
+auto=@each endofturn restriction{thisturn(planeswalker|mybattlefield)~morethan~0}:damage:2 opponent
 text=When Oath of Chandra enters the battlefield, it deals 3 damage to target creature an opponent controls. -- At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, Oath of Chandra deals 2 damage to each opponent.
 mana={1}{R}
 type=Legendary Enchantment
@@ -85238,7 +85239,7 @@ target=<upto:2>creature
 auto=tap
 auto=frozen
 other={U}
-otherrestriction=type(creature[green&fresh]|opponentbattlefield)~morethan~0
+otherrestriction=thisturn(creature[green]|mybattlefield)~morethan~0
 text=If an opponent had a green creature enter the battlefield under his or her control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost. -- Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
 mana={2}{U}{U}
 type=Instant
@@ -94205,7 +94206,7 @@ toughness=2
 name=Rest for the Weary
 target=player
 auto=life:4
-auto=aslongas(land[fresh]|mybattlefield) life:4
+auto=if thisturn(land|mybattlefield)~morethan~0 then life:4
 text=Target player gains 4 life. -- Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead.
 mana={1}{W}
 type=Instant
@@ -122089,7 +122090,7 @@ toughness=4
 name=Tomb Hex
 target=creature
 auto=-2/-2
-auto=aslongas(land[fresh]|mybattlefield) -2/-2
+auto=if thisturn(land|mybattlefield)~morethan~0 then -2/-2
 text=Target creature gets -2/-2 until end of turn. -- Landfall - If you had a land enter the battlefield under your control this turn, that creature gets -4/-4 until end of turn instead.
 mana={2}{B}
 type=Instant
@@ -124579,7 +124580,7 @@ subtype=Plains Island
 [/card]
 [card]
 name=Tunnel Ignus
-auto=@movedto(land|opponentbattlefield) restriction{type(land[fresh]|opponentbattlefield)~morethan~1}:damage:3 opponent
+auto=@movedto(land|opponentbattlefield) restriction{thisturn(land|opponentbattlefield)~morethan~1}:damage:3 opponent
 text=Whenever a land enters the battlefield under an opponent's control, if that player had another land enter the battlefield under his or her control this turn, Tunnel Ignus deals 3 damage to that player.
 mana={1}{R}
 type=Creature
@@ -133164,7 +133165,7 @@ name=Whiplash Trap
 target=<2>creature
 auto=moveTo(ownerhand)
 other={U}
-otherrestriction=type(creature[fresh]|battlefield)~morethan~1
+otherrestriction=thisturn(creature|opponentbattlefield)~morethan~1
 text=If an opponent had two or more creatures enter the battlefield under his or her control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost. -- Return two target creatures to their owners' hands.
 mana={3}{U}{U}
 type=Instant