From 5dbe6f8c9c79a8811a13198d5e5e88bc963edd8b Mon Sep 17 00:00:00 2001 From: Vittorio Alfieri Date: Wed, 6 Jan 2021 11:46:38 +0100 Subject: [PATCH] Fixed primitives. --- .../bin/Res/sets/primitives/borderline.txt | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt index 880673194..497ec9450 100644 --- a/projects/mtg/bin/Res/sets/primitives/borderline.txt +++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt @@ -161,9 +161,8 @@ toughness=2 [/card] [card] name=Act of Authority -auto=may (blink) target(artifact,enchantment) -auto=@each my upkeep:choice name(Do Nothing) donothing -auto=@each my upkeep:choice name(Exile and Give Control) (blink) target(artifact,enchantment) && moveto(opponentBattlefield) +auto=may name(Exile artifact or enchantment) target(*[artifact;enchantment]|battlefield) moveTo(ownerExile) +auto=@each my upkeep:ability$!name(Choose one) choice name(Exile opponent's artifact or enchantment) target(*[artifact;enchantment]|opponentbattlefield) moveTo(ownerExile) && all(mystored) moveto(opponentBattlefield) _ choice name(Exile your artifact or enchantment) target(*[artifact;enchantment]|mybattlefield) moveTo(ownerExile) _ choice name(Don't exile any artifact or enchantment) donothing!$ controller text=When Act of Authority enters the battlefield, you may exile target artifact or enchantment. -- At the beginning of your upkeep, you may exile target artifact or enchantment. If you do, its controller gains control of Act of Authority. mana={1}{W}{W} type=Enchantment @@ -10000,9 +9999,10 @@ subtype=Aura Curse [/card] [card] name=Crush Contraband -auto=choice name(Choose Artifact) moveto(exile) target(artifact) -auto=choice name(Choose Enchantment) moveto(exile) target(enchantment) -auto=choice name(Choose Both) moveto(exile) target(artifact) && ability$!name(exile enchantment) moveto(exile) target(enchantment)!$ controller +restriction=type(*[artifact;enchantment]|battlefield)~morethan~0 +auto=if type(artifact|battlefield)~morethan~0 then choice name(Exile artifact) name(Exile artifact) moveto(exile) target(artifact) +auto=if type(enchantment|battlefield)~morethan~0 then choice name(Exile enchantment) name(Exile enchantment) moveto(exile) target(enchantment) +auto=if type(artifact|battlefield)~morethan~0 then if type(enchantment|battlefield)~morethan~0 then choice name(Exile artifact amd enchantment) name(Exile artifact amd enchantment) name(Exile artifact amd enchantment) moveto(exile) target(artifact) && ability$!name(Exile enchantment) name(Exile enchantment) moveto(exile) target(enchantment)!$ controller text=Choose one or both — -- • Exile target artifact. -- • Exile target enchantment. mana={3}{W} type=Instant @@ -20025,8 +20025,8 @@ toughness=2 name=Grakmaw, Skyclave Ravager auto=counter(1/1,3) auto=@movedTo(other creature[counter{1/1}]|myGraveyard) from(mybattlefield):counter(1/1) all(this) -auto=_DIES_this(counter{1/1}=0) token(Hydra,Creature Hydra,0/0,black,green -auto=_DIES_this(counter{1/1}=1) token(Hydra,Creature Hydra,1/1,black,green +auto=_DIES_this(counter{1/1}=0) token(Hydra,Creature Hydra,0/0,black,green) +auto=_DIES_this(counter{1/1}=1) token(Hydra,Creature Hydra,1/1,black,green) auto=_DIES_this(counter{1/1}=2) token(Hydra,Creature Hydra,2/2,black,green) auto=_DIES_this(counter{1/1}=3) token(Hydra,Creature Hydra,3/3,black,green) auto=_DIES_this(counter{1/1}=4) token(Hydra,Creature Hydra,4/4,black,green) @@ -33378,7 +33378,7 @@ toughness=3 name=Oloro, Ageless Ascetic auto=@each my upkeep:life:2 controller auto=@lifeof(player) from(*[-Alhammarret's Archive;-Angel of Vitality;-Boon Reflection]):pay({1}) draw:1 controller && life:-1 opponent -#wagic doesn't have command zone +autocommandzone=@each my upkeep:life:2 controller text=At the beginning of your upkeep, you gain 2 life. -- Whenever you gain life, you may pay {1}. If you do, draw a card and each opponent loses 1 life. -- At the beginning of your upkeep, if Oloro, Ageless Ascetic is in the command zone, you gain 2 life. mana={3}{W}{U}{B} type=Legendary Creature @@ -45267,8 +45267,27 @@ toughness=3 [/card] [card] name=Soulstinger -auto=counter(-1/-1,2) target(creature) -#auto=@movedTo(this|graveyard) from(battlefield):target(creature) ability$!foreach counter(-1/-1) counter(-1/-1,1)!$ targetedcreature +auto=name(Put two -1/-1 counters) name(Put two -1/-1 counters) counter(-1/-1,2) target(creature) +auto=_DIES_this(counter{-1/-1}=1) ability$!name(Put -1/-1 counter) may name(Put -1/-1 counter) target(creature) counter(-1/-1,1)!$ controller +auto=_DIES_this(counter{-1/-1}=2) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,2)!$ controller +auto=_DIES_this(counter{-1/-1}=3) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,3)!$ controller +auto=_DIES_this(counter{-1/-1}=4) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,4)!$ controller +auto=_DIES_this(counter{-1/-1}=5) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,5)!$ controller +auto=_DIES_this(counter{-1/-1}=6) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,6)!$ controller +auto=_DIES_this(counter{-1/-1}=7) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,7)!$ controller +auto=_DIES_this(counter{-1/-1}=8) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,8)!$ controller +auto=_DIES_this(counter{-1/-1}=9) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,9)!$ controller +auto=_DIES_this(counter{-1/-1}=10) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,10)!$ controller +auto=_DIES_this(counter{-1/-1}=11) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,11)!$ controller +auto=_DIES_this(counter{-1/-1}=12) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,12)!$ controller +auto=_DIES_this(counter{-1/-1}=13) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,13)!$ controller +auto=_DIES_this(counter{-1/-1}=14) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,14)!$ controller +auto=_DIES_this(counter{-1/-1}=15) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,15)!$ controller +auto=_DIES_this(counter{-1/-1}=16) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,16)!$ controller +auto=_DIES_this(counter{-1/-1}=17) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,17)!$ controller +auto=_DIES_this(counter{-1/-1}=18) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,18)!$ controller +auto=_DIES_this(counter{-1/-1}=19) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,19)!$ controller +auto=_DIES_this(counter{-1/-1}>=20) ability$!name(Put -1/-1 counters) may name(Put -1/-1 counters) target(creature) counter(-1/-1,20)!$ controller text=When Soulstinger enters the battlefield, put two -1/-1 counters on target creature you control. -- When Soulstinger dies, you may put a -1/-1 counter on target creature for each -1/-1 counter on Soulstinger. mana={3}{B} type=Creature @@ -50115,7 +50134,7 @@ toughness=1 name=Thryx, the Sudden Storm abilities=flying,flash auto=lord(*[manacost>=5]|mycastingzone) altercost(colorless,-1) -auto=lord(*[manacost>=5]|mycastingzone) nofizzle +auto=@targeted(*[manacosto>=5]|mystack) from(instant|opponentzones):choice name(Spell can't be countered) name(Spell can't be countered) all(instant|opponentzones) fizzle text=Flash -- Flying -- Spells you cast with converted mana cost 5 or greater cost {1} less to cast and can’t be countered. mana={3}{U}{U} type=Legendary Creature @@ -52281,8 +52300,8 @@ toughness=1 [/card] [card] name=Underworld Sentinel -auto=@combat(attacking) source(this):moveTo(exile) target(creature|myGraveyard) -auto=@movedTo(this|mygraveyard) from(Battlefield):moveTo(myBattlefield) all(creature|myExile) +auto=@combat(attacking) source(this):target(creature|myGraveyard) moveTo(myexile) and!( counter(0/0,1,UnderworldExiled) )! +auto=@movedTo(this|mygraveyard) from(Battlefield):moveTo(myBattlefield) all(creature[counter{0/0.1.UnderworldExiled}]|myexile) text=Whenever Underworld Sentinel attacks, exile target creature card from your graveyard. -- When Underworld Sentinel dies, put all cards exiled with it onto the battlefield. mana={3}{B}{B} type=Creature @@ -54028,9 +54047,8 @@ toughness=8 [card] name=Void Maw abilities=trample -auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) moveto(ownerexile) -auto={0}:name(Target opponent creature) moveto(opponentgraveyard) target(creature|opponentexile) && 2/2 ueot all(this) -auto={0}:name(Target your creature) moveto(mygraveyard) target(creature|myexile) && 2/2 ueot all(this) +auto=@movedto(other creature|graveyard) from(battlefield):all(trigger[to]) moveto(ownerexile) and!( counter(0/0,1,MawExiled) )! +auto={0}:name(Put creature into owner graveyard) name(Put creature into owner graveyard) moveto(ownerGraveyard) target(creature[counter{0/0.1.MawExiled}]|exile) && 2/2 ueot all(this) text=Trample -- If another creature would die, exile it instead. -- Put a card exiled with Void Maw into its owner's graveyard: Void Maw gets +2/+2 until end of turn. mana={4}{B}{B} type=Creature @@ -56110,7 +56128,7 @@ toughness=1 [card] name=Yorion, Sky Nomad abilities=flying -auto=target(*[-land]|mybattlefield) transforms((,newability[moveto(myexile),newability[phaseaction[endofturn once] moveto(ownerbattlefield)])) ueot +auto=may name(Exile permanents) target(other *[-land]|mybattlefield) transforms((,newability[moveto(myexile),newability[phaseaction[endofturn once] moveto(ownerbattlefield)])) ueot text=Companion — Your starting deck contains at least twenty cards more than the minimum deck size. (If this card is your chosen companion, you may cast it once from outside the game.) -- Flying -- When Yorion enters the battlefield, exile any number of other nonland permanents you own and control. Return those cards to the battlefield at the beginning of the next end step. mana={3}{WU}{WU} type=Legendary Creature