New macros and primitives fixes

Fixes to whenever you draw your second card each turn, batallion

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

@@ -13466,7 +13466,7 @@ toughness=1
 [/card]
 [card]
 name=Bomber Corps
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:damage:1 target(creature,player)
+auto=_BATALLION_damage:1 target(creature,player)
 text=Battalion -- Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to target creature or player.
 mana={1}{R}
 type=Creature
@@ -13885,7 +13885,7 @@ type=Artifact
 [/card]
 [card]
 name=Boros Elite
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:2/2 ueot
+auto=_BATALLION_2/2 ueot
 text=Battalion -- Whenever Boros Elite and at least two other creatures attack, Boros Elite gets +2/+2 until end of turn.
 mana={W}
 type=Creature
@@ -13941,7 +13941,7 @@ type=Artifact
 [/card]
 [card]
 name=Boros Mastiff
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:lifelink ueot
+auto=_BATALLION_lifelink ueot
 text=Battalion -- Whenever Boros Mastiff and at least two other creatures attack, Boros Mastiff gets lifelink until end of turn.
 mana={1}{W}
 type=Creature
@@ -25644,7 +25644,7 @@ type=Instant
 [/card]
 [card]
 name=Daring Skyjek
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:flying ueot
+auto=_BATALLION_flying ueot
 text=Battalion -- Whenever Daring Skyjek and at least two other creatures attack, Daring Skyjek gains flying until end of turn.
 mana={1}{W}
 type=Creature
@@ -40721,7 +40721,7 @@ toughness=2
 [/card]
 [card]
 name=Firefist Striker
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:cantblock target(creature) ueot
+auto=_BATALLION_cantblock target(creature) ueot
 text=Battalion -- Whenever Firefist Striker and at least two other creatures attack, target creature can't block this turn.
 mana={1}{R}
 type=Creature
@@ -40803,7 +40803,7 @@ toughness=3
 [card]
 name=Firemane Avenger
 abilities=flying
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:choice damage:3 target(creature,player) && life:3 controller
+auto=_BATALLION_choice damage:3 target(creature,player) && life:3 controller
 text=Flying -- Battalion -- Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to target creature or player and you gain 3 life.
 mana={2}{R}{W}
 type=Creature
@@ -66275,7 +66275,7 @@ type=Enchantment
 [card]
 name=Legion Loyalist
 abilities=haste
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:all(creature|mybattlefield) transforms((,first strike,trample,newability[cantbeblockedby(creature[token])])) ueot
+auto=_BATALLION_all(creature|mybattlefield) transforms((,first strike,trample,newability[cantbeblockedby(creature[token])])) ueot
 text=Haste -- Battalion -- Whenever Legion Loyalist and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.
 mana={R}
 type=Creature
@@ -78441,7 +78441,7 @@ type=Sorcery
 [/card]
 [card]
 name=Nav Squad Commandos
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:1/1 ueot && untap
+auto=_BATALLION_1/1 ueot && untap
 text=Battalion -- Whenever Nav Squad Commandos and at least two other creatures attack, Nav Squad Commandos gets +1/+1 until end of turn. Untap it.
 mana={4}{W}
 type=Creature
@@ -83004,7 +83004,7 @@ toughness=1
 [/card]
 [card]
 name=Ordruun Veteran
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:double strike ueot
+auto=_BATALLION_double strike ueot
 text=Battalion -- Whenever Ordruun Veteran and at least two other creatures attack, Ordruun Veteran gains double strike until end of turn. (It deals both first-strike and regular combat damage.)
 mana={2}{R}{W}
 type=Creature
@@ -117266,7 +117266,7 @@ type=Land
 [card]
 name=Tajic, Blade of the Legion
 abilities=indestructible
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:5/5 ueot
+auto=_BATALLION_5/5 ueot
 text=Battalion -- Whenever Tajic atttacks with at least two other creatures attack, Tajic gets +5/+5 until end of turn. 
 mana={2}{R}{W}
 type=Legendary Creature
@@ -119427,7 +119427,7 @@ toughness=1
 [/card]
 [card]
 name=Thalakos Dreamsower
-abilities=doesnotuntap
+abilities=shadow,doesnotuntap
 auto=@each my untap sourcetap:may untap
 auto=@damagefoeof(player) from(this):target(creature) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
 text=Shadow (This creature can block or be blocked by only creatures with shadow.) -- You may choose not to untap Thalakos Dreamsower during your untap step. -- Whenever Thalakos Dreamsower deals damage to an opponent, tap target creature. That creature doesn't untap during its controller's untap step for as long as Thalakos Dreamsower remains tapped.
@@ -131931,7 +131931,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Warmind Infantry
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:2/0 ueot
+auto=_BATALLION_2/0 ueot
 text=Battalion -- Whenever Warmind Infantry and at least two other creatures attack, Warmind Infantry gets +2/+0 until end of turn.
 mana={2}{R}
 type=Creature
@@ -135111,7 +135111,7 @@ toughness=5
 [/card]
 [card]
 name=Wojek Halberdiers
-auto=@combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:first strike ueot
+auto=_BATALLION_first strike ueot
 text=Battalion -- Whenever Wojek Halberdiers and at least two other creatures attack, Wojek Halberdiers gains first strike until end of turn.
 mana={R}{W}
 type=Creature