Merge branch 'master' into cmake

projects/mtg/bin/Res/rules/modrules.xml

@@ -42,6 +42,10 @@
   	<item name="types" >
   	    <position x="22" y="49"/>
   	</item>
+  	<item name="cardid" >
+	    <position x="22" y="237"/>
+  	    <formattedtext>mtgid</formattedtext>
+  	</item>
   	<item name="expansionrarity" >
 	    <position x="22" y="255"/>
   	    <formattedtext>expansion rarity</formattedtext>

projects/mtg/bin/Res/rules/mtg.txt

@@ -35,6 +35,7 @@ auto=lifelinkrule
 auto=deathtouchrule
 auto=soulbondrule
 auto=dredgerule
+auto=bestowrule
 
 [PLAYERS]
 life:20

projects/mtg/bin/Res/sets/BFZ/_cards.dat

@@ -289,6 +289,11 @@ id=401859
 rarity=C
 [/card]
 [card]
+primitive=Dragon
+id=-401860
+rarity=T
+[/card]
+[card]
 primitive=Dragonmaster Outcast
 id=401860
 rarity=M
@@ -346,16 +351,76 @@ rarity=C
 [card]
 primitive=Eldrazi Scion
 rarity=T
+id=-401803
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
 id=-401819
 [/card]
 [card]
 primitive=Eldrazi Scion
 rarity=T
+id=-401825
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401832
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401833
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401836
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401838
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401839
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401893
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
 id=-402092
 [/card]
 [card]
 primitive=Eldrazi Scion
 rarity=T
+id=-401900
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401863
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401868
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
+id=-401875
+[/card]
+[card]
+primitive=Eldrazi Scion
+rarity=T
 id=-401915
 [/card]
 [card]
@@ -689,11 +754,21 @@ id=401932
 rarity=C
 [/card]
 [card]
+primitive=Knight Ally
+rarity=T
+id=-401897
+[/card]
+[card]
 primitive=Kor Ally
 rarity=T
 id=-402007
 [/card]
 [card]
+primitive=Kor Ally
+rarity=T
+id=-402084
+[/card]
+[card]
 primitive=Kor Bladewhirl
 id=401933
 rarity=U

projects/mtg/bin/Res/sets/OGW/_cards.dat

@@ -234,6 +234,26 @@ id=-407587
 rarity=T
 [/card]
 [card]
+primitive=Eldrazi Scion
+id=-407635
+rarity=T
+[/card]
+[card]
+primitive=Eldrazi Scion
+id=-407550
+rarity=T
+[/card]
+[card]
+primitive=Eldrazi Scion
+id=-407633
+rarity=T
+[/card]
+[card]
+primitive=Eldrazi Scion
+id=-407631
+rarity=T
+[/card]
+[card]
 primitive=Elemental
 id=-407614
 rarity=T
@@ -424,6 +444,11 @@ id=-407540
 rarity=T
 [/card]
 [card]
+primitive=Kor Ally
+id=-407672
+rarity=T
+[/card]
+[card]
 primitive=Kor Scythemaster
 id=407533
 rarity=C
@@ -980,6 +1005,11 @@ rarity=T
 [/card]
 [card]
 primitive=Zombie
+id=-407596
+rarity=T
+[/card]
+[card]
+primitive=Zombie
 id=-407598
 rarity=T
 [/card]

projects/mtg/bin/Res/sets/SOI/_cards.dat

@@ -44,6 +44,11 @@ id=-409751
 rarity=T
 [/card]
 [card]
+primitive=Angel
+id=-410011
+rarity=T
+[/card]
+[card]
 primitive=Angel of Deliverance
 id=409738
 rarity=R
@@ -216,7 +221,127 @@ rarity=C
 [card]
 primitive=Clue
 rarity=T
-id=-410067
+id=-409746
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409750
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409757
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409762
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409781
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409784
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409795
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409797
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409799
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409805
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409810
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409813
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409820
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409823
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409838
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409953
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409954
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409956
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409986
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-409997
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-410000
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-410004
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-410007
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-410024
+[/card]
+[card]
+primitive=Clue
+rarity=T
+id=-410032
 [/card]
 [card]
 primitive=Compelling Deterrence
@@ -319,6 +444,16 @@ rarity=T
 id=-410068
 [/card]
 [card]
+primitive=Devil
+rarity=T
+id=-409902
+[/card]
+[card]
+primitive=Devil
+rarity=T
+id=-409903
+[/card]
+[card]
 primitive=Devils' Playground
 id=409903
 rarity=R
@@ -689,8 +824,8 @@ id=409919
 rarity=C
 [/card]
 [card]
-primitive=Human Soldier
-id=-409780
+primitive=Human Cleric
+id=-409760
 rarity=T
 [/card]
 [card]
@@ -699,6 +834,16 @@ id=-410049
 rarity=T
 [/card]
 [card]
+primitive=Human Soldier
+id=-409780
+rarity=T
+[/card]
+[card]
+primitive=Human Soldier
+id=-410015
+rarity=T
+[/card]
+[card]
 primitive=Humble the Brute
 id=409762
 rarity=U
@@ -1350,10 +1495,40 @@ rarity=U
 [/card]
 [card]
 primitive=Spirit
+id=-409749
+rarity=T
+[/card]
+[card]
+primitive=Spirit
 id=-410031
 rarity=T
 [/card]
 [card]
+primitive=Spirit
+rarity=T
+id=-409753
+[/card]
+[card]
+primitive=Spirit
+rarity=T
+id=-409768
+[/card]
+[card]
+primitive=Spirit
+rarity=T
+id=-409769
+[/card]
+[card]
+primitive=Spirit
+rarity=T
+id=-409789
+[/card]
+[card]
+primitive=Spirit
+rarity=T
+id=-409755
+[/card]
+[card]
 primitive=Spiteful Motives
 id=409939
 rarity=U
@@ -1585,6 +1760,11 @@ rarity=C
 [/card]
 [card]
 primitive=Vampire Knight
+id=-409850
+rarity=T
+[/card]
+[card]
+primitive=Vampire Knight
 id=-410016
 rarity=T
 [/card]
@@ -1690,10 +1870,20 @@ rarity=U
 [/card]
 [card]
 primitive=Wolf
+id=-409959
+rarity=T
+[/card]
+[card]
+primitive=Wolf
 id=-409983
 rarity=T
 [/card]
 [card]
+primitive=Wolf
+id=-409991
+rarity=T
+[/card]
+[card]
 primitive=Wolf of Devil's Breach
 id=409949
 rarity=M
@@ -1705,6 +1895,36 @@ rarity=U
 [/card]
 [card]
 primitive=Zombie
+id=-409800
+rarity=T
+[/card]
+[card]
+primitive=Zombie
+id=-409826
+rarity=T
+[/card]
+[card]
+primitive=Zombie
+id=-409854
+rarity=T
+[/card]
+[card]
+primitive=Zombie
+id=-409859
+rarity=T
+[/card]
+[card]
+primitive=Zombie
+id=-409860
+rarity=T
+[/card]
+[card]
+primitive=Zombie
+id=-409862
+rarity=T
+[/card]
+[card]
+primitive=Zombie
 id=-409884
 rarity=T
 [/card]

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

@@ -12,18 +12,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Aven Warhawk
-abilities=flying
-auto=foreach(bird|myhand) counter(1/1,1)
-auto=foreach(soldier|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Bird and/or Soldier card you reveal in your hand.) -- Flying
-mana={4}{W}
-type=Creature
-subtype=Bird Soldier
-power=2
-toughness=2
-[/card]
-[card]
 name=Cemetery Puca
 text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
 auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
@@ -109,27 +97,6 @@ auto={3}:counter(1/1)
 #Not all player can use ability
 [/card]
 [card]
-name=Ghastly Remains
-auto=foreach(zombie|myhand) counter(1/1,1)
-autograveyard={B}{B}{B}:moveTo(myhand) myUpkeepOnly
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Zombie card you reveal in your hand.) -- At the beginning of your upkeep, if Ghastly Remains is in your graveyard, you may pay {B}{B}{B}. If you do, return Ghastly Remains to your hand.
-mana={B}{B}{B}
-type=Creature
-subtype=Zombie
-power=0
-toughness=0
-[/card]
-[card]
-name=Glowering Rogon
-auto=foreach(beast|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Beast card you reveal in your hand.)
-mana={5}{G}
-type=Creature
-subtype=Beast
-power=4
-toughness=4
-[/card]
-[card]
 name=Govern the Guildless
 target=creature[-multicolor]
 auto=moveto(mybattlefield)
@@ -348,6 +315,13 @@ text={T}: Add {1} to your mana pool. -- {2}, {T}: Thespian's Stage becomes a cop
 type=Land
 [/card]
 [card]
+name=Trinisphere
+auto=this(untapped) lord(*[-land]|hand,library,exile,graveyard) trinisphere forcedalive
+text=As long as Trinisphere is untapped, each spell that would cost less than three mana to cast costs three mana to cast. (Additional mana in the cost may be paid with any color of mana or colorless mana. For example, a spell that would cost {1}{B} to cast costs {2}{B} to cast instead.)
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Unstable Shapeshifter
 auto=@movedto(other creature|battlefield):all(trigger[from]) copy
 text=Whenever another creature enters the battlefield, Unstable Shapeshifter becomes a copy of that creature and gains this ability.
@@ -367,14 +341,3 @@ mana={B}
 type=Instant
 text=Target creature gets +2/+0 and gains deathtouch until end of turn. Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 [/card]
-[card]
-name=Zombie Brute
-abilities=trample
-auto=foreach(zombie|myhand) counter(1/1,1)
-text=Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Zombie card you reveal in your hand.) -- Trample
-mana={6}{B}
-type=Creature
-subtype=Zombie
-power=5
-toughness=4
-[/card]