Added ATH and DDN sets, refactored all sets to add a new tag for better sorting in set filter and award section, improved Android downloader.

projects/mtg/src/GameStateAwards.cpp

@@ -99,7 +99,7 @@ void GameStateAwards::Start()
     vector<pair<string, string> > orderedSet;
     for(int i = 0; i < setlist.size(); i++){
         sprintf(buf, "%s", setlist[i].c_str());
-        orderedSet.push_back(pair<string, string> (setlist.getInfo(i)->getName(), buf));
+        orderedSet.push_back(pair<string, string> (setlist.getInfo(i)->getOrderIndex(), buf)); // Now sets are sorted by new Order Index tag.
     }
     sort(orderedSet.begin(),orderedSet.end());
     for (unsigned int i = 0; i < orderedSet.size(); i++)

projects/mtg/src/MTGDeck.cpp

@@ -1607,6 +1607,18 @@ string MTGSetInfo::getName()
     return id; //Ugly name as well.
 }
 
+string MTGSetInfo::getDate()
+{
+    if (date.size()) return date; //Return the set release date.
+    return "..."; //Fallback if no date has been specified.
+}
+
+string MTGSetInfo::getOrderIndex()
+{
+    if (orderindex.size()) return orderindex; //Order Index for sorting sets.
+    return getName(); // Fallback to name if Order Index is empty.
+}
+
 string MTGSetInfo::getBlock()
 {
     if (block < 0 || block >= (int) setlist.blocks.size()) return "None";
@@ -1629,8 +1641,11 @@ void MTGSetInfo::processConfLine(string line)
         author = value;
     else if (key.compare("block") == 0)
         block = setlist.findBlock(value.c_str());
-    else if (key.compare("year") == 0) 
-        year = atoi(value.c_str());
-    else if (key.compare("total") == 0) 
+    else if (key.compare("year") == 0){ 
+        date = value; // Added to read the full release date of sets.
+        year = atoi(value.substr(0,4).c_str());
+    } else if (key.compare("total") == 0) 
         total = atoi(value.c_str());
+    else if (key.compare("orderindex") == 0) 
+        orderindex = value; // Added new tag for different sorting of sets.
 }

projects/mtg/src/WGui.cpp

@@ -2218,16 +2218,14 @@ void WGuiFilterItem::updateValue()
         }
         else if (filterType == FILTER_SET)
         {
-            char buf[512];
             vector<pair<string, string> > orderedSet;
             for(int i = 0; i < setlist.size(); i++){
                 if (options[Options::optionSet(i)].number == 0) continue;
-                sprintf(buf, "s:%s;", setlist[i].c_str());
-                orderedSet.push_back(pair<string, string> (setlist.getInfo(i)->getName(), buf));
+                orderedSet.push_back(pair<string, string> (setlist.getInfo(i)->getOrderIndex(), setlist[i].c_str())); // Now sets are sorted by new Order Index tag.
             }
             sort(orderedSet.begin(),orderedSet.end());
             for (unsigned int i = 0; i < orderedSet.size(); i++){
-                mParent->addArg(orderedSet.at(i).first, orderedSet.at(i).second);
+                mParent->addArg(setlist.getInfo(setlist.findSet(orderedSet.at(i).second))->getName(), "s:" + orderedSet.at(i).second + ";");
             }
         }
         else if (filterType == FILTER_ALPHA)