fix some cards

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