From a748e0337d238a76dc9d065149dbc7500c150424 Mon Sep 17 00:00:00 2001
From: zethfoxster <omegablast2002@yahoo.com>
Date: Wed, 6 Jul 2016 17:56:17 -0400
Subject: [PATCH] trying to get my commit in

---
 .../bin/Res/sets/primitives/borderline.txt    |  10 +
 projects/mtg/bin/Res/sets/primitives/mtg.txt  | 182 ++++++++----------
 .../bin/Res/sets/primitives/unsupported.txt   |  45 -----
 3 files changed, 89 insertions(+), 148 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 2b2e2c3ba..5ac11eec8 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -352,3 +352,13 @@ mana={B}
 type=Instant
 text=Target creature gets +2/+0 and gains deathtouch until end of turn. 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.)
 [/card]
+[card]
+name=Yixlid Jailer
+auto=lord(*|graveyard) loseabilities
+text=Cards in graveyards lose all abilities.
+mana={1}{B}
+type=Creature
+subtype=Zombie Wizard
+power=2
+toughness=1
+[/card]
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index ce55bb4a1..5a8969ebb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1043,7 +1043,7 @@ type=Enchantment
 [/card]
 [card]
 name=AEther Burst
-target=<type:AEther Burst:graveyardplus1plusend>creature|battlefield
+target=<plusonetype:AEther Burst:graveyard>creature|battlefield
 auto=moveto(ownerhand)
 text=Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst.
 mana={1}{U}
@@ -3677,7 +3677,7 @@ toughness=1+*
 [/card]
 [card]
 name=An-Havva Inn
-auto=life:type:creature[green]|battlefieldplus1plusend controller
+auto=life:plusonetype:creature[green]|battlefield controller
 text=You gain X plus 1 life, where X is the number of green creatures on the battlefield.
 mana={1}{G}{G}
 type=Sorcery
@@ -10126,7 +10126,7 @@ type=Sorcery
 [card]
 name=Black Vise
 auto=name(choose opponent) notatarget(opponent) deplete:0
-auto=@each targetedplayer upkeep:damage:type:*:opponenthandminus4minusend targetedplayer
+auto=@each targetedplayer upkeep:damage:morethanfourcards targetedplayer
 text=As Black Vise enters the battlefield, choose an opponent. -- At the beginning of the chosen player's upkeep, Black Vise deals X damage to that player, where X is the number of cards in his or her hand minus 4.
 mana={1}
 type=Artifact
@@ -12646,7 +12646,6 @@ subtype=Equipment
 [/card]
 [card]
 name=Boneyard Wurm
-
 anyzone=type:creature:mygraveyard/type:creature:mygraveyard cdaactive
 text=Boneyard Wurm's power and toughness are each equal to the number of creature cards in your graveyard.
 mana={1}{G}
@@ -15448,7 +15447,6 @@ subtype=Forest Plains
 [/card]
 [card]
 name=Cantivore
-
 abilities=vigilance
 anyzone=type:enchantment:graveyard/type:enchantment:graveyard cdaactive
 text=Vigilance -- Cantivore's power and toughness are each equal to the number of enchantment cards in all graveyards.
@@ -18074,7 +18072,6 @@ toughness=2
 [/card]
 [card]
 name=Cho-Manno's Blessing
-
 abilities=auraward
 target=creature
 abilities=flash
@@ -19729,7 +19726,6 @@ type=Instant
 [/card]
 [card]
 name=Cognivore
-
 abilities=flying
 anyzone=type:instant:graveyard/type:instant:graveyard cdaactive
 text=Flying -- Cognivore's power and toughness are each equal to the number of instant cards in all graveyards.
@@ -19799,7 +19795,6 @@ toughness=1
 [/card]
 [card]
 name=Coldsteel Heart
-
 auto=tap
 auto=chooseacolor {T}:add{chosencolor} chooseend
 text=Coldsteel Heart enters the battlefield tapped. -- As Coldsteel Heart enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool.
@@ -23086,7 +23081,6 @@ subtype=Aura Curse
 [/card]
 [card]
 name=Curse of Wizardry
-
 auto=chooseacolor transforms((,newability[@movedto(*[chosencolor]|mystack):life:-1 controller],newability[@movedto(*[chosencolor]|opponentstack):life:-1 opponent])) chooseend
 text=As Curse of Wizardry enters the battlefield, choose a color. -- Whenever a player casts a spell of the chosen color, that player loses 1 life.
 mana={2}{B}{B}
@@ -26020,6 +26014,16 @@ mana={3}{U}
 type=Enchantment
 [/card]
 [card]
+name=Delver of Secrets
+auto=@each my upkeep:reveal:1 optionone name(transform) target(*[instant;sorcery]|reveal) moveto(mylibrary) and!( all(this) transforms((,newability[flip(Insectile Aberration)])) forever )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
+text=At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform Delver of Secrets.
+mana={U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=1
+[/card]
+[card]
 name=Dematerialize
 target=*
 auto=moveTo(ownerhand)
@@ -26677,7 +26681,6 @@ text=Destroy target artifact with converted mana cost X. It can't be regenerated
 [/card]
 [card]
 name=Detritivore
-
 anyzone=type:land[-basic]:opponentgraveyard/type:land[-basic]:opponentgraveyard cdaactive
 autoexile=@counterremoved(0/0,1,Time) from(sourcecard) suspended:destroy target(land[-basic])
 suspend(0)={X}{3}{R}
@@ -38491,7 +38494,6 @@ toughness=2
 [/card]
 [card]
 name=Flickering Ward
-
 abilities=auraward
 target=creature
 auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend
@@ -38584,7 +38586,6 @@ toughness=1
 [/card]
 [card]
 name=Floating Shield
-
 abilities=auraward
 target=creature
 auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend
@@ -39521,6 +39522,13 @@ mana={1}{G}
 type=Enchantment
 [/card]
 [card]
+name=Fork in the Road
+auto=name(put in hand) moveto(myhand) notatarget(land[basic]|mylibrary) and!(name(put in graveyard) moveto(mygraveyard) notatarget(land[basic]|mylibrary))! oneshot
+text=Search your library for up to two basic land cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle your library.
+mana={1}{G}
+type=Sorcery
+[/card]
+[card]
 name=Forked Bolt
 target=creature,player
 auto=damage:1
@@ -39548,13 +39556,6 @@ mana={R}{R}
 type=Instant
 [/card]
 [card]
-name=Fork in the Road
-auto=name(put in hand) moveto(myhand) notatarget(land[basic]|mylibrary) and!(name(put in graveyard) moveto(mygraveyard) notatarget(land[basic]|mylibrary))! oneshot
-text=Search your library for up to two basic land cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle your library.
-mana={1}{G}
-type=Sorcery
-[/card]
-[card]
 name=Forlorn Pseudamma
 abilities=intimidate
 auto=@untapped(this):name(pay 2B for 2/2 Zombie) pay[[{2}{B}]] name(Pay 2B) token(Zombie,Enchantment Creature Zombie,2/2,black) controller
@@ -47785,7 +47786,6 @@ toughness=3
 [/card]
 [card]
 name=Hall of Triumph
-
 auto=activatechooseacolor transforms((,newability[lord(creature[chosencolor]|mybattlefield) 1/1])) forever activatechooseend
 text=As Hall of Triumph enters the battlefield, choose a color. -- Creatures you control of the chosen color get +1/+1.
 mana={3}
@@ -53868,6 +53868,14 @@ toughness=1
 color=green
 [/card]
 [card]
+name=Insectile Aberration
+type=Creature
+abilities=flying
+subtype=Human Insect
+power=3
+toughness=2
+[/card]
+[card]
 name=Inside Out
 target=creature
 auto=swap
@@ -54270,7 +54278,6 @@ type=Enchantment
 [/card]
 [card]
 name=Iona, Shield of Emeria
-
 abilities=flying
 auto=chooseacolor maxCast(*[chosencolor])0 opponent chooseend
 text=Flying -- As Iona, Shield of Emeria enters the battlefield, choose a color. -- Your opponents can't cast spells of the chosen color.
@@ -54369,7 +54376,7 @@ type=Artifact
 [/card]
 [card]
 name=Iron Maiden
-auto=@each opponent upkeep:damage:type:*:opponenthandminus4minusend opponent
+auto=@each opponent upkeep:damage:morethanfourcards opponent
 text=At the beginning of each opponent's upkeep, Iron Maiden deals X damage to that player, where X is the number of cards in his or her hand minus 4.
 mana={3}
 type=Artifact
@@ -55493,7 +55500,6 @@ toughness=3
 [/card]
 [card]
 name=Jihad
-
 auto=chooseacolor transforms((,newability[aslongas(*[chosencolor]|opponentbattlefield) lord(creature[white]|mybattlefield) 2/1],newability[aslongas(*[chosencolor]|opponentbattlefield) sacrifice <1])) chooseend
 text=As Jihad enters the battlefield, choose a color and an opponent. -- White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. -- When the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad.
 mana={W}{W}{W}
@@ -57931,7 +57937,7 @@ type=Instant
 [card]
 name=Kindle
 target=creature,player
-auto=damage:type:kindle:graveyardplus2plusend
+auto=damage:plustwotype:kindle:graveyard
 text=Kindle deals X damage to target creature or player, where X is 2 plus the number of cards named Kindle in all graveyards.
 mana={1}{R}
 type=Instant
@@ -61527,8 +61533,7 @@ toughness=5
 [/card]
 [card]
 name=Lhurgoyf
-
-anyzone=type:creature:graveyard/type:creature:graveyardplus1plusend cdaactive
+anyzone=type:creature:graveyard/plusonetype:creature:graveyard cdaactive
 text=Lhurgoyf's power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1.
 mana={2}{G}{G}
 type=Creature
@@ -63024,7 +63029,6 @@ toughness=2
 [/card]
 [card]
 name=Lord of Extinction
-
 anyzone=type:*:graveyard/type:*:graveyard cdaactive
 text=Lord of Extinction's power and toughness are each equal to the number of cards in all graveyards.
 mana={3}{B}{G}
@@ -63796,7 +63800,6 @@ type=Instant
 [/card]
 [card]
 name=Lurebound Scarecrow
-
 auto=chooseacolor aslongas(*[chosencolor]|myBattlefield) sacrifice <1 chooseend
 text=As Lurebound Scarecrow enters the battlefield, choose a color. -- When you control no permanents of the chosen color, sacrifice Lurebound Scarecrow.
 mana={3}
@@ -64491,7 +64494,6 @@ toughness=6
 [/card]
 [card]
 name=Magnivore
-
 abilities=haste
 anyzone=type:sorcery:graveyard/type:sorcery:graveyard cdaactive
 text=Haste (This creature can attack the turn it comes under your control.) -- Magnivore's power and toughness are each equal to the number of sorcery cards in all graveyards.
@@ -68100,7 +68102,7 @@ type=Legendary Land
 [card]
 name=Mind Burst
 target=player
-auto=ability$!name(discard) target(<type:mind burst:graveyard>*|myhandplus1plusend) reject!$ targetedplayer
+auto=ability$!name(discard) target(<plusonetype:mind burst:graveyard>*|myhand) reject!$ targetedplayer
 text=Target player discards X cards, where X is one plus the number of cards named Mind Burst in all graveyards.
 mana={1}{B}
 type=Sorcery
@@ -70774,7 +70776,6 @@ toughness=2
 [/card]
 [card]
 name=Mortivore
-
 auto={B}:regenerate
 anyzone=type:creature:graveyard/type:creature:graveyard cdaactive
 text=Mortivore's power and toughness are each equal to the number of creature cards in all graveyards. -- {B}: Regenerate Mortivore. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
@@ -77807,7 +77808,6 @@ subtype=Equipment
 [/card]
 [card]
 name=Paradise Plume
-
 auto=chooseacolor transforms((,newability[{T}:add{chosencolor}],newability[@movedto(*[chosencolor]|stack):life:1 controller])) forever chooseend
 text=As Paradise Plume enters the battlefield, choose a color. -- Whenever a player casts a spell of the chosen color, you may gain 1 life. -- {T}: Add one mana of the chosen color to your mana pool.
 mana={4}
@@ -78639,7 +78639,6 @@ type=Artifact
 [/card]
 [card]
 name=Pentarch Paladin
-
 abilities=flanking
 auto=chooseacolor {W}{W}{T}:destroy target(*[chosencolor]) chooseend
 text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.) -- As Pentarch Paladin enters the battlefield, choose a color. -- {W}{W}, {T}: Destroy target permanent of the chosen color.
@@ -78651,7 +78650,6 @@ toughness=3
 [/card]
 [card]
 name=Pentarch Ward
-
 abilities=auraward
 target=creature
 auto=chooseacolor teach(creature) protection from(*[chosencolor]) chooseend
@@ -81977,7 +81975,6 @@ type=Enchantment
 [/card]
 [card]
 name=Prism Ring
-
 auto=activatechooseacolor transforms((,newability[@movedto(*[chosencolor]|mystack):life:1 controller])) forever activatechooseend
 text=As Prism Ring enters the battlefield, choose a color. -- Whenever you cast a spell of the chosen color, you gain 1 life.
 mana={1}
@@ -82493,7 +82490,6 @@ toughness=2
 [/card]
 [card]
 name=Psychic Allergy
-
 auto=upcost[{S(island|mybattlefield)}{S(island|mybattlefield)}] sacrifice
 auto=chooseacolor transforms((,newability[@each opponent upkeep:damage:type:*[-token&chosencolor]:opponentbattlefield opponent])) chooseend
 text=As Psychic Allergy enters the battlefield, choose a color. -- At the beginning of each opponent's upkeep, Psychic Allergy deals X damage to that player, where X is the number of nontoken permanents of the chosen color he or she controls. -- At the beginning of your upkeep, destroy Psychic Allergy unless you sacrifice two Islands.
@@ -83714,7 +83710,6 @@ toughness=1
 [/card]
 [card]
 name=Quirion Elves
-
 auto={T}:Add{G}
 auto=chooseacolor {T}:add{chosencolor} chooseend
 text=As Quirion Elves enters the battlefield, choose a color. -- {T}: Add {G} to your mana pool. -- {T}: Add one mana of the chosen color to your mana pool.
@@ -87461,7 +87456,6 @@ toughness=3
 [/card]
 [card]
 name=Revenant
-
 abilities=flying
 anyzone=type:creature:mygraveyard/type:creature:mygraveyard cdaactive
 text=Flying -- Revenant's power and toughness are each equal to the number of creature cards in your graveyard.
@@ -91655,6 +91649,17 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Sarkhan the Mad
+auto=counter(0/0,7,loyalty)
+auto={0}:name(0: reveal damage) Reveal:1 revealzone(mylibrary) revealuntil(*|mylibrary) optionone name(put in hand) target(*|reveal) moveto(myhand) optiononeend afterrevealed all(this) damage:revealedmana afterrevealedend revealend
+auto={C(0/0,-2,Loyalty)}:name(-2: sacrifice) target(creature) sacrifice and!( token(Dragon,creature dragon,5/5,flying,red) targetcontroller )!
+auto={C(0/0,-4,Loyalty)}:name(-4: ultimate) all(creature[dragon]|mybattlefield) transforms((,newability[target(player) dynamicability<!powerstrike!>])) oneshot
+text=0: Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost. -- -2: Target creature's controller sacrifices it, then that player puts a 5/5 red Dragon creature token with flying onto the battlefield. -- -4: Each Dragon creature you control deals damage equal to its power to target player.
+mana={3}{B}{R}
+type=Planeswalker
+subtype=Sarkhan
+[/card]
+[card]
 name=Sarkhan Unbroken
 auto=counter(0/0,9,Loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Draw card add mana) draw:1 controller && transforms((,newability[activatechooseacolor add{chosencolor} activatechooseend])) forever asSorcery
@@ -91688,17 +91693,6 @@ type=Planeswalker
 subtype=Sarkhan
 [/card]
 [card]
-name=Sarkhan the Mad
-auto=counter(0/0,7,loyalty)
-auto={0}:name(0: reveal damage) Reveal:1 revealzone(mylibrary) revealuntil(*|mylibrary) optionone name(put in hand) target(*|reveal) moveto(myhand) optiononeend afterrevealed all(this) damage:revealedmana afterrevealedend revealend
-auto={C(0/0,-2,Loyalty)}:name(-2: sacrifice) target(creature) sacrifice and!( token(Dragon,creature dragon,5/5,flying,red) targetcontroller )!
-auto={C(0/0,-4,Loyalty)}:name(-4: ultimate) all(creature[dragon]|mybattlefield) transforms((,newability[target(player) dynamicability<!powerstrike!>])) oneshot
-text=0: Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost. -- -2: Target creature's controller sacrifices it, then that player puts a 5/5 red Dragon creature token with flying onto the battlefield. -- -4: Each Dragon creature you control deals damage equal to its power to target player.
-mana={3}{B}{R}
-type=Planeswalker
-subtype=Sarkhan
-[/card]
-[card]
 name=Sarkhan's Rage
 target=creature,player|battlefield
 auto=damage:5
@@ -96134,7 +96128,6 @@ subtype=Shapeshifter
 [/card]
 [card]
 name=Shifting Sky
-
 auto=chooseacolor lord(*[-land]) becomes(,chosencolor) chooseend
 text=As Shifting Sky enters the battlefield, choose a color. -- All nonland permanents are the chosen color.
 mana={2}{U}
@@ -97556,7 +97549,6 @@ toughness=1
 [/card]
 [card]
 name=Silhana Starfletcher
-
 abilities=reach
 auto=activatechooseacolor {T}:add{chosencolor} activatechooseend
 text=Reach (This creature can block creatures with flying.) -- As Silhana Starfletcher enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool.
@@ -99583,7 +99575,6 @@ subtype=Equipment
 [/card]
 [card]
 name=Slag Fiend
-
 anyzone=type:artifact:graveyard/type:artifact:graveyard cdaactive
 text=Slag Fiend's power and toughness are each equal to the number of artifact cards in all graveyards.
 mana={R}
@@ -100732,7 +100723,6 @@ toughness=3
 [/card]
 [card]
 name=Sol Grail
-
 auto=chooseacolor transforms((,newability[{T}:add{chosencolor}])) forever chooseend
 text=As Sol Grail enters the battlefield, choose a color. -- {T}: Add one mana of the chosen color to your mana pool.
 mana={3}
@@ -103624,7 +103614,6 @@ subtype=Aura
 [/card]
 [card]
 name=Splinterfright
-
 abilities=trample
 anyzone=type:creature:mygraveyard/type:creature:mygraveyard cdaactive
 auto=@each my upkeep:deplete:2 controller
@@ -109322,7 +109311,7 @@ toughness=7
 [/card]
 [card]
 name=Tarmogoyf
-anyzone=gravecardtypes/gravecardtypesplus1plusend cdaactive
+anyzone=gravecardtypes/plusonegravecardtypes cdaactive
 text=Tarmogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. (The card types are artifact, creature, enchantment, instant, land, planeswalker, sorcery, and tribal.)
 mana={1}{G}
 type=Creature
@@ -109363,6 +109352,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Tasigur, the Golden Fang
+other={delve} name(Delve)
+auto={2}{GU}{GU}:deplete:2 controller && ability$! moveto(ownerhand) notatarget(*[-land]|opponentgraveyard) !$ opponent
+text=Delve (Each card you exile from your graveyard while casting this spell pays for {1}.) -- {2}{GU}{GU}: Put the top two cards of your library into your graveyard, then return a nonland card of an opponent's choice from your graveyard to your hand.
+mana={5}{B}
+type=Legendary Creature
+subtype=Human Shaman
+power=4
+toughness=5
+[/card]
+[card]
 name=Tasigur's Cruelty
 auto=ability$!name(discard 2 cards) target(*|myhand) reject!$ opponent
 text=Delve (Each card you exile from your graveyard while casting this spell pays for {1}.) -- Each opponent discards two cards.
@@ -109676,7 +109676,6 @@ type=Legendary Land
 [/card]
 [card]
 name=Teferi's Moat
-
 auto=chooseacolor lord(creature[chosencolor&-flying]|opponentBattlefield) cantattack chooseend
 text=As Teferi's Moat enters the battlefield, choose a color. -- Creatures of the chosen color without flying can't attack you.
 mana={3}{W}{U}
@@ -110427,7 +110426,6 @@ type=Artifact
 [/card]
 [card]
 name=Terravore
-
 abilities=trample
 anyzone=type:land:graveyard/type:land:graveyard cdaactive
 text=Trample -- Terravore's power and toughness are each equal to the number of land cards in all graveyards.
@@ -116278,7 +116276,6 @@ type=Artifact
 [/card]
 [card]
 name=Umbra Stalker
-
 anyzone=type:manab:mygraveyard/type:manab:mygraveyard cdaactive
 text=Chroma - Umbra Stalker's power and toughness are each equal to the number of black mana symbols in the mana costs of cards in your graveyard.
 mana={4}{B}{B}{B}
@@ -120128,7 +120125,7 @@ toughness=3
 [/card]
 [card]
 name=Viseling
-auto=@each opponent upkeep:damage:type:*:opponenthandminus4minusend opponent
+auto=@each opponent upkeep:damage:morethanfourcards opponent
 text=At the beginning of each opponent's upkeep, Viseling deals X damage to that player, where X is the number of cards in his or her hand minus 4.
 mana={4}
 type=Artifact Creature
@@ -120203,7 +120200,7 @@ type=Instant
 [/card]
 [card]
 name=Vitalizing Cascade
-auto=life:Xplus3plusend
+auto=life:Xplusthree
 text=You gain X plus 3 life.
 mana={X}{G}{W}
 type=Instant
@@ -120461,7 +120458,6 @@ toughness=2
 [/card]
 [card]
 name=Voice of All
-
 abilities=flying
 auto=chooseacolor transforms((,newability[protection from(*[chosencolor])],newability[0/0])) forever chooseend
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- As Voice of All enters the battlefield, choose a color. -- Voice of All has protection from the chosen color. (It can't be blocked, targeted, dealt damage, or enchanted by anything of the chosen color.)
@@ -121955,7 +121951,7 @@ toughness=4
 [card]
 name=Wall of Tombstones
 abilities=defender
-auto=@each my upkeep:transforms((,settoughness=type:creature:mygraveyardplus1plusend)) forever
+auto=@each my upkeep:transforms((,settoughness=plusonetype:creature:mygraveyard)) forever
 text=Defender (This creature can't attack.) -- At the beginning of your upkeep, Wall of Tombstones's toughness becomes 1 plus the number of creature cards in your graveyard. (This effect lasts indefinitely.)
 mana={1}{B}
 type=Creature
@@ -122343,7 +122339,6 @@ toughness=1
 [/card]
 [card]
 name=Ward Sliver
-
 auto=chooseacolor transforms((,newability[lord(sliver) protection from(*[chosencolor])])) forever chooseend
 text=As Ward Sliver enters the battlefield, choose a color. -- All Slivers have protection from the chosen color.
 mana={4}{W}
@@ -126579,6 +126574,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Yisan, the Wanderer Bard
+auto={2}{G}{T}{C(0/0,1,Verse)}:name(search creature) Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[creature]|mylibrary) optionone target(creature[manacost=counter{0%0.1.Verse}]|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(mylibrary) )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(mylibrary) and!( all(*|reveal) moveto(mylibrary) )! optiontwoend afterrevealed shuffle afterrevealedend revealend
+text={2}{G}, {T}, Put a verse counter on Yisan, the Wanderer Bard: Search your library for a creature card with converted mana cost equal to the number of verse counters on Yisan, put it onto the battlefield, then shuffle your library.
+mana={2}{G}
+type=Legendary Creature
+subtype=Human Rogue
+power=2
+toughness=3
+[/card]
+[card]
 name=Yoke of the Damned
 target=creature
 auto=@movedTo(graveyard) from(creature|battlefield):destroy
@@ -126741,6 +126746,17 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Zameck Guildmage
+auto={G}{U}:name(1/1 counters) emblem transforms((,newability[@movedto(creature|myBattlefield):all(trigger[to]) counter(1/1.1)])) ueot
+auto={G}{U}{C(1/1,-1),*|mybattlefield}:name(remove a 1/1 counter) draw:1
+text={G}{U}: This turn, each creature you control enters the battlefield with an additional +1/+1 counter on it. -- {G}{U}, Remove a +1/+1 counter from a creature you control: Draw a card.
+mana={G}{U}
+type=Creature
+subtype=Elf Wizard
+power=2
+toughness=2
+[/card]
+[card]
 name=Zanam Djinn
 abilities=flying
 auto=this(variable{commonblue}>0) -2/-2
@@ -127539,46 +127555,6 @@ subtype=Orc Warrior
 power=7
 toughness=2
 [/card]
-######
-######unsorted
-[card]
-name=Dark Suspicions
-auto=@each opponent upkeep:life:-mathtype:*:opponenthandminustype:*:myhandminusendmathend opponent
-text=At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand.
-mana={2}{B}{B}
-type=Enchantment
-[/card]
-[card]
-name=Bulwark
-auto=@each opponent upkeep:target(opponent) damage:mathtype:*:myhandminustype:*:opponenthandminusendmathend opponent
-text=At the beginning of your upkeep, Bulwark deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand.
-mana={3}{R}{R}
-type=Enchantment
-[/card]
-[card]
-name=Roiling Horror
-anyzone=mathlifetotalminusopponentlifetotalminusendmathend/mathlifetotalminusopponentlifetotalminusendmathend cdaactive
-autoexile=@counterremoved(0/0,1,Time) from(sourcecard) suspended:ability$!choice life:-1 target(opponent) && life:1 controller!$ controller
-text=Roiling Horror's power and toughness are each equal to your life total minus the life total of an opponent with the most life. -- Suspend X—{X}{B}{B}{B}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{B}{B}{B} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.) -- Whenever a time counter is removed from Roiling Horror while it's exiled, target player loses 1 life and you gain 1 life.
-mana={3}{B}{B}
-suspend(0)={X}{b}{b}{b}
-type=Creature
-subtype=Horror
-power=*
-toughness=*
-[/card]
-[card]
-name=Dark Deal
-auto=count(type:*:myhand)
-auto=all(*|myhand) reject
-auto=draw:countedamountplus1plusend controller
-auto=count(type:*:opponenthand)
-auto=all(*|opponenthand) reject
-auto=draw:countedamountplus1plusend opponent
-text=Each player discards all the cards in his or her hand, then draws that many cards minus one.
-mana={2}{B}
-type=Sorcery
-[/card]
 ##due to card type association dryad arbor is placed at the end. any other card that associates 2 super types in this manner should also
 ##be in the end of the primitive to avoid abilities like changling thinking that "forest" is a creature type.
 [card]
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index a59319600..853855c96 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -4005,15 +4005,6 @@ mana={2}{B}
 type=Sorcery
 [/card]
 [card]
-name=Delver of Secrets
-text=At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform Delver of Secrets.
-mana={U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-[/card]
-[card]
 name=Dementia Sliver
 text=All Slivers have "{T}: Name a card. Target opponent reveals a card at random from his or her hand. If it's the named card, that player discards it. Activate this ability only during your turn."
 mana={3}{U}{B}
@@ -17769,15 +17760,6 @@ mana={1}{W}
 type=Sorcery
 [/card]
 [card]
-name=Tasigur, the Golden Fang
-text=Delve (Each card you exile from your graveyard while casting this spell pays for {1}.) -- {2}{GU}{GU}: Put the top two cards of your library into your graveyard, then return a nonland card of an opponent's choice from your graveyard to your hand.
-mana={5}{B}
-type=Legendary Creature
-subtype=Human Shaman
-power=4
-toughness=5
-[/card]
-[card]
 name=Task Mage Assembly
 text=When there are no creatures on the battlefield, sacrifice Task Mage Assembly. -- {2}: Task Mage Assembly deals 1 damage to target creature. Any player may activate this ability but only any time he or she could cast a sorcery.
 mana={2}{R}
@@ -20322,24 +20304,6 @@ power=3
 toughness=6
 [/card]
 [card]
-name=Yisan, the Wanderer Bard
-text={2}{G}, {T}, Put a verse counter on Yisan, the Wanderer Bard: Search your library for a creature card with converted mana cost equal to the number of verse counters on Yisan, put it onto the battlefield, then shuffle your library.
-mana={2}{G}
-type=Legendary Creature
-subtype=Human Rogue
-power=2
-toughness=3
-[/card]
-[card]
-name=Yixlid Jailer
-text=Cards in graveyards lose all abilities.
-mana={1}{B}
-type=Creature
-subtype=Zombie Wizard
-power=2
-toughness=1
-[/card]
-[card]
 name=Yosei, the Morning Star
 text=Flying -- When Yosei, the Morning Star dies, target player skips his or her next untap step. Tap up to five target permanents that player controls.
 mana={4}{W}{W}
@@ -20382,15 +20346,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Zameck Guildmage
-text={G}{U}: This turn, each creature you control enters the battlefield with an additional +1/+1 counter on it. -- {G}{U}, Remove a +1/+1 counter from a creature you control: Draw a card.
-mana={G}{U}
-type=Creature
-subtype=Elf Wizard
-power=2
-toughness=2
-[/card]
-[card]
 name=Zealous Inquisitor
 text={1}{W}: The next 1 damage that would be dealt to Zealous Inquisitor this turn is dealt to target creature instead.
 mana={2}{W}