Bug fixes on primitives

Misfortune
Cromat
Leafkin Druid
Cobbled Lancer
Skeletal Scrying
Wingfold Pteron
Zara, Renegade Recruiter was bouncing the creature even if it leaved the play
Mystic Subdual
Champion of Lambholt
Ranger-Captain of Eos
Najeela, the Blade-Blossom
Winter's Rest
Teferi's Time Twist
Shatter Assumptions
Titan's Presence
Boarded Window
Nim Deathmantle still missing rehook
Hollow Specter at least does something now
Urborg Uprising - You can cast Urborg Uprising with no targets if you want to only draw a card.
Grim Captain's Call
Avatar of Growth
Shining Armor
Alchemist's Gift
Jabari's Banner
Open into Wonder
Scroll of the Masters

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

@@ -1243,9 +1243,9 @@ type=Sorcery
 [card]
 name=Alchemist's Gift
 target=creature
-auto=1/1 ueot
+auto=1/1
-auto=choice name(Gains deathtouch) deathtouch ueot
+auto=choice name(Gains deathtouch) transforms((,newability[deathtouch])) ueot
-auto=choice name(Gains lifelink) lifelink ueot
+auto=choice name(Gains lifelink) transforms((,newability[lifelink])) ueot
 text=Target creature gets +1/+1 and gains your choice of deathtouch or lifelink until end of turn. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it. Damage dealt by a creature with lifelink also causes its controller to gain that much life.)
 mana={B}
 type=Instant
@@ -4693,8 +4693,7 @@ toughness=4
 name=Avatar of Growth
 abilities=Trample
 anyzone=changecost(colorless:-1)
-auto=name(search a basic land) notatarget(<upto:2>land[basic]|opponentlibrary) moveTo(opponentbattlefield) && shuffle opponent
+auto=ability$!name(search a basic land) notatarget(<upto:2>*[basic]|mylibrary) moveTo(mybattlefield)!$ controller && ability$!name(search a basic land) notatarget(<upto:2>*[basic]|mylibrary) moveTo(mybattlefield)!$ opponent
-auto=name(search a basic land) notatarget(<upto:2>land[basic]|mylibrary) moveTo(mybattlefield) && shuffle controller
 text=This spell cost {1} less to cast for each opponent you have. -- Trample -- When Avatar of Growth enters the battlefield, each player searches their library for up to two basic land cards, puts them onto the battlefield, then shuffles their library.
 mana={4}{G}{G}
 type=Creature
@@ -8596,7 +8595,7 @@ type=Sorcery
 [card]
 name=Boarded Window
 auto=lord(creature[attacking]|opponentbattlefield) -1/0
-auto=@each endofturn restriction{compare(pdcount)~morethan~3}:name(Exile) moveto(exile)
+auto=@each endofturn restriction{compare(pdcount)~morethan~3}:name(Exile) moveto(exile) all(this)
 text=Creatures attacking you get -1/-0. -- At the beginning of each end step, if you were dealt 4 or more damage this turn, exile Boarded Window.
 mana={3}
 type=Artifact
@@ -9834,7 +9833,7 @@ type=Enchantment
 [card]
 name=Breeches, Brazen Plunderer
 abilities=menace,partner
-auto=@combatdamagefoeof(player) from(*[pirate]|myBattlefield):all(*[zpos=1]|opponentlibrary) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[anytypeofmana],newability[phaseaction[endofturn once] moveTo(ownerexile)])) ueot )!
+auto=@combatdamagefoeof(player) from(*[pirate]|myBattlefield) turnlimited:all(*[zpos=1]|opponentlibrary) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[anytypeofmana],newability[phaseaction[endofturn once] moveTo(ownerexile)])) ueot )!
 text=Menace -- Whenever one or more Pirates you control deal damage to your opponents, exile the top card of each of those opponents' libraries. You may play those cards this turn, and you may spend mana as though it were mana of any color to cast those spells. -- Partner (You can have two commanders if both have partner.)
 mana={3}{R}
 type=Legendary Creature
@@ -14657,7 +14656,7 @@ type=Sorcery
 name=Cobbled Lancer
 autograveyard={3}{U}{E}:name(Draw a card) draw:1 controller
 text=As an additional cost to cast this spell, exile a creature card from your graveyard. -- {3}{U}, Exile Cobbled Lancer from your graveyard: Draw a card.
-mana={U}{E(*|mygraveyard)}
+mana={U}{E(creature|mygraveyard)}
 type=Creature
 subtype=Zombie Horse
 power=3
@@ -16792,9 +16791,9 @@ toughness=4
 [/card]
 [card]
 name=Cromat
-auto={W}{B}:destroy target(creature[blocking;attacking])
+auto=@combat(attacking,blocking) source(this):transforms((,newability[{W}{B}:destroy target(creature[attacking;blocking])])) ueot
 auto={U}{R}:flying ueot
-auto={B}{R}:regenerate
+auto={B}{G}:regenerate
 auto={R}{W}:1/1 ueot
 auto={G}{U}:moveto(ownerlibrary)
 text={W}{B}: Destroy target creature blocking or blocked by Cromat. -- {U}{R}: Cromat gains flying until end of turn. -- {B}{G}: Regenerate Cromat. -- {R}{W}: Cromat gets +1/+1 until end of turn. -- {G}{U}: Put Cromat on top of its owner's library.
@@ -21703,8 +21702,8 @@ toughness=2
 [card]
 name=Draconic Intervention
 abilities=exiledeath
-auto=all(creature[-dragon;-protection from red]) exiledeath
+auto=all(creature[-dragon]) exiledeath
-auto=all(creature[-dragon]|battlefield) damage:storedmanacost
+auto=all(creature[-dragon]) damage:storedmanacost
 text=As an additional cost to cast this spell, exile an instant or sorcery card from your graveyard. -- Draconic Intervention deals X damage to each non-Dragon creature, where X is the exiled card's mana value. If a creature dealt damage this way would die this turn, exile it instead. -- Exile Draconic Intervention.
 mana={2}{R}{R}{S(*[instant;sorcery]|mygraveyard)}
 type=Sorcery
@@ -29464,7 +29463,7 @@ name=Forebear's Blade
 auto=teach(creature) +3/+0
 auto=teach(creature) vigilance
 auto=teach(creature) trample
-auto=@movedto(mytgt|graveyard):rehook target(creature|mybattlefield)
+auto=aslongas(parents) rehook target(creature|myBattlefield) <1
 auto={3}:equip
 text=Equipped creature gets +3/+0 and has vigilance and trample. -- Whenever equipped creature dies, attach Forebear's Blade to target creature you control. -- Equip {3}
 mana={3}
@@ -34701,10 +34700,10 @@ type=Sorcery
 [/card]
 [card]
 name=Grim Captain's Call
-auto=moveto(myhand) target(pirate|mygraveyard)
+auto=ability$!name(Return a Pirate) may name(Return a Pirate) moveto(myhand) notatarget(pirate|mygraveyard)!$ controller
-auto=moveto(myhand) target(vampire|mygraveyard)
+auto=ability$!name(Return a Vampire) may name(Return a Vampire) moveto(myhand) notatarget(vampire|mygraveyard)!$ controller
-auto=moveto(myhand) target(dinosaur|mygraveyard)
+auto=ability$!name(Return a Dinosaur) may name(Return a Dinosaur) moveto(myhand) notatarget(dinosaur|mygraveyard)!$ controller
-auto=moveto(myhand) target(merfolk|mygraveyard)
+auto=ability$!name(Return a Merfolk) may name(Return a Merfolk) moveto(myhand) notatarget(merfolk|mygraveyard)!$ controller
 text=Return a Pirate card from your graveyard to your hand, then do the same for Vampire, Dinosaur, and Merfolk.
 mana={2}{B}
 type=Sorcery
@@ -37256,7 +37255,7 @@ toughness=4
 [/card]
 [card]
 name=Herald's Horn
-auto=chooseatype transforms(([@each my upkeep:name(Reveal) reveal:1 optionone target(*[chosentype]|reveal) transforms(([may moveTo(myhand)])) oneshot optiononeend optiontwo target(*|reveal) moveto(mylibrary) optiontwoend revealend)])) chooseend
+auto=chooseatype transforms(([@each my upkeep:name(Reveal) reveal:1 optionone target(chosentype|reveal) transforms(([may moveTo(myhand)])) oneshot optiononeend optiontwo target(*|reveal) moveto(mylibrary) optiontwoend revealend)])) chooseend
 auto=lord(*[creature&chosentype]|mycastingzone) altercost(colorless,-1)
 text=As Herald's Horn enters the battlefield, choose a creature type. -- Creature spells you cast of the chosen type cost {1} less to cast. -- At the beginning of your upkeep, look at the top card of your library. If it's a creature card of the chosen type, you may reveal it and put it into your hand.
 mana={3}
@@ -46020,8 +46019,7 @@ toughness=3
 [/card]
 [card]
 name=Leafkin Druid
-auto={T}:Add{G} restriction{type(creature|mybattlefield)~lessthan~4}
+auto={T}:if type(creature|mybattlefield)~morethan~3 then Add{G}{G} else Add{G}
-auto={T}:Add{G}{G} restriction{type(creature|mybattlefield)~morethan~3}
 text={T}: Add {G}. If you control four or more creatures, add {G}{G} instead.
 mana={1}{G}
 type=Creature
@@ -53013,8 +53011,8 @@ toughness=1
 name=Mystic Subdual
 abilities=flash
 target=creature
-auto=teach(creature) -2/-0
 auto=teach(creature) loseabilities
+auto=teach(creature) -2/-0
 text=Flash -- Enchant creature -- Enchanted creature gets -2/-0 and loses all abilities. (Mutating onto the creature won't give it new abilities. It can gain abilities in other ways.)
 mana={1}{U}
 type=Enchantment
@@ -53191,8 +53189,8 @@ toughness=3
 [/card]
 [card]
 name=Najeela, the Blade-Blossom
-auto=@combat(attacking) source(creature[warrior]):create(warrior:creature warrior:1/1:white:battleready)
+auto=@combat(attacking) source(warrior|myBattlefield):may create(warrior:creature warrior:1/1:white:battleready)
-auto={W}{U}{B}{R}{G}:untap all attacking creature they) trample, lifelink, && haste ueot after this phase, there is an additional combat phase activate this ability only during combat
+auto={W}{U}{B}{R}{G}:all(*[attacking]) transforms((,newability[untap],newability[trample],newability[lifelink],newability[haste])) ueot && nextphasealter(add,combatphases,controller,after<combatends>) restriction{during battle}
 text=Whenever a Warrior attacks, you may have its controller create a 1/1 white Warrior creature token that's tapped and attacking. -- {W}{U}{B}{R}{G}: Untap all attacking creatures. They gain trample, lifelink, and haste until end of turn. After this phase, there is an additional combat phase. Activate this ability only during combat.
 mana={2}{R}
 type=Legendary Creature
@@ -54444,8 +54442,8 @@ toughness=2
 name=Nim Deathmantle
 auto={4}:equip
 auto=teach(creature) 2/2
-auto=teach(creature) transforms((Zombie,newcolors[black],newability[intimidate])) forever
+auto=teach(creature) transforms((Zombie,newcolors[black],newability[intimidate]))
-auto=@movedTo(*[-token]|mygraveyard) from(battlefield):name(pay 4) pay[[{4}]] all(trigger[to]) moveTo(mybattlefield) and!(rehook)!
+auto=@movedTo(*[-token]|mygraveyard) from(battlefield):all(trigger[to]) transforms((,newability[pay[[{4}]]  moveTo(mybattlefield)])) and!(rehook)!
 text=Equipped creature gets +2/+2, has intimidate, and is a black Zombie. -- Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {4}. If you do, return that card to the battlefield and attach Nim Deathmantle to it. -- Equip {4}
 mana={2}
 type=Artifact
@@ -56317,9 +56315,9 @@ type=Instant
 [/card]
 [card]
 name=Open into Wonder
-target=creature
+target=<prex>creature
 auto=unblockable
-auto=@combatdamaged(player) from(this):draw:1 controller
+auto=transforms((,newability[@combatdamaged(player) from(this):draw:1 controller])) ueot
 text=X target creatures can't be blocked this turn. Until end of turn, those creatures gain "Whenever this creature deals combat damage to a player, draw a card."
 mana={X}{U}{U}
 type=Sorcery
@@ -62760,7 +62758,7 @@ subtype=Equipment
 [card]
 name=Ranger-Captain of Eos
 auto={S}:maxCast(*[-creature])0 target(opponent)
-auto=target(creature[manacost<=1]|mylibrary) moveto(myhand) and!( shuffle )!
+auto=may target(creature[manacost<=1]|mylibrary) moveto(myhand) and!( shuffle )!
 text=When Ranger-Captain of Eos enters the battlefield, you may search your library for a creature card with mana value 1 or less, reveal it, put it into your hand, then shuffle your library. -- Sacrifice Ranger-Captain of Eos: Your opponents can't cast noncreature spells this turn.
 mana={1}{W}{W}
 type=Creature
@@ -70921,7 +70919,7 @@ toughness=2
 [card]
 name=Shatter Assumptions
 target=opponent
-aicode=activate choice reject all(*[-land;cololess]|targetedpersonshand)
+aicode=activate choice reject all(*[-land;colorless]|targetedpersonshand)
 aicode=activate choice reject all(*[multicolor]|targetedpersonshand)
 auto=choice name(discard colorless) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(look at the cards) target(*|reveal) transforms((,newability[moveto(ownerhand) and!( reject )! all(*[-land;colorless]|reveal)])) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiontwoend revealend
 auto=choice name(discard multicolor) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(look at the cards) target(*|reveal) transforms((,newability[moveto(ownerhand) and!( reject )! all(*[multicolor]|reveal)])) optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiontwoend revealend
@@ -71365,7 +71363,7 @@ toughness=4
 [card]
 name=Shining Armor
 abilities=flash
-auto=aslongas(parents) name(Attach to knight) rehook target(creature[knight]|myBattlefield) <1
+auto=name(Attach to knight) rehook target(creature[knight]|myBattlefield)
 auto={3}:equip
 auto=teach(creature) 0/2
 auto=teach(creature) vigilance
@@ -72836,9 +72834,9 @@ toughness=3
 [card]
 name=Skeletal Scrying
 auto=draw:X controller
-auto=life:castx controller
+auto=life:-castx controller
-text=Destroy X target nonblack creatures. Draw X cards.
+text=As an additional cost to cast this spell, exile X cards from your graveyard. -- You draw X cards and you lose X life.
-mana={X}{B}{E<prex>*|myGraveyard}
+mana={X}{B}{E(<prex>*|myGraveyard)}
 type=Instant
 [/card]
 [card]
@@ -80668,7 +80666,7 @@ toughness=6
 [card]
 name=Teferi's Time Twist
 target=*|mybattlefield
-auto=(blink)ueot return(counter(1/1))
+auto=if cantargetcard(creature) then (blink)ueot return(counter(1/1)) else (blink)ueot
 text=Exile target permanent you control. Return that card to the battlefield under its owner's control at the beginning of the next end step. If it enters the battlefield as a creature, it enters with an additional +1/+1 counter on it.
 mana={1}{U}
 type=Instant
@@ -83402,6 +83400,7 @@ auto=if type(*[colorless&power=18]|myhand)~morethan~0 then choice name(Reveal cr
 auto=if type(*[colorless&power=19]|myhand)~morethan~0 then choice name(Reveal creature with power 19) name(Reveal creature with power 19) target(creature[power<=19]) moveto(exile)
 auto=if type(*[colorless&power>=20]|myhand)~morethan~0 then choice name(Reveal creature with power 20) name(Reveal creature with power 20) target(creature[power<=20]) moveto(exile)
 text=As an additional cost to cast Titan's Presence, reveal a colorless creature card from your hand. -- Exile target creature if its power is less than or equal to the revealed card's power.
+restriction=type(creature[colorless]|myHand)~morethan~0
 mana={3}
 type=Instant
 [/card]
@@ -91254,7 +91253,7 @@ name=Wingfold Pteron
 auto=this(counter{0/0.1.Flying}>=1) flying
 auto=this(counter{0/0.1.Hexproof}>=1) opponentshroud
 auto=choice name(Flying) counter(0/0,1,Flying)
-auto=choice name(First Strike) counter(0/0,1,Hexproof)
+auto=choice name(Hexproof) counter(0/0,1,Hexproof)
 text=Wingfold Pteron enters the battlefield with your choice of a flying counter or a hexproof counter on it. (A creature with hexproof can't be the target of spells or abilities your opponents control.)
 mana={5}{U}
 type=Creature
@@ -91358,7 +91357,7 @@ type=Artifact
 name=Winter's Rest
 target=creature
 auto=teach(creature) tap
-auto=aslongas(*[snow]|myBattlefield)~morethan~1 teach(creature) doesnotuntap
+auto=aslongas(other *[snow]|myBattlefield)~morethan~1 teach(creature) doesnotuntap
 text=Enchant creature -- When Winter's Rest enters the battlefield, tap enchanted creature. -- As long as you control another snow permanent, enchanted creature doesn't untap during its controller's untap step.
 mana={1}{U}
 type=Snow Enchantment
@@ -92868,7 +92867,7 @@ toughness=4
 name=Zara, Renegade Recruiter
 abilities=flying
 aicode=activate target(creature|opponenthand) moveto(mybattlefield) and!( transforms((,newability[ninjutsu],newability[phaseaction[endofturn once sourceinplay] moveto(ownerhand)])) forever )!
-auto=_ATTACKING_reveal:type:*:opponenthand revealzone(opponenthand) optionone name(Reveal) target(creature|reveal) moveto(mybattlefield) and!( transforms((,newability[ninjutsu],newability[phaseaction[endofturn] moveto(ownerhand)])) forever )! optiononeend optiontwo all(*|reveal) moveto(opponenthand) optiontwoend revealend
+auto=_ATTACKING_reveal:type:*:opponenthand revealzone(opponenthand) optionone name(Reveal) target(creature|reveal) moveto(mybattlefield) and!( transforms((,newability[ninjutsu],newability[phaseaction[endofturn once sourceinplay] moveto(ownerhand)])) forever )! optiononeend optiontwo all(*|reveal) moveto(opponenthand) optiontwoend revealend
 text=Flying -- Whenever Zara, Renegade Recruiter attacks, look at defending player's hand. You may put a creature card from it onto the battlefield under your control tapped and attacking that player or a planeswalker they control. Return that creature to its owner's hand at the beginning of the next end step.
 mana={3}{U}{R}
 type=Legendary Creature

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

@@ -18679,7 +18679,7 @@ toughness=2
 [/card]
 [card]
 name=Champion of Lambholt
-auto=lord(creature[power<=powerminus1minusend]|opponentbattlefield) cantblock
+auto=lord(*[power<=powerminus1minusend]|opponentbattlefield) cantblock
 auto=@movedto(other creature|myBattlefield):counter(1/1)
 text=Creatures with power less than Champion of Lambholt's power can't block creatures you control. -- Whenever another creature enters the battlefield under your control, put a +1/+1 counter on Champion of Lambholt.
 mana={1}{G}{G}
@@ -54997,7 +54997,7 @@ toughness=3
 [card]
 name=Hollow Specter
 abilities=flying
-auto=@combatdamagefoeof(player) from(this):may pay({x}) name(Specter Pay X) Reveal:x revealzone(opponenthand) optionone choice name(choose Discards) target(<1>*|reveal) transforms((,newability[moveto(ownerhand) and!(reject)!])) oneshot optiononeend optiontwo name(Put Back) target(*|reveal) transforms((,newability[all(*|reveal) moveto(ownerhand)])) oneshot optiontwoend revealend
+auto=@combatdamagefoeof(player) from(this):may pay({1}) name(Specter Pay 1) Reveal:1 revealzone(opponenthand) optionone choice name(choose Discards) target(<1>*|reveal) transforms((,newability[moveto(ownerhand) and!(reject)!])) oneshot optiononeend optiontwo name(Put Back) target(*|reveal) transforms((,newability[all(*|reveal) moveto(ownerhand)])) oneshot optiontwoend revealend
 text=Flying -- Whenever Hollow Specter deals combat damage to a player, you may pay {X}. If you do, that player reveals X cards from his or her hand and you choose one of them. That player discards that card.
 mana={1}{B}{B}
 type=Creature
@@ -59714,7 +59714,7 @@ subtype=Human Wizard
 [/card]
 [card]
 name=Jabari's Banner
-auto={1}{T}:target(creature) teach(creature) flanking ueot && teach(creature) flanker ueot
+auto={1}{T}:target(creature) transforms((,newability[flanking])) ueot
 text={1}, {T}: Target creature gains flanking until end of turn. (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
 mana={2}
 type=Artifact
@@ -74814,8 +74814,8 @@ type=Instant
 [/card]
 [card]
 name=Misfortune
-auto=ability$!choice name(opponent's creatures) all(creature|opponentbattlefield) counter(1/1) && life:4 opponent _ choice name(your creatures) all(creature|mybattlefield) counter(-1/-1) && life:-4 controller !$ opponent
+auto=ability$!choice name(opponent's creatures) all(creature|opponentbattlefield) counter(1/1) && life:4 opponent _ choice name(your creatures) all(creature|mybattlefield) counter(-1/-1) && damage:4 controller !$ opponent
-text=An opponent chooses one - You put a +1/+1 counter on each creature you control and gain 4 life; or you put a -1/-1 counter on each creature that player controls and Misfortune deals 4 damage to him or her.
+text=An opponent chooses one - -- - You put a +1/+1 counter on each creature you control and gain 4 life. -- - You put a -1/-1 counter on each creature that player controls and Misfortune deals 4 damage to that player.
 mana={1}{B}{R}{G}
 type=Sorcery
 [/card]
@@ -100804,7 +100804,7 @@ type=Artifact
 [/card]
 [card]
 name=Scroll of the Masters
-auto=@movedTo(*[-creature]|mystack):counter(0/0,Lore) all(this)
+auto=@movedTo(*[-creature]|mystack):counter(0/0,1,Lore)
 auto={3}{T}:thisforeach(counter{0/0.1.Lore}) 1/1 target(creature|mybattlefield) ueot
 text=Whenever you cast a noncreature spell, put a lore counter on Scroll of the Masters. -- {3}{T}: Target creature you control gets +1/+1 until end of turn for each lore counter on Scroll of the Masters.
 mana={2}
@@ -125475,7 +125475,7 @@ backside=Ulvenwald Mystics
 auto={G}:regenerate
 auto=@each upkeep restriction{lastturn(*|mystack)~morethan~1,lastturn(*|opponentstack)~lessthan~2}:name(Transform Werewolf) flip(backside)
 auto=@each upkeep restriction{lastturn(*|opponentstack)~morethan~1}:name(Transform Werewolf) flip(backside)
-text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ulvenwald Primordials. // Ulvenwald Mystics
+text={G}: Regenerate Ulvenwald Primordials. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ulvenwald Primordials. // Ulvenwald Mystics
 color=green
 type=Creature
 subtype=Werewolf
@@ -126684,8 +126684,7 @@ toughness=2
 [/card]
 [card]
 name=Urborg Uprising
-target=<upto:2>creature|mygraveyard
+auto=may moveTo(ownerhand) target(<upto:2>creature|mygraveyard)
-auto=moveTo(ownerhand)
 auto=draw:1 controller
 text=Return up to two target creature cards from your graveyard to your hand. -- Draw a card.
 mana={4}{B}