merged my changes to the base

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

@@ -1043,7 +1043,7 @@ type=Enchantment
 [/card]
 [card]
 name=AEther Burst
-target=<plusonetype:AEther Burst:graveyard>creature|battlefield
+target=<type:AEther Burst:graveyardplus1plusend>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:plusonetype:creature[green]|battlefield controller
+auto=life:type:creature[green]|battlefieldplus1plusend 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:morethanfourcards targetedplayer
+auto=@each targetedplayer upkeep:damage:type:*:opponenthandminus4minusend 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
@@ -54376,7 +54376,7 @@ type=Artifact
 [/card]
 [card]
 name=Iron Maiden
-auto=@each opponent upkeep:damage:morethanfourcards opponent
+auto=@each opponent upkeep:damage:type:*:opponenthandminus4minusend 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
@@ -57937,7 +57937,7 @@ type=Instant
 [card]
 name=Kindle
 target=creature,player
-auto=damage:plustwotype:kindle:graveyard
+auto=damage:type:kindle:graveyardplus2plusend
 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
@@ -61533,7 +61533,7 @@ toughness=5
 [/card]
 [card]
 name=Lhurgoyf
-anyzone=type:creature:graveyard/plusonetype:creature:graveyard cdaactive
+anyzone=type:creature:graveyard/type:creature:graveyardplus1plusend 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
@@ -68102,7 +68102,7 @@ type=Legendary Land
 [card]
 name=Mind Burst
 target=player
-auto=ability$!name(discard) target(<plusonetype:mind burst:graveyard>*|myhand) reject!$ targetedplayer
+auto=ability$!name(discard) target(<type:mind burst:graveyard>*|myhandplus1plusend) 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
@@ -109311,7 +109311,7 @@ toughness=7
 [/card]
 [card]
 name=Tarmogoyf
-anyzone=gravecardtypes/plusonegravecardtypes cdaactive
+anyzone=gravecardtypes/gravecardtypesplus1plusend 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
@@ -120125,7 +120125,7 @@ toughness=3
 [/card]
 [card]
 name=Viseling
-auto=@each opponent upkeep:damage:morethanfourcards opponent
+auto=@each opponent upkeep:damage:type:*:opponenthandminus4minusend 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
@@ -120200,7 +120200,7 @@ type=Instant
 [/card]
 [card]
 name=Vitalizing Cascade
-auto=life:Xplusthree
+auto=life:Xplus3plusend
 text=You gain X plus 3 life.
 mana={X}{G}{W}
 type=Instant
@@ -121951,7 +121951,7 @@ toughness=4
 [card]
 name=Wall of Tombstones
 abilities=defender
-auto=@each my upkeep:transforms((,settoughness=plusonetype:creature:mygraveyard)) forever
+auto=@each my upkeep:transforms((,settoughness=type:creature:mygraveyardplus1plusend)) 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
@@ -127555,6 +127555,46 @@ 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]