* Fixed Academy Researchers can be enchanted by auras that can't legally enchant it

* Added Eye of the Storm, Neurok Transmuter, Overwhelming Instinct and Total War
* Vanguard: Added Phage the Untouchable Avatar and Prodigal Sorcerer Avatar
* Scheme: Added My Undead Horde Awakens

.gitattributes

@@ -3240,6 +3240,7 @@ res/cardsfolder/e/extruder.txt svneol=native#text/plain
 res/cardsfolder/e/exuberant_firestoker.txt svneol=native#text/plain
 res/cardsfolder/e/eye_of_nowhere.txt svneol=native#text/plain
 res/cardsfolder/e/eye_of_ramos.txt svneol=native#text/plain
+res/cardsfolder/e/eye_of_the_storm.txt -text
 res/cardsfolder/e/eye_of_ugin.txt svneol=native#text/plain
 res/cardsfolder/e/eye_spy.txt svneol=native#text/plain
 res/cardsfolder/e/eyeblights_ending.txt svneol=native#text/plain
@@ -6617,6 +6618,7 @@ res/cardsfolder/m/mwonvuli_acid_moss.txt svneol=native#text/plain
 res/cardsfolder/m/mwonvuli_beast_tracker.txt -text
 res/cardsfolder/m/mwonvuli_ooze.txt svneol=native#text/plain
 res/cardsfolder/m/my_genius_knows_no_bounds.txt -text
+res/cardsfolder/m/my_undead_horde_awakens.txt -text
 res/cardsfolder/m/my_wish_is_your_command.txt -text
 res/cardsfolder/m/mycoid_shepherd.txt svneol=native#text/plain
 res/cardsfolder/m/mycologist.txt svneol=native#text/plain
@@ -6801,6 +6803,7 @@ res/cardsfolder/n/neurok_prodigy.txt svneol=native#text/plain
 res/cardsfolder/n/neurok_replica.txt svneol=native#text/plain
 res/cardsfolder/n/neurok_spy.txt svneol=native#text/plain
 res/cardsfolder/n/neurok_stealthsuit.txt -text
+res/cardsfolder/n/neurok_transmuter.txt -text
 res/cardsfolder/n/neverending_torment.txt -text
 res/cardsfolder/n/nevermaker.txt svneol=native#text/plain
 res/cardsfolder/n/nevermore.txt -text
@@ -7153,6 +7156,7 @@ res/cardsfolder/o/oversoul_of_dusk.txt svneol=native#text/plain
 res/cardsfolder/o/overtaker.txt svneol=native#text/plain
 res/cardsfolder/o/overwhelm.txt -text
 res/cardsfolder/o/overwhelming_forces.txt svneol=native#text/plain
+res/cardsfolder/o/overwhelming_instinct.txt -text
 res/cardsfolder/o/overwhelming_intellect.txt svneol=native#text/plain
 res/cardsfolder/o/overwhelming_stampede.txt svneol=native#text/plain
 res/cardsfolder/o/ovinize.txt -text
@@ -7320,6 +7324,7 @@ res/cardsfolder/p/petrified_plating.txt svneol=native#text/plain
 res/cardsfolder/p/petrified_wood_kin.txt -text
 res/cardsfolder/p/pewter_golem.txt svneol=native#text/plain
 res/cardsfolder/p/phage_the_untouchable.txt -text
+res/cardsfolder/p/phage_the_untouchable_avatar.txt -text
 res/cardsfolder/p/phantasmagorian.txt -text
 res/cardsfolder/p/phantasmal_abomination.txt svneol=native#text/plain
 res/cardsfolder/p/phantasmal_bear.txt svneol=native#text/plain
@@ -7622,6 +7627,7 @@ res/cardsfolder/p/probe.txt -text svneol=unset#text/plain
 res/cardsfolder/p/proclamation_of_rebirth.txt svneol=native#text/plain
 res/cardsfolder/p/prodigal_pyromancer.txt svneol=native#text/plain
 res/cardsfolder/p/prodigal_sorcerer.txt svneol=native#text/plain
+res/cardsfolder/p/prodigal_sorcerer_avatar.txt -text
 res/cardsfolder/p/profane_command.txt svneol=native#text/plain
 res/cardsfolder/p/profane_prayers.txt svneol=native#text/plain
 res/cardsfolder/p/progenitus.txt svneol=native#text/plain
@@ -10557,6 +10563,7 @@ res/cardsfolder/t/torture.txt svneol=native#text/plain
 res/cardsfolder/t/torture_chamber.txt -text
 res/cardsfolder/t/tortured_existence.txt svneol=native#text/plain
 res/cardsfolder/t/toshiro_umezawa.txt -text svneol=unset#text/plain
+res/cardsfolder/t/total_war.txt -text
 res/cardsfolder/t/totem_guide_hartebeest.txt svneol=native#text/plain
 res/cardsfolder/t/totem_speaker.txt svneol=native#text/plain
 res/cardsfolder/t/touch_of_brilliance.txt svneol=native#text/plain

res/cardsfolder/a/academy_researchers.txt

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura | AttachedTo$ Self
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource | AttachedTo$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_researchers.jpg
 SetInfo:USG|Uncommon|http://magiccards.info/scans/en/us/58.jpg

res/cardsfolder/e/elvish_champion.txt

@@ -5,6 +5,7 @@ Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Elf+Other | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Forestwalk | Description$ Other Elf creatures get +1/+1 and have forestwalk.
 SVar:PlayMain1:TRUE
+SVar:BuffedBy:Elf
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_champion.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/241.jpg

res/cardsfolder/e/eye_of_the_storm.txt

@@ -0,0 +1,13 @@
+Name:Eye of the Storm
+ManaCost:5 U U
+Types:Enchantment
+Text:no text
+T:Mode$ SpellCast | ValidCard$ Card.Instant,Card.Sorcery | Execute$ TrigExileSpell | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts an instant or sorcery card, exile it. Then that player copies each instant or sorcery card exiled with CARDNAME. For each copy, the player may cast the copy without paying its mana cost.
+SVar:TrigExileSpell:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Stack | Destination$ Exile | Fizzle$ True | RememberChanged$ True | SubAbility$ DBPlaySpell
+SVar:DBPlaySpell:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Card.IsRemembered | ChooseOrder$ True | Zone$ Exile | RepeatSubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Imprinted | Controller$ TriggeredCardController | WithoutManaCost$ True | CopyCard$ True | Optional$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/eye_of_the_storm.jpg
+SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/48.jpg
+Oracle:Whenever a player casts an instant or sorcery card, exile it. Then that player copies each instant or sorcery card exiled with Eye of the Storm. For each copy, the player may cast the copy without paying its mana cost.
+End

res/cardsfolder/m/my_undead_horde_awakens.txt

@@ -0,0 +1,13 @@
+Name:My Undead Horde Awakens
+ManaCost:no cost
+Types:Ongoing Scheme
+Text:no text
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigNecromancy | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may put target creature card from an opponent's graveyard onto the battlefield under your control.
+SVar:TrigNecromancy:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.OppCtrl | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | RememberChanged$ True
+T:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigAbandon | TriggerZones$ Command | TriggerDescription$ When a creature put onto the battlefield with this scheme dies, abandon this scheme.
+SVar:TrigAbandon:AB$ Abandon$ | Cost$ 0
+SVar:Rarity:Common
+SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/my_undead_horde_awakens.jpg
+SetInfo:ARC|Common|http://magiccards.info/extras/scheme/archenemy/my-undead-horde-awakens.jpg
+Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAt the beginning of your end step, you may put target creature card from an opponent's graveyard onto the battlefield under your control.\nWhen a creature put onto the battlefield with this scheme dies, abandon this scheme.
+End

res/cardsfolder/n/neurok_transmuter.txt

@@ -0,0 +1,12 @@
+Name:Neurok Transmuter
+ManaCost:2 U
+Types:Creature Human Wizard
+Text:no text
+PT:2/2
+A:AB$ Animate | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Artifact | SpellDescription$ Target creature becomes an artifact in addition to its other types until end of turn.
+A:AB$ Animate | Cost$ U | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | Colors$ Blue | OverwriteColors$ True | RemoveTypes$ Artifact | SpellDescription$ Until end of turn, target artifact creature becomes blue and isn't an artifact.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/neurok_transmuter.jpg
+SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/27.jpg
+Oracle:{U}: Target creature becomes an artifact in addition to its other types until end of turn.\n{U}: Until end of turn, target artifact creature becomes blue and isn't an artifact.
+End

res/cardsfolder/o/overwhelming_instinct.txt

@@ -0,0 +1,12 @@
+Name:Overwhelming Instinct
+ManaCost:2 G
+Types:Enchantment
+Text:no text
+T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE3 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1
+SVar:OverwhelmInstinct:Count$Valid Creature.attacking
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/overwhelming_instinct.jpg
+SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/276.jpg
+Oracle:Whenever you attack with three or more creatures, draw a card.
+End

res/cardsfolder/p/phage_the_untouchable_avatar.txt

@@ -0,0 +1,16 @@
+Name:Phage the Untouchable Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+0/-5
+A:AB$ Effect | Cost$ PayLife<1> | ActivationZone$ Command | Triggers$ TrigPhageDestroy | SVars$ PhageAvatarDestroy | References$ TrigPhageDestroy,PhageAvatarDestroy | SpellDescription$ Until end of turn, whenever a creature deals combat damage to you, destroy that creature.
+SVar:TrigPhageDestroy:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You | TriggerZones$ Command | CombatDamage$ True | Execute$ PhageAvatarDestroy | TriggerDescription$ Whenever a creature deals combat damage to you, destroy that creature.
+SVar:PhageAvatarDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredSource
+A:AB$ Effect | Cost$ PayLife<1> | ActivationZone$ Command | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Triggers$ TrigPhageCreature | SVars$ PhageAvatarDestroy2 | RememberObjects$ Targeted | References$ TrigPhageCreature,PhageAvatarDestroy2 | SpellDescription$ Until end of turn, whenever target creature you control deals combat damage to a creature, destroy the damaged creature.
+SVar:TrigPhageCreature:Mode$ DamageDone | ValidSource$ Creature.IsRemembered | ValidTarget$ Creature | TriggerZones$ Command | CombatDamage$ True | Execute$ PhageAvatarDestroy2 | TriggerDescription$ Whenever target creature you control deals combat damage to a creature, destroy the damaged creature.
+SVar:PhageAvatarDestroy2:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/phage_the_untouchable_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/phage-the-untouchable.jpg
+Oracle:Hand +0, life -5\nPay 1 life: Until end of turn, whenever a creature deals combat damage to you, destroy that creature.\nPay 1 life: Until end of turn, whenever target creature you control deals combat damage to a creature, destroy the damaged creature.
+End

res/cardsfolder/p/prodigal_sorcerer_avatar.txt

@@ -0,0 +1,12 @@
+Name:Prodigal Sorcerer Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+0/+5
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
+SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
+SVar:Rarity:Special
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/prodigal_sorcerer_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/prodigal-sorcerer.jpg
+Oracle:Hand +0, life +5\nAt the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
+End

res/cardsfolder/s/show_and_tell.txt

@@ -2,7 +2,7 @@ Name:Show and Tell
 ManaCost:2 U
 Types:Sorcery
 Text:no text
-A:SP$ ChangeZone | Cost$ 2 U | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature,Artifact,Enchantment,Land | DefinedPlayer$ Each | ChangeNum$ 1 | SpellDescription$ Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
+A:SP$ ChangeZone | Cost$ 2 U | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature,Artifact,Enchantment,Land | DefinedPlayer$ Player | ChangeNum$ 1 | SpellDescription$ Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/show_and_tell.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/96.jpg

res/cardsfolder/t/total_war.txt

@@ -0,0 +1,11 @@
+Name:Total War
+ManaCost:3 R
+Types:Enchantment
+Text:no text
+T:Mode$ AttackersDeclared | Execute$ TrigDestroy | TriggerZones$ Battlefield | AttackingPlayer$ Player | TriggerDescription$ Whenever a player attacks with one or more creatures, destroy all untapped non-Wall creatures that player controls that didn't attack, except for creatures the player hasn't controlled continuously since the beginning of the turn.
+SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.nonWall+notFirstTurnControlled+untapped+ActivePlayerCtrl+notattacking
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/total_war.jpg
+SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/221.jpg
+Oracle:Whenever a player attacks with one or more creatures, destroy all untapped non-Wall creatures that player controls that didn't attack, except for creatures the player hasn't controlled continuously since the beginning of the turn.
+End