fix some cards

projects/mtg/bin/Res/sets/PPR/_cards.dat

@@ -1988,16 +1988,6 @@ id=77788732
 rarity=S
 [/card]
 [card]
-primitive=Angel
-id=-4514111
-rarity=T
-[/card]
-[card]
-primitive=Soldier
-id=-4514112
-rarity=T
-[/card]
-[card]
 primitive=Demonic Tutor
 id=77788735
 rarity=S
@@ -2721,11 +2711,6 @@ id=7778845
 rarity=S
 [/card]
 [card]
-primitive=Avatar Token
-id=-140233
-rarity=T
-[/card]
-[card]
 primitive=Avatar of Woe
 id=7778844
 rarity=S

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

@@ -99,29 +99,6 @@ power=0
 toughness=2
 [/card]
 [card]
-name=Distortion Strike
-target=creature
-auto=1/0
-auto=unblockable
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={U}
-type=Sorcery
-text=Target creature gets +1/+0 until end of turn and is unblockable this 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=Emerge Unscathed
-target=creature|mybattlefield
-auto=choice name(green) transforms((,newability[protection from green])) ueot
-auto=choice name(red) transforms((,newability[protection from red])) ueot
-auto=choice name(blue) transforms((,newability[protection from blue])) ueot
-auto=choice name(black) transforms((,newability[protection from black])) ueot
-auto=choice name(white) transforms((,newability[protection from white])) ueot
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={W}
-type=Instant
-text=Target creature you control gains protection from the color of your choice 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=Eureka
 auto=ability$! moveto(ownerbattlefield) notatarget(<anyamount>artifact,creature,enchantment,land,planeswalker|myhand) !$ controller
 auto=ability$! moveto(ownerbattlefield) notatarget(<anyamount>artifact,creature,enchantment,land,planeswalker|myhand) !$ opponent
@@ -284,14 +261,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Nomads' Assembly
-auto=token(Kor Soldier,Creature Kor Soldier,1/1,white)*type:creature:mybattlefield
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={4}{W}{W}
-type=Sorcery
-text=Put a 1/1 white Kor Soldier creature token onto the battlefield for each creature you control. 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=Ogre Marauder
 text=Whenever Ogre Marauder attacks, it gains "Ogre Marauder can't be blocked" until end of turn unless defending player sacrifices a creature.
 auto=@combat(attacking) source(this):ability$!name(choose one) if type(creature|mybattlefield)~morethan~0 then choice sacrifice notatarget(creature|mybattlefield) _ choice all(mystored) unblockable ueot!$ opponent
@@ -302,15 +271,6 @@ power=3
 toughness=1
 [/card]
 [card]
-name=Prey's Vengeance
-target=creature
-auto=2/2
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={G}
-type=Instant
-text=Target creature gets +2/+2 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=Qasali Ambusher
 abilities=reach,spellmastery
 other={0} name(cast for free)
@@ -354,15 +314,6 @@ mana={X}{X}{U}
 type=Sorcery
 [/card]
 [card]
-name=Recurring Insight
-target=opponent
-auto=draw:type:*:targetedpersonshand controller
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={4}{U}{U}
-type=Sorcery
-text=Draw cards equal to the number of cards in target opponent's hand. 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=Relentless Dead
 auto=@movedTo(this|graveyard) from(battlefield):transforms((,newability[{B}:moveto(myhand)])) ueot
 auto=@movedTo(this|graveyard) from(battlefield):transforms((,newability[{X}:moveto(myhand) target(zombie[manacost=X]|mygraveyard)])) ueot
@@ -481,15 +432,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Staggershock
-target=creature,player
-auto=damage:2
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={2}{R}
-type=Instant
-text=Staggershock deals 2 damage to target creature or player. 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=Surrak Dragonclaw
 abilities=flash,nofizzle
 #lord nofizzle doesn't seem to work
@@ -503,23 +445,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Surreal Memoir
-auto=moverandom(instant) from(mygraveyard) to(myhand)
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={3}{R}
-type=Sorcery
-text=Return an instant card at random from your graveyard to your hand. 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=Survival Cache
-auto=life:2 controller
-auto=if compare(lifetotal)~morethan~compare(opponentlifetotal) then draw:1 controller
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-mana={2}{W}
-type=Sorcery
-text=You gain 2 life. Then if you have more life than an opponent, draw a card. 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=Teferi, Mage of Zhalfir
 abilities=flash
 auto=lord(creature|mycastingzone) flash
@@ -580,16 +505,6 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
-name=Virulent Swipe
-target=creature
-auto=2/0
-auto=deathtouch
-auto=if rebound then transforms((,newability[moveto(exile)],newability[phaseaction[my upkeep once checkex] activate may activate castcard(restricted)]))
-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=Wren's Run Vanquisher
 otherrestriction=type(*[elf]|myhand)~lessthan~2
 other={4}{G}

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

@@ -1676,7 +1676,7 @@ name=Ajani Goldmane
 auto=counter(0/0,4,loyalty)
 auto={C(0/0,1,Loyalty)}:life:2 controller
 auto={C(0/0,-1,Loyalty)}:all(creature|mybattlefield) counter(1/1,1) && all(creature|mybattlefield) vigilance ueot
-auto={C(0/0,-6,Loyalty)}:token(-140233)
+auto={C(0/0,-6,Loyalty)}:token(Avatar,Creature Avatar,0/0,white) and!( transforms((,newability[lifetotal/lifetotal cdaactive])) forever)!
 text=+1: You gain 2 life. -- -1: Put a +1/+1 counter on each creature you control. Those creatures gain vigilance until end of turn. -- -6: Put a white Avatar creature token onto the battlefield. It has "This creature's power and toughness are each equal to your life total."
 mana={2}{W}{W}
 type=Planeswalker
@@ -3493,16 +3493,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Angel
-type=Creature
-subtype=Angel
-abilities=flying
-text=Flying
-power=4
-toughness=4
-color=white
-[/card]
-[card]
 name=Angelheart Vial
 auto=@damageof(player):may counter(0/0,thatmuch,Charge)
 auto={2}{T}{C(0/0,-4,Charge)}:life:2 && draw:1 controller
@@ -7060,15 +7050,6 @@ power=6
 toughness=5
 [/card]
 [card]
-name=Avatar Token
-anyzone=lifetotal/lifetotal cdaactive
-type=Creature
-subtype=Avatar
-power=*
-toughness=*
-color=white
-[/card]
-[card]
 name=Aven Archer
 abilities=flying
 auto={2}{W}{T}:damage:2 target(creature[attacking;blocking])
@@ -26317,9 +26298,9 @@ type=Sorcery
 [/card]
 [card]
 name=Decree of Justice
-auto=token(-4514111)*XX
+auto=token(Angel,Creature Angel,4/4,flying,white,tnum:11)*XX
 autohand=__CYCLING__({2}{W})
-autohand={X}{2}{W}{cycle}:name(cycle + effect) token(-4514112)*X && draw:1 controller
+autohand={X}{2}{W}{cycle}:name(cycle + effect) token(Soldier,Creature Soldier,1/1,white,tnum:12)*X && draw:1 controller
 text=Put X 4/4 white Angel creature tokens with flying onto the battlefield. -- Cycling {2}{W} ({2}{W}, Discard this card: Draw a card.) -- When you cycle Decree of Justice, you may pay {X}. If you do, put X 1/1 white Soldier creature tokens onto the battlefield.
 mana={X}{X}{2}{W}{W}
 type=Sorcery
@@ -103587,14 +103568,6 @@ power=1
 toughness=3
 [/card]
 [card]
-name=Soldier
-type=Creature
-subtype=Soldier
-power=1
-toughness=1
-color=white
-[/card]
-[card]
 name=Solemn Offering
 target=artifact,enchantment
 auto=destroy