Added/fixed primitives.

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

@@ -7728,8 +7728,13 @@ type=Land
 [/card]
 [card]
 name=Brightflame
-auto=damage:X target(creature)
+target=creature
-auto=damage:X all(other creature[share!color!])
+auto=if cantargetcard(creature[white]|*) then name(Damage white creature) name(Damage white creature) foreach(creature[white]|battlefield) life:X controller && all(creature[white]|battlefield) damage:X
+auto=if cantargetcard(creature[black]|*) then name(Damage black creature) name(Damage black creature) foreach(creature[black]|battlefield) life:X controller && all(creature[black]|battlefield) damage:X
+auto=if cantargetcard(creature[red]|*) then name(Damage red creature) name(Damage red creature) foreach(creature[red]|battlefield) life:X controller && all(creature[red]|battlefield) damage:X
+auto=if cantargetcard(creature[green]|*) then name(Damage green creature) name(Damage green creature) foreach(creature[green]|battlefield) life:X controller && all(creature[green]|battlefield) damage:X
+auto=if cantargetcard(creature[blue]|*) then name(Damage blue creature) name(Damage blue creature) foreach(creature[blue]|battlefield) life:X controller && all(creature[blue]|battlefield) damage:X
+auto=if cantargetcard(creature[colorless]|*) then name(Damage colorless creature) name(Damage colorless creature) life:X controller && damage:X
 text=Radiance -- Brightflame deals X damage to target creature and each other creature that shares a color with it. You gain life equal to the damage dealt this way.
 mana={X}{R}{R}{W}{W}
 type=Sorcery
@@ -17245,8 +17250,8 @@ type=Sorcery
 [/card]
 [card]
 name=Dregscape Sliver
-autograveyard={2}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
-auto=lord(sliver|mygraveyard) {2}:moveto(ownerbattlefield) and!( transforms((,unearth,haste)) forever )! assorcery
+auto=lord(sliver|mygraveyard) {2}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Each Sliver creature card in your graveyard has unearth {2}. -- Unearth {2} ({2} : Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}
 type=Creature
@@ -22135,13 +22140,13 @@ toughness=3
 [/card]
 [card]
 name=First-Sphere Gargantua
-auto=draw:1
+auto=draw:1 controller
-auto=life:-1
+auto=life:-1 controller
-autograveyard={2}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When First-Sphere Gargantua enters the battlefield, you draw a card and you lose 1 life. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{B}{B}
 type=Creature
-subtype=Horror
+subtype=Phyrexian Horror
 power=5
 toughness=4
 [/card]
@@ -71520,6 +71525,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Wojek Embermage
+auto={T}:name(Damage creature) target(creature) transforms((,newability[all(creature[share!color!]) damage:1])) oneshot
+text=Radiance — {T}: Wojek Embermage deals 1 damage to target creature and each other creature that shares a color with it.
+mana={3}{R}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=2
+[/card]
+[card]
 name=Wolf Gar
 auto=@movedto(this|ownergraveyard) from(battlefield):counter(0/0,1,loyalty) all(Garruk)
 text=When this creature dies, put a loyalty counter on each Garruk you control.

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

@@ -3344,7 +3344,7 @@ type=Sorcery
 [card]
 name=Anathemancer
 auto=name(choose target player) target(player) damage:type:land[-basic]:targetedpersonsbattlefield
-autograveyard={5}{B}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={5}{B}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls. -- Unearth {5}{B}{R} ({5}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -14216,7 +14216,7 @@ type=Instant
 name=Brackwater Elemental
 auto=_ATTACKING_treason ueot
 auto=@combat(blocking) source(this):treason ueot
-autograveyard={2}{U}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{U}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Brackwater Elemental attacks or blocks, sacrifice it at the beginning of the next end step. -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{U}
 type=Creature
@@ -22634,7 +22634,7 @@ type=Instant
 name=Corpse Connoisseur
 aicode=activate target(creature|mylibrary) moveto(mygraveyard)
 auto=name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mygraveyard)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
-autograveyard={4}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={4}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Corpse Connoisseur enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{B}
 type=Creature
@@ -31974,7 +31974,7 @@ type=Sorcery
 [/card]
 [card]
 name=Dregscape Zombie
-autograveyard={B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Unearth {B} ({B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}
 type=Creature
@@ -37265,7 +37265,7 @@ toughness=3
 [/card]
 [card]
 name=Etherium Abomination
-autograveyard={1}{U}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{U}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Unearth {1}{U}{B} ({1}{U}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{U}{B}
 type=Artifact Creature
@@ -37997,7 +37997,7 @@ type=Sorcery
 [card]
 name=Extractor Demon
 abilities=flying
-autograveyard={2}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 auto=@movedTo(other creature|nonbattlezone) from(battlefield):may deplete:2 target(player)
 text=Flying -- Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{B}{B}
@@ -39198,7 +39198,7 @@ type=Instant
 name=Fatestitcher
 auto={T}:Tap target(other *)
 auto={T}:Untap target(other *)
-autograveyard={U}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={U}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text={T}: You may tap or untap another target permanent. -- Unearth {U} ({U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{U}
 type=Creature
@@ -40700,7 +40700,7 @@ toughness=1
 [card]
 name=Fire-Field Ogre
 abilities=first strike
-autograveyard={U}{B}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={U}{B}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=First strike -- Unearth {U}{B}{R} ({U}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{U}{B}{R}
 type=Creature
@@ -50646,7 +50646,7 @@ type=Land
 [card]
 name=Grixis Slavedriver
 auto=@movedTo(this|nonbattlezone) from(battlefield):token(Zombie,Creature Zombie,2/2,black)
-autograveyard={3}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={3}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Grixis Slavedriver leaves the battlefield, put a 2/2 black Zombie creature token onto the battlefield. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={5}{B}
 type=Creature
@@ -53842,7 +53842,7 @@ toughness=1
 [card]
 name=Hell's Thunder
 abilities=flying,haste,treason
-autograveyard={4}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={4}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Flying, haste -- At the beginning of the end step, sacrifice Hell's Thunder. -- Unearth {4}{R} ({4}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{R}{R}
 type=Creature
@@ -53853,7 +53853,7 @@ toughness=4
 [card]
 name=Hellspark Elemental
 abilities=trample,haste,treason
-autograveyard={1}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Trample, haste -- At the beginning of the end step, sacrifice Hellspark Elemental. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{R}
 type=Creature
@@ -61850,7 +61850,7 @@ toughness=1
 name=Kathari Bomber
 abilities=flying
 auto=@combatdamaged(player) from(this):token(Goblin,Creature Goblin,1/1,red)*2 && moveTo(ownergraveyard) all(this)
-autograveyard={3}{B}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={3}{B}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Flying -- When Kathari Bomber deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice Kathari Bomber. -- Unearth {3}{B}{R} ({3}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -61873,7 +61873,7 @@ toughness=1
 [card]
 name=Kathari Screecher
 abilities=flying
-autograveyard={2}{U}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{U}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Flying -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{U}
 type=Creature
@@ -62107,7 +62107,7 @@ toughness=3
 [card]
 name=Kederekt Leviathan
 auto=moveTo(ownerhand) all(other *[-land])
-autograveyard={6}{U}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={6}{U}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Kederekt Leviathan enters the battlefield, return all other nonland permanents to their owners' hands. -- Unearth {6}{U} ({6}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={6}{U}{U}
 type=Creature
@@ -96898,7 +96898,7 @@ toughness=8
 [card]
 name=Rotting Rats
 auto=transforms((,newability[ability$!name(discard) notatarget(*|myhand) reject!$ controller],newability[ability$!name(discard) notatarget(*|myhand) reject!$ opponent])) ueot
-autograveyard={1}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Rotting Rats enters the battlefield, each player discards a card. -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}
 type=Creature
@@ -100197,7 +100197,7 @@ type=Instant
 [card]
 name=Scourge Devil
 auto=1/0 all(creature|myBattlefield)
-autograveyard={2}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=When Scourge Devil enters the battlefield, creatures you control get +1/+0 until end of turn. -- Unearth {2}{R} ({2}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{R}
 type=Creature
@@ -101515,7 +101515,7 @@ name=Sedraxis Specter
 abilities=flying
 auto=@combatdamagefoeof(player) from(this):ability$!name(discard) target(*|myhand) reject!$ opponent
 auto=@combatdamageof(player) from(this):ability$!name(discard) target(*|myhand) reject!$ controller
-autograveyard={1}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Flying -- Whenever Sedraxis Specter deals combat damage to a player, that player discards a card. -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={U}{B}{R}
 type=Creature
@@ -101525,7 +101525,7 @@ toughness=2
 [/card]
 [card]
 name=Sedris, the Traitor King
-auto=lord(creature|mygraveyard) {2}{B}:moveto(ownerbattlefield) and!( transforms((,unearth,haste)) forever )! assorcery
+auto=lord(creature|mygraveyard) {2}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Each creature card in your graveyard has unearth {2}{B}. ({2}{B}: Return the card to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{U}{B}{R}
 type=Legendary Creature
@@ -103311,7 +103311,7 @@ toughness=1
 [card]
 name=Shambling Remains
 abilities=cantblock
-autograveyard={B}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={B}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Shambling Remains can't block. -- Unearth {B}{R} ({B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -125603,7 +125603,7 @@ toughness=1
 [card]
 name=Undead Leotau
 auto={R}:1/-1
-autograveyard={2}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={2}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text={R}: Undead Leotau gets +1/-1 until end of turn. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={5}{B}
 type=Creature
@@ -129416,7 +129416,7 @@ toughness=5
 name=Viscera Dragger
 abilities=cycling
 autohand=__CYCLING__({2})
-autograveyard={1}{B}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{B}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text=Cycling {2} ({2}, Discard this card: Draw a card.) -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{B}
 type=Creature
@@ -129601,7 +129601,7 @@ toughness=2
 [card]
 name=Vithian Stinger
 auto={T}:damage:1 target(creature,player)
-autograveyard={1}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
+autograveyard={1}{R}:name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 text={T}: Vithian Stinger deals 1 damage to target creature or player. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{R}
 type=Creature

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

@@ -13097,15 +13097,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Wojek Embermage
-text=Radiance — {T}: Wojek Embermage deals 1 damage to target creature and each other creature that shares a color with it.
-mana={3}{R}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=2
-[/card]
-[card]
 name=Wood Sage
 text={T}: Name a creature card. Reveal the top four cards of your library and put all of them with that name into your hand. Put the rest into your graveyard.
 mana={G}{U}