Merge remote-tracking branch 'refs/remotes/WagicProject/master'

projects/mtg/User/player/options.txt

@@ -0,0 +1,3 @@
+maxGrade=0: Borderline (99% OK)
+keybindings_sdl=13:2,27:2,32:10,97:7,98:5,100:6,101:15,102:16,105:11,106:12,107:13,108:10,113:14,115:9,119:8,1073741903:6,1073741904:7,1073741905:9,1073741906:8,1073741912:2,1073741952:14,1073741953:13,1073742048:3,1073742052:3,1073742094:2
+aidecks=10

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

@@ -1555,7 +1555,7 @@ toughness=7
 name=Aetherworks Marvel
 auto=@movedto(graveyard) from(*|myBattlefield):alterenergy:1 controller
 aicode=activate castcard(normal) target(*[-land;zpos<=6]|mylibrary)
-autohand={t}{e:6}:name(look) reveal:6 optionone name(Cast Card) target(<1>*[-land]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(bottom of library) target(<1>*|reveal) transforms((,newability[all(*|reveal) bottomoflibrary])) oneshot optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!( activate castcard(normal) )! afterrevealedend revealend
+auto={t}{e:6}:name(look) reveal:6 optionone name(Cast Card) target(<1>*[-land]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(bottom of library) target(<1>*|reveal) transforms((,newability[all(*|reveal) bottomoflibrary])) oneshot optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!( activate castcard(normal) )! afterrevealedend revealend
 text=Whenever a permanent you control is put into a graveyard, you get {E} (an energy counter). -- {T}, Pay {E}{E}{E}{E}{E}{E}: Look at the top six cards of your library. You may cast a card from among them without paying its mana cost. Put the rest on the bottom of your library in a random order.
 mana={4}
 type=Legendary Artifact
@@ -2501,7 +2501,7 @@ toughness=4
 [/card]
 [card]
 name=Alaborn Cavalier
-auto=@combat(attacking) source(this):may tap target(*)
+auto=@combat(attacking) source(this):may tap target(creature)
 text=Whenever Alaborn Cavalier attacks, you may tap target creature.
 mana={2}{W}{W}
 type=Creature
@@ -6287,10 +6287,11 @@ toughness=3
 [/card]
 [card]
 name=Ascended Lawmage
-abilities=flying,opponentshroud 
+abilities=flying,opponentshroud
+text=Flying -- Hexproof (This creature can't be the target of spells or abilities your opponents control.)
 mana={2}{W}{U}
 type=Creature
-subtype=Vedalkan Wizard
+subtype=Vedalken Wizard
 power=3
 toughness=2
 [/card]
@@ -25772,16 +25773,6 @@ power=3
 toughness=1
 [/card]
 [card]
-name=Daring Sleuth
-auto=@sacrificed(clue|mybattlefield):flip(Bearer of Overwhelming Truths)
-text=When you sacrifice a Clue, transform Daring Sleuth.
-mana={1}{U}
-type=Creature
-subtype=Human Rogue
-power=2
-toughness=1
-[/card]
-[card]
 name=Dark Banishing
 target=creature[-black]
 auto=bury
@@ -38181,7 +38172,7 @@ toughness=5
 [card]
 name=Extricator of Sin
 auto=may sacrifice target(*|mybattlefield) && token(Eldrazi Horror) controller
-auto==@each upkeep restriction{delirium}:flip(Extricator of Flesh)
+auto=@each upkeep restriction{delirium}:flip(Extricator of Flesh)
 text=When Extricator of Sin enters the battlefield, you may sacrifice another permanent. If you do, put a 3/2 colorless Eldrazi Horror creature token onto the battlefield. -- Delirium -- At the beginning of your upkeep, if there are four or more card types among cards in your graveyard, transform Extricator of Sin.
 mana={2}{W}
 type=Creature
@@ -45692,7 +45683,7 @@ toughness=4
 [card]
 name=Ghastly Demise
 target=creature[-black]
-auto=teach(creature[toughness<=type:*:opponentgraveyard]) destroy
+auto=teach(creature[toughness<=type:*:mygraveyard]) destroy
 text=Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
 mana={B}
 type=Instant
@@ -52212,7 +52203,7 @@ type=Sorcery
 [card]
 name=Hammer of Purphoros
 auto=lord(creature|mybattlefield) haste
-auto={2}{R}{S(land|myBattlefield)}:token(Golem,Enchantment Artifact Creature Golem,3/3) controller
+auto={2}{R}{T}{S(land|myBattlefield)}:token(Golem,Enchantment Artifact Creature Golem,3/3) controller
 text=Creatures you control have haste. --{2}{R}, {T}: Sacrifice a land: Put a 3/3 colorless Golem enchantment artifact creature token onto the battlefield. 
 mana={1}{R}{R}
 type=Legendary Enchantment Artifact
@@ -79920,7 +79911,7 @@ toughness=1
 [/card]
 [card]
 name=Night of Souls' Betrayal
-auto=all(creature) -1/-1 ueot
+auto=all(creature) -1/-1
 text=All creatures get -1/-1.
 mana={2}{B}{B}
 type=Legendary Enchantment
@@ -93652,7 +93643,7 @@ type=Instant
 [card]
 name=Reduce in Stature
 target=creature|battlefield
-auto=teach(creature) becomes(0/2)
+auto=teach(creature) becomes(,0/2)
 text=Enchant creature -- Enchanted creature has base power and toughness 0/2.
 mana={2}{U}
 type=Enchantment
@@ -97215,7 +97206,7 @@ mana={4}{B}
 type=Creature
 subtype=Insect
 power=3
-toughness=3
+toughness=5
 [/card]
 [card]
 name=Rotlung Reanimator
@@ -111110,6 +111101,7 @@ type=Artifact
 [/card]
 [card]
 name=Sphinx of Jwar Isle
+abilities=flying,opponentshroud
 alias=185709
 aicode=activate name(look) donothing
 auto={0}:name(Look) reveal:1 optionone name(look) target(<1>*|reveal) moveto(mylibrary) optiononeend optiontwo name(put it back) all(*|reveal) moveto(mylibrary) optiontwoend revealend
@@ -111122,6 +111114,7 @@ toughness=5
 [/card]
 [card]
 name=Sphinx of Lost Truths
+abilities=flying
 other={4}{U}{U}{U} name(pay kicker)
 auto=draw:3
 auto=ifnot paid(alternative) then reject notatarget(<3>*|myhand)

projects/mtg/include/AllAbilities.h

@@ -2157,7 +2157,7 @@ public:
     MTGAbility * andAbility;
 
     AACloner(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL, int who = 0,
-            string abilitiesStringList = "",string typeslist = "");
+            string abilitiesStringList = "",string typeslist = "",string manaCostList = "");
     int resolve();
     const string getMenuText();
     virtual ostream& toString(ostream& out) const;