Added/fixed primitives.

Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+dist: trusty
 branches:
   except:
     - latest-master
@@ -9,16 +10,16 @@ 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 -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
@@ -31,9 +32,11 @@ before_install:
 # 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,16 @@ 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;
   fi
+- sudo python -m easy_install --upgrade 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 +61,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;

CHANGELOG.md

@@ -1,6 +1,37 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 8/3/16
+- *Merged pull-request:* andAbility on ATokenCreator, Extend AAFlip [#\824] (https://github.com/WagicProject/wagic/pull/824) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/31/16
+- *Merged pull-request:* Fix Chandra, Flamecaller & Cryptolith Rite [#\818] (https://github.com/WagicProject/wagic/pull/818) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/28/16
+- *Merged pull-request:* changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. [#\800] (https://github.com/WagicProject/wagic/pull/800) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/26/16
+- *Merged pull-request:* granted flashback [#\791] (https://github.com/WagicProject/wagic/pull/791) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/23/16
+- *Merged pull-request:* Fix Flying vs Moat (multiples of them). Fixes issue #526 [#\783] (https://github.com/WagicProject/wagic/pull/783) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/19/16
+- *Merged pull-request:* pushing to master [#\770] (https://github.com/WagicProject/wagic/pull/770) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/18/16
+- *Merged pull-request:* Fix Deck Menu layer, Change Main Menu Layout, Fix Crash cdaactive on tokens [#\765] (https://github.com/WagicProject/wagic/pull/765) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/12/16
+- *Merged pull-request:* Pushing fixes [#\750] (https://github.com/WagicProject/wagic/pull/750) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* try to fix failed logic here [#\747] (https://github.com/WagicProject/wagic/pull/747) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/9/16
+- *Merged pull-request:* pushing to master [#\738] (https://github.com/WagicProject/wagic/pull/738) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\736] (https://github.com/WagicProject/wagic/pull/736) ([kevlahnota](https://github.com/kevlahnota))
+
 #### 7/7/16
 - *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
 

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/DebugRoutines.h

@@ -18,9 +18,9 @@ using namespace std;
 template <class T>
 std::string ToHex(T* pointer)
 {
-    std::ostringstream stream;
-    stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
-    return stream.str();
+	std::ostringstream stream;
+	stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
+	return stream.str();
 }
 
 #ifdef LINUX
@@ -42,9 +42,9 @@ std::string ToHex(T* pointer)
 #else // CAPTURE_STDERR
 #define DebugTrace(inString)								\
 {															\
-  std::ostringstream stream;								\
-  stream << inString;					    \
-  qDebug("%s", stream.str().c_str()); \
+	std::ostringstream stream;								\
+	stream << inString;					    \
+	qDebug("%s", stream.str().c_str()); \
 }
 #endif // CAPTURE_STDERR
 
@@ -52,16 +52,16 @@ std::string ToHex(T* pointer)
 #include <android/log.h>
 #define DebugTrace(inString)								\
 {															\
-  std::ostringstream stream;								\
-  stream << inString;					    \
-  __android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
+	std::ostringstream stream;								\
+	stream << inString;					    \
+	__android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
 }
 #else
 #define DebugTrace(inString)								\
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-  OutputDebugStringA(stream.str().c_str());  \
+	OutputDebugStringA(stream.str().c_str());  \
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux
@@ -71,7 +71,7 @@ std::string ToHex(T* pointer)
 #ifndef DebugTrace
 #define DebugTrace(inString)								\
 {															\
-  std::cerr << inString << std::endl;					    \
+	std::cerr << inString << std::endl;					    \
 }
 #endif //DEBUG
 #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("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,7 +257,8 @@ u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
             keyBinds.erase(er);
         }
         else ++it;
-        return keyBinds.size();
+    }
+    return keyBinds.size();
 }
 
 u32 JGE::UnbindKey(LocalKeySym sym)
@@ -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/JGui.cpp

@@ -197,7 +197,7 @@ bool JGuiController::CheckUserInput(JButton key)
                     mObjects[mCurr]->Entering();
                 }
                 mEngine->LeftClickedProcessed();
-				mEngine->ResetInput();
+                mEngine->ResetInput();
                 return true;
             }
             mEngine->LeftClickedProcessed();

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,8 +143,16 @@ 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();
+                }
             }
         }
 
@@ -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

@@ -184,7 +184,13 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
             const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
             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,7 +96,8 @@ hgeParticleSystem::hgeParticleSystem(hgeParticleSystemInfo *psi)
 {
   //hge=hgeCreate(HGE_VERSION);
 
-  memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
+	if (psi)
+		memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
 
   vecLocation.x=vecPrevLocation.x=0.0f;
   vecLocation.y=vecPrevLocation.y=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

JGE/src/zipFS/zfsystem.cpp

@@ -631,8 +631,8 @@ streamoff filesystem::CentralDirZipped(std::istream & File, std::streamoff begin
     std::streamoff eof = begin + size;
 
 	// Look for the "end of central dir" header. Start minimum 22 bytes before end.
-    if (! File.seekg(eof - 22, ios::beg))
-        return -1;
+	if (! File.seekg(eof - 22, ios::beg))
+		return -1;
 
 	streamoff EndPos;
 	streamoff StartPos = File.tellg();

JGE/src/zipFS/zfsystem.h

@@ -258,8 +258,8 @@ inline void izfstream::open(const char * FilePath, filesystem * pFS) {
     if (pFS)
         m_pFS = pFS;
 
-	if (m_pFS != NULL)
-		m_pFS->Open(* this, FilePath);
+    if (m_pFS != NULL)
+        m_pFS->Open(* this, FilePath);
 }
 
 inline void izfstream::close() {

JGE/src/zipFS/zstream.cpp

@@ -76,8 +76,8 @@ bool zbuffer::use(std::streamoff Offset, std::streamoff Size)
 		return false;
 
     //Don't use a buffer already used;
-    if (m_Used)
-        return false;
+	if (m_Used)
+		return false;
 
 	// adjust file position
 	if (! m_ZipFile.seekg(Offset, ios::beg))

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.com/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">
-            <intent-filter>
-                <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"/>
-</manifest>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<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" />
+      </intent-filter>
+    </activity>
+  </application>
+  <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();
@@ -35,90 +35,90 @@ public class DeckImporter
                     while (scanner.hasNext()) 
                     {
                         String line = scanner.nextLine();
-						line = line.trim();
-						if (!line.equals("")) // don't write out blank lines
-						{
-							String[] slines = line.split("\\s+");
-							String arranged = "";
-							for(int idx = 1; idx < slines.length; idx++)
-							{
-								arranged += slines[idx] + " ";
-							}
-							if ((isNumeric(slines[0])) && arranged != null)
-							{							
-								if (slines[1] != null && slines[1].startsWith("["))
-								{
-									arranged = arranged.substring(5);
-									slines[1] = slines[1].replaceAll("\\[", "").replaceAll("\\]","");
-									deck += arranged + " (" + renameSet(slines[1]) + ") * " + slines[0] + "\n";
-								}
-								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())
-							{
-								//save deck
-								int countdeck = 1;
-								File[] files = rootProfiles.listFiles();
-								for (int i = 0; i < files.length; i++)
-								{//check if there is available deck...
-									if(files[i].getName().startsWith("deck"))
-                                       countdeck++;
-								}
-								File toSave = new File(rootProfiles+"/deck"+countdeck+".txt");
-								try 
-								{
-									FileOutputStream fop = new FileOutputStream(toSave);
-                                   
-									// if file doesn't exists, then create it
-									if (!toSave.exists()) {
-                                       toSave.createNewFile();
-									}
-										// get the content in bytes
-									byte[] contentInBytes = deck.getBytes();
-									fop.write(contentInBytes);
-									fop.flush();
-									fop.close();
-									message = "Import Deck Success!\n\n"+deck;
-								} 
-								catch (IOException e) 
-								{
-									message = e.getMessage();
-								}
-							}
-							else
-							{
-								message = "Missing Folder!";
-							}
-						}
-					}
-					else
-					{
-						message = "Invalid Profile!";
-					}
-				}
-				else
-				{
-					message = "No errors, and file EMPTY";
-				}
-			}
-			catch(IOException e)
-			{
-				message = e.getMessage();
-			}
-		}
-		return message;
+                        line = line.trim();
+                        if (line.equals("")) {
+                            line = scanner.nextLine();
+                            if (line.equals("")) {
+                                line = scanner.nextLine();
+                                prefix = "#SB:"; // Sideboard started from next card (we assumed that 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++)
+                            {
+                                arranged += slines[idx] + " ";
+                            }
+                            if ((isNumeric(slines[0])) && arranged != null)
+                            {
+                                if (slines[1] != null && slines[1].startsWith("["))
+                                {
+                                    arranged = arranged.substring(5);
+                                    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
+                        rootDecks = new File(activePath + "/User/player/");
+                    if (rootDecks.exists() && rootDecks.isDirectory())
+                    {
+                        //save deck
+                        int countdeck = 1;
+                        File[] files = rootDecks.listFiles();
+                        for (int i = 0; i < files.length; i++)
+                        {//check if there is available deck...
+                            if (files[i].getName().startsWith("deck"))
+                                countdeck++;
+                        }
+                        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())
+                            {
+                                toSave.createNewFile();
+                            }
+                            // get the content in bytes
+                            byte[] contentInBytes = deck.getBytes();
+                            fop.write(contentInBytes);
+                            fop.flush();
+                            fop.close();
+                            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
+                    {
+                        message = "Problem opening decks folder: " + rootDecks.getAbsolutePath();
+                    }
+                } else
+                {
+                    message = "No errors, and file EMPTY";
+                }
+            } catch (IOException e)
+            {
+                message = e.getMessage();
+            }
+        }
+        return message;
     }
       
     private static boolean isNumeric(String input)
@@ -133,7 +133,7 @@ public class DeckImporter
         }
         return true;
     }
-    
+
     private static String getActiveProfile(File mypath)
     {
         String name = "";
@@ -147,16 +147,16 @@ public class DeckImporter
                 }
                 else
                 {
-                    return "Missing!";
+                    return "Default";
                 }
             }
             catch(IOException e)
             {
-                return "Missing!";
+                return "Default";
             }
         return name;
     }
-    
+
     private static String renameSet(String set)
     {
         if (set == "")
@@ -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);
         }
     }
@@ -174,15 +185,18 @@ public class StorageOptions
     {
         /*
          * Sometimes the two lists of mount points will be different. We only want those mount points that are in both list.
-         * 
+         *
          * Compare the two lists together and remove items that are not in both lists.
          */
 
-        for (int i = 0; i < mMounts.size(); i++)
+        if (mVold.size() > 0)
         {
-            String mount = mMounts.get(i);
-            if (!mVold.contains(mount))
-                mMounts.remove(i--);
+            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
@@ -204,9 +218,10 @@ public class StorageOptions
             if (!root.exists() || !root.isDirectory() || !root.canWrite())
                 mMounts.remove(i--);
         }
-        
+
         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"));
@@ -224,7 +239,7 @@ public class StorageOptions
                     }
                 }
             }
-            
+
             if (System.getenv("SECONDARY_STORAGE") != null)
             {
                 File root = new File(System.getenv("SECONDARY_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,84 +327,97 @@ public class StorageOptions
     *
     * @return <code>true</code> if the device is rooted, <code>false</code> otherwise.
     */
-    public static boolean isRooted() {
-
-    // get from build info
-    String buildTags = android.os.Build.TAGS;
-    if (buildTags != null && buildTags.contains("test-keys")) {
-      return true;
-    }
-
-    // check if /system/app/Superuser.apk is present
-    try {
-      File file = new File("/system/app/Superuser.apk");
-      if (file.exists()) {
-        return true;
-      }
-    } 
-    catch (Exception e1) {
-      // ignore
-    }
-    try {
-      File file = new File("/system/app/Superuser/Superuser.apk");
-      if (file.exists()) {
-        return true;
-      }
-    } 
-    catch (Exception e1) {
-      // ignore
-    }
-    //SuperSU
-    try {
-      File file = new File("/system/app/SuperSU.apk");
-      if (file.exists()) {
-        return true;
-      }
-    } 
-    catch (Exception e1) {
-      // ignore
-    }
-    try {
-      File file = new File("/system/app/SuperSU/SuperSU.apk");
-      if (file.exists()) {
-        return true;
-      }
-    } 
-    catch (Exception e1) {
-      // ignore
-    }
-    // try executing commands
-    return canExecuteCommand("/system/xbin/which su")
-        || canExecuteCommand("/system/bin/which su") || canExecuteCommand("which su");
-    }
-
-    // executes a command on the system
-    private static boolean canExecuteCommand(String command) {
-    boolean executedSuccesfully;
-    try {
-      Runtime.getRuntime().exec(command);
-      executedSuccesfully = true;
-    } 
-    catch (Exception e) {
-      executedSuccesfully = false;
-    }
-
-    return executedSuccesfully;
-    }
-    
-    private static boolean findForcemount(){
-    try 
+    public static boolean isRooted()
     {
-        File file = new File(System.getenv("EXTERNAL_STORAGE")+"/forcemount");
-        if (file.exists()) 
+        // get from build info
+        String buildTags = android.os.Build.TAGS;
+        if (buildTags != null && buildTags.contains("test-keys"))
         {
             return true;
         }
-    } 
-    catch (Exception e1) 
+
+        // check if /system/app/Superuser.apk is present
+        try
+        {
+            File file = new File("/system/app/Superuser.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        try
+        {
+            File file = new File("/system/app/Superuser/Superuser.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        //SuperSU
+        try
+        {
+            File file = new File("/system/app/SuperSU.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        try
+        {
+            File file = new File("/system/app/SuperSU/SuperSU.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        // try executing commands
+        return canExecuteCommand("/system/xbin/which su")
+                || canExecuteCommand("/system/bin/which su") || canExecuteCommand("which su");
+    }
+
+    // executes a command on the system
+    private static boolean canExecuteCommand(String command)
     {
+        boolean executedSuccesfully;
+        try
+        {
+            Runtime.getRuntime().exec(command);
+            executedSuccesfully = true;
+        } catch (Exception e)
+        {
+            executedSuccesfully = false;
+        }
+
+        return executedSuccesfully;
+    }
+
+    private static boolean findForcemount()
+    {
+        Log.d(TAG, "findForcemount()");
+        try
+        {
+            File file = new File(System.getenv("EXTERNAL_STORAGE") + "/forcemount");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e)
+        {
+            Log.w(TAG, e.getMessage());
+            return false;
+        }
         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
@@ -74,19 +73,36 @@ 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 +126,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/deck101.txt

@@ -1,19 +1,19 @@
-#NAME:Herdsmen
-Aurochs	 (ICE) *4
-Brushwagg	 (MIR) *2
-Birds of Paradise	 (7ED) *4
-Snorting Gahr	 (MRQ) *1
-Aggressive Urge	 (INV) *4
-Blanchwood Armor	 (8ED) *4
-Bull Aurochs	 (CSP) *4
-Boreal Druid	 (CSP) *4
-Aurochs Herd	 (CSP) *4
-Timbermaw Larva	 (ZEN) *4
-Bramble Creeper	 (M10) *2
-Awakening Zone	 (ROE) *4
-Beastmaster Ascension	 (ZEN) *4
-Forest	 (M11) *4
-Forest	 (SOM) *4
-Forest	 (SOM) *4
-Forest	 (SOM) *4
-Forest	 (SOM) *4
+#NAME:Herdsmen
+Aurochs	 (ICE) *4
+Brushwagg	 (MIR) *2
+Birds of Paradise	 (7ED) *4
+Snorting Gahr	 (MRQ) *1
+Aggressive Urge	 (INV) *4
+Blanchwood Armor	 (8ED) *4
+Bull Aurochs	 (CSP) *4
+Boreal Druid	 (CSP) *4
+Aurochs Herd	 (CSP) *4
+Timbermaw Larva	 (ZEN) *4
+Bramble Creeper	 (M10) *2
+Awakening Zone	 (ROE) *4
+Beastmaster Ascension	 (ZEN) *4
+Forest	 (M11) *4
+Forest	 (SOM) *4
+Forest	 (SOM) *4
+Forest	 (SOM) *4
+Forest	 (SOM) *4

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

@@ -1,26 +1,26 @@
-#NAME:The KOR
-#DESC:The Kor never stand down.Golem-Skin Gauntlets	 (MRD) *1
-Plains	 (8ED) *4
-Plains	 (8ED) *4
-Bonesplitter	 (MRD) *2
-Vulshok Battlegear	 (MRD) *1
-Plains	 (MRD) *4
-Plains	 (MRD) *4
-Plains	 (MRD) *4
-Cranial Plating	 (5DN) *2
-Skyhunter Skirmisher	 (5DN) *2
-Paradise Mantle	 (5DN) *2
-Shuko	 (BOK) *2
-Umezawa's Jitte	 (BOK) *2
-Kor Duelist	 (ZEN) *2
-Spidersilk Net	 (ZEN) *1
-Bone Saw	 (CFX) *2
-Armament Master	 (ZEN) *3
-Lone Missionary	 (ROE) *2
-Pennon Blade	 (ROE) *1
-Kor Line-Slinger	 (ROE) *2
-Kitesail Apprentice	 (WWK) *2
-Stoneforge Mystic	 (WWK) *2
-Accorder's Shield	 (SOM) *2
-Swords to Plowshares	 (EVT) *2
-Kor Hookmaster	 (EVT) *2
+#NAME:The KOR
+#DESC:The Kor never stand down.Golem-Skin Gauntlets	 (MRD) *1
+Plains	 (8ED) *4
+Plains	 (8ED) *4
+Bonesplitter	 (MRD) *2
+Vulshok Battlegear	 (MRD) *1
+Plains	 (MRD) *4
+Plains	 (MRD) *4
+Plains	 (MRD) *4
+Cranial Plating	 (5DN) *2
+Skyhunter Skirmisher	 (5DN) *2
+Paradise Mantle	 (5DN) *2
+Shuko	 (BOK) *2
+Umezawa's Jitte	 (BOK) *2
+Kor Duelist	 (ZEN) *2
+Spidersilk Net	 (ZEN) *1
+Bone Saw	 (CFX) *2
+Armament Master	 (ZEN) *3
+Lone Missionary	 (ROE) *2
+Pennon Blade	 (ROE) *1
+Kor Line-Slinger	 (ROE) *2
+Kitesail Apprentice	 (WWK) *2
+Stoneforge Mystic	 (WWK) *2
+Accorder's Shield	 (SOM) *2
+Swords to Plowshares	 (EVT) *2
+Kor Hookmaster	 (EVT) *2

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

@@ -1,37 +1,37 @@
-#NAME:Smoke and mirrors
-Order of the Ebon Hand	 (FEM) *2
-Combat Medic	 (FEM) *1
-Combat Medic	 (FEM) *1
-Combat Medic	 (FEM) *1
-Sanctum Custodian	 (USG) *2
-False Prophet	 (UDS) *1
-Revered Elder	 (MRQ) *1
-Hallowed Healer	 (ODY) *1
-Beloved Chaplain	 (ODY) *2
-Ancestor's Chosen	 (JUD) *1
-Battlefield Medic	 (ONS) *1
-Rotlung Reanimator	 (ONS) *4
-Doubtless One	 (ONS) *2
-Glowrider	 (LGN) *2
-Aven Redeemer	 (LGN) *1
-Edgewalker	 (SCG) *2
-Vile Deacon	 (LGN) *2
-Master Healer	 (8ED) *1
-Auriok Champion	 (5DN) *2
-Swamp	 (UNH) *3
-Master Healer	 (9ED) *1
-Godless Shrine	 (GPT) *3
-Disciple of Tevesh Szat	 (CSP) *2
-Blightspeaker	 (PLC) *2
-True Believer	 (10E) *1
-Soul Warden	 (10E) *1
-Icatian Priest	 (10E) *1
-Platinum Angel	 (10E) *1
-Soul's Attendant	 (ROE) *1
-Plains	 (ZEN) *3
-Plains	 (ZEN) *2
-Plains	 (ZEN) *2
-Plains	 (ZEN) *3
-Swamp	 (ZEN) *3
-Swamp	 (ZEN) *3
-Shepherd of Rot	 (HOP) *2
+#NAME:Smoke and mirrors
+Order of the Ebon Hand	 (FEM) *2
+Combat Medic	 (FEM) *1
+Combat Medic	 (FEM) *1
+Combat Medic	 (FEM) *1
+Sanctum Custodian	 (USG) *2
+False Prophet	 (UDS) *1
+Revered Elder	 (MRQ) *1
+Hallowed Healer	 (ODY) *1
+Beloved Chaplain	 (ODY) *2
+Ancestor's Chosen	 (JUD) *1
+Battlefield Medic	 (ONS) *1
+Rotlung Reanimator	 (ONS) *4
+Doubtless One	 (ONS) *2
+Glowrider	 (LGN) *2
+Aven Redeemer	 (LGN) *1
+Edgewalker	 (SCG) *2
+Vile Deacon	 (LGN) *2
+Master Healer	 (8ED) *1
+Auriok Champion	 (5DN) *2
+Swamp	 (UNH) *3
+Master Healer	 (9ED) *1
+Godless Shrine	 (GPT) *3
+Disciple of Tevesh Szat	 (CSP) *2
+Blightspeaker	 (PLC) *2
+True Believer	 (10E) *1
+Soul Warden	 (10E) *1
+Icatian Priest	 (10E) *1
+Platinum Angel	 (10E) *1
+Soul's Attendant	 (ROE) *1
+Plains	 (ZEN) *3
+Plains	 (ZEN) *2
+Plains	 (ZEN) *2
+Plains	 (ZEN) *3
+Swamp	 (ZEN) *3
+Swamp	 (ZEN) *3
+Shepherd of Rot	 (HOP) *2

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

@@ -1,29 +1,29 @@
-#NAME:Kill by Numbers
-#DESC:They just keep multiplying.
-#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
-#HINT:dontattackwith(Rhys the Redeemed)
-#HINT:dontblockwith(Rhys the Redeemed)
-#HINT:dontattackwith(Kazandu Tuskcaller)
-#HINT:dontblockwith(Kazandu Tuskcaller)
-
-Mox Emerald	 (LEA) *2
-Mox Pearl	 (LEA) *2
-Forest	 (LEA) *15
-Plains	 (LEA) *8
-Marble Diamond	 (MIR) *2
-Blazing Archon	 (*) *2
-Serra's Sanctum	 (USG) *1
-Gaea's Cradle	 (USG) *2
-Rofellos, Llanowar Emissary	 (UDS) *2
-Beacon of Creation	 (5DN) *2
-Honden of Life's Web	 (CHK) *2
-Kabira Vindicator	 (*) *2
-Rhys the Redeemed	 (SHM) *2
-Fable of Wolf and Owl	 (EVE) *2
-Murkfiend Liege	 (EVE) *2
-Creakwood Liege	 (EVE) *2
-Spawnwrithe	 (SHM) *2
-Awakening Zone	 (ROE) *3
-Kazandu Tuskcaller	 (ROE) *2
-Conqueror's Pledge	 (ZEN) *2
-Bestial Menace	 (WWK) *2
+#NAME:Kill by Numbers
+#DESC:They just keep multiplying.
+#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
+#HINT:dontattackwith(Rhys the Redeemed)
+#HINT:dontblockwith(Rhys the Redeemed)
+#HINT:dontattackwith(Kazandu Tuskcaller)
+#HINT:dontblockwith(Kazandu Tuskcaller)
+
+Mox Emerald	 (LEA) *2
+Mox Pearl	 (LEA) *2
+Forest	 (LEA) *15
+Plains	 (LEA) *8
+Marble Diamond	 (MIR) *2
+Blazing Archon	 (*) *2
+Serra's Sanctum	 (USG) *1
+Gaea's Cradle	 (USG) *2
+Rofellos, Llanowar Emissary	 (UDS) *2
+Beacon of Creation	 (5DN) *2
+Honden of Life's Web	 (CHK) *2
+Kabira Vindicator	 (*) *2
+Rhys the Redeemed	 (SHM) *2
+Fable of Wolf and Owl	 (EVE) *2
+Murkfiend Liege	 (EVE) *2
+Creakwood Liege	 (EVE) *2
+Spawnwrithe	 (SHM) *2
+Awakening Zone	 (ROE) *3
+Kazandu Tuskcaller	 (ROE) *2
+Conqueror's Pledge	 (ZEN) *2
+Bestial Menace	 (WWK) *2

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

@@ -1,28 +1,28 @@
-#NAME:Infected wounds
-Forest	 (UGL) *4
-Forest	 (ALA) *1
-Forest	 (ALA) *1
-Forest	 (M10) *1
-Forest	 (M10) *1
-Necropede	 (SOM) *2
-Contagious Nim	 (SOM) *2
-Blight Mamba	 (SOM) *2
-Ichor Rats	 (SOM) *2
-Ichorclaw Myr	 (SOM) *4
-Blackcleave Goblin	 (SOM) *2
-Corpse Cur	 (SOM) *2
-Forest	 (ZEN) *4
-Forest	 (ZEN) *3
-Forest	 (ZEN) *4
-Forest	 (ZEN) *2
-Swamp	 (HOP) *3
-Cystbearer	 (SOM) *2
-Tel-Jilad Fallen	 (SOM) *2
-Swamp	 (ROE) *4
-Swamp	 (ROE) *3
-Swamp	 (ROE) *4
-Putrefax	 (SOM) *2
-Plague Stinger	 (SOM) *2
-Relic Putrescence	 (SOM) *2
-Skithiryx, the Blight Dragon	 (SOM) *2
-Hand of the Praetors	 (SOM) *2
+#NAME:Infected wounds
+Forest	 (UGL) *4
+Forest	 (ALA) *1
+Forest	 (ALA) *1
+Forest	 (M10) *1
+Forest	 (M10) *1
+Necropede	 (SOM) *2
+Contagious Nim	 (SOM) *2
+Blight Mamba	 (SOM) *2
+Ichor Rats	 (SOM) *2
+Ichorclaw Myr	 (SOM) *4
+Blackcleave Goblin	 (SOM) *2
+Corpse Cur	 (SOM) *2
+Forest	 (ZEN) *4
+Forest	 (ZEN) *3
+Forest	 (ZEN) *4
+Forest	 (ZEN) *2
+Swamp	 (HOP) *3
+Cystbearer	 (SOM) *2
+Tel-Jilad Fallen	 (SOM) *2
+Swamp	 (ROE) *4
+Swamp	 (ROE) *3
+Swamp	 (ROE) *4
+Putrefax	 (SOM) *2
+Plague Stinger	 (SOM) *2
+Relic Putrescence	 (SOM) *2
+Skithiryx, the Blight Dragon	 (SOM) *2
+Hand of the Praetors	 (SOM) *2

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

@@ -1,18 +1,18 @@
-#NAME:Painful Dream
-Traumatize	 (ODY) *2
-Island	 (UNH) *4
-Followed Footsteps	 (RAV) *4
-Howling Mine	 (10E) *4
-Dreamborn Muse	 (10E) *4
-Forced Fruition	 (LRW) *4
-Memory Erosion	 (ALA) *4
-Hedron Crab	 (ZEN) *4
-Font of Mythos	 (CFX) *4
-Tome Scour	 (M10) *4
-Island	 (ZEN) *4
-Island	 (ZEN) *4
-Island	 (ZEN) *4
-Island	 (ZEN) *4
-Platinum Angel	 (M11) *1
-Sword of Body and Mind	 (SOM) *2
-Seat of the Synod	 (EVT) *4
+#NAME:Painful Dream
+Traumatize	 (ODY) *2
+Island	 (UNH) *4
+Followed Footsteps	 (RAV) *4
+Howling Mine	 (10E) *4
+Dreamborn Muse	 (10E) *4
+Forced Fruition	 (LRW) *4
+Memory Erosion	 (ALA) *4
+Hedron Crab	 (ZEN) *4
+Font of Mythos	 (CFX) *4
+Tome Scour	 (M10) *4
+Island	 (ZEN) *4
+Island	 (ZEN) *4
+Island	 (ZEN) *4
+Island	 (ZEN) *4
+Platinum Angel	 (M11) *1
+Sword of Body and Mind	 (SOM) *2
+Seat of the Synod	 (EVT) *4

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/deck129.txt

@@ -1,109 +1,109 @@
-#NAME:Synthetic
-#DESC:Selesnya Guild
-########################################
-#    Creatures                         #
-########################################
-#1 x Giant Adephage (GTC), {5}{g}{g}, Creature Insect, 7/7, trample; 
-366394
-
-#2 x Rubblebelt Raiders (GTC), {1}{r/g}{r/g}{r/g}, Creature Human Warrior, 3/3, 
-366462
-366462
-
-#4 x Voice of Resurgence (DGM), {g}{w}, Creature Elemental, 2/2, 
-368951
-368951
-368951
-368951
-
-#4 x Trostani's Summoner (DGM), {5}{g}{w}, Creature Elf Shaman, 1/1, 
-369072
-369072
-369072
-369072
-
-#4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
-999009
-999009
-999009
-999009
-
-#2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
-999171
-999171
-
-#4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
-999260
-999260
-999260
-999260
-
-#1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
-999262
-
-
-
-########################################
-#    Spells                            #
-########################################
-#4 x Advent of the Wurm (DGM), {1}{g}{g}{w}, Instant, 
-369036
-369036
-369036
-369036
-
-#2 x Selesnya Cluestone (DGM), {3}, Artifact, 
-369060
-369060
-
-#2 x Chromatic Lantern (RTR), {3}, Artifact, 
-999039
-999039
-
-#4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
-999106
-999106
-999106
-999106
-
-
-
-########################################
-#    Lands                             #
-########################################
-#4 x Forest (GVL), Basic Land Forest, 
-204967
-204967
-204967
-204967
-
-#4 x Selesnya Guildgate (DGM), Land Gate, 
-369018
-369018
-369018
-369018
-
-#4 x Forest (RTR), Basic Land Forest, 
-999086
-999086
-999086
-999086
-
-#4 x Plains (RTR), Basic Land Plains, 
-999168
-999168
-999168
-999168
-
-#2 x Temple Garden (RTR), Land Forest Plains, 
-999238
-999238
-
-#4 x Plains (RTR), Basic Land Plains, 
-999265
-999265
-999265
-999265
-
-
-
+#NAME:Synthetic
+#DESC:Selesnya Guild
+########################################
+#    Creatures                         #
+########################################
+#1 x Giant Adephage (GTC), {5}{g}{g}, Creature Insect, 7/7, trample; 
+366394
+
+#2 x Rubblebelt Raiders (GTC), {1}{r/g}{r/g}{r/g}, Creature Human Warrior, 3/3, 
+366462
+366462
+
+#4 x Voice of Resurgence (DGM), {g}{w}, Creature Elemental, 2/2, 
+368951
+368951
+368951
+368951
+
+#4 x Trostani's Summoner (DGM), {5}{g}{w}, Creature Elf Shaman, 1/1, 
+369072
+369072
+369072
+369072
+
+#4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
+253587
+253587
+253587
+253587
+
+#2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
+270792
+270792
+
+#4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
+253539
+253539
+253539
+253539
+
+#1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
+253575
+
+
+
+########################################
+#    Spells                            #
+########################################
+#4 x Advent of the Wurm (DGM), {1}{g}{g}{w}, Instant, 
+369036
+369036
+369036
+369036
+
+#2 x Selesnya Cluestone (DGM), {3}, Artifact, 
+369060
+369060
+
+#2 x Chromatic Lantern (RTR), {3}, Artifact, 
+290542
+290542
+
+#4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
+270957
+270957
+270957
+270957
+
+
+
+########################################
+#    Lands                             #
+########################################
+#4 x Forest (GVL), Basic Land Forest, 
+204967
+204967
+204967
+204967
+
+#4 x Selesnya Guildgate (DGM), Land Gate, 
+369018
+369018
+369018
+369018
+
+#4 x Forest (RTR), Basic Land Forest, 
+289326
+289326
+289326
+289326
+
+#4 x Plains (RTR), Basic Land Plains, 
+289310
+289310
+289310
+289310
+
+#2 x Temple Garden (RTR), Land Forest Plains, 
+253681
+253681
+
+#4 x Plains (RTR), Basic Land Plains, 
+289309
+289309
+289309
+289309
+
+
+