Bug fixes, closed issue #518

Nissa's Defeat
Ornery Dilophosaur
Species Specialist
Phantom Wings
Sun Clasp
Trickster's Talisman sacrifice
Brain in a Jar
Dream Tides untap outside upkeep
Rain of Thorns
Sudden Spoiling
Power Taint,Slow Motion, closed issue #518
Barbed Lightning
Banish into Fable

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

@@ -5262,8 +5262,7 @@ type=Legendary Artifact
 name=Azor, the Lawbringer
 abilities=flying
 auto=phaseaction[upkeep once] maxCast(*[instant;sorcery])0 opponent ueot
-auto=_ATTACKING_may pay({1}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
+auto=_ATTACKING_may pay({X}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
-auto=_ATTACKING_may pay({2}{W}{U}{U}) name(Gain X life and draw X cards) life:x controller && draw:x controller
 text=Flying -- When Azor, the Lawbringer enters the battlefield, each opponent can't cast instant or sorcery spells during that player's next turn. -- Whenever Azor attacks, you may pay {X}{W}{U}{U}. If you do, you gain X life and draw X cards.
 mana={2}{W}{W}{U}{U}
 type=Legendary Creature
@@ -5743,9 +5742,10 @@ toughness=2
 [/card]
 [card]
 name=Banish into Fable
-auto=if casted(this) restriction{type(artifact|myBattlefield)~morethan~0} then copy(Banish into Fable)
+auto=if casted(this) restriction{type(artifact|myBattlefield)~morethan~0} then ability$!moveTo(ownerhand) target(*[-land])!$ controller && ability$!_KNIGHTTOKEN_ controller!$ controller
-auto=if casted(this) restriction{type(enchantment|myBattlefield)~morethan~0} then copy(Banish into Fable)
+auto=if casted(this) restriction{type(enchantment|myBattlefield)~morethan~0} then ability$!moveTo(ownerhand) target(*[-land])!$ controller && ability$!_KNIGHTTOKEN_ controller!$ controller
-auto=moveTo(ownerhand) target(*[-land]) && _KNIGHTTOKEN_ controller
+auto=_KNIGHTTOKEN_ controller
+auto=moveTo(ownerhand) target(*[-land])
 text=When you cast this spell from your hand, copy it if you control an artifact, then copy it if you control an enchantment. You may choose new targets for the copies. -- Return target nonland permanent to its owner's hand. You create a 2/2 white Knight creature token with vigilance.
 mana={4}{W}{U}
 type=Instant
@@ -5835,10 +5835,9 @@ subtype=Equipment
 [/card]
 [card]
 name=Barbed Lightning
-target=player
 other={4}{R} name(Entwine)
-auto=ifnot paid(alternative) then transforms((,newability[choice damage:3],newability[choice damage:3 target(creature)]))
+auto=ifnot paid(alternative) then transforms((,newability[choice name(3 damage to target creature) damage:3 target(creature)],newability[choice name(3 damage to target player) damage:3 target(player)]))
-auto=if paid(alternative) then damage:3 && damage:3 target(creature)
+auto=if paid(alternative) then name(3 damage to target creature) ability$! damage:3 target(creature)!$ controller && ability$!(name(3 damage to target player) damage:3 target(player))!$ controller
 text=Choose one Barbed Lightning deals 3 damage to target creature; or Barbed Lightning deals 3 damage to target player. -- Entwine {2} (Choose both if you pay the entwine cost.)
 mana={2}{R}
 type=Instant
@@ -23123,7 +23122,7 @@ toughness=2
 [card]
 name=Dream Tides
 auto=lord(creature) doesnotuntap
-auto=lord(creature[-green]) transforms((,newability[@each my upkeep:{2}:untap]))
+auto=lord(creature[-green]) transforms((,newability[@each my upkeep:{2}:untap myupkeeponly]))
 text=Creatures don't untap during their controllers' untap steps. -- At the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
 mana={2}{U}{U}
 type=Enchantment
@@ -47030,7 +47029,7 @@ subtype=Aura
 [/card]
 [card]
 name=Lapis Orb of Dragonkind
-auto={T}:name(Add blue mana) transforms((,newability[add{U}],newability[@movedto(creature[dragon]|mystack) turnlimited:name(Scry 2)_SCRY_(2)])) ueot
+auto={T}:name(Add blue mana) transforms((,newability[add{U}],newability[@movedto(creature[dragon]|mystack) turnlimited:name(Scry 2)_SCRY2_])) ueot
 text={T}: Add {U}. When you spend this mana to cast a Dragon creature spell, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={2}{U}
 type=Artifact
@@ -56272,9 +56271,8 @@ toughness=3
 [/card]
 [card]
 name=Nissa's Defeat
-target=Forest, green enchantment,,green planeswalker
+auto=choice name(Destroy Forest) destroy target(forest)
-auto=destroy
+auto=choice name(Destroy green enchantment, or green planeswalker) destroy target(*[enchantment;planeswalker;green]) and!(if cantargetcard(*[nissa]|*) then draw:1 controller)!
-auto=if type(nissa|opponentbattlefield)~morethan~0 draw:1
 text=Destroy target Forest, green enchantment, or green planeswalker. If that permanent was a Nissa planeswalker, draw a card.
 mana={2}{G}
 type=Sorcery
@@ -58445,7 +58443,7 @@ type=Artifact
 [card]
 name=Ornery Dilophosaur
 abilities=deathtouch
-auto=_ATTACKING_if type(creature[power>=4]|myBattlefield)~morethan~0} then 2/2 ueot
+auto=_ATTACKING_if type(creature[power>=4]|myBattlefield)~morethan~0 then 2/2 ueot
 text=Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.) -- Whenever Ornery Dilophosaur attacks, if you control a creature with power 4 or greater, Ornery Dilophosaur gets +2/+2 until end of turn.
 mana={3}{G}
 type=Creature
@@ -64167,11 +64165,11 @@ type=Instant
 [/card]
 [card]
 name=Rain of Thorns
-restriction=type(*[artifact;land]|battlefield)~morethan~0
+restriction=type(*[artifact;enchantment;land]|battlefield)~morethan~0
-auto=if type(artifact|battlefield)~morethan~0 then choice name(Destroy artifact) name(Destroy artifact) destroy target(artifact|battlefield)
+auto=ability$!name(Destroy artifact) may name(Destroy artifact) destroy target(artifact)!$ controller
-auto=if type(land|battlefield)~morethan~0 then choice name(Destroy land) name(Destroy land) destroy target(land|battlefield)
+auto=ability$!name(Destroy enchantment) may name(Destroy enchantment) destroy target(enchantment)!$ controller
-auto=if type(artifact|battlefield)~morethan~0 then if type(land|battlefield)~morethan~0 then choice name(Choose both) name(Choose both) name(Choose both) destroy target(artifact|battlefield) and!( name(Destroy land) destroy target(land|battlefield) )!
+auto=ability$!name(Destroy land) may name(Destroy land) destroy target(land)!$ controller
-text=Choose one or both -- Destroy target artifact. -- Destroy target land.
+text=Choose one or more -- Destroy target artifact. -- Destroy target enchantment. -- Destroy target land.
 mana={4}{G}{G}
 type=Sorcery
 [/card]
@@ -77503,7 +77501,7 @@ toughness=2
 [/card]
 [card]
 name=Species Specialist
-auto=chooseatype transforms((,newability[@movedTo(creature[chosentype]|myGraveyard)}:may draw:1 controller])) forever chooseend
+auto=chooseatype transforms((,newability[@movedTo(creature[chosentype]|myGraveyard):may draw:1 controller])) forever chooseend
 text=As Species Specialist enters the battlefield, choose a creature type. -- Whenever a creature of the chosen type dies, you may draw a card.
 mana={2}{B}{B}
 type=Creature
@@ -87343,8 +87341,8 @@ type=Enchantment
 name=Trickster's Talisman
 auto={2}:equip
 auto=teach(creature) 1/1
-auto=teach(creature) transforms((,newability[@combatdamaged(player) from(this):may name(Sacrifice Talisman and copy) clone and!( target("Talisman of the Trickster"[attached]|mybattlefield) sacrifice )!]))
+auto=teach(creature) transforms((,newability[@combatdamaged(player) from(this):may name(Sacrifice Talisman and copy) clone and!( target(Trickster's Talisman[attached]|mybattlefield) sacrifice )!]))
-text=Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice "Talisman of the Trickster". If you do, create a token that's a copy of this creature." -- Equip {2}
+text=Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature." -- Equip {2}
 mana={U}
 type=Artifact
 subtype=Equipment

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

@@ -14330,11 +14330,11 @@ auto={3}{T}{c(0/0,-2,Charge)}:name(Scry 2) _SCRY2_
 auto={3}{T}{c(0/0,-3,Charge)}:name(Scry 3) _SCRY3_
 auto={3}{T}{c(0/0,-4,Charge)}:name(Scry 4) _SCRY4_
 auto={3}{T}{c(0/0,-5,Charge)}:name(Scry 5) _SCRY5_
-auto={3}{T}{c(0/0,-6,Charge)}:name(Scry 6) _SCRY_(6)
+auto={3}{T}{c(0/0,-6,Charge)}:name(Scry 6) scry:6 scrycore delayed dontshow donothing scrycoreend scryend
-auto={3}{T}{c(0/0,-7,Charge)}:name(Scry 7) _SCRY_(7)
+auto={3}{T}{c(0/0,-7,Charge)}:name(Scry 7) scry:7 scrycore delayed dontshow donothing scrycoreend scryend
-auto={3}{T}{c(0/0,-8,Charge)}:name(Scry 8) _SCRY_(8)
+auto={3}{T}{c(0/0,-8,Charge)}:name(Scry 8) scry:8 scrycore delayed dontshow donothing scrycoreend scryend
-auto={3}{T}{c(0/0,-9,Charge)}:name(Scry 9) _SCRY_(9)
+auto={3}{T}{c(0/0,-9,Charge)}:name(Scry 9) scry:9 scrycore delayed dontshow donothing scrycoreend scryend
-auto={3}{T}{c(0/0,-10,Charge)}:name(Scry 10) _SCRY_(10)
+auto={3}{T}{c(0/0,-10,Charge)}:name(Scry 10) scry:10 scrycore delayed dontshow donothing scrycoreend scryend
 text={1}, {T}: Put a charge counter on Brain in a Jar, then you may cast an instant or sorcery card with mana value equal to the number of charge counters on Brain in a Jar from your hand without paying its mana cost. -- {3}, {T}, Remove X charge counters from Brain in a Jar: Scry X.
 mana={2}
 type=Artifact
@@ -63456,7 +63456,7 @@ toughness=3
 [/card]
 [card]
 name=Kjeldoran Home Guard
-auto=@combat(attacking,blocking) source(this):phaseactionmulti[combatends once,sourceinplay] counter(0/-1,1) && token(Deserter,Creature Deserter,0/1,white)
+auto=@combat(attacking,blocking) source(this):phaseactionmulti[combatends once sourceinplay] counter(0/-1,1) && token(Deserter,Creature Deserter,0/1,white)
 text=At end of combat, if Kjeldoran Home Guard attacked or blocked this combat, put a -0/-1 counter on Kjeldoran Home Guard and put a 0/1 white Deserter creature token onto the battlefield.
 mana={3}{W}
 type=Creature
@@ -70370,7 +70370,7 @@ type=Enchantment
 [card]
 name=Mana Chains
 target=creature
-auto=teach(creature) cumulativeupcost[{1}] sacrifice
+auto=teach(creature) transforms((,newability[cumulativeupcost[{1}] sacrifice]))
 text=Enchant creature -- Enchanted creature has "Cumulative upkeep {1}." (At the beginning of its controller's upkeep, that player puts an age counter on it, then sacrifices it unless he or she pays its upkeep cost for each age counter on it.)
 mana={U}
 type=Enchantment
@@ -85935,7 +85935,7 @@ toughness=2
 name=Phantom Wings
 target=creature
 auto=flying
-auto={S}:moveTo(ownerhand) notatarget(mytgt)
+auto={S}:teach(creature) moveTo(ownerhand)
 text=Enchant creature -- Enchanted creature has flying. -- Sacrifice Phantom Wings: Return enchanted creature to its owner's hand.
 mana={1}{U}
 type=Enchantment
@@ -87982,7 +87982,7 @@ subtype=Aura
 name=Power Taint
 abilities=cycling
 target=enchantment
-auto=teach(creature) upcost[{2}] life:-2 controller
+auto=teach(enchantment) upcost[{2}] life:-2 controller
 autohand=__CYCLING__({2})
 text=Enchant enchantment -- At the beginning of the upkeep of enchanted enchantment's controller, that player loses 2 life unless he or she pays {2}. -- Cycling {2} ({2}, Discard this card: Draw a card.)
 mana={1}{U}
@@ -108230,7 +108230,7 @@ toughness=2
 [card]
 name=Slow Motion
 target=creature
-auto=teach(creature) upcost[{2}] sacrifice
+auto=teach(creature) transforms((,newability[upcost[{2}] sacrifice]))
 autograveyard=_DIES_moveTo(ownerhand)
 text=Enchant creature -- At the beginning of the upkeep of enchanted creature's controller, that player sacrifices that creature unless he or she pays {2}. -- When Slow Motion is put into a graveyard from the battlefield, return Slow Motion to its owner's hand.
 mana={2}{U}
@@ -115215,7 +115215,7 @@ abilities=split second
 name=Sudden Spoiling
 abilities=split second
 target=player
-auto=all(creature|targetedpersonsbattlefield) transforms((,newability[loseabilities],setpower=0,settoughness=2)) ueot
+auto=all(creature|targetedpersonsbattlefield) transforms((,newability[loseabilities],setpower=0,settoughness=2))
 text=Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.) -- Creatures target player controls become 0/2 and lose all abilities until end of turn.
 mana={1}{B}{B}
 type=Instant
@@ -115481,7 +115481,7 @@ toughness=3
 name=Sun Clasp
 target=creature
 auto=1/3
-auto={W}:moveTo(ownerhand)
+auto={W}:teach(creature) moveTo(ownerhand)
 text=Enchant creature -- Enchanted creature gets +1/+3. -- {W}: Return enchanted creature to its owner's hand.
 mana={1}{W}
 type=Enchantment
@@ -132480,7 +132480,7 @@ toughness=1
 [/card]
 [card]
 name=Waterspout Djinn
-auto=upcost[{h(island[-tapped]|mybattlefield)}] sacrifice
+auto=upcost[{H(island|mybattlefield)}] sacrifice
 abilities=flying
 text=Flying -- At the beginning of your upkeep, sacrifice Waterspout Djinn unless you return an untapped Island you control to its owner's hand.
 mana={2}{U}{U}