From f383d0b8a555b77e7ad413bdd80edccc0ea6ba4f Mon Sep 17 00:00:00 2001 From: Vittorio Alfieri Date: Sat, 13 Feb 2021 18:54:15 +0100 Subject: [PATCH] Fixed some primitives. --- .../mtg/bin/Res/sets/primitives/borderline.txt | 14 +++++++------- .../mtg/bin/Res/sets/primitives/planeswalkers.txt | 9 +++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index 9fe7cf476..7ec6c47a3 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -5078,7 +5078,7 @@ type=Instant [card] name=Blessed Reincarnation target=creature|opponentbattlefield -auto=moveto(exile) and!( transforms((,newability[Reveal:1 revealzone(mylibrary) revealuntil(creature|mylibrary) optionone all(creature|reveal) moveto(mybattlefield) optiononeend optiontwo all(*|myreveal) bottomoflibrary optiontwoend revealend])) oneshot )! +auto=moveto(exile) && ability$!name(Put first creature in play) name(Put first creature in play) target(*[zpos=findfirsttypecreature]|mylibrary) moveto(myBattlefield) and!( shuffle controller )! !$ opponent auto=if rebound then ability$!moveto(exile) all(Blessed Reincarnation|mystack)!$ controller autoexile=@rebounded:may activate castcard(normal) text=Exile target creature an opponent controls. That player reveals cards from the top of his or her library until a creature card is revealed. The player puts that card onto the battlefield, then shuffles the rest into his or her library. -- 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.) @@ -28938,12 +28938,12 @@ toughness=6 [/card] [card] name=Kolaghan's Command -auto=choice name(Choose 1 and 2) moveto(myhand) target(creature|mygraveyard) && ability$!notatarget(*|myhand) reject!$ opponent -auto=choice name(Choose 1 and 3) moveto(myhand) target(creature|mygraveyard) && destroy target(artifact) -auto=choice name(Choose 1 and 4) moveto(myhand) target(creature|mygraveyard) && damage:2 opponent -auto=choice name(Choose 2 and 3) ability$!notatarget(*|myhand) reject!$ opponent && destroy target(artifact) -auto=choice name(Choose 2 and 4) ability$!notatarget(*|myhand) reject!$ opponent && damage:2 target(creature,player) -auto=choice name(Choose 3 and 4) destroy target(artifact) && damage:2 opponent +auto=if type(creature|mygraveyard)~morethan~0 then choice name(Return creature and discard card) name(Return creature and discard card) moveto(myhand) target(creature|mygraveyard) && ability$!name(Discard a card) name(Discard a card) notatarget(*|myhand) reject!$ opponent +auto=if type(creature|mygraveyard)~morethan~0 then if type(artifact|battlefield)~morethan~0 then choice name(Return creature and destroy artifact) name(Return creature and destroy artifact) name(Return creature and destroy artifact) moveto(myhand) target(creature|mygraveyard) && ability$!name(Destroy artifact) name(Destroy artifact) destroy target(artifact)!$ controller +auto=if type(creature|mygraveyard)~morethan~0 then choice name(Return creature and deals damage) name(Return creature and deals damage) moveto(myhand) target(creature|mygraveyard) && ability$!name(Deals 2 damage) name(Deals 2 damage) damage:2 target(creature,player)!$ controller +auto=if type(artifact|battlefield)~morethan~0 then choice name(Discard card and destroy artifact) name(Discard card and destroy artifact) ability$!name(Discard a card) name(Discard a card) notatarget(*|myhand) reject!$ opponent && destroy target(artifact) +auto=choice name(Discard card and deals damage) ability$!name(Discard a card) name(Discard a card) notatarget(*|myhand) reject!$ opponent && damage:2 target(creature,player) +auto=if type(artifact|battlefield)~morethan~0 then choice name(Destroy artifact and deals damage) name(Destroy artifact and deals damage) destroy target(artifact) && ability$!name(Deals 2 damage) name(Deals 2 damage) damage:2 target(creature,player)!$ controller text=Choose two — -- • Return target creature card from your graveyard to your hand. -- • Target player discards a card. -- • Destroy target artifact. -- • Kolaghan's Command deals 2 damage to target creature or player. mana={1}{B}{R} type=Instant diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt index b1611a870..5a79b94fb 100644 --- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt +++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt @@ -2426,7 +2426,7 @@ subtype=Teferi name=Teferi, Time Raveler auto=counter(0/0,4,loyalty) auto=this(variable{controllerturn}>0) maxCast(*)0 opponent -auto={C(0/0,1,Loyalty)}:name(+1: Cas sorceries as flash) emblem transforms((,newability[lord(sorcery|mycastingzone) flash])) uynt +auto={C(0/0,1,Loyalty)}:name(+1: Cast sorceries as flash) emblem transforms((,newability[lord(sorcery|mycastingzone) flash])) uynt auto={C(0/0,-3,Loyalty)}:name(-3: Return artifact, creature or enchantment) target(*[artifact;creature;enchantment]) moveTo(ownerhand) && draw:1 controller text=Each opponent can cast spells only any time they could cast a sorcery. -- +1: Until your next turn, you may cast sorcery spells as though they had flash. -- -3: Return up to one target artifact, creature, or enchantment to its owner's hand. Draw a card. mana={1}{W}{U} @@ -2822,9 +2822,10 @@ subtype=Will [card] name=Wrenn and Six auto=counter(0/0,3,loyalty) -auto={C(0/0,1,Loyalty)}:name(+1: Return target land from graveyard) moveTo(myHand) target(*[land]|myGraveyard) -auto={C(0/0,-1,Loyalty)}name(-1: Deals 1 damage to any target) damage:1 target(player,creature,planeswalker) -auto={C(0/0,-7,Loyalty)}:name(-7: Emblem: Instants and Sorceries have Retrace) emblem transforms((,newability[lord(*[instant;sorcery]|myGraveyard) retrace])) forever dontremove +auto={C(0/0,1,Loyalty)}:restriction{type(land|mygraveyard)~morethan~0} name(+1: Return target land from graveyard) moveTo(myHand) target(land|myGraveyard) +auto={C(0/0,1,Loyalty)}:name(+1: Don't return any land) donothing +auto={C(0/0,-1,Loyalty)}:name(-1: Deals 1 damage to any target) damage:1 target(player,creature,planeswalker) +auto={C(0/0,-7,Loyalty)}:name(-7: Emblem: Instants and Sorceries have Retrace) emblem transforms((,newability[lord(*[instant;sorcery]|myGraveyard) transforms((,newability[{D(land|myhand)}:name(Discard land) canplayfromgraveyard limit:1]))])) forever dontremove text=+1: Return up to one target land card from your graveyard to your hand. -- -1: Wrenn and Six deals 1 damage to any target. -- -7: You get an emblem with "Instant and sorcery cards in your graveyard have retrace." (You may cast instant and sorcery cards from your graveyard by discarding a land card in addition to paying their other costs.) mana={R}{G} type=Legendary Planeswalker