Added/fixed primitives, updated the "missing_cards_by_sets" folder, moved AI avatar images to main graphics folder.

ancestral blade not attaching to token
etherium spinner token wasn't artifact
Ichthyomorphosis
Jungle Creeper must activate from GY
Lightning Skelemental crashed the game
Vedalken Plotter
Steel-Plume Marshal is only for flying
Venser emblem created by the AI lets the player exile
Markov Purifier was drawing two cards
Jace, Mirror Mage clone was legendary

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+dist: xenial
 branches:
   except:
     - latest-master
@@ -9,31 +10,33 @@ before_install:
   - export BUILD_Qt=YES
   - export BUILD_MAC=NO
 # Only building on Mac when not handling pull request
-  - if [ "$TRAVIS_PULL_REQUEST" ==  "false" ]; then
-      export BUILD_MAC=YES;
-    fi
+# - if [ "$TRAVIS_PULL_REQUEST" ==  "false" ]; then
+#     export BUILD_MAC=YES;
+#   fi
   - sudo apt-get update -qq
 # Building for PSP here
   - if [ "$BUILD_PSP" == "YES" ]; then
       export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
       export PSPSDK="$PSPDEV/psp/sdk" &&
       export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" &&
-      wget -O sdk.lzma http://superb-sea2.dl.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma;
+      wget --no-check-certificate -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma;
     fi
 # Building for Qt here
   - if [ "$BUILD_Qt" == "YES" ]; then
-      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" &&
-      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" &&
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu xenial universe" &&
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu xenial main" &&
       sudo apt-get -qq update &&
-      sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
+      sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev libqt5opengl5 libqt5opengl5-dev pulseaudio libpulse-dev &&
       export QMAKE="qmake -qt=qt5";
     fi
 # Building for Android here
   - if [ "$BUILD_ANDROID" == "YES" ]; then
       export ANDROID="android-sdk-linux/tools/android" &&
-      if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi &&
-      wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
-      wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv;
+      if [ `uname -m` = x86_64 ]; then 
+        sudo dpkg --add-architecture i386 && sudo apt-get update &&
+        sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi &&
+        wget https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip -nv &&
+        wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv;
     fi
     
 install:
@@ -41,21 +44,21 @@ install:
     tar -x --xz -f sdk.lzma;
   fi
 - if [ "$BUILD_ANDROID" == "YES" ]; then
-    tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
-    tar -zxf android-sdk_r24.3.4-linux.tgz &&
+    unzip android-ndk-r22-linux-x86_64.zip &&
+    tar -zxf android-sdk_r24.4.1-linux.tgz &&
     $ANDROID list sdk --extended -a &&
-    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https;
+    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
+    sudo apt-get install openjdk-8-jdk;
+    export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64;
+    export PATH=$JAVA_HOME/bin:$PATH;
   fi
+- sudo pip install --upgrade pip
+- sudo pip install setuptools-rust
+- sudo pip install pyOpenSSL
 - sudo pip install pyjavaproperties
 - sudo pip install github3.py
 - sudo pip install cpp-coveralls
   
-env:
-  global:
-  - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8="
-  - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ="
-  - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA="
-
 script: "tools/travis-script.sh"
 
 after_success:
@@ -63,3 +66,4 @@ after_success:
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH
+- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l qt-gui-build/linuxqtrelease.zip -r Wagic-linux-QT.zip -b $TRAVIS_BRANCH

Boost/boost/thread/xtime.hpp

@@ -20,7 +20,7 @@ namespace boost {
 
 enum xtime_clock_types
 {
-    TIME_UTC=1
+    TIME_UTC_=1
 //    TIME_TAI,
 //    TIME_MONOTONIC,
 //    TIME_PROCESS,
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time)
 
 inline int xtime_get(struct xtime* xtp, int clock_type)
 {
-    if (clock_type == TIME_UTC)
+    if (clock_type == TIME_UTC_)
     {
         *xtp=get_xtime(get_system_time());
         return clock_type;

Boost/lib/pthread/thread.cpp

@@ -350,7 +350,7 @@ namespace boost
                     cond.timed_wait(lock, xt);
 #   endif
                     xtime cur;
-                    xtime_get(&cur, TIME_UTC);
+                    xtime_get(&cur, TIME_UTC_);
                     if (xtime_cmp(xt, cur) <= 0)
                         return;
                 }
@@ -365,7 +365,7 @@ namespace boost
             BOOST_VERIFY(!pthread_yield());
 #   else
             xtime xt;
-            xtime_get(&xt, TIME_UTC);
+            xtime_get(&xt, TIME_UTC_);
             sleep(xt);
 #   endif
         }

Boost/lib/pthread/timeconv.inl

@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000;
 inline void to_time(int milliseconds, boost::xtime& xt)
 {
     int res = 0;
-    res = boost::xtime_get(&xt, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&xt, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
     xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
     {
@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         milliseconds = 0;
@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         microseconds = 0;

JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c

@@ -77,6 +77,13 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
         : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
     return (result == 0);
 
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+    int result;
+    __asm__ __volatile__(
+        "lock ; xchgl %0, (%1)\n"
+        : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
+    return (result == 0);
+
 #else
     /* Need CPU instructions for spinlock here! */
     __need_spinlock_implementation__

JGE/Dependencies/libpng/png.h

@@ -474,7 +474,7 @@
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
-#include "zlib.h"
+#include "../include/zlib.h"
 #endif
 
 /* include all user configurable info, including optional assembler routines */

JGE/Makefile

@@ -32,6 +32,7 @@ HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \
 
 CXXFLAGS = -W -Wall -Werror -Wno-unused
 CXXFLAGS += -DTIXML_USE_STL
+CXXFLAGS += -Wno-deprecated-declarations -Wno-sign-compare
 
 ifdef DEBUG
 CXXFLAGS += -ggdb3
@@ -82,8 +83,8 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
 OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
 TARGET_LIB = libjge.a
 TARGET_HGE = libhgetools.a
-INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I../Boost -Isrc/zipFS -Iinclude/
-CXXFLAGS += -DLINUX $(FMOD)
+INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I/usr/include/boost -Isrc/zipFS -Iinclude/
+CXXFLAGS += -DLINUX -DNETWORK_SUPPORT $(FMOD)
 CXXFLAGS += $(INCDIR)
 LIBDIR = lib/linux
 endif

JGE/include/JGE.h

@@ -394,6 +394,7 @@ class JGE
    void SetJNIEnv(JNIEnv * env, jclass cls);
    void sendJNICommand(std::string command);
    std::string getFileSystemLocation();
+   std::string getFileUserFolderPath();
 #endif 
   
  protected:

JGE/include/JGui.h

@@ -30,6 +30,7 @@ const int kInfoMenuID = -200;
 const int kRandomPlayerMenuID = -11;
 const int kRandomAIPlayerMenuID = -12;
 const int kEvilTwinMenuID = -14;
+const int kCommanderMenuID = -33;
 
 class JGuiListener
 {

JGE/src/JFileSystem.cpp

@@ -16,9 +16,14 @@ User folder is the only one that is really needed to guarantee both read and wri
 The content that users should not be touching.
 */
 
-#ifndef PSP
+#if defined (ANDROID)
 #include "PrecompiledHeader.h"
-#endif //PSP
+#endif //ANDROID
+
+#if defined (LINUX)
+#include "../../projects/mtg/include/PrecompiledHeader.h"
+#endif //LINUX
+
 
 #ifdef WIN32
 #pragma warning(disable : 4786)
@@ -126,10 +131,11 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     systemPath = [[documentsDirectory  stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
 
 #elif defined (ANDROID)
-    userPath = JGE::GetInstance()->getFileSystemLocation();
-    systemPath = "";
+    userPath = JGE::GetInstance()->getFileUserFolderPath();
+    systemPath = JGE::GetInstance()->getFileSystemLocation();
 
     DebugTrace("User path " << userPath);
+    DebugTrace("System path " << systemPath);
 #elif defined (QT_CONFIG)
 
     QDir sysDir(RESDIR);
@@ -254,6 +260,7 @@ void JFileSystem::clearZipCache()
 
 bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL */)
 {
+#ifndef WIN32
     if (mZipAvailable && mZipFile.is_open())
     {
         if (mZipFileName != zipfile)
@@ -261,7 +268,7 @@ bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL
         else
             return true;
     }
-
+#endif
     mZipFileName = zipfile;
     mPassword = password;
 

JGE/src/JGE.cpp

@@ -249,6 +249,7 @@ u32 JGE::BindKey(LocalKeySym sym, JButton button)
 u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
 {
     for (keycodes_it it = keyBinds.begin(); it != keyBinds.end(); )
+    {
         if (sym == it->first && button == it->second)
         {
             keycodes_it er = it;
@@ -256,6 +257,7 @@ u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
             keyBinds.erase(er);
         }
         else ++it;
+    }
     return keyBinds.size();
 }
 
@@ -666,7 +668,7 @@ string JGE::getFileSystemLocation()
     if (env == NULL)
     {
         DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
     };
 
     jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
@@ -675,7 +677,36 @@ string JGE::getFileSystemLocation()
     if (methodId == 0)
     {
         DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
+    };
+
+    jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);
+
+    // Now convert the Java String to C++ char array
+	const char* cstr = env->GetStringUTFChars(systemPath, 0); 
+	string retVal (cstr);
+	env->ReleaseStringUTFChars(systemPath, cstr); 
+	env->DeleteLocalRef(systemPath);
+
+    return retVal;
+}
+
+string JGE::getFileUserFolderPath()
+{
+    JNIEnv * env = getJNIEnv();
+    if (env == NULL)
+    {
+        DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic");
+        return "/mnt/sdcard/Wagic/User";
+    };
+
+    jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
+    jmethodID methodId = env->GetStaticMethodID( jniClass, "getUserFolderPath", "()Ljava/lang/String;");
+
+    if (methodId == 0)
+    {
+        DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic");
+        return "/mnt/sdcard/Wagic/User";
     };
 
     jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);

JGE/src/Qtconsole.cpp

@@ -87,8 +87,6 @@ WagicWrapper::~WagicWrapper()
 
 int main(int argc, char* argv[])
 {
-    QCoreApplication a(argc, argv);
-
     int result = 0;
     WagicWrapper* wagicCore =  new WagicWrapper();
     MTGCollection()->loadFolder("sets/primitives/");

JGE/src/SDLmain.cpp

@@ -18,6 +18,11 @@
 #include <stdexcept>
 #include <iostream>
 #include <math.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
 
 #if (defined FORCE_GLES)
 #undef GL_ES_VERSION_2_0
@@ -53,6 +58,7 @@ JGameLauncher* g_launcher = NULL;
 #ifdef ANDROID
 JNIEnv * mJNIEnv = NULL;
 jclass * mJNIClass = NULL;
+int SDL_ResumeSyncTime = 0;
 #endif
 
 class SdlApp;
@@ -78,6 +84,7 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativeResume(
 {    
 	if (!g_engine)
 		return;
+    SDL_ResumeSyncTime = 100000;
     g_engine->Resume();
 }
 
@@ -136,10 +143,18 @@ public:
                     if(!g_engine->IsPaused())
                         OnEvent(&Event);
                 }
-                if(!g_engine->IsPaused())
+                if(!g_engine->IsPaused()){
+                    #ifdef ANDROID
+                    // Fix for SDL crash on resuming Android app from background.
+                    if(SDL_ResumeSyncTime){
+                        usleep(SDL_ResumeSyncTime);
+                        SDL_ResumeSyncTime = 0;
+                    }
+                    #endif
                     OnUpdate();
                 }
             }
+        }
 
         OnCleanup();
 
@@ -293,17 +308,18 @@ static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[]
 	{ SDLK_DOWN,          JGE_BTN_DOWN },
 	{ SDLK_LEFT,          JGE_BTN_LEFT },
 	{ SDLK_RIGHT,         JGE_BTN_RIGHT },
-	{ SDLK_z,             JGE_BTN_UP },
-	{ SDLK_d,             JGE_BTN_RIGHT },
+	{ SDLK_w,             JGE_BTN_UP },
 	{ SDLK_s,             JGE_BTN_DOWN },
-	{ SDLK_q,             JGE_BTN_LEFT },
-	{ SDLK_a,             JGE_BTN_PREV },
+	{ SDLK_a,             JGE_BTN_LEFT },
+	{ SDLK_d,             JGE_BTN_RIGHT },
+	{ SDLK_q,             JGE_BTN_PREV },
 	{ SDLK_e,             JGE_BTN_NEXT },
 	{ SDLK_i,             JGE_BTN_CANCEL },
 	{ SDLK_l,             JGE_BTN_OK },
 	{ SDLK_SPACE,         JGE_BTN_OK },
 	{ SDLK_k,             JGE_BTN_SEC },
 	{ SDLK_j,             JGE_BTN_PRI },
+	{ SDLK_b,             JGE_BTN_SOUND },
 	{ SDLK_f,             JGE_BTN_FULLSCREEN },
 
 	/* old Qt ones, basically modified to comply with the N900 keyboard

JGE/src/Xmain.cpp

@@ -185,9 +185,9 @@ static const int doubleBufferAttributes[] = {
     GLX_RED_SIZE,      1,     /* the maximum number of bits per component    */
     GLX_GREEN_SIZE,    1,
     GLX_BLUE_SIZE,     1,
-    None
+    0L /* None */
 };
-static Bool WaitForNotify(Display *dpy, XEvent *event, XPointer arg)
+static int WaitForNotify(Display *dpy, XEvent *event, XPointer arg)
 {
   return (event->type == MapNotify) && (event->xmap.window == (Window) arg);
 }
@@ -387,13 +387,13 @@ int main(int argc, char* argv[])
       if (XCheckWindowEvent(gXDisplay, gXWindow, KeyPressMask | KeyReleaseMask | StructureNotifyMask, &event))
 	switch (event.type)
 	  {
-	  case KeyPress:
+	  case 2: /* KeyPress */
             {
               const KeySym sym = XKeycodeToKeysym(gXDisplay, event.xkey.keycode, 1);
               g_engine->HoldKey_NoRepeat(sym);
             }
             break;
-	  case KeyRelease:
+	  case 3: /* KeyRelease */
             g_engine->ReleaseKey(XKeycodeToKeysym(gXDisplay, event.xkey.keycode, 1));
             break;
 	  case ConfigureNotify:

JGE/src/android/JSfx.cpp

@@ -185,6 +185,12 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
             result = (*engineEngine)->CreateAudioPlayer(engineEngine, &music->playerObject, &audioSrc, &audioSnk, 2, ids, req);
             DebugTrace("result " << result);
             
+            if(result == SL_RESULT_MEMORY_FAILURE){
+                 delete music;
+                 mCurrentMusic = NULL;
+                 return NULL;
+            }
+            
             // realize the player
             result = (*music->playerObject)->Realize(music->playerObject, SL_BOOLEAN_FALSE);
             DebugTrace("result " << result);
@@ -303,6 +309,12 @@ JSample *JSoundSystem::LoadSample(const char *fileName)
               1, ids, req);
         DebugTrace("result " << result);
 
+        if(result == SL_RESULT_MEMORY_FAILURE){
+             delete sample;
+             mCurrentSample = NULL;
+             return NULL;
+        }
+
         // realize the player
         result = (*sample->playerObject)->Realize(sample->playerObject, SL_BOOLEAN_FALSE);
         DebugTrace("result " << result);

JGE/src/hge/hgeparticle.cpp

@@ -96,6 +96,7 @@ hgeParticleSystem::hgeParticleSystem(hgeParticleSystemInfo *psi)
 {
   //hge=hgeCreate(HGE_VERSION);
 
+	if (psi)
 		memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
 
   vecLocation.x=vecPrevLocation.x=0.0f;

JGE/src/pc/JGfx.cpp

@@ -1804,7 +1804,7 @@ static void PNGCustomReadDataFn(png_structp png_ptr, png_bytep data, png_size_t
 {
     png_size_t check;
 
-    JFileSystem *fileSystem = (JFileSystem*)png_ptr->io_ptr;
+    JFileSystem *fileSystem = (JFileSystem*)png_get_io_ptr(png_ptr);
 
     check = fileSystem->ReadFile(data, length);
 
@@ -1887,7 +1887,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
 
         return JGE_ERR_PNG;
     }
@@ -1896,11 +1896,15 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
     png_set_sig_bytes(png_ptr, sig_read);
     png_read_info(png_ptr, info_ptr);
-    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
+    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
     png_set_strip_16(png_ptr);
     png_set_packing(png_ptr);
     if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png_ptr);
+#if PNG_LIBPNG_VER >= 10400
+    if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
+#endif
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
     png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
 
@@ -1910,7 +1914,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
         return JGE_ERR_MALLOC_FAILED;
     }
 
@@ -1932,7 +1936,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
         for (y = 0; y < (int)height; y++)
         {
-            png_read_row(png_ptr, (BYTE*) line, png_bytep_NULL);
+            png_read_row(png_ptr, (BYTE*) line, NULL);
             for (x = 0; x < (int)width; x++)
             {
                 DWORD color32 = line[x];
@@ -1955,7 +1959,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     free (line);
 
     png_read_end(png_ptr, info_ptr);
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
     fileSystem->CloseFile();
 
@@ -1998,8 +2002,15 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     GifFileType *GifFileIn = NULL;
     ColorMapObject *palette;
     int ExtCode;
+
+#if GIFLIB_MAJOR >= 5
+    if ((GifFileIn = DGifOpen(handle, readFunc, NULL)) == NULL)
+        return 1;
+#else
     if ((GifFileIn = DGifOpen(handle, readFunc)) == NULL)
         return 1;
+#endif
+
     *bgcolor = 0;
     textureInfo.mWidth = 0;
     textureInfo.mHeight = 0;
@@ -2008,7 +2019,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     do {
         if (DGifGetRecordType(GifFileIn, &RecordType) == GIF_ERROR)
         {
+#if GIFLIB_MAJOR >= 5
+            DGifCloseFile(GifFileIn, NULL);
+#else
             DGifCloseFile(GifFileIn);
+#endif
             return 1;
         }
 
@@ -2017,12 +2032,20 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
             {
                 if (DGifGetImageDesc(GifFileIn) == GIF_ERROR)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 if((palette = (GifFileIn->SColorMap != NULL) ? GifFileIn->SColorMap : GifFileIn->Image.ColorMap) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mWidth = GifFileIn->Image.Width;
@@ -2030,7 +2053,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 *bgcolor = gif_color32(GifFileIn->SBackGroundColor);
                 if((LineIn = (GifRowType) malloc(GifFileIn->Image.Width * sizeof(GifPixelType))) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mTexWidth = getNextPower2(GifFileIn->Image.Width);
@@ -2040,7 +2067,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 if((p32 = (DWORD *)malloc(sizeof(PIXEL_TYPE) * textureInfo.mTexWidth * textureInfo.mTexHeight)) == NULL)
                 {
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 DWORD * curr = p32;
@@ -2052,7 +2083,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     {
                         free((void *)p32);
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                        DGifCloseFile(GifFileIn, NULL);
+#else
                         DGifCloseFile(GifFileIn);
+#endif
                         return 1;
                     }
                     for (GifWord j = 0; j < GifFileIn->Image.Width; j ++)
@@ -2081,7 +2116,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 }
                 if(LineIn != NULL)
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                DGifCloseFile(GifFileIn, NULL);
+#else
                 DGifCloseFile(GifFileIn);
+#endif
                 return 1;
             }
             while (Extension != NULL) {
@@ -2094,7 +2133,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     }
                     if(LineIn != NULL)
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
             }
@@ -2109,7 +2152,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
 
     if(LineIn != NULL)
         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+    DGifCloseFile(GifFileIn, NULL);
+#else
     DGifCloseFile(GifFileIn);
+#endif
 
     return 0;
 }

JGE/src/pc/JSocket.cpp

@@ -48,7 +48,9 @@ JSocket::JSocket(string ipAddr)
 
 #ifdef WIN32
 	unsigned int addr_dest = inet_addr(ipAddr.c_str());
-	hostentptr=gethostbyaddr((char*) &addr_dest, 4, AF_INET);
+	hostentptr = gethostbyaddr((char*) &addr_dest, 4, AF_INET);
+	if (hostentptr == NULL)
+	    hostentptr = gethostbyname(ipAddr.c_str()); // Fix for Windows if IP Address cannot be resolved.
 #elif LINUX
 	hostentptr = gethostbyname(ipAddr.c_str());
 #endif

README.md

@@ -1,7 +1,7 @@
 #Wagic the Homebrew
 
 
-[![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic)
+[![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.com/WagicProject/wagic)
 [![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master)
 [![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master)
 
@@ -20,7 +20,7 @@ It is highly customizable and allows the player to tweak the rules / create thei
 
 Info, downloads, discussions and more at http://wololo.net/forum/index.php
 
--![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")
+![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")
 
 
 

projects/mtg/Android/.gitignore

@@ -1,3 +1,4 @@
 /gen
 /bin
+/libs
 

projects/mtg/Android/AndroidManifest.xml

@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0201" android:versionName="@string/app_version" package="net.wagic.app">
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <application android:debuggable="true" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
-        <activity android:configChanges="keyboard|keyboardHidden|orientation" android:label="@string/app_name" android:name="org.libsdl.app.SDLActivity" android:screenOrientation="sensorLandscape">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          android:versionCode="0231"
+          android:installLocation="preferExternal"
+          android:versionName="@string/app_version"
+          package="net.wagic.app">
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <application android:icon="@drawable/icon"
+               android:label="@string/app_name"
+               android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+               
+    <activity android:debuggable="false"
+              android:configChanges="keyboard|keyboardHidden|orientation"
+              android:label="@string/app_name"
+              android:name="org.libsdl.app.SDLActivity"
+              android:screenOrientation="sensorLandscape">
       <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-        
-        <activity android:configChanges="keyboard|keyboardHidden|orientation" android:name="com.google.ads.AdActivity" android:screenOrientation="sensorLandscape"/>
   </application>
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
+  <uses-sdk android:minSdkVersion="10"
+            android:targetSdkVersion="29" />
 </manifest>

projects/mtg/Android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/jni/Android.mk

@@ -11,9 +11,8 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL
 BOOST_PATH := $(MY_WAGIC_ROOT)/Boost
 JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg
 PNG_PATH := $(JGE_PATH)/Dependencies/libpng
-DEBUG ?= DEBUG
 
-LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG)
+LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -DNETWORK_SUPPORT
 LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL
 LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS
 LOCAL_STATIC_LIBRARIES := libpng libjpeg
@@ -134,6 +133,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
         $(MTG_PATH)/src/WFilter.cpp \
         $(MTG_PATH)/src/WFont.cpp \
         $(MTG_PATH)/src/WGui.cpp \
+        $(MTG_PATH)/src/WParsedInt.cpp \
         $(MTG_PATH)/src/WResourceManager.cpp \
         $(MTG_PATH)/src/DeckView.cpp \
         $(MTG_PATH)/src/CarouselDeckView.cpp \

projects/mtg/Android/jni/Application.mk

@@ -1,7 +1,8 @@
 APP_PROJECT_PATH := $(call my-dir)/..
 APP_CPPFLAGS += -frtti -fexceptions
-APP_ABI := armeabi armeabi-v7a
-APP_STL := gnustl_static
+APP_ABI := armeabi-v7a
+#APP_ABI := x86 # mainly for emulators
+APP_STL := c++_static
 APP_MODULES := libpng libjpeg main SDL
 
 #APP_OPTIM is 'release' by default

projects/mtg/Android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/res/layout/main.xml

@@ -4,6 +4,7 @@
     android:id="@+id/mainLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:keepScreenOn="true"
     >
 <TextView  
     android:layout_width="fill_parent" 

projects/mtg/Android/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Wagic</string>
-    <string name="app_version">0.20.1</string>
-    <string name="info_text">Wagic v0.20.1\\nAll Rights Reserved.</string>
+    <string name="app_version">0.23.1</string>
+    <string name="info_text">All Rights Reserved.</string>
 </resources>

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

@@ -11,13 +11,13 @@ import android.util.Log;
 
 public class DeckImporter
 {
-
     public static String importDeck( File f, String mypath, String activePath )
     {
         String message = "";
         String deck = "";
         String deckname = "";
-		String prefix = "#SB:";
+        String prefix = "";
+        int cardcount = 0;
         if(f.exists() && !f.isDirectory())
         { 
             deckname = f.getName();
@@ -36,11 +36,18 @@ public class DeckImporter
                     {
                         String line = scanner.nextLine();
                         line = line.trim();
+                        if (line.equals("")) {
+                            line = scanner.nextLine();
+                            prefix = "#SB:"; // Sideboard started from next card.
+                            if (line.equals("")) {
+                                line = scanner.nextLine(); // Sometimes there are 2 blank lines from main deck and sideboard.
+                            }
+                        }
                         if (!line.equals("")) // don't write out blank lines
                         {
                             String[] slines = line.split("\\s+");
                             String arranged = "";
-							for(int idx = 1; idx < slines.length; idx++)
+                            for (int idx = 1; idx < slines.length; idx++)
                             {
                                 arranged += slines[idx] + " ";
                             }
@@ -49,40 +56,43 @@ public class DeckImporter
                                 if (slines[1] != null && slines[1].startsWith("["))
                                 {
                                     arranged = arranged.substring(5);
-									slines[1] = slines[1].replaceAll("\\[", "").replaceAll("\\]","");
-									deck += arranged + " (" + renameSet(slines[1]) + ") * " + slines[0] + "\n";
+                                    slines[1] = slines[1].replaceAll("\\[", "").replaceAll("\\]", "");
+                                    deck += prefix + arranged + " (" + renameSet(slines[1]) + ") * " + slines[0] + "\n";
+                                } else
+                                {
+                                    deck += prefix + arranged + "(*) * " + slines[0] + "\n";
                                 }
+                                cardcount += Integer.parseInt(slines[0]);
+                            }
+                        }
+                    }
+                    File profile = new File(activePath + "/User/settings/options.txt");
+                    String profileName = "Default";
+                    if (profile.exists() && !profile.isDirectory())
+                        profileName = getActiveProfile(profile);
+                    File rootDecks = null;
+                    if (!profileName.equalsIgnoreCase("Default"))
+                        rootDecks = new File(activePath + "/User/profiles/" + profileName);
                     else
-								{
-									deck += arranged + "(*) * " + slines[0] + "\n";
-								}
-							}
-						}
-					}
-					File profile = new File(activePath+"/Res/settings/options.txt");
-					if(profile.exists() && !profile.isDirectory())
-					{
-						String profileName = getActiveProfile(profile);
-						if(profileName != "Missing!")
-						{
-							File rootProfiles = new File(activePath+"/Res/profiles/"+profileName);
-							if(rootProfiles.exists() && rootProfiles.isDirectory())
+                        rootDecks = new File(activePath + "/User/player/");
+                    if (rootDecks.exists() && rootDecks.isDirectory())
                     {
                         //save deck
                         int countdeck = 1;
-								File[] files = rootProfiles.listFiles();
+                        File[] files = rootDecks.listFiles();
                         for (int i = 0; i < files.length; i++)
                         {//check if there is available deck...
-									if(files[i].getName().startsWith("deck"))
+                            if (files[i].getName().startsWith("deck"))
                                 countdeck++;
                         }
-								File toSave = new File(rootProfiles+"/deck"+countdeck+".txt");
+                        File toSave = new File(rootDecks + "/deck" + countdeck + ".txt");
                         try
                         {
                             FileOutputStream fop = new FileOutputStream(toSave);
 
                             // if file doesn't exists, then create it
-									if (!toSave.exists()) {
+                            if (!toSave.exists())
+                            {
                                 toSave.createNewFile();
                             }
                             // get the content in bytes
@@ -90,30 +100,20 @@ public class DeckImporter
                             fop.write(contentInBytes);
                             fop.flush();
                             fop.close();
-									message = "Import Deck Success!\n\n"+deck;
-								} 
-								catch (IOException e) 
+                            message = "The deck has been successfully imported as: " + toSave.getName() + "\n" + cardcount + " total cards in this deck\n\n" + deck;
+                        } catch (IOException e)
                         {
                             message = e.getMessage();
                         }
-							}
-							else
+                    } else
                     {
-								message = "Missing Folder!";
+                        message = "Problem opening decks folder: " + rootDecks.getAbsolutePath();
                     }
-						}
-					}
-					else
-					{
-						message = "Invalid Profile!";
-					}
-				}
-				else
+                } else
                 {
                     message = "No errors, and file EMPTY";
                 }
-			}
-			catch(IOException e)
+            } catch (IOException e)
             {
                 message = e.getMessage();
             }
@@ -147,12 +147,12 @@ public class DeckImporter
                 }
                 else
                 {
-                    return "Missing!";
+                    return "Default";
                 }
             }
             catch(IOException e)
             {
-                return "Missing!";
+                return "Default";
             }
         return name;
     }
@@ -276,5 +276,4 @@ public class DeckImporter
         else
             return set;
     }
-    
 }

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

@@ -14,6 +14,7 @@ import android.util.Log;
 
 public class StorageOptions
 {
+    private static final String      TAG     = StorageOptions.class.getCanonicalName();
     private static ArrayList<String> mMounts = new ArrayList<String>();
     private static ArrayList<String> mVold   = new ArrayList<String>();
 
@@ -22,7 +23,7 @@ public class StorageOptions
     public static int                count   = 0;
     public static String             defaultMountPoint;
 
-    public static void determineStorageOptions()
+    public static void determineStorageOptions(android.content.Context mContext)
     {
         initializeMountPoints();
         if (findForcemount()){
@@ -35,6 +36,16 @@ public class StorageOptions
         }
         compareMountsWithVold();
         testAndCleanMountsList();
+        File[] externalStorageVolumes = mContext.getExternalFilesDirs("");
+        for(int i = 0; i < externalStorageVolumes.length; i++){
+            mMounts.add(externalStorageVolumes[i].getAbsolutePath());
+        }
+        for(int i = 0; i < mMounts.size(); i++){
+            for(int j = 0; j < mMounts.size(); j++){
+                if(i!=j && mMounts.get(i).startsWith(mMounts.get(j)))
+                    mMounts.remove(i);
+            }
+        }
         setProperties();
     }
 
@@ -77,11 +88,11 @@ public class StorageOptions
         } catch (FileNotFoundException fnfex)
         {
             // if proc/mount doesn't exist we just use
-            Log.i(StorageOptions.class.getCanonicalName(), fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
             mMounts.add(defaultMountPoint);
         } catch (Exception e)
         {
-            Log.e(StorageOptions.class.getCanonicalName(), e.getMessage() + ": unknown exception while reading mounts file");
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading mounts file");
             mMounts.add(defaultMountPoint);
         }
     }
@@ -111,11 +122,11 @@ public class StorageOptions
         } catch (FileNotFoundException fnfex)
         {
             // if proc/mount doesn't exist we just use
-            Log.i(StorageOptions.class.getCanonicalName(), fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
             mMounts.add(defaultMountPoint);
         } catch (Exception e)
         {
-            Log.e(StorageOptions.class.getCanonicalName(), e.getMessage() + ": unknown exception while reading mounts file");
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading mounts file");
             mMounts.add(defaultMountPoint);
         }
     }
@@ -144,11 +155,11 @@ public class StorageOptions
         } catch (FileNotFoundException fnfex)
         {
             // if vold.fstab doesn't exist we use the value gathered from the Environment
-            Log.i(StorageOptions.class.getCanonicalName(), fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
             mMounts.add(defaultMountPoint);
         } catch (Exception e)
         {
-            Log.e(StorageOptions.class.getCanonicalName(), e.getMessage() + ": unknown exception while reading mounts file");
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading vold.fstab file");
             mMounts.add(defaultMountPoint);
         }
     }
@@ -178,12 +189,15 @@ public class StorageOptions
          * Compare the two lists together and remove items that are not in both lists.
          */
 
+        if (mVold.size() > 0)
+        {
             for (int i = 0; i < mMounts.size(); i++)
             {
                 String mount = mMounts.get(i);
                 if (!mVold.contains(mount))
                     mMounts.remove(i--);
             }
+        }
 
         // don't need this anymore, clear the vold list to reduce memory
         // use and to prepare it for the next time it's needed.
@@ -206,7 +220,8 @@ public class StorageOptions
         }
 
         if (t == 0 && Build.VERSION.SDK_INT >= 16 && findForcemount())
-        {//if none is found lets force it for Jellybean and above...
+        {
+            //if none is found lets force it for Jellybean and above...
             if (System.getenv("EXTERNAL_STORAGE") != null)
             {
                 File root = new File(System.getenv("EXTERNAL_STORAGE"));
@@ -247,6 +262,7 @@ public class StorageOptions
 
     private static void setProperties()
     {
+        Log.d(TAG, "setProperties()");
         /*
          * At this point all the paths in the list should be valid. Build the public properties.
          */
@@ -258,21 +274,22 @@ public class StorageOptions
             for (String path : mMounts)
             {//with forcemount menu
                 if ("/mnt/sdcard".equalsIgnoreCase(path) || "/storage/sdcard0".equalsIgnoreCase(path))
-                    mLabels.add("Internal SD " + "[" + path + "]");
+                    mLabels.add("Internal SD " + "[" + path + "/]");
                 else if (path.contains("emulated"))
-                    mLabels.add("Emulated SD " + " [" + path + "]");
+                    mLabels.add("Emulated SD " + " [" + path + "/]");
                 else
-                    mLabels.add("External SD " + " [" + path + "]");
+                    mLabels.add("External SD " + " [" + path + "/]");
             }
         }
         else
         {
             for (String path : mMounts)
-            { // TODO: /mnt/sdcard is assumed to always mean internal storage. Use this comparison until there is a better way to do this
-                if ("/mnt/sdcard".equalsIgnoreCase(path))
-                    mLabels.add("Built-in Storage");
+            {
+                // TODO: /mnt/sdcard and emulated are assumed to always mean internal storage. Use this comparison until there is a better way to do this
+                if ("/mnt/sdcard".equalsIgnoreCase(path) || path.contains("emulated"))
+                    mLabels.add("Built-in Storage " + "[" + path + "/]");
                 else
-                    mLabels.add("External SD Card " + i++);
+                    mLabels.add("External SD Card " + "[" + path + "/]");
             }
         }
         
@@ -310,50 +327,59 @@ public class StorageOptions
     *
     * @return <code>true</code> if the device is rooted, <code>false</code> otherwise.
     */
-    public static boolean isRooted() {
-
+    public static boolean isRooted()
+    {
         // get from build info
         String buildTags = android.os.Build.TAGS;
-    if (buildTags != null && buildTags.contains("test-keys")) {
+        if (buildTags != null && buildTags.contains("test-keys"))
+        {
             return true;
         }
 
         // check if /system/app/Superuser.apk is present
-    try {
+        try
+        {
             File file = new File("/system/app/Superuser.apk");
-      if (file.exists()) {
+            if (file.exists())
+            {
                 return true;
             }
-    } 
-    catch (Exception e1) {
+        } catch (Exception e1)
+        {
             // ignore
         }
-    try {
+        try
+        {
             File file = new File("/system/app/Superuser/Superuser.apk");
-      if (file.exists()) {
+            if (file.exists())
+            {
                 return true;
             }
-    } 
-    catch (Exception e1) {
+        } catch (Exception e1)
+        {
             // ignore
         }
         //SuperSU
-    try {
+        try
+        {
             File file = new File("/system/app/SuperSU.apk");
-      if (file.exists()) {
+            if (file.exists())
+            {
                 return true;
             }
-    } 
-    catch (Exception e1) {
+        } catch (Exception e1)
+        {
             // ignore
         }
-    try {
+        try
+        {
             File file = new File("/system/app/SuperSU/SuperSU.apk");
-      if (file.exists()) {
+            if (file.exists())
+            {
                 return true;
             }
-    } 
-    catch (Exception e1) {
+        } catch (Exception e1)
+        {
             // ignore
         }
         // try executing commands
@@ -362,30 +388,34 @@ public class StorageOptions
     }
 
     // executes a command on the system
-    private static boolean canExecuteCommand(String command) {
+    private static boolean canExecuteCommand(String command)
+    {
         boolean executedSuccesfully;
-    try {
+        try
+        {
             Runtime.getRuntime().exec(command);
             executedSuccesfully = true;
-    } 
-    catch (Exception e) {
+        } catch (Exception e)
+        {
             executedSuccesfully = false;
         }
 
         return executedSuccesfully;
     }
 
-    private static boolean findForcemount(){
+    private static boolean findForcemount()
+    {
+        Log.d(TAG, "findForcemount()");
         try
         {
-        File file = new File(System.getenv("EXTERNAL_STORAGE")+"/forcemount");
+            File file = new File(System.getenv("EXTERNAL_STORAGE") + "/forcemount");
             if (file.exists())
             {
                 return true;
             }
-    } 
-    catch (Exception e1) 
+        } catch (Exception e)
         {
+            Log.w(TAG, e.getMessage());
             return false;
         }
         return false;

projects/mtg/Makefile

@@ -27,7 +27,7 @@ OBJS	= objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.o\
 	objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o\
 	objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o\
 	objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o\
-	objs/WFont.o objs/CarouselDeckView.o objs/GridDeckView.o objs/DeckView.o
+	objs/WFont.o objs/WParsedInt.o objs/CarouselDeckView.o objs/GridDeckView.o objs/DeckView.o
 DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))
 
 RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)
@@ -59,7 +59,6 @@ endif
 
 ifeq ($(TARGET_ARCHITECTURE),psp)
 DEFAULT_RULE = 3xx
-TARGET_ARCHITECTURE = psp
 PSP_FW_VERSION=371
 BUILD_PRX = 1
 SIGN_PRX = 1
@@ -69,24 +68,42 @@ EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = Wagic, the Homebrew?!
 PSP_EBOOT_ICON = icon.png
 #PSP_EBOOT_ICON1 = icon1.pmf
+PSP_LARGE_MEMORY = 1
 PSP_EBOOT_UNKPNG = pic0.png
 PSP_EBOOT_PIC1 = pic1.png
 INCDIR = ../../JGE/include ../../JGE/src/zipFS ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include ../../Boost
 LIBDIR = ../../JGE/lib/psp
 CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP -DTIXML_USE_STL
+
 else
+
+ifeq ($(MAKECMDGOALS),x11)
+
+OBJS += objs/TestSuiteAI.o
+INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I/usr/include/boost -I../../JGE/src/zipFS
+LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib
+LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lpthread $(FMOD)
+CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL -Wno-nonnull-compare 
+
+ASFLAGS = $(CXXFLAGS)
+
+all: $(DEFAULT_RULE)
+else
+
 OBJS += objs/TestSuiteAI.o
 INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS
 LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib
 LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD)
-CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1
+CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -Wno-nonnull-compare 
+
 ASFLAGS = $(CXXFLAGS)
 
 all: $(DEFAULT_RULE)
 
+endif
 endif
 
-CFLAGS := -Wall -W -Werror -Wno-unused $(CFLAGS)
+CFLAGS := -Wall -W -Werror -Wno-unused -Wno-deprecated-declarations $(CFLAGS)
 CXXFLAGS += $(CFLAGS)
 # -fno-exceptions
 
@@ -110,8 +127,6 @@ debug: all
 
 else
 
-
-
 $(TARGET): Makefile.$(TARGET_ARCHITECTURE) $(OBJS) ../../JGE/lib/linux/libjge.a
 	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) $(LIBDIR)
 

projects/mtg/bin/Res/ai/baka/deck10.txt

@@ -7,75 +7,24 @@
 # (would've been better to add creatures, but all creatures in the
 # deck were already at 4 pieces))
 
-#Spark Elemental
-129577
-129577
-129577
-129577
-#Raging Goblin
-129688
-129688
-129688
-129688
-#Goblin Piker
-129580
-129580
-129580
-129580
-#Goblin King
-129578
-129578
-129578
-129578
-#Goblin Striker
-48592
-48592
-48592
-48592
-#Lightning Bolt
-1303
-1303
-1303
-1303
-#Wheel of Fate
-1326
-#Black Vise
-1097
-1097
-1097
-1097
-#Hearthfire Hobgoblin
-157201
-157201
-157201
-157201
-#Howling Mine
-129598
-129598
-129598
-#Goblin Mountaineer
-174938
-174938
-174938
-174938
-#Mountain
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
-1390
+# Land(s)
+Mountain (8ED) * 20
+
+# Creature(s)
+Goblin King (8ED) * 4
+Goblin Mountaineer (9ED) * 4
+Goblin Piker (9ED) * 4
+Goblin Striker (MRD) * 4
+Hearthfire Hobgoblin (EVE) * 4
+Raging Goblin (8ED) * 4
+Spark Elemental (5DN) * 4
+
+# Artifact(s)
+Black Vise (V10) * 4
+Howling Mine (8ED) * 3
+
+# Instant(s)
+Lightning Bolt (M10) * 4
+
+# Sorcery(s)
+Wheel of Fortune (VMA) * 1

projects/mtg/bin/Res/ai/baka/deck103.txt

@@ -1,4 +1,4 @@
-#NAME:Smoke and mirrors
+#NAME:Smoke & Mirrors
 Order of the Ebon Hand	 (FEM) *2
 Combat Medic	 (FEM) *1
 Combat Medic	 (FEM) *1

projects/mtg/bin/Res/ai/baka/deck104.txt

@@ -1,4 +1,4 @@
-#NAME:Kill by Numbers
+#NAME:Kazandu the Redeemed
 #DESC:They just keep multiplying.
 #HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
 #HINT:dontattackwith(Rhys the Redeemed)

projects/mtg/bin/Res/ai/baka/deck105.txt

@@ -1,4 +1,4 @@
-#NAME:Infected wounds
+#NAME:Infected Wounds
 Forest	 (UGL) *4
 Forest	 (ALA) *1
 Forest	 (ALA) *1

projects/mtg/bin/Res/ai/baka/deck109.txt

@@ -1,4 +1,4 @@
-#NAME:Red Deck Wins
+#NAME:Krenko's Hellrider
 #DESC:Standard R Aggro
 #DESC:ISD-M13-RTR
 #HINT:combo hold(Hellrider|myhand)^until(creature|mybattlefield)^cast(Hellrider|myhand)^restriction{type(creature|mybattlefield)~morethan~2}^totalmananeeded({2}{R}{R})

projects/mtg/bin/Res/ai/baka/deck110.txt

@@ -1,7 +1,6 @@
 #NAME:Etched Affinity
 #DESC:Modern URB Aggro
 #HINT:dontattackwith(creature[power<=0])
-#HINT:combo hold(Glimmervoid|myhand)^until(artifact|mybattlefield)^cast(Glimmervoid|myhand)^totalmananeeded({0})
 #HINT:combo hold(Galvanic Blast|myhand)^cast(Galvanic Blast|myhand)^restriction{type(artifact|mybattlefield)~morethan~2,turn:3}^totalmananeeded({R})
 
 #25 creatures

projects/mtg/bin/Res/ai/baka/deck124.txt

@@ -1,4 +1,4 @@
-#NAME:Sweep The Tomb
+#NAME:Wipe them out!
 #DESC:Modern RBW Control
 #HINT:castpriority(enchantment,sorcery,artifact,instant)
 #HINT:combo hold(Devour Flesh|myhand)^until(creature|opponentbattlefield)^cast(Devour Flesh|myhand)^totalmananeeded({1}{B})

projects/mtg/bin/Res/ai/baka/deck129.txt

@@ -23,23 +23,23 @@
 369072
 
 #4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
-999009
-999009
-999009
-999009
+253587
+253587
+253587
+253587
 
 #2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
-999171
-999171
+270792
+270792
 
 #4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
-999260
-999260
-999260
-999260
+253539
+253539
+253539
+253539
 
 #1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
-999262
+253575
 
 
 
@@ -57,14 +57,14 @@
 369060
 
 #2 x Chromatic Lantern (RTR), {3}, Artifact, 
-999039
-999039
+290542
+290542
 
 #4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
-999106
-999106
-999106
-999106
+270957
+270957
+270957
+270957
 
 
 
@@ -84,26 +84,26 @@
 369018
 
 #4 x Forest (RTR), Basic Land Forest, 
-999086
-999086
-999086
-999086
+289326
+289326
+289326
+289326
 
 #4 x Plains (RTR), Basic Land Plains, 
-999168
-999168
-999168
-999168
+289310
+289310
+289310
+289310
 
 #2 x Temple Garden (RTR), Land Forest Plains, 
-999238
-999238
+253681
+253681
 
 #4 x Plains (RTR), Basic Land Plains, 
-999265
-999265
-999265
-999265
+289309
+289309
+289309
+289309
 
 
 

projects/mtg/bin/Res/ai/baka/deck130.txt

@@ -0,0 +1,27 @@
+#NAME: Kai Buide 1999
+#DESC: 1999 World Championship Deck 
+#DESC: by Kai Buide
+Mountain (*) *13
+Voltaic Key (*) * 4
+Thran Dynamo (*) * 4
+Grim Monolith (*) * 4
+Fire Diamond (*) *4
+Mishra's Helix (*) *2
+Worn Powerstone (*) *2
+City of Traitors (*) *4
+Wildfire (*) *4
+Masticore (*) *3
+Ancient Tomb (*) *3
+Karn, Silver Golem (*) *1
+Covetous Dragon (*) *4
+Earthquake (*) *4 
+Temporal Aperture (*) * 4
+
+
+#SB: Mishra's Helix (*) *1
+#SB: Spellshock (*) *4 
+#SB: Boil (*) *2
+#SB: Phyrexian Processor (*) *1
+#SB: Cursed Scroll (*) *4 
+#SB: Rack and Ruin (*) *2
+#SB: Shattering Pulse (*) *2

projects/mtg/bin/Res/ai/baka/deck131.txt

@@ -0,0 +1,22 @@
+#NAME: Mind Control
+#DESC: The Best Counter Deck Ever 
+Aetherize (*) *4
+Artificer's Epiphany (*) *4
+Counterspell (*) *2
+Dissipate (*) *2
+Downsize (*) *3
+Elixir of Immortality (*) *3
+Essence Scatter (*) *3
+Guttersnipe (*) *3
+Hydrolash (*) *2
+Island (*) *14
+Mountain (*) *8
+Opportunity (*) *2
+Prism Ring (*) *4
+Young Pyromancer (*) *3
+Cyclonic Rift (*) *3
+
+#SB: Aetherling (*) *1
+#SB: Spellheart Chimera (*) *1
+#SB: Flashfreeze (*) *3
+#SB: Negate (*) *2

projects/mtg/bin/Res/ai/baka/deck132.txt

@@ -0,0 +1,16 @@
+#NAME: Ajani's Chaplain
+#DESC: The First M20 Deck
+Ajani, Inspiring Leader (M20) *1
+Serra's Guardian (M20) *1
+Daybreak Chaplain (M20) *4
+Fencing Ace (M20) *3
+Impassioned Orator (M20) *3
+Loxodon Lifechanter (M20) *1
+Goldmane Griffin (M20) *2
+Angel of Vitality (M20) *3
+Dawning Angel (M20) *3
+Savannah Sage (M20) *4
+Twinblade Paladin (M20) *3
+Moment of Heroism (M20) *4
+Pacifism (M20) *3
+Plains (M20) *25

projects/mtg/bin/Res/ai/baka/deck133.txt

@@ -0,0 +1,28 @@
+#NAME: Phyrexian Asphodel
+#DESC: The First MH1 Deck
+Bloodghast (*) *4
+Geralf's Messenger (*) *4
+Phyrexian Obliterator (*) *4
+Gray Merchant of Asphodel (*) *4
+Yawgmoth, Thran Physician (*) *2
+Liliana of the Veil (*) *3
+Liliana, the Last Hope (*) *2
+Fatal Push (*) *4
+Inquisition of Kozilek (*) *4
+Thoughtseize (*) *4
+Collective Brutality (*) *1
+Phyrexian Arena (*) *1
+Bloodstained Mire (*) *2
+Polluted Delta (*) *2
+Verdant Catacombs (*) *2
+Marsh Flats (*) *1
+Urborg, Tomb of Yawgmoth (*) *1
+Snow-Covered Swamp (*) *15
+
+#SB: Surgical Extraction (*) *3
+#SB: Collective Brutality (*) *2
+#SB: Ashiok, Dream Render (*) *1
+#SB: Dead of Winter (*) *2
+#SB: Force of Despair (*) *1
+#SB: Fulminator Mage (*) *4
+#SB: Plague Engineer (*) *2

projects/mtg/bin/Res/ai/baka/deck134.txt

@@ -0,0 +1,37 @@
+#NAME: Urza's Control
+#DESC: Hellsau, 1st MTGO
+#DESC: Pauper League
+Dinrova Horror (*) *1
+Stonehorn Dignitary (*) *1
+Mnemonic Wall (*) *3
+Mulldrifter (*) *4
+Condescend (*) *2
+Forbidden Alchemy (*) *2
+Ghostly Flicker (*) *2
+Mystical Teachings (*) *2
+Counterspell (*) *2
+Impulse (*) *3
+Moment's Peace (*) *4
+Compelling Argument (*) *1
+Pulse of Murasa (*) *2
+Expedition Map (*) *4
+Prophetic Prism (*) *4
+Remote Isle (*) *1
+Island (*) *3
+Unknown Shores (*) *3
+Thornwood Falls (*) *4
+Urza's Mine (*) *4
+Urza's Power Plant (*) *4
+Urza's Tower (*) *4
+
+#SB: Dinrova Horror (*) *1
+#SB: Stonehorn Dignitary (*) *1
+#SB: Pulse of Murasa (*) *1
+#SB: Circle of Protection: Red (*) *2
+#SB: Dispel (*) *1
+#SB: Electrickery (*) *1
+#SB: Hydroblast (*) *2
+#SB: Pyroblast (*) *3
+#SB: Shattering Pulse (*) *1
+#SB: Sprout Swarm (*) *1
+#SB: Tangle (*) *1

projects/mtg/bin/Res/ai/baka/deck135.txt

@@ -0,0 +1,31 @@
+#NAME: Modern Snow
+#DESC: First Snow Deck
+Flooded Strand (*) *2
+Misty Rainforest (*) *3
+Prismatic Vista (*) *4
+Scrying Sheets (*) *1
+Snow-Covered Forest (*) *4
+Snow-Covered Island (*) *2
+Snow-Covered Plains (*) *2
+Windswept Heath (*) *2
+Glacial Revelation (*) *4
+Into the North (*) *4
+Abominable Treefolk (*) *4
+Boreal Druid (*) *2
+Diamond Faerie (*) *2
+Ice-Fang Coatl (*) *4
+Icehide Golem (*) *4
+Ohran Viper (*) *4
+Gelid Shackles (*) *1
+Force of Negation (*) *4
+Search for Azcanta (*) *3
+Arcum's Astrolabe (*) *4
+
+#SB: Diamond Faerie (*) *1
+#SB: On Thin Ice (*) *4
+#SB: Gelid Shackles (*) *3
+#SB: Mouth of Ronom (*) *1
+#SB: Negate (*) *3
+#SB: Scrying Sheets (*) *2
+#SB: Search for Azcanta (*) *1
+#SB: Spell Pierce (*) *2

projects/mtg/bin/Res/ai/baka/deck136.txt

@@ -0,0 +1,29 @@
+#NAME: Yarok of Pranks
+#DESC: The First Eldraine Deck
+Midnight Reaper (*) *2
+Cavalier of Night (*) *3
+Dread Presence (*) *4
+Knight of the Ebon Legion (*) *4
+Yarok's Fenlurker (*) *4
+Foulmire Knight (*) *3
+Rankle, Master of Pranks (*) *3
+Murderous Rider (*) *4
+Ritual of Soot (*) *2
+Mausoleum Secrets (*) *1
+Command the Dreadhorde (*) *1
+Legion's End (*) *2
+Swamp (*) *19
+Witch's Cottage (*) *4
+Castle Locthwain (*) *2
+Ugin, the Ineffable (*) *1
+Liliana, Dreadhorde General (*) *1
+
+#SB: Massacre Girl (*) *1
+#SB: Ayara, First of Locthwain (*) *1
+#SB: The Elderspell (*) *1
+#SB: Duress (*) *2
+#SB: Noxious Grasp (*) *3
+#SB: Covetous Urge (*) *2
+#SB: Witch's Vengeance (*) *2
+#SB: Epic Downfall (*) *2
+#SB: The Cauldron of Eternity (*) *1

projects/mtg/bin/Res/ai/baka/deck137.txt

@@ -0,0 +1,26 @@
+#NAME: Selesnya Adventures
+#DESC: First Adventure Deck
+Edgewall Innkeeper (*) *4
+Faerie Guidemother // Gift of the Fae (ELD) *4
+Flaxen Intruder // Welcome Home (ELD) *2
+Giant Killer // Chop Down (ELD) *4
+Lovestruck Beast // Heart's Desire (ELD) *4
+Shepherd of the Flock // Usher to Safety (ELD) *1
+Venerated Loxodon (*) *4
+Emmara, Soul of the Accord (*) *1
+Trostani Discordant (*) *2
+Forest (*) *8
+Plains (*) *8
+Castle Ardenvale (*) *1
+Temple Garden (*) *4
+March of the Multitudes (*) *4
+Once Upon a Time (*) *4
+Unbreakable Formation (*) *1
+Flower // Flourish (*) *4
+
+#SB: Knight of Autumn (*) *2
+#SB: Unbreakable Formation (*) *1
+#SB: Veil of Summer (*) *3
+#SB: Questing Beast (*) *3
+#SB: Gideon Blackblade (*) *2
+#SB: Devout Decree (*) *4

projects/mtg/bin/Res/ai/baka/deck138.txt

@@ -0,0 +1,30 @@
+#NAME:Turbo Stasi
+#DESC:Black Summer 1996
+City of Brass (*) *4
+Island (*) *13
+Underground River (*) *4
+Boomerang (*) *4
+Force of Will (*) *4
+Recall (*) *2
+Kismet (*) *2
+Land Tax (*) *1
+Stasis (*) *4
+Despotic Scepter (*) *3
+Feldon's Cane (*) *2
+Howling Mine (*) *4
+Ivory Tower (*) *2
+Zuran Orb (*) *1
+Black Vise (*) *2
+Counterspell (*) *4
+Adarkar Wastes (*) *4
+
+#SB: Kismet (*) *1
+#SB: Wall of Air (*) *2
+#SB: Arcane Denial (*) *4
+#SB: Blue Elemental Blast (*) *2
+#SB: Disenchant (*) *2
+#SB: Hydroblast (*) *2
+#SB: Lodestone Bauble (*) *1
+#SB: Mana Short (*) *3
+#SB: Swords to Plowshares (*) *1
+#SB: Lim-Dul's Vault (*) *4

projects/mtg/bin/Res/ai/baka/deck139.txt

@@ -0,0 +1,26 @@
+#NAME: The New Mutatants
+#DESC: The First Ikoria Mutation Deck
+Arboreal Grazer (*) *4
+Pollywog Symbiote (*) *3
+Dryad of the Ilysian Grove (*) *2
+Vadrok, Apex of Thunder	(*) *2
+Everquill Phoenix (*) *3
+Gemrazer (*) *4
+Migratory Greathorn (*) *4
+Snapdax, Apex of the Hunt (*) *2
+Brokkos, Apex of Forever (*) *2
+Illuna, Apex of Wishes (*) *2
+Nethroi, Apex of Death (*) *2
+Beanstalk Giant // Fertile Footsteps (*) *4
+Nissa, Who Shakes the World (*) *2
+Breeding Pool (*) *2
+Forest (*) *3
+Island (*) *2
+Mountain (*) *2
+Overgrown Tomb (*) *2
+Plains (*) *2
+Sacred Foundry (*) *2
+Steam Vents (*) *1
+Stomping Ground (*) *3
+Swamp (*) *2
+Temple Garden (*) *3

projects/mtg/bin/Res/ai/baka/deck140.txt

@@ -0,0 +1,93 @@
+#NAME:Golgari ramp
+#DESC:The first Commander Format Deck
+#HINT:castpriority(commander,*)
+Mardu Shadowspear (*) *1
+Night Market Lookout (*) *1
+Pulse Tracker (*) *1
+Thornbow Archer (*) *1
+Vicious Conquistador (*) *1
+Archers' Parapet (*) *1
+Shepherd of Rot (*) *1
+Loyal Subordinate (*) *1
+Crypt Ghast (*) *1
+Rankle, Master of Pranks (*) *1
+Spawn of Mayhem (*) *1
+Twilight Prophet (*) *1
+Conduit of Ruin (*) *1
+Duplicant (*) *1
+Oblivion Sower (*) *1
+Wurmcoil Engine (*) *1
+World Breaker (*) *1
+Platinum Emperion (*) *1
+Apex Devastator (*) *1
+Blightsteel Colossus (*) *1
+Ugin, the Ineffable (*) *1
+Malakir Rebirth (*) *1
+Nature's Claim (*) *1
+Veil of Summer (*) *1
+Vicious Rumors (*) *1
+Worldly Tutor (*) *1
+Assassin's Trophy (*) *1
+Damnable Pact (*) *1
+Demonic Tutor (*) *1
+Exsanguinate (*) *1
+Farseek (*) *1
+Heroic Intervention (*) *1
+Rampant Growth (*) *1
+Three Visits (*) *1
+Torment of Hailfire (*) *1
+Agadeem's Awakening (*) *1
+Barrier Breach (*) *1
+Beast Within (*) *1
+Cultivate (*) *1
+Grim Tutor (*) *1
+Kodama's Reach (*) *1
+Toxic Deluge (*) *1
+Skyshroud Claim (*) *1
+Return of the Wildspeaker (*) *1
+Beseech the Queen (*) *1
+Turntimber Symbiosis (*) *1
+Decree of Pain (*) *1
+In Garruk's Wake (*) *1
+Sol Ring (*) *1
+Arcane Signet (*) *1
+Lightning Greaves (*) *1
+Swiftfoot Boots (*) *1
+Talisman of Resilience (*) *1
+Thought Vessel (*) *1
+God-Pharaoh's Statue (*) *1
+Staff of Nin (*) *1
+The Immortal Sun (*) *1
+Ward of Bones (*) *1
+Cryptolith Rite (*) *1
+Sanctum of Stone Fangs (*) *1
+Phyrexian Arena (*) *1
+Retreat to Hagra (*) *1
+Court of Ambition (*) *1
+Eldrazi Conscription (*) *1
+Sandwurm Convergence (*) *1
+Ancient Tomb (*) *1
+Blast Zone (*) *1
+Bojuka Bog (*) *1
+Cabal Coffers (*) *1
+Castle Garenbrig (*) *1
+Castle Locthwain (*) *1
+Command Tower (*) *1
+Crawling Barrens (*) *1
+Forest (*) *7
+Leechridden Swamp (*) *1
+Llanowar Wastes (*) *1
+Nurturing Peatland (*) *1
+Overgrown Tomb (*) *1
+Phyrexian Tower (*) *1
+Prismatic Vista (*) *1
+Reliquary Tower (*) *1
+Sanctum of Ugin (*) *1
+Swamp (*) *5
+Twilight Mire (*) *1
+Undergrowth Stadium (*) *1
+Urborg, Tomb of Yawgmoth (*) *1
+Verdant Catacombs (*) *1
+War Room (*) *1
+Woodland Cemetery (*) *1
+#CMD:Belbe, Corrupted Observer (*) *1

projects/mtg/bin/Res/ai/baka/deck141.txt

@@ -0,0 +1,90 @@
+#NAME:Omnath Commander
+#DESC:The Budget league Omnath Deck
+#HINT:castpriority(commander,*)
+Smokebraider (*) *1
+Cloudkin Seer (*) *1
+Flickerwisp (*) *1
+Kazandu Mammoth (*) *1
+Risen Reef (*) *1
+Soulherder (*) *1
+Springbloom Druid (*) *1
+Angel of Finality (*) *1
+Archaeomancer (*) *1
+Emeria Angel (*) *1
+Felidar Guardian (*) *1
+Mina and Denn, Wildborn (*) *1
+Slithermuse (*) *1
+Acidic Slime (*) *1
+Cataclysmic Gearhulk (*) *1
+Cavalier of Thorns (*) *1
+Mnemonic Wall (*) *1
+Mulldrifter (*) *1
+Yorion, Sky Nomad (*) *1
+Multani, Yavimaya's Avatar (*) *1
+Phylath, World Sculptor (*) *1
+Rampaging Baloths (*) *1
+Omnath, Locus of Rage (*) *1
+Ephemerate (*) *1
+Gelatinous Genesis (*) *1
+Path to Exile (*) *1
+Spikefield Hazard (*) *1
+Wildest Dreams (*) *1
+Disdainful Stroke (*) *1
+Growth Spiral (*) *1
+Reap the Past (*) *1
+Sejiri Shelter (*) *1
+Starstorm (*) *1
+Eerie Interlude (*) *1
+Far Wanderings (*) *1
+Ghostly Flicker (*) *1
+Harrow (*) *1
+Release to the Wind (*) *1
+Roiling Regrowth (*) *1
+Silundi Vision (*) *1
+Whirlwind Denial (*) *1
+Circuitous Route (*) *1
+Crush Contraband (*) *1
+Fact or Fiction (*) *1
+Summary Dismissal (*) *1
+Sylvan Reclamation (*) *1
+Time Wipe (*) *1
+Tragic Arrogance (*) *1
+Urban Evolution (*) *1
+Austere Command (*) *1
+Hour of Revelation (*) *1
+Nissa's Renewal (*) *1
+Sublime Epiphany (*) *1
+Ondu Inversion (*) *1
+Khalni Heart Expedition (*) *1
+Rites of Flourishing (*) *1
+Court of Bounty (*) *1
+Felidar Retreat (*) *1
+Retreat to Emeria (*) *1
+Wilderness Reclamation (*) *1
+Zendikar's Roil (*) *1
+Blighted Woodland (*) *1
+Command Tower (*) *1
+Evolving Wilds (*) *1
+Exotic Orchard (*) *1
+Field of Ruin (*) *1
+Forest (*) *7
+Frontier Bivouac (*) *1
+Gruul Guildgate (*) *1
+Gruul Turf (*) *1
+Island (*) *3
+Jungle Shrine (*) *1
+Krosan Verge (*) *1
+Mountain (*) *4
+Myriad Landscape (*) *1
+Mystic Monastery (*) *1
+Naya Panorama (*) *1
+Path of Ancestry (*) *1
+Plains (*) *4
+Scavenger Grounds (*) *1
+Seaside Citadel (*) *1
+Selesnya Guildgate (*) *1
+Selesnya Sanctuary (*) *1
+Simic Growth Chamber (*) *1
+Simic Guildgate (*) *1
+Terramorphic Expanse (*) *1
+#CMD:Omnath, Locus of Creation (*) *1

projects/mtg/bin/Res/ai/baka/deck142.txt

@@ -0,0 +1,103 @@
+#NAME:Scion Of The Ur-Dragon
+#DESC:The Scion Commander Deck
+#HINT:castpriority(commander,*)
+Aggravated Assault (*) * 1
+Ancient Tomb (*) * 1
+Arcane Signet (*) * 1
+Arid Mesa (*) * 1
+Atarka, World Render (*) * 1
+Balefire Dragon (*) * 1
+Bladewing the Risen (*) * 1
+Blood Crypt (*) * 1
+Bloom Tender (*) * 1
+Breeding Pool (*) * 1
+Cascading Cataracts (*) * 1
+Cavern of Souls (*) * 1
+Chromatic Lantern (*) * 1
+Chromatic Orrery (*) * 1
+Chrome Mox (*) * 1
+Coalition Relic (*) * 1
+Command Beacon (*) * 1
+Command Tower (*) * 1
+Crux of Fate (*) * 1
+Crystal Quarry (*) * 1
+Curiosity (*) * 1
+Cyclonic Rift (*) * 1
+Debtors' Knell (*) * 1
+Defense of the Heart (*) * 1
+Demonic Tutor (*) * 1
+Dragonlord Silumgar (*) * 1
+Drakuseth, Maw of Flames (*) * 1
+Faeburrow Elder (*) * 1
+Farseek (*) * 1
+Fearsome Awakening (*) * 1
+Flooded Strand (*) * 1
+Force of Will (*) * 1
+Godless Shrine (*) * 1
+Greater Good (*) * 1
+Grim Tutor (*) * 1
+Hallowed Fountain (*) * 1
+Haven of the Spirit Dragon (*) * 1
+Hellkite Charger (*) * 1
+Hellkite Tyrant (*) * 1
+Indatha Triome (*) * 1
+Karrthus, Tyrant of Jund (*) * 1
+Keiga, the Tide Star (*) * 1
+Ketria Triome (*) * 1
+Kokusho, the Evening Star (*) * 1
+Lightning Greaves (*) * 1
+Living Death (*) * 1
+Lotus Petal (*) * 1
+Malfegor (*) * 1
+Mana Confluence (*) * 1
+Mana Crypt (*) * 1
+Mana Drain (*) * 1
+Marsh Flats (*) * 1
+Misty Rainforest (*) * 1
+Moltensteel Dragon (*) * 1
+Mox Amber (*) * 1
+Mox Diamond (*) * 1
+Mox Opal (*) * 1
+Mox Tantalite (*) * 1
+Nicol Bolas (*) * 1
+Niv-Mizzet, the Firemind (*) * 1
+Overgrown Tomb (*) * 1
+Path of Ancestry (*) * 1
+Polluted Delta (*) * 1
+Prismatic Geoscope (*) * 1
+Raugrin Triome (*) * 1
+Sacred Foundry (*) * 1
+Savage Ventmaw (*) * 1
+Savai Triome (*) * 1
+Scalding Tarn (*) * 1
+Sensei's Divining Top (*) * 1
+Silumgar, the Drifting Death (*) * 1
+Skithiryx, the Blight Dragon (*) * 1
+Skyclave Relic (*) * 1
+Skyshroud Claim (*) * 1
+Sneak Attack (*) * 1
+Sol Ring (*) * 1
+Spoils of Victory (*) * 1
+Steam Vents (*) * 1
+Stomping Ground (*) * 1
+Swiftfoot Boots (*) * 1
+Sword of Feast and Famine (*) * 1
+Sylvan Library (*) * 1
+Temple Garden (*) * 1
+Temur Ascendancy (*) * 1
+Teneb, the Harvester (*) * 1
+Terror of the Peaks (*) * 1
+The Ur-Dragon (*) * 1
+Three Visits (*) * 1
+Unburial Rites (*) * 1
+Utvara Hellkite (*) * 1
+Vaevictis Asmadi, the Dire (*) * 1
+Vampiric Tutor (*) * 1
+Verdant Catacombs (*) * 1
+Watery Grave (*) * 1
+Wheel of Sun and Moon (*) * 1
+Windswept Heath (*) * 1
+Wooded Foothills (*) * 1
+Yosei, the Morning Star (*) * 1
+Zagoth Triome (*) * 1
+#CMD:Scion of the Ur-Dragon (*) * 1

projects/mtg/bin/Res/ai/baka/deck143.txt

@@ -0,0 +1,79 @@
+#NAME:Phantom Premonition
+#HINT:castpriority(commander,*)
+Angel of Finality (*) * 1
+Angel of Serenity (*) * 1
+Arcane Artisan (*) * 1
+Arcane Signet (*) * 1
+Azorius Chancery (*) * 1
+Azorius Guildgate (*) * 1
+Azorius Signet (*) * 1
+Banishing Light (*) * 1
+Behold the Multiverse (*) * 1
+Brago, King Eternal (*) * 1
+Burnished Hart (*) * 1
+Cleansing Nova (*) * 1
+Cloudblazer (*) * 1
+Cloudgoat Ranger (*) * 1
+Command Tower (*) * 1
+Commander's Sphere (*) * 1
+Cosmic Intervention (*) * 1
+Cryptic Caves (*) * 1
+Curse of the Swine (*) * 1
+Day of the Dragons (*) * 1
+Eerie Interlude (*) * 1
+Empyrean Eagle (*) * 1
+Ethereal Valkyrie (*) * 1
+Evangel of Heliod (*) * 1
+Flickerwisp (*) * 1
+Gates of Istfell (*) * 1
+Geist-Honored Monk (*) * 1
+Ghostly Flicker (*) * 1
+Ghostly Prison (*) * 1
+Glacial Floodplain (*) * 1
+Goldnight Commander (*) * 1
+Hero of Bretagard (*) * 1
+Inspired Sphinx (*) * 1
+Iron Verdict (*) * 1
+Island (*) * 12
+Kor Cartographer (*) * 1
+Marble Diamond (*) * 1
+Marshal's Anthem (*) * 1
+Meandering River (*) * 1
+Meteor Golem (*) * 1
+Migratory Route (*) * 1
+Mind Stone (*) * 1
+Mist Raven (*) * 1
+Mistmeadow Witch (*) * 1
+Momentary Blink (*) * 1
+Mulldrifter (*) * 1
+Myriad Landscape (*) * 1
+Niko Defies Destiny (*) * 1
+Opal Palace (*) * 1
+Plains (*) * 13
+Ravenform (*) * 1
+Replicating Ring (*) * 1
+Restoration Angel (*) * 1
+Return to Dust (*) * 1
+Sage of the Beyond (*) * 1
+Saw It Coming (*) * 1
+Sea Gate Oracle (*) * 1
+Sejiri Refuge (*) * 1
+Sky Diamond (*) * 1
+Sol Ring (*) * 1
+Soulherder (*) * 1
+Spectral Deluge (*) * 1
+Stoic Farmer (*) * 1
+Storm Herd (*) * 1
+Sun Titan (*) * 1
+Surtland Elementalist (*) * 1
+Swiftfoot Boots (*) * 1
+Synthetic Destiny (*) * 1
+Tales of the Ancestors (*) * 1
+Thunderclap Wyvern (*) * 1
+Tranquil Cove (*) * 1
+Vega, the Watcher (*) * 1
+Wall of Omens (*) * 1
+Warhorn Blast (*) * 1
+Whirler Rogue (*) * 1
+Windfall (*) * 1
+#CMD:Ranar the Ever-Watchful (*) * 1

projects/mtg/bin/Res/ai/baka/deck144.txt

@@ -0,0 +1,81 @@
+#NAME:Draconic Rage
+#DESC:The First D&D Deck
+#HINT:castpriority(commander,*)
+Bogardan Hellkite (*) *1
+Demanding Dragon (*) *1
+Dragonmaster Outcast (*) *1
+Hoard-Smelter Dragon (*) *1
+Opportunistic Dragon (*) *1
+Scourge of Valkas (*) *1
+Shivan Hellkite (*) *1
+Skyline Despot (*) *1
+Skyship Stalker (*) *1
+Taurean Mauler (*) *1
+Terror of Mount Velus (*) *1
+Thunderbreak Regent (*) *1
+Chameleon Colossus (*) *1
+Atarka, World Render (*) *1
+Earth-Cult Elemental (*) *1
+Anger (*) *1
+Dragonlord's Servant (*) *1
+Savage Ventmaw (*) *1
+Dragonspeaker Shaman (*) *1
+Chain Reaction (*) *1
+Rishkar's Expertise (*) *1
+Shamanic Revelation (*) *1
+Rile (*) *1
+Cultivate (*) *1
+Explore (*) *1
+Rampant Growth (*) *1
+Magmaquake (*) *1
+Spit Flame (*) *1
+Decree of Savagery (*) *1
+Kindred Summons (*) *1
+Return of the Wildspeaker (*) *1
+Beast Within (*) *1
+Return to Nature (*) *1
+Dragon's Hoard (*) *1
+Arcane Signet (*) *1
+Commander's Sphere (*) *1
+Gruul Signet (*) *1
+Heirloom Blade (*) *1
+Sol Ring (*) *1
+Gratuitous Violence (*) *1
+Outpost Siege (*) *1
+Warstorm Surge (*) *1
+Barbarian Class (*) *1
+Colossal Majesty (*) *1
+Garruk's Uprising (*) *1
+Cinder Glade (*) *1
+Crucible of the Spirit Dragon (*) *1
+Exotic Orchard (*) *1
+Game Trail (*) *1
+Haven of the Spirit Dragon (*) *1
+Mossfire Valley (*) *1
+Mosswort Bridge (*) *1
+Command Tower (*) *1
+Desert (*) *1
+Gruul Turf (*) *1
+Path of Ancestry (*) *1
+Mountain (*) *12
+Forest (*) *15
+Klauth, Unrivaled Ancient (*) *1
+Berserker's Frenzy (*) *1
+Chaos Dragon (*) *1
+Maddening Hex (*) *1
+Vengeful Ancestor (*) *1
+Bag of Tricks (*) *1
+Druid of Purification (*) *1
+Indomitable Might (*) *1
+Neverwinter Hydra (*) *1
+Wild Endeavor (*) *1
+Dragonborn Champion (*) *1
+Klauth's Will (*) *1
+Wulfgar of Icewind Dale (*) *1
+Component Pouch (*) *1
+Sword of Hours (*) *1
+Underdark Rift (*) *1
+#CMD:Vrondiss, Rage of Ancients (*) *1
+#DNG:Tomb of Annihilation (*) *1
+#DNG:Lost Mine of Phandelver (*) *1
+#DNG:Dungeon of the Mad Mage (*) *1

projects/mtg/bin/Res/ai/baka/deck145.txt

@@ -0,0 +1,26 @@
+#NAME: Dungeon Delving
+#DESC: New Player D&D Experience 
+Ranger's Hawk (*) *3
+Malakir Blood-Priest (*) *3
+Nullpriest of Oblivion (*) *1
+Thunderous Orator (*) *3
+Triumphant Adventurer (*) *1
+Acererak the Archlich (*) *1
+Gloom Stalker (*) *2
+Nadaar, Selfless Paladin (*) *1
+Yuan-Ti Fang-Blade (*) *3
+Barrowin of Clan Undurr (*) *3
+Veteran Dungeoneer (*) *3
+Demonic Gifts (*) *2
+Vanishing Verse (*) *1
+Silverquill Command (*) *1
+Closing Statement (*) *3
+Cloister Gargoyle (*) *3
+Precipitous Drop (*) *2
+Brightclimb Pathway (*) *1
+Plains (*) *9
+Snowfield Sinkhole (*) *4
+Swamp (*) *10
+#DNG:Dungeon of the Mad Mage (*) *1
+#DNG:Lost Mine of Phandelver (*) *1
+#DNG:Tomb of Annihilation (*) *1

projects/mtg/bin/Res/ai/baka/deck146.txt

@@ -0,0 +1,29 @@
+#NAME: Orzhov Dungeons
+#DESC:The Second D&D Deck
+Silverquill Silencer (*) *4
+Triumphant Adventurer (*) *4
+Vanishing Verse (*) *4
+Nadaar, Selfless Paladin (*) *4
+Soul Shatter (*) *4
+Silverquill Command (*) *4
+Brightclimb Pathway (*) *4
+Shineshadow Snarl (*) *4
+Acererak the Archlich (*) *3
+Lolth, Spider Queen (*) *3
+Hive of the Eye Tyrant (*) *3
+Pelakka Predation (*) *2
+Barrowin of Clan Undurr (*) *2
+Kaya the Inexorable (*) *2
+Emeria's Call (*) *2
+Agadeem's Awakening (*) *1
+Plains (*) *6
+Swamp (*) *4
+#SB:Ray of Enfeeblement (*) *4
+#SB:Lithoform Blight (*) *2
+#SB:Paladin Class (*) *2
+#SB:Fracture (*) *2
+#SB:Crippling Fear (*) *2
+#SB:Humiliate (*) *3
+#DNG:Tomb of Annihilation (*) *1
+#DNG:Lost Mine of Phandelver (*) *1
+#DNG:Dungeon of the Mad Mage (*) *1

projects/mtg/bin/Res/ai/baka/deck147.txt

@@ -0,0 +1,26 @@
+#NAME:Selesnya Magecraft
+#DESC:The Fastest Deck in 2022
+Arctic Treeline (*) * 4
+Blizzard Brawl (*) * 2
+Branchloft Pathway (*) * 4
+Charge Through (*) * 4
+Clarion Spirit (*) * 4
+Clever Lumimancer (*) * 4
+Dragonsguard Elite (*) * 4
+Guiding Voice (*) * 4
+Hall of Oracles (*) * 2
+Leonin Lightscribe (*) * 4
+Mage Duel (*) * 2
+Mavinda, Students' Advocate (*) * 2
+Monk of the Open Hand (*) * 4
+Show of Confidence (*) * 2
+Snakeskin Veil (*) * 4
+Snow-Covered Forest (*) * 4
+Snow-Covered Plains (*) * 6
+#SB:Basic Conjuration (*) * 1
+#SB:Containment Breach (*) * 1
+#SB:Environmental Sciences (*) * 1
+#SB:Expanded Anatomy (*) * 1
+#SB:Inkling Summoning (*) * 1
+#SB:Mascot Exhibition (*) * 1
+#SB:Pest Summoning (*) * 1

projects/mtg/bin/Res/ai/baka/deck148.txt

@@ -0,0 +1,85 @@
+#NAME:Tergrid Commander
+#DESC:The Tergrid Commander Deck
+#HINT:castpriority(commander,*)
+Mana Crypt (VMA) *1
+Necrogen Mists (MRD) *1
+Animate Dead (VMA) *1
+Recurring Nightmare (VMA) *1
+Mind Stone (AFC) *1
+Coldsteel Heart (CSP) *1
+Steel Hellkite (C17) *1
+Hedron Archive (C19) *1
+Prismatic Vista (H1R) *1
+Blackblade Reforged (SS2) *1
+Tevesh Szat, Doom of Fools (CMR) *1
+Thespian's Stage (C19) *1
+Priest of Forgotten Gods (RNA) *1
+Duplicant (PZ1) *1
+Swamp (2XM) *19
+Strip Mine (EXP) *1
+Toxic Deluge (PZ1) *1
+Archon of Cruelty (MH2) *1
+No Mercy (MP2) *1
+Whip of Erebos (THS) *1
+Plaguecrafter (C19) *1
+Cabal Coffers (MH2) *1
+Smallpox (M12) *1
+Geier Reach Sanitarium (C19) *1
+Pox (ME1) *1
+Braids, Cabal Minion (EMA) *1
+Vampiric Tutor (EMA) *1
+Meteor Golem (C19) *1
+Phyrexian Reclamation (JMP) *1
+Damnation (MM3) *1
+Mana Vault (PUMA) *1
+Commander's Sphere (C19) *1
+Liliana's Triumph (WAR) *1
+Dream Devourer (KHM) *1
+Homeward Path (PZ1) *1
+Night's Whisper (EMA) *1
+Grave Pact (CMD) *1
+Bojuka Bog (C19) *1
+Chain of Smog (ONS) *1
+Village Rites (KHM) *1
+Memory Jar (FVR) *1
+Gonti, Lord of Luxury (MB1) *1
+Tinybones, Trinket Thief (JMP) *1
+Sol Ring (C19) *1
+Dreadhorde Invasion (WAR) *1
+Command Beacon (PZ1) *1
+Solemn Simulacrum (TSR) *1
+Barren Moor (C19) *1
+Lotus Petal (MB1) *1
+Oppression (7ED) *1
+Shadowspear (THB) *1
+Worn Powerstone (PZ1) *1
+Arcane Signet (AFC) *1
+Grim Monolith (ULG) *1
+Lightning Greaves (AFC) *1
+Dark Ritual (ME4) *1
+Sanctum of Eternity (C19) *1
+Tourach, Dread Cantor (MH2) *1
+Ravenous Chupacabra (MB1) *1
+Ancient Tomb (EXP) *1
+Sword of Feast and Famine (MPS) *1
+Witch of the Moors (JMP) *1
+Thought Vessel (MB1) *1
+Urborg, Tomb of Yawgmoth (TSR) *1
+Thoughtseize (2XM) *1
+Tyrite Sanctum (KHM) *1
+Soul Shatter (ZNR) *1
+Mox Diamond (FVR) *1
+Thran Dynamo (C19) *1
+Bloodstained Mire (ONS) *1
+Sangromancer (MBS) *1
+Phyrexian Arena (TD0) *1
+Blast Zone (WAR) *1
+Rune-Scarred Demon (MB1) *1
+Demonic Tutor (MB1) *1
+Polluted Delta (ONS) *1
+Liliana, Dreadhorde General (WAR) *1
+Cunning Rhetoric (C21) *1
+Crypt Ghast (GTC) *1
+Palladium Myr (MB1) *1
+Myriad Landscape (C19) *1
+#CMD:Tergrid, God of Fright (KHM) *1

projects/mtg/bin/Res/ai/baka/deck149.txt

@@ -0,0 +1,87 @@
+#NAME:Tatyova Commander 
+#DESC:The Tatiyova Commander Deck
+#HINT:castpriority(commander,*)
+Mana Crypt (VMA) *1
+Allosaurus Shepherd (JMP) *1
+Rimewood Falls (KHM) *1
+Explore (C19) *1
+Rampant Growth (PRM) *1
+Commit // Memory (MB1) *1
+Echoing Truth (C19) *1
+Mystic Sanctuary (ELD) *1
+Ramunap Excavator (PRM) *1
+Prismatic Vista (H1R) *1
+Harmonize (PRM) *1
+Summer Bloom (POR) *1
+Mana Reflection (SHM) *1
+Cyclonic Rift (MM3) *1
+Upheaval (MH2) *1
+Wild Growth (AFC) *1
+Narset, Parter of Veils (WAR) *1
+Timetwister (PRM) *1
+Thrasios, Triton Hero (PZ2) *1
+Strip Mine (EXP) *1
+Tropical Island (ME4) *1
+Avenger of Zendikar (PRM) *1
+Harrow (MB1) *1
+Kodama's Reach (C17) *1
+Fastbond (VMA) *1
+Crucible of Worlds (PRM) *1
+Force of Will (EMA) *1
+Broken Bond (MB1) *1
+Command Tower (C19) *1
+Sylvan Scrying (MB1) *1
+Mana Vault (PUMA) *1
+Jolrael, Mwonvuli Recluse (M21) *1
+Solemn Simulacrum (MB1) *1
+Simic Signet (C15) *1
+Reliquary Tower (C19) *1
+Genesis Wave (IMA) *1
+Khalni Garden (PZ1) *1
+Cultivate (PZ1) *1
+Yavimaya Elder (UDS) *1
+Exploration (PRM) *1
+Sol Ring (C19) *1
+Koma, Cosmos Serpent (KHM) *1
+Simic Growth Chamber (C19) *1
+Command Beacon (PZ1) *1
+Eternal Witness (PZ1) *1
+Sylvan Library (PZ1) *1
+Heroic Intervention (KLR) *1
+Kinnan, Bonder Prodigy (IKO) *1
+Lotus Cobra (PRM) *1
+Island (UNH) *8
+Archmage's Charm (H1R) *1
+Dryad Arbor (TSR) *1
+Finale of Devastation (WAR) *1
+Arcane Signet (AFC) *1
+Flooded Grove (EXP) *1
+Crop Rotation (2XM) *1
+Forest (2XM) *10
+Lightning Greaves (AFC) *1
+Scalding Tarn (MH2) *1
+Ancient Tomb (EXP) *1
+Sakura-Tribe Elder (MB1) *1
+Seedborn Muse (C19) *1
+Prophet of Kruphix (PRM) *1
+Misty Rainforest (ZNE) *1
+Natural Order (EMA) *1
+Wayfarer's Bauble (C17) *1
+Tyrite Sanctum (KHM) *1
+Gaea's Cradle (USG) *1
+Consecrated Sphinx (MBS) *1
+Castle Vantress (ELD) *1
+Mox Diamond (FVR) *1
+Verdant Catacombs (MH2) *1
+Primeval Titan (TSR) *1
+Neoform (WAR) *1
+Rampaging Baloths (C19) *1
+Pongify (TSR) *1
+Flooded Strand (EXP) *1
+Nyxbloom Ancient (THB) *1
+Nexus of Fate (M19) *1
+Polluted Delta (ONS) *1
+Birds of Paradise (PRM) *1
+Courser of Kruphix (TSR) *1
+Search for Tomorrow (MB1) *1
+#CMD:Tatyova, Benthic Druid (DOM) *1

projects/mtg/bin/Res/ai/baka/deck150.txt

@@ -0,0 +1,82 @@
+#NAME:Ragavan Commander 
+#DESC:The Ragavan Commander Deck
+#HINT:castpriority(commander,*)
+Treasure Nabber (PZ2) *1
+Dire Fleet Daredevil (AFC) *1
+Trash for Treasure (C16) *1
+Tome of Legends (ELD) *1
+Helm of the Host (DOM) *1
+Coercive Recruiter (CMR) *1
+World at War (ROE) *1
+Commander's Plate (CMR) *1
+Neheb, the Eternal (AKR) *1
+Strike It Rich (MH2) *1
+Audacious Reshapers (C21) *1
+Shinka, the Bloodsoaked Keep (CHK) *1
+Inventors' Fair (KLD) *1
+Strip Mine (EXP) *1
+Embercleave (ELD) *1
+Break Through the Line (FRF) *1
+Valakut, the Molten Pinnacle (ZEN) *1
+Imperial Recruiter (ME2) *1
+Tibalt's Trickery (KHM) *1
+Mogg Salvage (NMS) *1
+Seize the Day (ODY) *1
+Mishra's Bauble (MB1) *1
+Hellkite Tyrant (GTC) *1
+Goblin Engineer (MH1) *1
+Aggravated Assault (ONS) *1
+Xorn (AFR) *1
+Mana Vault (PUMA) *1
+Magda, Brazen Outlaw (KHM) *1
+Sensei's Divining Top (EMA) *1
+Combat Celebrant (AKR) *1
+Blood Moon (2XM) *1
+Access Tunnel (STX) *1
+Sword of Hearth and Home (MH2) *1
+Mox Opal (2XM) *1
+Treasure Vault (AFR) *1
+Sword of Fire and Ice (2XM) *1
+Urza's Saga (MH2) *1
+Jeska's Will (CMR) *1
+Sol Ring (C19) *1
+Seize the Spoils (KHM) *1
+Abrade (PLIST) *1
+Fury of the Horde (CSP) *1
+Valakut Awakening (ZNR) *1
+Mountain (UNH) *20
+Godo, Bandit Warlord (CHK) *1
+Mox Amber (DOM) *2
+Cursed Mirror (C21) *1
+Price of Glory (ODY) *1
+Spire of Industry (AER) *1
+Vandalblast (AFC) *1
+Ancient Tomb (ZNE) *1
+Chaos Warp (AFC) *1
+Mana Confluence (CMR) *1
+Shatterskull Smashing (ZNR) *1
+Grim Monolith (ULG) *1
+Lightning Greaves (MB1) *1
+Pirate's Pillage (RIX) *1
+Shattering Spree (MB1) *1
+Sword of Feast and Famine (MPS) *1
+Goblin Welder (ULG) *1
+War's Toll (BBD) *1
+Wayfarer's Bauble (C17) *1
+Cathedral of War (M13) *1
+Sword of Light and Shadow (2XM) *1
+Underworld Breach (THB) *1
+Subira, Tulzidi Caravanner (M21) *1
+Dockside Extortionist (C19) *1
+Mox Diamond (FVR) *1
+Bloodstained Mire (ONS) *1
+Lightning Bolt (ME1) *1
+City of Brass (ME4) *1
+Goldspan Dragon (KHM) *1
+Ruby Medallion (C14) *1
+Sword of the Animist (AFC) *1
+Grenzo, Havoc Raiser (PZ2) *2
+Moraug, Fury of Akoum (ZNR) *1
+Wheel of Fortune (VMA) *1
+Port Razer (CMR) *1
+#CMD:Ragavan, Nimble Pilferer (MH2) *1

projects/mtg/bin/Res/ai/baka/deck151.txt

@@ -0,0 +1,99 @@
+#NAME:Arcades Commander
+#DESC:Original Deck by ashby4 (tappedout.net),
+#DESC:refined for Wagic by Bob
+#HINT:castpriority(commander,*)
+Adarkar Wastes (*) * 1
+Akroma's Will (*) * 1
+Arcane Signet (*) * 1
+Assault Formation (*) * 1
+Aura Shards (*) * 1
+Axebane Guardian (*) * 1
+Azorius Signet (*) * 1
+Bant Panorama (*) * 1
+Blossoming Sands (*) * 1
+Bountiful Promenade (*) * 1
+Branchloft Pathway (*) * 1
+Brushland (*) * 1
+Canopy Vista (*) * 1
+Carven Caryatid (*) * 1
+Colossus of Akros (*) * 1
+Command Tower (*) * 1
+Crashing Drawbridge (*) * 1
+Dismantling Wave (*) * 1
+Drift of Phantasms (*) * 1
+Dusk // Dawn (*) * 1 
+Edge of Autumn (*) * 1
+Farseek (*) * 1
+Fell the Mighty (*) * 1
+Forest (*) * 6 
+Fortified Rampart (*) * 1
+Fortified Village (*) * 1
+Glacial Fortress (*) * 1
+Glacial Wall (*) * 1
+Hallowed Fountain (*) * 1
+High Alert (*) * 1
+Hinterland Harbor (*) * 1
+Hover Barrier (*) * 1
+Irrigated Farmland (*) * 1
+Island (*) * 2
+Jeskai Barricade (*) * 1
+Jungle Barrier (*) * 1
+Leyline of Vitality (*) * 1
+Lightning Greaves (MPS) (*) * 1
+Lumithread Field (*) * 1
+Meekstone (*) * 1
+Mirror Shield (*) * 1
+Monastery Flock (*) * 1
+Noetic Scales (*) * 1
+Oathsworn Giant (*) * 1
+Overgrown Battlement (*) * 1
+Perimeter Captain (*) * 1
+Plains (*) * 5
+Port Town (*) * 1
+Prairie Stream (*) * 1
+Rejuvenating Springs (*) * 1
+Sakura-Tribe Elder (*) * 1
+Scattered Groves (*) * 1
+Sea of Clouds (*) * 1
+Seaside Citadel (*) * 1
+Selesnya Signet (CMA) (*) * 1
+Shield Sphere (*) * 1
+Simic Signet (*) * 1
+Slagwurm Armor (*) * 1
+Slaughter the Strong (*) * 1
+Sol Ring (*) * 1
+Soulsworn Jury (DIS) (*) * 1
+Spidersilk Armor (*) * 1
+Stalwart Shield-Bearers (*) * 1
+Sunpetal Grove (*) * 1
+Sunscape Familiar (*) * 1
+Swiftfoot Boots (*) * 1
+Swords to Plowshares (*) * 1
+Sylvan Caryatid (*) * 1
+Temple Garden (*) * 1
+Temple of Enlightenment (*) * 1
+Temple of Mystery (*) * 1
+Temple of Plenty (*) * 1
+Tetsuko Umezawa, Fugitive (*) * 1
+Teyo, the Shieldmage (*) * 1
+Thallid Shell-Dweller (TSR) (*) * 1
+Thornwood Falls (*) * 1
+Tower Defense (*) * 1
+Towering Titan (*) * 1
+Tranquil Cove (*) * 1
+Tree of Redemption (*) * 1
+Treva's Ruins (*) * 1
+Vine Trellis (*) * 1
+Wall of Blossoms (*) * 1
+Wall of Denial (*) * 1
+Wall of Faith (*) * 1
+Wall of Glare (*) * 1
+Wall of Ice (*) * 1
+Wall of Junk (*) * 1
+Wall of Omens (*) * 1
+Wall of Roots (*) * 1
+Wall of Stolen Identity (*) * 1
+Wall of Tanglecord (*) * 1
+Wave of Reckoning (*) * 1
+Yavimaya Coast (*) * 1
+#CMD:Arcades, the Strategist (*) * 1

projects/mtg/bin/Res/ai/baka/deck152.txt

@@ -0,0 +1,28 @@
+#NAME:Bant Midrange
+#DESC:The New Innistrad Deck
+Teferi, Who Slows the Sunset (*) *3
+Luminarch Aspirant (*) *4
+Intrepid Adversary (*) *3
+Katilda, Dawnhart Prime (*) *4
+Elite Spellbinder (*) *4
+Augur of Autumn (*) *1
+Briarbridge Tracker (*) *2
+Brutal Cathar (*) *4
+Sigarda, Champion of Light (*) *4
+Tovolar's Huntmaster (*) *2
+Fateful Absence (*) *2
+Ranger Class (*) *2
+Forest (*) *1
+Plains (*) *3
+Branchloft Pathway (*) *4
+Hengegate Pathway (*) *4
+Barkchannel Pathway (*) *4
+Deserted Beach (*) *4
+Lair of the Hydra (*) *1
+Overgrown Farmland (*) *4
+#SB:Skyclave Apparition (*) *4
+#SB:Disdainful Stroke (*) *3
+#SB:Negate (*) *3
+#SB:Sunset Revelry (*) *2
+#SB:Pithing Needle (*) *2
+#SB:Ranger Class (*) *1

projects/mtg/bin/Res/ai/baka/deck153.txt

@@ -0,0 +1,87 @@
+#NAME:Krenko Commander
+#DESC:Original Deck by AGunWithLegs (tappedout.net),
+#DESC:refined for Wagic by Bob
+#HINT:castpriority(commander,creature,*)
+#HINT:dontattackwith(Krenko, Mob Boss)
+#HINT:dontblockwith(Krenko, Mob Boss)
+Basilisk Collar (*) * 1
+Battle Cry Goblin (*) * 1
+Blasphemous Act (*) * 1
+Blood Moon (*) * 1
+Bloodmark Mentor (SHM) (*) * 1
+Boggart Shenanigans (*) * 1
+Chancellor of the Forge (*) * 1
+Coat of Arms (*) * 1
+Dragon Fodder (ALA) (*) * 1
+Fervor (*) * 1
+Flamekin Village (*) * 1
+Foundry Street Denizen (*) * 1
+Goblin Assassin (*) * 1
+Goblin Burrows (*) * 1
+Goblin Caves (*) * 1
+Goblin Chieftain (*) * 1
+Goblin Chirurgeon (*) * 1
+Goblin Dark-Dwellers (*) * 1
+Goblin General (*) * 1
+Goblin Grenade (*) * 1
+Goblin King (*) * 1
+Goblin Lackey (*) * 1
+Goblin Oriflamme (*) * 1
+Goblin Matron (*) * 1
+Goblin Piledriver (*) * 1
+Goblin Rally (*) * 1
+Goblin Recruiter (*) * 1
+Goblin Sharpshooter (*) * 1
+Goblin Snowman (*) * 1
+Goblin War Strike (*) * 1
+Goblin Warchief (*) * 1
+Goblin Wardriver (*) * 1
+Goblin War Drums (*) * 1
+Goblin Wizard (*) * 1
+Homeward Path (*) * 1
+Horde of Boggarts (*) * 1
+Hordeling Outburst (*) * 1
+Impact Tremors (*) * 1
+Intimidator Initiate (*) * 1
+Krenko's Enforcer (*) * 1
+Krenko's Command (*) * 1
+Krenko, Tin Street Kingpin (*) * 1
+Legion Loyalist (*) * 1
+Legion Warboss (*) * 1
+Lightning Greaves (MRD) (*) * 1
+Madblind Mountain (*) * 1
+Mask of Avacyn (*) * 1
+Mob Justice (*) * 1
+Mogg Alarm (*) * 1
+Mogg Flunkies (*) * 1
+Mogg Maniac (*) * 1
+Mogg Raider (*) * 1
+Moggcatcher (*) * 1
+Mons's Goblin Raiders (*) * 1
+Mountain (4ED) (*) * 4
+Mountain (M10) (*) * 4
+Mountain (ICE) (*) * 4
+Mountain (M20) (*) * 4
+Mountain (MIR) (*) * 4
+Mountain (LEA) (*) * 3
+Mountain (5ED) (*) * 3
+Pashalik Mons (*) * 1
+Prophetic Ravings (*) * 1
+Purphoros, God of the Forge (*) * 1
+Quest for the Goblin Lord (*) * 1
+Reckless Bushwhacker (*) * 1
+Reckless One (*) * 1
+Reliquary Tower (*) * 1
+Ruby Medallion (*) * 1
+Shared Animosity (*) * 1
+Siege-Gang Commander (*) * 1
+Skirk Commando (*) * 1
+Smash (*) * 1
+Smoldering Spires (*) * 1
+Sol Ring (*) * 1
+Swiftfoot Boots (*) * 1
+Valakut, the Molten Pinnacle (*) * 1
+Vandalblast (*) * 1
+Warren Instigator (*) * 1
+Whispersilk Cloak (*) * 1
+#CMD:Krenko, Mob Boss (*) * 1

projects/mtg/bin/Res/ai/baka/deck154.txt

@@ -0,0 +1,34 @@
+#NAME:Crimson Marriage
+#DESC:The First Crimson Vow Deck
+Cemetery Protector (VOW) * 1
+Hallowed Haunting (VOW) * 1
+Faithbound Judge (VOW) * 1
+Katilda, Dawnhart Martyr (VOW) * 1
+Lantern Flare (VOW) * 2
+Savior of Ollenbock (VOW) * 1
+Sigarda's Summons (VOW) * 2
+Wedding Announcement (VOW) * 2
+Welcoming Vampire (VOW) * 2
+Voice of the Blessed (VOW) * 2
+Cemetery Gatekeeper (VOW) * 2
+Ill-Tempered Loner (VOW) * 2
+Chandra, Dressed to Kill (VOW) * 2
+Manaform Hellkite (VOW) * 2
+Stensia Uprising (VOW) * 2
+Volatile Arsonist (VOW) * 2
+Kessig Wolfrider (VOW) * 2
+Dominating Vampire (VOW) * 2
+Creepy Puppeteer (VOW) * 2
+Dollhouse of Horrors (VOW) * 1
+Odric, Blood-Cursed (VOW) * 2
+Sundown Pass (VOW) * 4
+Plains (VOW) * 10
+Mountain (VOW) * 10
+#SB:By Invitation Only (VOW) * 1
+#SB:Markov Waltzer (VOW) * 2
+#SB:Hopeful Initiate (VOW) * 2
+#SB:Sanctify (VOW) * 3
+#SB:Thalia, Guardian of Thraben (VOW) * 2
+#SB:Kessig Wolfrider (VOW) * 2
+#SB:Dominating Vampire (VOW) * 1
+#SB:Change of Fortune (VOW) * 2

projects/mtg/bin/Res/ai/baka/deck155.txt

@@ -0,0 +1,97 @@
+#NAME:Edgar Markov Commander
+#DESC:Original Deck Concept by DespairFaction (tappedout.net)
+#DESC:Designed for Wagic by Bob
+#HINT:castpriority(commander,creature,*)
+#HINT:alwaysattackwith(Edgar Markov)
+Ancient Tomb (*) * 1
+Asylum Visitor (*) * 1
+Badlands (*) * 1
+Basri's Solidarity (*) * 1
+Bishop's Soldier (*) * 1
+Blackcleave Cliffs (*) * 1
+Blade of the Bloodchief (*) * 1
+Blood Artist (*) * 1
+Blood Burglar (*) * 1
+Blood Crypt (*) * 1
+Bloodfell Caves (*) * 1
+Bloodline Keeper (*) * 1
+Bloodmad Vampire (*) * 1
+Bold Impaler (*) * 1
+Captivating Vampire (*) * 1
+Cathars' Crusade (*) * 1
+Child of Night (*) * 1
+Clifftop Retreat (*) * 1
+Coat of Arms (*) * 1
+Command Tower (*) * 1
+Concealed Courtyard (*) * 1
+Cordial Vampire (*) * 1
+Crescendo of War (*) * 1
+Dark Ritual (*) * 1
+Dragonskull Summit (*) * 1
+Drana, Liberator of Malakir (*) * 1
+Duskborne Skymarcher (*) * 1
+Elenda, the Dusk Rose (*) * 1
+Exquisite Blood (*) * 1 
+Falkenrath Exterminator (*) * 1
+Falkenrath Noble (*) * 1
+Falkenrath Perforator (*) * 1
+Fervor (*) * 1 
+Gift of Estates (*) * 1
+Gifted Aetherborn (*) * 1
+Godless Shrine (*) * 1
+Guul Draz Assassin (*) * 1
+Guul Draz Vampire (*) * 1
+Impact Tremors (*) * 1
+Inspiring Vantage (*) * 1
+Iroas, God of Victory (*) * 1
+Isolated Chapel (*) * 1
+Knight of the Ebon Legion (*) * 1
+Land Tax (*) * 1
+Legion Lieutenant (*) * 1
+Legion's Landing (*) * 1
+Malakir Cullblade (*) * 1
+Martyr of Dusk (*) * 1
+Mountain (*) * 1
+Necropolis Regent (*) * 1
+Nomad Outpost (*) * 1
+Nullpriest of Oblivion (*) * 1
+Orcish Oriflamme (EMA) (*) * 1
+Path of Ancestry (*) * 1
+Path of Bravery (*) * 1
+Plains (*) * 3
+Plateau (*) * 1
+Pulse Tracker (*) * 1
+Purphoros, God of the Forge (*) * 1
+Quag Vampires (*) * 1 
+Ruthless Cullblade (*) * 1
+Sacred Foundry (*) * 1
+Sanctum Seeker (*) * 1
+Scoured Barrens (*) * 1
+Scrubland (*) * 1
+Shadow Alley Denizen (*) * 1
+Skyblade of the Legion (*) * 1
+Skymarcher Aspirant (*) * 1
+Smoldering Marsh (*) * 1
+Sol Ring (*) * 1
+Stensia Masquerade (*) * 1
+Stromkirk Captain (*) * 1
+Stromkirk Noble (*) * 1
+Swamp (ICE) (*) * 4
+Swamp (MIR)  (*) * 4
+Swamp (M20)  (*) * 2
+Throne of the God-Pharaoh (*) * 1
+Tithe (*) * 1
+Unholy Officiant (*) * 1
+Urborg, Tomb of Yawgmoth (*) * 1
+Vampire Cutthroat (*) * 1
+Vampire Interloper (*) * 1
+Vampire Lacerator (*) * 1
+Vampire Neonate (*) * 1
+Vampire of the Dire Moon (*) * 1
+Vampire Socialite  (*) * 1
+Vicious Conquistador (*) * 1
+Vito, Thorn of the Dusk Rose (*) * 1
+Voldaren Stinger (*) * 1
+Whispersilk Cloak (*) * 1
+Wing-Scarred Crag (*) * 1 
+#CMD:Edgar Markov (*) * 1

projects/mtg/bin/Res/ai/baka/deck16.txt

@@ -1,5 +1,5 @@
 #Black/White Deck 10E/RV
-#NAME:Panda Hive
+#NAME:The Hive
 #DESC:When the last living being
 #DESC:succumbs to the terrible blight
 #DESC:the wasps will rise

projects/mtg/bin/Res/ai/baka/deck19.txt

@@ -1,4 +1,4 @@
-#NAME:Elves
+#NAME:Wilt-Leaf Liege
 #DESC:And here you thought you would enjoy
 #DESC:a little trip in the forest...
 #DESC: 

projects/mtg/bin/Res/ai/baka/deck27.txt

@@ -1,4 +1,4 @@
-#NAME:Tsabo
+#NAME:Undead Infiltrator
 #DESC:You may be prepared
 #DESC:for an army of zombies
 #DESC:rising from the graves.

projects/mtg/bin/Res/ai/baka/deck3.txt

@@ -4,94 +4,36 @@
 #DESC:there is no time for dispute
 #DESC:or rivalries
 #DESC:in Eladamri and Gerrard's army
-#2x Black Vise
-1097
-1097
-#2x The Rack
-1139
-1139
-#2x Cockatrice
-1238
-1238
-#2x Craw Wurm
-1239
-1239
-#2x Giant Spider
-1249
-1249
-#2x Grizzly Bears
-1250
-1250
-#2x Ironroot Treefolk
-1253
-1253
-#1x Living Lands 
-1259
-#3x Scryb Sprites
-1264
-1264
-1264
-#4x Shanodin Dryads
-1265
-1265
-1265
-1265
-#2x Thicket Basilisk
-1267
-1267
-#1x War Mammoth 
-1277
-#1x Armageddon
-1328
 # (PSY) 2x Benalish Hero not available any more, removed (deck has still >60 cards)
-#2x Benalish Hero
-#1330
-#1330
-#2x Castle
-1334
-1334
-#2x Crusade
-1341
-1341
 # (PSY) 2x Mesa Pegasus not available any more, removed (deck has still >60 cards)
-#2x Mesa Pegasus
-#1354
-#1354
-#2x Pearled Unicorn
-1356
-1356
-#2x Savannah Lions
-1365
-1365
-#2x Serra Angel
-1366
-1366
-#2x Wrath of God
-1372
-1372
-# Forest (RV)
-1386
-1386
-1386
-1386
-1387
-1387
-1387
-1387
-1388
-1388
-1388
-1388
-# Plains (RV)
-1395
-1395
-1395
-1395
-1396
-1396
-1396
-1396
-1397
-1397
-1397
-1397
+
+# Land(s)
+Forest (8ED) * 13
+Plains (8ED) * 9
+
+# Creature(s)
+Cockatrice (TSB) * 2
+Craw Wurm (9ED) * 2
+Giant Spider (AKH) * 2
+Grizzly Bears (8ED) * 2
+Spitting Spider (8ED) * 2
+Ronom Unicorn (CSP) * 2
+Savannah Lions (A25) * 2
+Scute Mob (ZEN) * 3
+Serra Angel (M13) * 2
+Jukai Messenger (CHK) * 4
+Kessig Recluse (DKA) * 2
+Rhox Charger (ALA) * 1
+
+# Artifact(s)
+Black Vise (V10) * 2
+The Rack (DPA) * 2
+
+# Enchantment(s)
+Builder's Blessing (AVR) * 2
+Crusade (DDF) * 2
+Living Lands (ME4) * 1
+
+# Sorcery(s)
+Armageddon (VMA) * 1
+Wrath of God (8ED) * 2

projects/mtg/bin/Res/ai/baka/deck30.txt

@@ -1,4 +1,4 @@
-#NAME:Elfball
+#NAME:Imperious Vanguard
 #DESC:An endless stream
 #DESC:of elvish warriors
 #DESC:will overwhelm you,
@@ -9,21 +9,23 @@
 #DESC:
 #DESC:You have no chance!
 
-Llanowar Elves (M10) *4
-Wellwisher (ONS) *4
-Elvish Vanguard (ONS) *4
-Elvish Visionary (M10) *4
-Elvish Hexhunter (SHM) *4
-Elvish Promenade (LRW) *4
-Elvish Archdruid (M10) *4
-Imperious Perfect (LRW) *4
-Drove of Elves (SHM) *1
-Heedless One (ONS) *3
-Overrun (10E) *2
-Forest (10E) *4
-Forest (M10) *4
-Forest (ALA) *4
-Forest (LRW) *4
-Forest (RAV) *4
-Pendelhaven (LEG) *1
-Gaea's Cradle (USG) *1
+# Land(s)
+Forest (M12) * 20
+Gaea's Cradle (PRM) * 1
+Pendelhaven (A25) * 1
+
+# Creature(s)
+Drove of Elves (SHM) * 1
+Elvish Archdruid (M10) * 4
+Elvish Hexhunter (SHM) * 4
+Elvish Vanguard (EMA) * 4
+Elvish Visionary (ALA) * 4
+Heedless One (PSAL) * 3
+Imperious Perfect (LRW) * 4
+Llanowar Elves (9ED) * 4
+Wellwisher (C14) * 4
+
+# Sorcery(s)
+Elvish Promenade (LRW) * 4
+Overrun (10E) * 2
+

projects/mtg/bin/Res/ai/baka/deck31.txt

@@ -3,20 +3,26 @@
 #DESC:will sweep through your defenses
 #DESC:while all your forces can do
 #DESC:is watch and gape in awe.
-Angelic Chorus (10E) *3
-Honor of the Pure (M10) *4
-Kitchen Finks (SHM) *4
-Mesa Enchantress (M10) *4
-Moat (LEG) *3
-Pacifism (10E) *4
-Cage of Hands (CHK) *3
-Sigil of the Empty Throne (CFX) *4
-Swords to Plowshares (ICE) *4
-Wrath of God (10E) *3
-Quicksand (10E) *4
-Plains (10E) *4
-Plains (M10) *4
-Plains (ALA) *4
-Plains (LRW) *4
-Plains (RAV) *3
-Serra's Sanctum (USG) *1
+# Land(s)
+Plains (M15) * 19
+Quicksand (WWK) * 4
+Serra's Sanctum (*) * 1
+
+# Creature(s)
+Kitchen Finks (SHM) * 4
+Mesa Enchantress (PLC) * 4
+
+# Enchantment(s)
+Angelic Chorus (10E) * 3
+Cage of Hands (CHK) * 3
+Honor of the Pure (M10) * 4
+Moat (PRM) * 3
+Pacifism (A25) * 4
+Sigil of the Empty Throne (CFX) * 4
+
+# Instant(s)
+Swords to Plowshares (DDF) * 4
+
+# Sorcery(s)
+Wrath of God (10E) * 3
+

projects/mtg/bin/Res/ai/baka/deck32.txt

@@ -3,20 +3,24 @@
 #DESC:and barely present,
 #DESC:but if you let them grow
 #DESC:they will crush your army.
-Crusade (RV) *4
-Glorious Anthem (10E) *4
-Honor of the Pure (M10) *4
-Armored Ascension (M10) *2
-Swords to Plowshares (ICE) *4
-Disenchant (TMP) *3
-Paladin en-Vec (10E) *2
-Knight of Meadowgrain (LRW) *4
-Kitchen Finks (SHM) *3
-Spectral Procession (SHM) *4
-Stillmoon Cavalier (EVE) *3
-Plains (10E) *4
-Plains (M10) *4
-Plains (ALA) *4
-Plains (LRW) *4
-Plains (SHM) *4
-Plains (RAV) *3
+# Land(s)
+Plains (M21) * 23
+
+# Creature(s)
+Kitchen Finks (SHM) * 3
+Knight of Meadowgrain (LRW) * 4
+Paladin en-Vec (10E) * 2
+Stillmoon Cavalier (EVE) * 3
+
+# Enchantment(s)
+Armored Ascension (SHM) * 2
+Crusade (DDF) * 4
+Glorious Anthem (8ED) * 4
+Honor of the Pure (M10) * 4
+
+# Instant(s)
+Disenchant (TPR) * 3
+Swords to Plowshares (DDF) * 4
+
+# Sorcery(s)
+Spectral Procession (SHM) * 4

projects/mtg/bin/Res/ai/baka/deck33.txt

@@ -4,19 +4,24 @@
 #DESC: And we will grow stronger
 #DESC: as you keep losing
 #DESC: your thoughts."
-The Rack (RV) *4
-Doom Blade (M10) *4
-Last Gasp (RAV) *4
-Hymn to Tourach (FEM) *4
-Black Knight (M10) *4
-Hypnotic Specter (10E) *4
-Nyxathid (CFX) *4
-Graveborn Muse (10E) *4
-Tendrils of Corruption (M10) *4   
-Gargoyle Castle (M10) *4
-Volrath's Stronghold (STH) *1
-Swamp (10E) *4
-Swamp (M10) *4
-Swamp (ALA) *4
-Swamp (LRW) *4
-Swamp (RAV) *3
+# Land(s)
+Gargoyle Castle (M10) * 4
+Swamp (M21) * 19
+Volrath's Stronghold (TPR) * 1
+
+# Creature(s)
+Black Knight (M10) * 4
+Graveborn Muse (10E) * 4
+Hypnotic Specter (M10) * 4
+Nyxathid (CFX) * 4
+
+# Artifact(s)
+The Rack (DPA) * 4
+
+# Instant(s)
+Doom Blade (M10) * 4
+Last Gasp (RAV) * 4
+Tendrils of Corruption (TSP) * 4
+
+# Sorcery(s)
+Hymn to Tourach (V13) * 4

projects/mtg/bin/Res/ai/baka/deck34.txt

@@ -1,49 +1,55 @@
 #NAME:Kobold Overlord
-#
 #DESC:"You may think we are weak
 #DESC: But we are many
 #DESC: And sometimes we can hire
 #DESC: A powerful mercenary!"
-#
-Mountain (10E)              *20
-Kher Keep (TSP)             *2 # produces kobold tokens
-Crimson Kobolds (LEG)       *4
-Crookshank Kobolds (LEG)    *4
-Kobold Drill Sergeant (LEG) *4
-Kobold Overlord (LEG)       *4
-Kobold Taskmaster (LEG)     *4
-Kobolds of Kher Keep (LEG)  *4
-Battle Squadron (MRQ)       *2 # to have a flyer in the deck
-Keldon Warlord (RV)         *2
-#   Doesn't fit the theme too well (would a Keldon Warlord really
-#   work as a mercenary for a Kobold Overlord?), but without it
-#   the deck would be too weak, and a deck full of weak
-#   creatures is exactly the environment where a Keldon Warlord
-#   thrives.
-Wheel of Fortune (RV)       *1
-#To get a new hand (hopefully) full of cheap kobolds once the
-#previous hand has been used up. Only 1 because it's
-#restricted.
-Slate of Ancestry (ONS)     *2
-#To draw more cards (check whether the AI overuses it and
-#decks itself out)
-Howling Mine (10E)          *4
-Mob Justice (STH)           *3  # finisher
-#
-#
+
 # Cards considered, but not included:
 # Orcish Oriflamme - would match the deck's focus of
 #   strengthening the creatures, but is too expensive. Perhaps add
 #   it when mana acceleration is possible for this deck.
-#
+
 # Cards removed from he deck:
 # 3 x Bravado (USG) (ID 5848)
 # The card's name and illustration don't really fit the "kobold"
 # theme, but the effect (strength through numbers) definitely
 # does.
 # Removed because the AI casts it on its opponent's creatures.
-#
+
 # 4 x Brightstone Ritual (ONS) (ID 39846)
 # for mana acceleration
 # Removed because the AI doesn't use the mana.
 # Also ... only works with goblins. Duh. *blush*
+
+# Land(s)
+Kher Keep (TSP) * 2 # produces kobold tokens
+Mountain (ONS) * 20 
+
+# Creature(s)
+Battle Squadron (MMQ) * 2
+Crimson Kobolds (ME3) * 4
+Crookshank Kobolds (ME1) * 4
+Keldon Warlord (5ED) * 2
+#   Doesn't fit the theme too well (would a Keldon Warlord really
+#   work as a mercenary for a Kobold Overlord?), but without it
+#   the deck would be too weak, and a deck full of weak
+#   creatures is exactly the environment where a Keldon Warlord
+#   thrives.
+
+Kobold Drill Sergeant (ME3) * 4
+Kobold Overlord (ME3) * 4
+Kobold Taskmaster (ME3) * 4
+Kobolds of Kher Keep (ME3) * 4
+
+# Artifact(s)
+Howling Mine (7ED) * 4
+Slate of Ancestry (ONS) * 2
+#To draw more cards (check whether the AI overuses it and
+#decks itself out)
+
+# Sorcery(s)
+Mob Justice (*) * 3
+Wheel of Fortune (VMA) * 1
+#To get a new hand (hopefully) full of cheap kobolds once the
+#previous hand has been used up. Only 1 because it's
+#restricted.

projects/mtg/bin/Res/ai/baka/deck35.txt

@@ -8,54 +8,30 @@
 #DESC:into a squirming mass
 #DESC:of these small, yet dangerous
 #DESC:... things ...
-#
-#
 
-Winged Sliver (TMP)  *2 # gives Flying
+# Land(s)
+Forest (8ED) * 12
+Island (8ED) * 3
+Mountain (8ED) * 6
+Plains (8ED) * 3
 
-Horned Sliver (TMP)  *3 # gives Trample, also 2/2 isn't bad for a
-#                       # 3-drop creature that others will pump 
+# Creature(s)
+Bonesplitter Sliver (TSP) * 4 # nice cumulative +2/+0 bonus
+Crystalline Sliver (H09) * 1  # Shroud is nice, especially in a deck with no non-creature spells
+Fury Sliver (TSP) * 2         # gives double strike, only 2 because it's a 6-drop creature
+Gemhide Sliver (TSP) * 4      # Additional mana source to get Might Slivers out faster
+Heart Sliver (H09) * 2        # gives Haste
+Horned Sliver (TPR) * 3       # gives Trample, also 2/2 isn't bad for a 3-drop creature that others will pump
+Might Sliver (TSP) * 4        # nice cumulative +2/+2 bonus
+Muscle Sliver (H09) * 4       # cheap and the +1/+1 bonus is cumulative and can't be misused by the AI
+Shadow Sliver (TSP) * 1       # might be great or bad - thrown in as an element of surprise
+Spined Sliver (H09) * 2       # gives Rampage
+Spinneret Sliver (TSP) * 3    # 2/2 Sliver for only 2 mana, also gives Reach to all slivers, which is good because we only have
+#                             # two Winged Slivers in the deck, and those might not even be played because we have few Islands.
+Talon Sliver (*) * 3          # gives First Strike
+Watcher Sliver (TSP) * 1      # nice cumulative +0/+2 bonus, but too expensive to have more of them, and we have 3 plains in the deck
+Winged Sliver (H09) * 2       # gives Flying
 
-Muscle Sliver (TMP)  *4 # cheap and the +1/+1 bonus is cumulative
-#                       # and can't be misused by the AI
-
-Heart Sliver (TMP)   *2 # gives Haste
-
-Talon Sliver (TMP)   *3 # gives First Strike
-
-Watcher Sliver (TSP) *1 # nice cumulative +0/+2 bonus, but too
-#                       # expensive to have more of them, and we
-#                       # only have 3 plains in the deck
-
-Shadow Sliver (TSP) *1  # might be great or bad - thrown in as
-#                       # an element of surprise
-
-Crystalline Sliver (STH) *1 # Shroud is nice, especially in a
-#                           # deck with no non-creature spells
-
-Bonesplitter Sliver (TSP) *4  # nice cumulative +2/+0 bonus
-
-Fury Sliver (TSP) *2    # gives double strike, only 2 because
-#                       # it's a 6-drop creature
-
-Might Sliver (TSP) *4   # nice cumulative +2/+2 bonus
-#
-Spined Sliver (STH) *2  # gives Rampage
-
-Spinneret Sliver (TSP) *3  # 2/2 Sliver for only 2 mana, also
-# gives Reach to all slivers, which is good because we only have
-# two Winged Slivers in the deck, and those might not even be
-# played because we have few Islands.
-
-Gemhide Sliver (TSP) *4 # Additional mana source to get Might
-#                       # Slivers out faster
-
-Forest (M10)   *12      # (most slivers in the deck are green)
-Island (M10)   *3       # only 4 blue creatures in the deck
-Mountain (M10) *6
-Plains (M10)   *3       # only 5 white creatures in the deck
-
-#
 # Cards considered, but not included:
 # Basal Sliver - AI too eager to sacrifice
 # Clot Sliver - would be the only black sliver left after Basal

projects/mtg/bin/Res/ai/baka/deck36.txt

@@ -1,53 +1,7 @@
 #NAME:Master of Ether
-#
 #DESC:"Surrounded by the things I built
 #DESC: my power will grow
 #DESC: boundlessly."
-#
-
-Master of Etherium (ALA) *4  # gets stronger with every artifact
-
-Vedalken Archmage (MRD)  *2  # draws card when summoning artifact
-
-Ornithopter (10E)        *4  # cheap artifact, later air defense
-Nuisance Engine (MRD)    *4  # create more cheap artifacts
-
-Cathodion (MRD)          *4  # 3-drop 3/3 creature without a down-
-#                            # side since manaburn was abolished
-
-Steel Wall (MRD)         *2  # mainly for defending
-Yotian Soldier (MRD)     *2  # cheap defender
-
-Coiled Tinviper (TMP)    *1  # first strike attacker
-
-Scarecrone (EVE)         *2  # brings back artifacts
-
-Glaze Fiend (ALA)        *2  # temp. bonus for playing artifacts
-
-Salvage Slasher (CFX)    *2  # grows stronger with artifacts in
-#                            # graveyard - nice effect if opponent
-#                            # has destroyed all artifacts
-
-Silver Myr (MRD)         *4  # artifact source of blue mana (which
-#                            # is needed for the 6 Vedalken)
-
-Akroma's Memorial (FUT)  *2  # massive bonuses incl. Trample
-
-
-Island (10E)             *3  # more blue mana
-
-Seat of the Synod (MRD)  *4  # 20 artifact lands for huge bonuses
-Vault of Whispers (MRD)  *4  # on Master of Etherium and Tolarian
-Great Furnace (MRD)      *4  # Academy.
-Tree of Tales (MRD)      *4
-Ancient Den (MRD)        *4
-
-Academy Ruins (TSP)      *1  # brings back artifacts
-
-Tolarian Academy (USG)   *1  # Generates massive amounts of mana
-#                            # in this deck - which the AI usually
-#                            # wastes.
-
 
 # Cards considered, but not included:
 # Gaea's Cradle - would make the deck even stronger, but doesn't
@@ -55,3 +9,30 @@ Tolarian Academy (USG)   *1  # Generates massive amounts of mana
 #
 # Cards removed from the deck:
 # Sculpting Steel - reported to lead to crashes
+
+# Land(s)
+Ancient Den (MRD) * 4        # 20 artifact lands for huge bonuses on Master of Etherium and Tolarian Academy.
+Great Furnace (MRD) * 4
+Seat of the Synod (MRD) * 4
+Tree of Tales (MRD) * 4
+Vault of Whispers (MRD) * 4
+Academy Ruins (TSP) * 1      # brings back artifacts
+Tolarian Academy (VMA) * 1   # Generates massive amounts of mana in this deck - which the AI usually wastes.
+Island (10E) * 3
+
+# Creature(s)
+Cathodion (C14) * 4          # 3-drop 3/3 creature without a down-side since manaburn was abolished
+Coiled Tinviper (TPR) * 1    # first strike attacker
+Glaze Fiend (ALA) * 2        # temp. bonus for playing artifacts
+Master of Etherium (ALA) * 4 # gets stronger with every artifact
+Ornithopter (MRD) * 4        # cheap artifact, later air defense
+Salvage Slasher (CFX) * 2    # grows stronger with artifacts in graveyard - nice effect if opponent has destroyed all artifacts
+Scarecrone (EVE) * 2         # brings back artifacts
+Silver Myr (MRD) * 4         # artifact source of blue mana (which is needed for the 6 Vedalken)
+Steel Wall (MRD) * 2         # mainly for defending
+Vedalken Archmage (MRD) * 2  # draws card when summoning artifact
+Yotian Soldier (MRD) * 2     # cheap defender
+
+# Artifact(s)
+Akroma's Memorial (FUT) * 2  # massive bonuses incl. Trample
+Nuisance Engine (MRD) * 4    # create more cheap artifacts

projects/mtg/bin/Res/ai/baka/deck37.txt

@@ -1,4 +1,4 @@
-#NAME:Kinsb. Cavalier
+#NAME:Kinsbaile Cavalier
 #DESC:The knights on their steeds
 #DESC:and the knights from the sky
 #DESC:unite

projects/mtg/bin/Res/ai/baka/deck38.txt

@@ -2,20 +2,25 @@
 #DESC:If you ever thought
 #DESC:  that YOU had bad dreams ...
 #DESC:Wait until you meet these.
-Black Vise (RV) *1
-Wheel of Fortune (RV) *1
-Howling Mine (M10) *4
-Underworld Dreams (10E) *4
-Spiteful Visions (SHM) *4
-Sudden Impact (10E) *4
-Font of Mythos (CFX) *2
-Damnation (PLC) *4
-Infest (ALA) *4
-Lightning Bolt (M10) *4
-Terminate (ARB) *4
-Swamp (RAV) *4
-Swamp (TSP) *4
-Swamp (LRW) *4
-Swamp (ALA) *4
-Mountain (RAV) *4
-Mountain (TSP) *4
+# Land(s)
+Mountain (M10) * 8
+Swamp (M10) * 16
+
+# Artifact(s)
+Black Vise (V10) * 1
+Font of Mythos (CFX) * 2
+Howling Mine (8ED) * 4
+
+# Enchantment(s)
+Spiteful Visions (SHM) * 4
+Underworld Dreams (8ED) * 4
+
+# Instant(s)
+Lightning Bolt (M10) * 4
+Sudden Impact (8ED) * 4
+Terminate (ARB) * 4
+
+# Sorcery(s)
+Damnation (PLC) * 4
+Infest (ALA) * 4
+Wheel of Fortune (VMA) * 1

projects/mtg/bin/Res/ai/baka/deck46.txt

@@ -1,4 +1,4 @@
-#NAME:AshenmoorCohort
+#NAME:Ashenmoor Cohort
 #
 #DESC: How does it feel
 #DESC: to be dead

projects/mtg/bin/Res/ai/baka/deck51.txt

@@ -1,4 +1,4 @@
-#NAME:Mindwracked
+#NAME:Mind Wracked
 #DESC:"What was it, what was it ... I know
 #DESC: there was something I wanted to tell
 #DESC: you. Or was it something you wanted

projects/mtg/bin/Res/ai/baka/deck53.txt

@@ -1,4 +1,4 @@
-#NAME:VampireViscounts
+#NAME:Ascendant Bloodwitch
 #DESC:Oh to sink one's teeth
 #DESC:into the warm softness
 #DESC:of pulsating flesh!

projects/mtg/bin/Res/ai/baka/deck55.txt

@@ -1,4 +1,4 @@
-#NAME:Red Cats
+#NAME:Wild Cats
 #DESC:Ferocious predators
 #DESC:descend from the mountains,
 #DESC:lured down

projects/mtg/bin/Res/ai/baka/deck60.txt

@@ -1,4 +1,4 @@
-#NAME:No Bushwhacker
+#NAME:No Bushwhacked
 #DESC:"Attack! Heal! Attack! Heal!
 #DESC: And again and again and again.
 #DESC: Oh, how I miss my days

projects/mtg/bin/Res/ai/baka/deck61.txt

@@ -1,4 +1,4 @@
-#NAME:Tarmac
+#NAME:The Tarmack
 #DESC:How does it feel
 #DESC:being stripped to the rack
 #DESC:while Tarmogoyf licks

projects/mtg/bin/Res/ai/baka/deck65.txt

@@ -1,4 +1,4 @@
-#NAME:Token Terror
+#NAME:Soul Blossom Procession
 #DESC:"Beware!
 #DESC: they come from everywhere!"
 #DESC: