Merge pull request #705 from kevlahnota/master

CardID Indicator, Add Missing Tokens, Support Importing dck for Android

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 6/27/16
+- *Merged pull-request:* CardID Indicator, Add Missing Tokens, Support Importing dck for Android [#\705] (https://github.com/WagicProject/wagic/pull/705) ([kevlahnota](https://github.com/kevlahnota))
 
 #### 6/23/16
 - *Merged pull-request:* Fix producecolor:color [#\704] (https://github.com/WagicProject/wagic/pull/704) ([kevlahnota](https://github.com/kevlahnota))
@@ -14,6 +16,24 @@
 #### 6/11/16
 - *Merged pull-request:* Refactor & Devotion [#\690] (https://github.com/WagicProject/wagic/pull/690) ([kevlahnota](https://github.com/kevlahnota))
 
+#### 6/9/16
+- *Closed issue:* Clone goes to graveyard before being able to copy anything [\#546](https://github.com/WagicProject/wagic/issues/546)
+
+- *Closed issue:* Blinking an aura causes freeze [\#541](https://github.com/WagicProject/wagic/issues/541)
+
+- *Closed issue:* Profile name at upper left side is not being updated correctly [\#469](https://github.com/WagicProject/wagic/issues/469)
+
+- *Closed issue:* Giving card C protection from X does not remove cards attached to C which have quality X [\#464](https://github.com/WagicProject/wagic/issues/464)
+
+- *Closed issue:* (graphical glitch) wood / gold textures [\#461](https://github.com/WagicProject/wagic/issues/461)
+
+- *Closed issue:* Clone does not get all P/T bonuses [\#448](https://github.com/WagicProject/wagic/issues/448)
+
+- *Closed issue:* Card "threaten" messes up the GUI [\#473](https://github.com/WagicProject/wagic/issues/473)
+
+#### 6/7/16
+- *Closed issue:* Emrakul isn't killed by creatures with deathtouch [\#597](https://github.com/WagicProject/wagic/issues/597)
+
 #### 6/3/16
 - *Merged pull-request:* Cost Increaser & Reducer Fix [#\676] (https://github.com/WagicProject/wagic/pull/676) ([kevlahnota](https://github.com/kevlahnota))
 

projects/mtg/Android/src/net/wagic/utils/DeckImporter.java

@@ -17,6 +17,7 @@ public class DeckImporter
         String message = "";
         String deck = "";
         String deckname = "";
+		String prefix = "#SB:";
         if(f.exists() && !f.isDirectory())
         { 
             deckname = f.getName();
@@ -33,15 +34,21 @@ public class DeckImporter
                 {
                     while (scanner.hasNext()) 
                     {
+						boolean foundSideboard = false;
                         String line = scanner.nextLine();
+						if(line.toLowerCase().contains("sideboard"))
+							foundSideboard = true;
                         String[] slines = line.split("\\s+");
                         String arranged = "";
                         for(int idx = 1; idx < slines.length; idx++)
                         {
                              arranged += slines[idx] + " ";
                         }
-                        if (isNumeric(slines[0]) && arranged != null)
+                        if ((isNumeric(slines[0])||foundSideboard) && arranged != null)
                         {
+							if (foundSideboard)
+								deck += prefix;
+							
                             if (slines[1] != null && slines[1].startsWith("["))
                             {
                                 arranged = arranged.substring(5);

projects/mtg/Android/src/org/libsdl/app/SDLActivity.java

@@ -221,7 +221,7 @@ public class SDLActivity extends Activity implements OnKeyListener
         File[] files = root.listFiles();
         for( File f : files) 
         {
-            if( !myresult.contains(f.toString()) && (f.toString().contains(".txt")||f.toString().contains(".dec")))
+            if( !myresult.contains(f.toString()) && (f.toString().contains(".txt")||f.toString().contains(".dck")||f.toString().contains(".dec")))
                 myresult.add(f.toString());
         }
         

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/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
+primitive=Human Cleric
-id=-409780
+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/src/CardGui.cpp

@@ -659,6 +659,14 @@ void CardGui::AlternateRender(MTGCard * card, const Pos& pos)
                 
                 }
 
+                found = Carditem->mName.find("cardid"); // Write the cardid
+                if (found != string::npos)
+                {
+                    stringstream st;
+                    st << card->getMTGId();
+                    formattedfield = FormattedData(formattedfield, "mtgid", st.str());
+                }
+
                 found = Carditem->mName.find("power"); // Write the strength
                 if (found != string::npos)
                 {