add some missing cards from lorwyn

also fix card enters tapped

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

@@ -141,6 +141,30 @@ auto={3}:counter(1/1)
 #Not all player can use ability
 [/card]
 [card]
+name=Flamekin Bladewhirl
+otherrestriction=type(*[elemental]|myhand)~lessthan~2
+other={3}{R}
+restriction=type(*[elemental]|myhand)~morethan~1
+text=As an additional cost to cast Flamekin Bladewhirl, reveal an Elemental card from your hand or pay {3}.
+mana={R}
+type=Creature
+subtype=Elemental Warrior
+power=2
+toughness=1
+[/card]
+[card]
+name=Goldmeadow Stalwart
+otherrestriction=type(*[kithkin]|myhand)~lessthan~2
+other={3}{W}
+restriction=type(*[kithkin]|myhand)~morethan~1
+text=As an additional cost to cast Goldmeadow Stalwart, reveal a Kithkin card from your hand or pay {3}.
+mana={W}
+type=Creature
+subtype=Kithkin Soldier
+power=2
+toughness=2
+[/card]
+[card]
 name=Goldnight Castigator
 #need doubler damage ability...
 abilities=flying,haste
@@ -399,6 +423,19 @@ mana={B}{G}
 type=Enchantment
 [/card]
 [card]
+name=Squeaking Pie Sneak
+abilities=fear
+otherrestriction=type(*[goblin]|myhand)~lessthan~2
+other={4}{B}
+restriction=type(*[goblin]|myhand)~morethan~1
+text=As an additional cost to cast Squeaking Pie Sneak, reveal a Goblin card from your hand or pay {3}. -- Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)
+mana={1}{B}
+type=Creature
+subtype=Goblin Rogue
+power=2
+toughness=2
+[/card]
+[card]
 name=Staggershock
 target=creature,player
 auto=damage:2
@@ -508,6 +545,19 @@ type=Instant
 text=Target creature gets +2/+0 and gains deathtouch until end of turn. Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 [/card]
 [card]
+name=Wren's Run Vanquisher
+otherrestriction=type(*[elf]|myhand)~lessthan~2
+other={4}{G}
+restriction=type(*[elf]|myhand)~morethan~1
+abilities=deathtouch
+text=As an additional cost to cast Wren's Run Vanquisher, reveal an Elf card from your hand or pay {3}. -- Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)
+mana={1}{G}
+type=Creature
+subtype=Elf Warrior
+power=3
+toughness=3
+[/card]
+[card]
 name=Yixlid Jailer
 auto=lord(*|graveyard) loseabilities
 text=Cards in graveyards lose all abilities.

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

@@ -11127,7 +11127,7 @@ toughness=3
 [card]
 name=Blind Obedience
 auto=@movedto(*|mystack):pay({WB}) life:-1 opponent && life:1 controller
-auto=lord(artifact,creature|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;artifact;creature]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.) -- Artifacts and creatures your opponents control enter the battlefield tapped.
 mana={1}{W}
 type=Enchantment
@@ -36725,6 +36725,15 @@ type=Tribal Enchantment
 subtype=Faerie
 [/card]
 [card]
+name=Faerie Trickery
+target=*[-faerie]|stack
+auto=fizzleto(exile)
+text=Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
+mana={1}{U}{U}
+type=Tribal Instant
+subtype=Faerie
+[/card]
+[card]
 name=Faith Healer
 auto={S(enchantment|myBattlefield)}:life:storedmanacost
 text=Sacrifice an enchantment: You gain life equal to the sacrificed enchantment's converted mana cost.
@@ -41736,7 +41745,7 @@ toughness=3
 [/card]
 [card]
 name=Frozen AEther
-auto=lord(artifact,creature,land|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;artifact;creature;land]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
 mana={3}{U}
 type=Enchantment
@@ -54669,7 +54678,7 @@ type=Sorcery
 [/card]
 [card]
 name=Imposing Sovereign
-auto=lord(creature|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;creature]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Creatures your opponents control enter the battlefield tapped.
 mana={1}{W}
 type=Creature
@@ -60049,7 +60058,7 @@ type=Sorcery
 [/card]
 [card]
 name=Kismet
-auto=lord(artifact,creature,land|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;artifact;creature;land]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
 mana={3}{W}
 type=Enchantment
@@ -65336,7 +65345,7 @@ toughness=2
 [/card]
 [card]
 name=Loxodon Gatekeeper
-auto=lord(artifact,creature,land|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;artifact;creature;land]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
 mana={2}{W}{W}
 type=Creature
@@ -78645,7 +78654,7 @@ toughness=3
 [/card]
 [card]
 name=Orb of Dreams
-auto=lord(*|battlefield) transforms((,newability[tap(noevent)]))
+auto=lord(other *[recent]|battlefield) transforms((,newability[tap(noevent)]))
 text=Permanents enter the battlefield tapped.
 mana={3}
 type=Artifact
@@ -91616,7 +91625,7 @@ toughness=3
 [/card]
 [card]
 name=Root Maze
-auto=lord(artifact,land|battlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;artifact;land]|battlefield) transforms((,newability[tap(noevent)]))
 text=Artifacts and lands enter the battlefield tapped.
 mana={G}
 type=Enchantment
@@ -108366,7 +108375,7 @@ toughness=2
 [card]
 name=Storm Entity
 abilities=haste
-auto=thisforeach(variable{countallspell}>1) counter(1/1,1)
+auto=if casted(this) then thisforeach(variable{countallspell}>1) counter(1/1,1) else thisforeach(variable{countallspell}>0) counter(1/1,1)
 text=Haste -- Storm Entity enters the battlefield with a +1/+1 counter on it for each other spell cast this turn.
 mana={1}{R}
 type=Creature
@@ -113606,8 +113615,8 @@ toughness=1
 [card]
 name=Thalia, Heretic Cathar
 abilities=first strike
-auto=@movedTo(land[-basic]|opponentBattlefield):all(trigger) tap(noevent)
+auto=@movedTo(*[recent;land;-basic]|opponentBattlefield):all(trigger) tap(noevent)
-auto=@movedTo(creature|opponentBattlefield):all(trigger) tap(noevent)
+auto=@movedTo(*[recent;creature]|opponentBattlefield):all(trigger) tap(noevent)
 text=First strike -- Creatures and nonbasic lands your opponents control enter the battlefield tapped.
 mana={2}{W}
 type=Legendary Creature
@@ -120184,7 +120193,7 @@ type=Sorcery
 [/card]
 [card]
 name=Uphill Battle
-auto=lord(creature|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;creature]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Creatures your opponents play enter the battlefield tapped.
 mana={2}{R}
 type=Enchantment
@@ -120220,7 +120229,7 @@ type=Enchantment
 [card]
 name=Urabrask the Hidden
 auto=lord(creature|mybattlefield) haste
-auto=lord(creature|opponentbattlefield) transforms((,newability[tap(noevent)]))
+auto=lord(*[recent;creature]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 text=Creatures you control have Haste. -- Creatures your opponents control enter the battlefield tapped.
 mana={3}{R}{R}
 type=Legendary Creature
@@ -125609,6 +125618,16 @@ power=3
 toughness=4
 [/card]
 [card]
+name=Warren Pilferers
+auto=moveto(ownerhand) and!( if cantargetcard(goblin|*) then haste all(this) )! notatarget(creature|mygraveyard)
+text=When Warren Pilferers enters the battlefield, return target creature card from your graveyard to your hand. If that card is a Goblin card, Warren Pilferers gains haste until end of turn.
+mana={4}{B}
+type=Creature
+subtype=Goblin Rogue
+power=3
+toughness=3
+[/card]
+[card]
 name=Warren Instigator
 abilities=double strike
 auto=@damagefoeof(player) from(this):may moveto(myBattlefield) target(creature[goblin]|myHand)
@@ -125620,6 +125639,15 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Warren Weirding
+target=player
+auto=ability$!sacrifice and!( if cantargetcard(goblin|*) then token(Goblin Rogue,Creature Goblin Rouge,1/1,black,haste)*2 )! notatarget(creature|mybattlefield)!$ targetedplayer
+text=Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn.
+mana={1}{B}
+type=Tribal Sorcery
+subtype=Goblin
+[/card]
+[card]
 name=Warren-Scourge Elf
 auto=protection from(goblin)
 text=Protection from Goblins