Merge pull request #731 from kevlahnota/master

Softcoded some cards alias

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 7/7/16
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* push to wagicproject [#\725] (https://github.com/WagicProject/wagic/pull/725) ([zethfoxster](https://github.com/zethfoxster))
+
 #### 7/4/16
+- *Merged pull-request:* Sorted Primitives & Updated Premium Deck Series [#\719] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
 - *Merged pull-request:* Fails but I have no idea why [#\717] (https://github.com/WagicProject/wagic/pull/717) ([zethfoxster](https://github.com/zethfoxster))
 
 - *Merged pull-request:* Updated Sets [#\715] (https://github.com/WagicProject/wagic/pull/715) ([kevlahnota](https://github.com/kevlahnota))

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

@@ -673,9 +673,7 @@ toughness=4
 [card]
 name=Act of Aggression
 target=creature|opponentbattlefield
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 color=red
 text=({p(R)} may be paid for with either {R} or 2 life.) -- Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
 mana={3}{p(R)}{p(R)}
@@ -684,9 +682,7 @@ type=Instant
 [card]
 name=Act of Treason
 target=creature
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
 mana={2}{R}
 type=Sorcery
@@ -10756,9 +10752,7 @@ toughness=3
 [card]
 name=Blind with Anger
 target=creature[-legendary]
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Untap target nonlegendary creature and gain control of it until end of turn. That creature gains haste until end of turn.
 mana={3}{R}
 type=Instant
@@ -27601,9 +27595,8 @@ type=Instant
 [card]
 name=Disharmony
 target=creature[attacking]
-auto=untap
 auto=removefromcombat
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap])) ueot)!
 restriction=blockersonly
 text=Cast Disharmony only during combat before blockers are declared. -- Untap target attacking creature and remove it from combat. Gain control of that creature until end of turn.
 mana={2}{R}
@@ -33291,8 +33284,8 @@ type=Enchantment
 [/card]
 [card]
 name=Energy Tap
-target=creature|myBattlefield
-alias=1480
+target=creature[-tapped]|myBattlefield
+auto=transforms((,newability[tap],newability[thisforeach(variable{manacost}>0) add{1}])) oneshot
 text=Tap target untapped creature you control. If you do, add {X} to your mana pool, where X is that creature's converted mana cost.
 mana={U}
 type=Sorcery
@@ -38122,10 +38115,8 @@ toughness=2
 [card]
 name=Flash Conscription
 target=creature
-auto=untap
-auto=haste
-alias=129767
 auto=if spent({W}) then teach(creature) spiritlink ueot
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. If {W} was spent to cast Flash Conscription, the creature gains "Whenever this creature deals combat damage, you gain that much life" until end of turn.
 mana={5}{R}
 type=Instant
@@ -41402,7 +41393,7 @@ type=Land
 [card]
 name=Gaze of Adamaro
 target=player
-alias=129750
+auto=damage:type:*:targetedpersonshand
 text=Gaze of Adamaro deals damage equal to the number of cards in target player's hand to that player.
 mana={2}{R}{R}
 type=Instant
@@ -63167,10 +63158,8 @@ toughness=8
 [card]
 name=Lose Calm
 target=creature
-auto=haste
-auto=untap
 auto=menace
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Gain control of target creature until end of turn. Untap that creature. It gains haste and menace until end of turn. (A creature with menace can't be blocked except by two or more creatures.)
 mana={3}{R}
 type=Sorcery
@@ -64879,10 +64868,8 @@ type=Enchantment
 [card]
 name=Malevolent Whispers
 target=creature
-auto=haste
-auto=untap
 auto=2/0 ueot
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 abilities=madness
 autoexile=restriction{discarded} pay({3}{r}) name(pay 3r to cast) activate name(pay 3r to cast) castcard(normal)?name(put in graveyard) moveto(ownergraveyard)
 text=Gain control of target creature until end of turn. Untap that creature. It gets +2/+0 and gains haste until end of turn.  -- Madness {3}{R} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
@@ -65794,10 +65781,8 @@ subtype=Aura
 [card]
 name=Mark of Mutiny
 target=creature
-auto=untap
-auto=haste
 auto=counter(1/1,1)
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Gain control of target creature until end of turn. Put a +1/+1 counter on it and untap it. That creature gains haste until end of turn.
 mana={2}{R}
 type=Sorcery
@@ -66288,9 +66273,7 @@ type=Enchantment
 [card]
 name=Mass Mutiny
 target=creature|opponentbattlefield
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=For each opponent, gain control of up to one target creature that player controls until end of turn. Untap those creatures. They gain haste until end of turn.
 mana={3}{R}{R}
 type=Sorcery
@@ -67630,9 +67613,7 @@ type=Instant
 [card]
 name=Metallic Mastery
 target=artifact
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Untap target artifact and gain control of it until end of turn. That artifact gains haste until end of turn.
 mana={2}{R}
 type=Sorcery
@@ -81154,9 +81135,7 @@ type=Artifact
 [card]
 name=Portent of Betrayal
 target=creature
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
 text=Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{R}
@@ -82535,7 +82514,8 @@ type=Instant
 [card]
 name=Psychic Drain
 target=player
-alias=89114
+auto=deplete:x targetedplayer
+auto=life:x controller
 text=Target player puts the top X cards of his or her library into his or her graveyard and you gain X life.
 mana={X}{U}{B}
 type=Sorcery
@@ -85369,10 +85349,7 @@ toughness=3
 [card]
 name=Ray of Command
 target=creature|opponentBattlefield
-auto=untap
-auto=haste
-auto=@next endofturn:tap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseactionmulti[endofturn sourceinplay] moveTo(ownerbattlefield) && tap],newability[untap],haste)) ueot)!
 text=Untap target creature an opponent controls and gain control of it until end of turn. That creature gains haste until end of turn. When you lose control of the creature, tap it.
 mana={3}{U}
 type=Instant
@@ -103001,11 +102978,8 @@ type=Instant
 name=Spinal Embrace
 target=creature|opponentbattlefield
 restriction=during battle
-auto=haste
-auto=untap
-auto=transforms((,newability[phaseaction[endofturn once] life:toughness controller]))
-auto=teach(creature) treason
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseactionmulti[endofturn sourceinplay] sacrifice && life:toughness],newability[untap],haste)) ueot)!
+auto=transforms((,newability[phaseactionmulti[endofturn once] sacrifice && life:toughness controller]))
 text=Cast Spinal Embrace only during combat. -- Untap target creature you don't control and gain control of it. It gains haste until end of turn. At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness.
 mana={3}{U}{U}{B}
 type=Instant
@@ -106758,7 +106732,7 @@ type=Sorcery
 [card]
 name=Sudden Impact
 target=player
-alias=129750
+auto=damage:type:*:targetedpersonshand
 text=Sudden Impact deals damage equal to the number of cards in target player's hand to that player.
 mana={3}{R}
 type=Instant
@@ -110147,9 +110121,7 @@ type=Sorcery
 [card]
 name=Temporary Insanity
 target=creature[power <=type:*:mygraveyard]
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Untap target creature with power less than the number of cards in your graveyard and gain control of it until end of turn. That creature gains haste until end of turn.
 mana={3}{R}
 type=Instant
@@ -111977,9 +111949,7 @@ subtype=Aura
 [card]
 name=Threaten
 target=creature
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn. (It can attack and {T} this turn.)
 mana={2}{R}
 type=Sorcery
@@ -114219,10 +114189,7 @@ toughness=4
 [card]
 name=Traitorous Blood
 target=creature
-auto=haste
-auto=trample
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste,trample)) ueot)!
 text=Gain control of target creature until end of turn. Untap it. It gains trample and haste until end of turn.
 mana={1}{R}{R}
 type=Sorcery
@@ -114230,10 +114197,8 @@ type=Sorcery
 [card]
 name=Traitorous Instinct
 target=creature
-auto=untap
-auto=haste
 auto=2/0
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Gain control of target creature until end of turn. Untap that creature. Until end of turn it gets +2/+0 and gains haste.
 mana={3}{R}
 type=Sorcery
@@ -115674,9 +115639,7 @@ type=Instant
 [card]
 name=Turn Against
 target=creature
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Devoid (This card has no color.) -- Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 mana={4}{R}
 abilities=devoid
@@ -117116,10 +117079,8 @@ type=Sorcery
 [card]
 name=Unwilling Recruit
 target=creature
-auto=haste
-auto=untap
 auto=X/0
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Gain control of target creature until end of turn. Untap that creature. It gets +X/+0 and gains haste until end of turn.
 mana={X}{R}{R}{R}
 type=Sorcery
@@ -125520,7 +125481,7 @@ toughness=3
 [/card]
 [card]
 name=Woodland Stream
-auto=aslongas(island,forest|myhand) tap(noevent) <1
+auto=tap(noevent)
 auto={T}:add{G}
 auto={T}:add{U}
 text=Woodland Stream enters the battlefield tapped. -- {T}: Add {G} or {U} to your mana pool.
@@ -125661,9 +125622,7 @@ type=Instant
 [card]
 name=Word of Seizing
 target=*|battlefield
-auto=haste
-auto=untap
-alias=129767
+auto=moveto(mybattlefield) and!(transforms((,newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot)!
 text=Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.) -- Untap target permanent and gain control of it until end of turn. It gains haste until end of turn.
 mana={3}{R}{R}
 type=Instant