From c81eecf6d29dc03652ca4db6c3e45e0a76c34f7d Mon Sep 17 00:00:00 2001 From: valfieri Date: Sun, 29 Mar 2020 16:28:57 +0200 Subject: [PATCH] Fix on primitives with Explores and Escalation keywords. --- projects/mtg/bin/Res/sets/primitives/XLN.txt | 24 +++++++++---------- .../bin/Res/sets/primitives/borderline.txt | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/XLN.txt b/projects/mtg/bin/Res/sets/primitives/XLN.txt index ad0d4af62..1729171f7 100644 --- a/projects/mtg/bin/Res/sets/primitives/XLN.txt +++ b/projects/mtg/bin/Res/sets/primitives/XLN.txt @@ -91,7 +91,7 @@ toughness=1 [card] name=Emissary of Sunrise abilities=first strike -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=First strike -- When Emissary of Sunrise enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={2}{W} type=Creature @@ -415,7 +415,7 @@ toughness=3 [card] name=Sunrise Seeker abilities=vigilance -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=Vigilance -- When Sunrise Seeker enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={4}{W} type=Creature @@ -759,7 +759,7 @@ toughness=3 [card] name=Siren Lookout abilities=flying -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=Flying -- When Siren Lookout enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={2}{U} type=Creature @@ -981,7 +981,7 @@ toughness=2 [card] name=Deadeye Tracker -auto={1}{B}{T}:moveto(exile) target(<2>*|opponentgraveyard) && reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto={1}{B}{T}:moveto(exile) target(<2>*|opponentgraveyard) && reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend text={1}{B}, {T}: Exile two target cards from an opponent's graveyard. Deadeye Tracker explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={B} type=Creature @@ -1027,7 +1027,7 @@ toughness=1 [card] name=Dire Fleet Interloper abilities=menace -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=Menace -- When Dire Fleet Interloper enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={3}{B} type=Creature @@ -1138,7 +1138,7 @@ type=Sorcery [card] name=Queen's Agent abilities=lifelink -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=Lifelink -- When Queen's Agent enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={5}{B} type=Creature @@ -1209,7 +1209,7 @@ toughness=4 [card] name=Seekers' Squire -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=When Seekers' Squire enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={1}{B} type=Creature @@ -1348,7 +1348,7 @@ toughness=5 [card] name=Brazen Buccaneers abilities=haste -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=Haste -- When Brazen Buccaneers enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={3}{R} type=Creature @@ -1865,7 +1865,7 @@ toughness=1 [card] name=Emperor's Vanguard -auto=@combatdamaged(player) from(this):reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend +auto=@combatdamaged(player) from(this):reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend text=Whenever Emperor's Vanguard deals combat damage to a player, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={3}{G} type=Creature @@ -1904,7 +1904,7 @@ type=Legendary Land [card] name=Ixalli's Diviner -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=When Ixalli's Diviner enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={1}{G} type=Creature @@ -1961,7 +1961,7 @@ toughness=1 [card] name=Merfolk Branchwalker -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=When Merfolk Branchwalker enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={1}{G} type=Creature @@ -2104,7 +2104,7 @@ toughness=5 [card] name=Tishana's Wayfinder -auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)],newability[may target(<1>*|reveal) moveto(myGraveyard)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then target(<1>*|reveal) moveto(myHand) else target(<1>*|reveal) moveto(myLibrary) optiontwoend revealend limit:1 +auto=reveal:1 optionone if type(land|reveal)~lessthan~1 then transforms((,newability[counter(1/1)])) optiononeend optiontwo if type(land|reveal)~morethan~0 then name(move to Hand) target(<1>*|reveal) moveto(myHand) else transforms((,newability[Choice name(back to library) target(<1>*|reveal) moveto(mylibrary)],newability[Choice name(put into Graveyard) target(<1>*|reveal) moveto(myGraveyard)])) optiontwoend revealend limit:1 text=When Tishana's Wayfinder enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.) mana={2}{G} type=Creature diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index 132c6fe0b..fc9e75f64 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -150,9 +150,9 @@ name=Borrowed Hostility target=creature other={3}{R} name(Escalate) auto=if paid(alternative) then 3/0 ueot -auto=if paid(alternative) then target(creature) first strike ueot +auto=if paid(alternative) then first strike target(creature) ueot auto=ifnot paid(alternative) then choice name(Target creature gets +3/+0) 3/0 ueot -auto=ifnot paid(alternative) then choice name(Target creature gets first strike) first strike ueot +auto=ifnot paid(alternative) then choice name(Target creature gets first strike) first strike target(creature) ueot text=Escalate {3} (Pay this cost for each mode chosen beyond the first.) -- Choose one or both — -- • Target creature gets +3/+0 until end of turn. -- • Target creature gains first strike until end of turn. mana={R} type=Instant