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,68 +1,69 @@
 language: cpp
-env:
-  global:
-    secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8="
-  matrix:
-    - BUILD_TYPE=PSP
-    - BUILD_TYPE=Android
-    - BUILD_TYPE=Qt
-
+dist: xenial
 branches:
   except:
     - latest-master
 
 before_install:
+  - export BUILD_PSP=YES
+  - export BUILD_ANDROID=YES
+  - 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
   - sudo apt-get update -qq
 # Building for PSP here
-  - if [ "$BUILD_TYPE" == "PSP" ]; then
+  - 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://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download;
-    fi
-# Building for Android here
-  - if [ "$BUILD_TYPE" == "Android" ]; 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_r23.0.2-linux.tgz -nv;
+      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_TYPE" == "Qt" ]; then
-      sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
+  - if [ "$BUILD_Qt" == "YES" ]; then
+      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 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 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:
-# Building for PSP here
-  - if [ "$BUILD_TYPE" == "PSP" ]; then
-      tar -x --xz -f sdk.lzma;
-    fi
-  - if [ "$BUILD_TYPE" == "Android" ]; then
-      tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
-      tar -zxf android-sdk_r23.0.2-linux.tgz &&
-      $ANDROID list sdk --extended -a &&
-      echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,android-10 --no-ui --force --no-https;
-    fi
-  - sudo pip install pyjavaproperties
-  - sudo pip install github3.py
-script: ./travis-script.sh
+- if [ "$BUILD_PSP" == "YES" ]; then
+    tar -x --xz -f sdk.lzma;
+  fi
+- if [ "$BUILD_ANDROID" == "YES" ]; then
+    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-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
+  
+script: "tools/travis-script.sh"
 
-matrix:
-  fast_finish: true
-
-deploy:
-  provider: releases
-  api-key:
-    secure: "gzfDEihpfTmoO6CSjTNpHSlLTPtQUZUqTlmD91CQby6+znDsOy4xsqj10MNXe+l/3KYny1DtM48nxNKeVjsyeYg66TTzKsrgMVzt6Ah5CBhSXO99/TiaMJmSXmMO7GGfKDct190Dqej1gbR7AMd38DOYe2vpR0LX+Lf3gzDVLoU="
-  file:
-    - ${TRAVIS_BUILD_DIR}/core.zip
-    - ${TRAVIS_BUILD_DIR}/projects/mtg/Android/bin/Wagic-debug.apk
-    - ${TRAVIS_BUILD_DIR}/projects/mtg/psprelease.zip
-  skip_cleanup: true
-  on:
-    repo: WagicProject/wagic
-    tags: false
-    branch: auto_releases
+after_success:
+- coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp'
+- 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/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/include/JLBFont.h

@@ -178,8 +178,6 @@ private:
 	float       mSpacing;
 
 	PIXEL_TYPE		mColor;
-	int			mBlend;
-
 	int			mBase;
 
 };

JGE/include/JRenderer.h

@@ -598,8 +598,6 @@ private:
   GLint     prog2_positionLoc;
   GLint     prog2_texCoordLoc;
   GLint     prog2_colorLoc;
-  // MVP matrix
-  ESMatrix  prog2_mvpMatrix;
   // Uniform locations
   GLint     prog2_mvpLoc;
 
@@ -612,13 +610,11 @@ private:
   int mCurrentTextureFormat;
 #endif
 
+#ifdef PSP
 	bool mVsync;
-
+    int mTexCounter;
+#endif
 	int mSwizzle;
-	int mTexCounter;
-  
-
-
 	int mCurrentTextureFilter;
 
 	int mCurrTexBlendSrc;

JGE/include/JSoundSystem.h

@@ -258,7 +258,9 @@ private:
 #endif
 
     int mVolume;
+#ifndef IOS
     int mMusicVolume;
+#endif
     int mSampleVolume;
 
 

JGE/include/JSpline.h

@@ -18,12 +18,11 @@ using namespace std;
 
 #define MID_POINT_THRESHOLD			1.0f
 
-
 //////////////////////////////////////////////////////////////////////////
 /// Position of a single dot on screen.
 /// 
 //////////////////////////////////////////////////////////////////////////
-class Point
+class JPoint
 {
 public:
 
@@ -34,13 +33,13 @@ public:
 	/// @param _y - Y position.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point(float _x, float _y) { x = _x; y = _y; }
+    JPoint(float _x, float _y) { x = _x; y = _y; }
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Constructor, set position to default (0.0f, 0.0f)
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point() { x = 0.0f; y = 0.0f; }
+    JPoint() { x = 0.0f; y = 0.0f; }
 
 	float x;	///< X position.
 	float y;	///< Y position.
@@ -95,7 +94,7 @@ public:
 	/// @param pt - Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void AddControlPoint(const Point &pt);
+    void AddControlPoint(const JPoint &pt);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a control point of the spline.
@@ -105,7 +104,7 @@ public:
 	/// @return Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetControlPoint(Point &point, int index);
+    void GetControlPoint(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Work out all pixels of the spline.
@@ -128,7 +127,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3);
+    void PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a number of pixels for this spline.
@@ -146,7 +145,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetPixel(Point &point, int index);
+    void GetPixel(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Render the spline to screen.
@@ -156,8 +155,8 @@ public:
 
 private:
 
-	vector<Point> mMidPoints;
-	vector<Point> mPixels;
+    vector<JPoint> mMidPoints;
+    vector<JPoint> mPixels;
 	int mCount;
 
 };

JGE/include/Threading.h

@@ -311,9 +311,7 @@ namespace boost
 
 #include <QMutex>
 #include <QThread>
-
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <QSharedPointer>
 
 #include "../include/JLogger.h"
 
@@ -420,23 +418,25 @@ namespace boost
             virtual void run() = 0;
         };
 
-        typedef boost::shared_ptr<detail::thread_data_base> thread_data_ptr;
 
-        template<typename F>
+        typedef QSharedPointer<detail::thread_data_base> thread_data_ptr;
+
+        template<typename F, typename A1>
         class thread_data : public detail::thread_data_base
         {
         public:
-            thread_data(F f_) : f(f_)
+            thread_data(F f_, A1 a1_) : f(f_), a1(a1_)
             {
             }
 
             void run()
             {
-                f();
+                f(a1);
             }
 
         private:
             F f;
+            A1 a1;
 
             void operator=(thread_data&);
             thread_data(thread_data&);
@@ -493,7 +493,7 @@ namespace boost
         }
 
         template <class F,class A1>
-        thread(F f, A1 a1) : mThreadInfo(make_thread_info(boost::bind(boost::type<void>(), f, a1)))
+        thread(F f, A1 a1) : mThreadInfo(make_thread_info(f, a1))
         {
             mpThread = new threadImpl(mThreadInfo);
             LOG("Calling start func");
@@ -510,10 +510,10 @@ namespace boost
         }
 
     private:
-        template<typename F>
-        static inline detail::thread_data_ptr make_thread_info(F f)
+        template<typename F, typename A1>
+        static inline detail::thread_data_ptr make_thread_info(F f, A1 a1)
         {
-            return detail::thread_data_ptr(new detail::thread_data<F>(f));
+            return detail::thread_data_ptr(new detail::thread_data<F, A1>(f, a1));
         }
 
         detail::thread_data_ptr mThreadInfo;

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)
@@ -38,6 +43,12 @@ The content that users should not be touching.
 #include <QDir>
 #endif
 
+/*
+#ifdef IOS
+#include <Foundation/Foundation.h>
+#endif
+*/
+
 JFileSystem* JFileSystem::mInstance = NULL;
 
 JZipCache::JZipCache()
@@ -120,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);
@@ -248,14 +260,15 @@ void JFileSystem::clearZipCache()
 
 bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL */)
 {
-    if (mZipAvailable && mZipFile != NULL)
+#ifndef WIN32
+    if (mZipAvailable && mZipFile.is_open())
     {
         if (mZipFileName != zipfile)
             DetachZipFile();		// close the previous zip file
         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/JSpline.cpp

@@ -71,7 +71,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 		element->QueryFloatAttribute("x", &xx);
 		element->QueryFloatAttribute("y", &yy);
 
-		Point pt(xx*xscale, yy*yscale);
+        JPoint pt(xx*xscale, yy*yscale);
 		AddControlPoint(pt);
 		
 	}
@@ -84,7 +84,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 
 
 
-void JSpline::PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3)
+void JSpline::PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3)
 {
 	float t2 = t * t;
 	float t3 = t2 * t;
@@ -113,8 +113,8 @@ void JSpline::GeneratePixels()
 	x = mMidPoints[1].x;
 	y = mMidPoints[1].y;
 
-	Point newPt(x, y);
-	Point extraPt;
+    JPoint newPt(x, y);
+    JPoint extraPt;
 
 	mPixels.push_back(newPt);
 
@@ -151,13 +151,13 @@ void JSpline::GeneratePixels()
 }
 
 
-void JSpline::AddControlPoint(const Point &pt)
+void JSpline::AddControlPoint(const JPoint &pt)
 {
 	mMidPoints.push_back(pt);
 }
 
 
-void JSpline::GetControlPoint(Point &point, int index)
+void JSpline::GetControlPoint(JPoint &point, int index)
 {
 	if (index < (int)mMidPoints.size())
 	{
@@ -167,7 +167,7 @@ void JSpline::GetControlPoint(Point &point, int index)
 }
 
 
-void JSpline::GetPixel(Point &point, int index)
+void JSpline::GetPixel(JPoint &point, int index)
 {
 	if (index < (int)mPixels.size())
 	{

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/iOS/EAGLViewController.h

@@ -10,5 +10,6 @@ void resumeGame();
 @property (nonatomic, retain) id eaglView;
 @property (nonatomic, retain) UITextField *inputField;
 @property (nonatomic, assign) BOOL bannerIsVisible;
+- (void)toggleKeyboardWithState: (NSString *) initialText;
 
 @end

JGE/src/iOS/EAGLViewController.m

@@ -53,28 +53,28 @@
 
 - (void)viewWillAppear:(BOOL)animated {
 	NSLog(@"EAGL ViewController - view Will Appear");
-    [self.view resumeGame];
+    [(id)self.view resumeGame];
 }
 
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)pauseGame
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)resumeGame
 {
-    [self.view resumeGame];
+    [(id)self.view resumeGame];
 }
 
 - (void)endGame
 {
-    [self.view endGame];
+    [(id)self.view endGame];
 }
 
 - (void)viewDidAppear:(BOOL)animated {

JGE/src/iOS/wagicAppDelegate.m

@@ -337,7 +337,7 @@
 
 - (void)applicationWillTerminate:(UIApplication *)application
 {
-    [self.glViewController.view destroyGame];
+    [(id)self.glViewController.view destroyGame];
 }
 
 - (void)initializeKeyboard: (id) initialState

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

@@ -7,6 +7,7 @@
 #include <winsock.h>
 #include <fcntl.h>
 #elif LINUX
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -47,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/unzip/crypt.h

@@ -87,13 +87,13 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #  endif
 
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
+static int crypthead(
+    const char *passwd,         /* password string */
+    unsigned char *buf,         /* where to write header */
+    int bufSize,
+    unsigned long* pkeys,
+    const unsigned long* pcrc_32_tab,
+    unsigned long crcForCrypting)
 {
     int n;                       /* index in random header */
     int t;                       /* temporary */

JGE/src/unzip/ioapi.c

@@ -65,10 +65,10 @@ int ZCALLBACK ferror_file_func OF((
    voidpf stream));
 
 
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
+voidpf ZCALLBACK fopen_file_func (
+   voidpf opaque,
+   const char* filename,
+   int mode)
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
@@ -87,11 +87,11 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
 }
 
 
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
+uLong ZCALLBACK fread_file_func (
+   voidpf opaque,
+   voidpf stream,
+   void* buf,
+   uLong size)
 {
     uLong ret;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
@@ -99,31 +99,31 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
 }
 
 
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
+uLong ZCALLBACK fwrite_file_func (
+   voidpf opaque,
+   voidpf stream,
+   const void* buf,
+   uLong size)
 {
     uLong ret;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+long ZCALLBACK ftell_file_func (
+   voidpf opaque,
+   voidpf stream)
 {
     long ret;
     ret = ftell((FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
+long ZCALLBACK fseek_file_func (
+   voidpf opaque,
+   voidpf stream,
+   uLong offset,
+   int origin)
 {
     int fseek_origin=0;
     long ret;
@@ -145,26 +145,26 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
     return ret;
 }
 
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+int ZCALLBACK fclose_file_func (
+   voidpf opaque,
+   voidpf stream)
 {
     int ret;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+int ZCALLBACK ferror_file_func (
+   voidpf opaque,
+   voidpf stream)
 {
     int ret;
     ret = ferror((FILE *)stream);
     return ret;
 }
 
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
+void fill_fopen_filefunc (
+  zlib_filefunc_def* pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;

JGE/src/unzip/unzip.c

@@ -168,10 +168,7 @@ local int unzlocal_getByte OF((
     voidpf filestream,
     int *pi));
 
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi)
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -198,10 +195,7 @@ local int unzlocal_getShort OF((
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
 {
     uLong x ;
     int i;
@@ -226,10 +220,7 @@ local int unzlocal_getLong OF((
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
 {
     uLong x ;
     int i;
@@ -259,9 +250,7 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
 
 
 /* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
+local int strcmpcasenosensitive_internal (const char* fileName1,const char* fileName2)
 {
     for (;;)
     {
@@ -302,10 +291,7 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
         (like 1 on Unix, 2 on Windows)
 
 */
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity)
 {
     if (iCaseSensitivity==0)
         iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
@@ -328,9 +314,7 @@ local uLong unzlocal_SearchCentralDir OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
+local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream)
 {
     unsigned char* buf;
     uLong uSizeFile;
@@ -394,9 +378,7 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
      Else, the return value is a unzFile Handle, usable with other function
        of this unzip package.
 */
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
+extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc_def)
 {
     unz_s us;
     unz_s *s;
@@ -497,8 +479,7 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
 }
 
 
-extern unzFile ZEXPORT unzOpen (path)
-    const char *path;
+extern unzFile ZEXPORT unzOpen (const char *path)
 {
     return unzOpen2(path, NULL);
 }
@@ -508,8 +489,7 @@ extern unzFile ZEXPORT unzOpen (path)
   If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
-    unzFile file;
+extern int ZEXPORT unzClose (unzFile file)
 {
     unz_s* s;
     if (file==NULL)
@@ -529,9 +509,7 @@ extern int ZEXPORT unzClose (file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
+extern int ZEXPORT unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info)
 {
     unz_s* s;
     if (file==NULL)
@@ -545,9 +523,7 @@ extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
 /*
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
+local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
 {
     uLong uDate;
     uDate = (uLong)(ulDosDate>>16);
@@ -574,21 +550,16 @@ local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   char *szComment,
                                                   uLong commentBufferSize));
 
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
+local int unzlocal_GetCurrentFileInfoInternal (
+    unzFile file,
+    unz_file_info *pfile_info,
+    unz_file_info_internal *pfile_info_internal,
+    char *szFileName,
+    uLong fileNameBufferSize,
+    void *extraField,
+    uLong extraFieldBufferSize,
+    char *szComment,
+    uLong commentBufferSize)
 {
     unz_s* s;
     unz_file_info file_info;
@@ -746,19 +717,15 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
+extern int ZEXPORT unzGetCurrentFileInfo (
+    unzFile file,
+    unz_file_info *pfile_info,
+    char *szFileName,
+    uLong fileNameBufferSize,
+    void *extraField,
+    uLong extraFieldBufferSize,
+    char *szComment,
+    uLong commentBufferSize)
 {
     return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
                                                 szFileName,fileNameBufferSize,
@@ -770,8 +737,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (file,
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
 {
     int err=UNZ_OK;
     unz_s* s;
@@ -792,8 +758,7 @@ extern int ZEXPORT unzGoToFirstFile (file)
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
+extern int ZEXPORT unzGoToNextFile (unzFile file)
 {
     unz_s* s;
     int err;
@@ -826,10 +791,7 @@ extern int ZEXPORT unzGoToNextFile (file)
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
 {
     unz_s* s;
     int err;
@@ -905,9 +867,7 @@ typedef struct unz_file_pos_s
 } unz_file_pos;
 */
 
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
+extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos)
 {
     unz_s* s;
 
@@ -923,9 +883,7 @@ extern int ZEXPORT unzGetFilePos(file, file_pos)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
+extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos*file_pos)
 {
     unz_s* s;
     int err;
@@ -959,13 +917,11 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos)
   store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
+local int unzlocal_CheckCurrentFileCoherencyHeader (
+    unz_s* s,
+    uInt* piSizeVar,
+    uLong *poffset_local_extrafield,
+    uInt  *psize_local_extrafield)
 {
     uLong uMagic,uData,uFlags;
     uLong size_filename;
@@ -1050,12 +1006,12 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFile3 (
+    unzFile file,
+    int* method,
+    int* level,
+    int raw,
+    const char* password)
 {
     int err=UNZ_OK;
     uInt iSizeVar;
@@ -1136,7 +1092,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
       pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
       pfile_in_zip_read_info->stream.zfree = (free_func)0;
       pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (Bytef*)0;
       pfile_in_zip_read_info->stream.avail_in = 0;
 
       err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
@@ -1195,24 +1151,21 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
 }
 
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
 }
 
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
+extern int ZEXPORT unzOpenCurrentFile2 (
+    unzFile file,
+    int* method,
+    int* level,
+    int raw)
 {
     return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
@@ -1227,10 +1180,10 @@ extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+extern int ZEXPORT unzReadCurrentFile(
+    unzFile file,
+    voidp buf,
+    unsigned len)
 {
     int err=UNZ_OK;
     uInt iRead = 0;
@@ -1388,8 +1341,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 /*
   Give the current position in uncompressed data
 */
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
+extern z_off_t ZEXPORT unztell (unzFile file)
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1408,8 +1360,7 @@ extern z_off_t ZEXPORT unztell (file)
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
-extern int ZEXPORT unzeof (file)
-    unzFile file;
+extern int ZEXPORT unzeof (unzFile file)
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1441,10 +1392,10 @@ extern int ZEXPORT unzeof (file)
   the return value is the number of bytes copied in buf, or (if <0)
     the error code
 */
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+extern int ZEXPORT unzGetLocalExtrafield (
+    unzFile file,
+    voidp buf,
+    unsigned len)
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1492,8 +1443,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
   Close the file in zip opened with unzipOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
 {
     int err=UNZ_OK;
 
@@ -1535,12 +1485,11 @@ extern int ZEXPORT unzCloseCurrentFile (file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
+extern int ZEXPORT unzGetGlobalComment (
+    unzFile file,
+    char *szComment,
+    uLong uSizeBuf)
 {
-    int err=UNZ_OK;
     unz_s* s;
     uLong uReadThis ;
     if (file==NULL)
@@ -1567,8 +1516,7 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 }
 
 /* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
+extern uLong ZEXPORT unzGetOffset (unzFile file)
 {
     unz_s* s;
 
@@ -1583,9 +1531,9 @@ extern uLong ZEXPORT unzGetOffset (file)
     return s->pos_in_central_dir;
 }
 
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
+extern int ZEXPORT unzSetOffset (
+        unzFile file,
+        uLong pos)
 {
     unz_s* s;
     int err;

JGE/src/unzip/zip.c

@@ -172,8 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
     return ldi;
 }
 
-local void free_datablock(ldi)
-    linkedlist_datablock_internal* ldi;
+local void free_datablock(linkedlist_datablock_internal* ldi)
 {
     while (ldi!=NULL)
     {
@@ -183,24 +182,24 @@ local void free_datablock(ldi)
     }
 }
 
-local void init_linkedlist(ll)
-    linkedlist_data* ll;
+local void init_linkedlist(
+    linkedlist_data* ll)
 {
     ll->first_block = ll->last_block = NULL;
 }
 
-local void free_linkedlist(ll)
-    linkedlist_data* ll;
+local void free_linkedlist(
+    linkedlist_data* ll)
 {
     free_datablock(ll->first_block);
     ll->first_block = ll->last_block = NULL;
 }
 
 
-local int add_data_in_datablock(ll,buf,len)
-    linkedlist_data* ll;
-    const void* buf;
-    uLong len;
+local int add_data_in_datablock(
+    linkedlist_data* ll,
+    const void* buf,
+    uLong len)
 {
     linkedlist_datablock_internal* ldi;
     const unsigned char* from_copy;
@@ -263,11 +262,11 @@ local int add_data_in_datablock(ll,buf,len)
 
 local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
                                 voidpf filestream, uLong x, int nbByte));
-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong x;
-    int nbByte;
+local int ziplocal_putValue (
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong x,
+    int nbByte)
 {
     unsigned char buf[4];
     int n;
@@ -291,10 +290,10 @@ local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
 }
 
 local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
-local void ziplocal_putValue_inmemory (dest, x, nbByte)
-    void* dest;
-    uLong x;
-    int nbByte;
+local void ziplocal_putValue_inmemory (
+    void* dest,
+    uLong x,
+    int nbByte)
 {
     unsigned char* buf=(unsigned char*)dest;
     int n;
@@ -315,9 +314,9 @@ local void ziplocal_putValue_inmemory (dest, x, nbByte)
 /****************************************************************************/
 
 
-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
-    const tm_zip* ptm;
-    uLong dosDate;
+local uLong ziplocal_TmzDateToDosDate(
+    const tm_zip* ptm,
+    uLong dosDate)
 {
     uLong year = (uLong)ptm->tm_year;
     if (year>1980)
@@ -337,10 +336,10 @@ local int ziplocal_getByte OF((
     voidpf filestream,
     int *pi));
 
-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+local int ziplocal_getByte(
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi)
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -367,10 +366,10 @@ local int ziplocal_getShort OF((
     voidpf filestream,
     uLong *pX));
 
-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int ziplocal_getShort (
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX)
 {
     uLong x ;
     int i;
@@ -395,10 +394,10 @@ local int ziplocal_getLong OF((
     voidpf filestream,
     uLong *pX));
 
-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int ziplocal_getLong (
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX)
 {
     uLong x ;
     int i;
@@ -437,9 +436,9 @@ local uLong ziplocal_SearchCentralDir OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
+local uLong ziplocal_SearchCentralDir(
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream)
 {
     unsigned char* buf;
     uLong uSizeFile;
@@ -496,11 +495,11 @@ local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
 #endif /* !NO_ADDFILEINEXISTINGZIP*/
 
 /************************************************************/
-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
-    const char *pathname;
-    int append;
-    zipcharpc* globalcomment;
-    zlib_filefunc_def* pzlib_filefunc_def;
+extern zipFile ZEXPORT zipOpen2 (
+    const char *pathname,
+    int append,
+    zipcharpc* globalcomment,
+    zlib_filefunc_def* pzlib_filefunc_def)
 {
     zip_internal ziinit;
     zip_internal* zi;
@@ -615,7 +614,7 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
 
         if (size_comment>0)
         {
-            ziinit.globalcomment = ALLOC(size_comment+1);
+            ziinit.globalcomment = (char*)ALLOC(size_comment+1);
             if (ziinit.globalcomment)
             {
                size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
@@ -680,35 +679,30 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
     }
 }
 
-extern zipFile ZEXPORT zipOpen (pathname, append)
-    const char *pathname;
-    int append;
+extern zipFile ZEXPORT zipOpen (
+    const char *pathname,
+    int append)
 {
     return zipOpen2(pathname,append,NULL,NULL);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
-                                         extrafield_local, size_extrafield_local,
-                                         extrafield_global, size_extrafield_global,
-                                         comment, method, level, raw,
-                                         windowBits, memLevel, strategy,
-                                         password, crcForCrypting)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
-    int windowBits;
-    int memLevel;
-    int strategy;
-    const char* password;
-    uLong crcForCrypting;
+extern int ZEXPORT zipOpenNewFileInZip3 (
+    zipFile file,
+    const char* filename,
+    const zip_fileinfo* zipfi,
+    const void* extrafield_local,
+    uInt size_extrafield_local,
+    const void* extrafield_global,
+    uInt size_extrafield_global,
+    const char* comment,
+    int method,
+    int level,
+    int raw,
+    int windowBits,
+    int memLevel,
+    int strategy,
+    const char* password,
+    uLong crcForCrypting)
 {
     zip_internal* zi;
     uInt size_filename;
@@ -896,21 +890,18 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     return err;
 }
 
-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level, raw)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
+extern int ZEXPORT zipOpenNewFileInZip2(
+    zipFile file,
+    const char* filename,
+    const zip_fileinfo* zipfi,
+    const void* extrafield_local,
+    uInt size_extrafield_local,
+    const void* extrafield_global,
+    uInt size_extrafield_global,
+    const char* comment,
+    int method,
+    int level,
+    int raw)
 {
     return zipOpenNewFileInZip3 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
@@ -920,20 +911,17 @@ extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
                                  NULL, 0);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
+extern int ZEXPORT zipOpenNewFileInZip (
+    zipFile file,
+    const char* filename,
+    const zip_fileinfo* zipfi,
+    const void* extrafield_local,
+    uInt size_extrafield_local,
+    const void* extrafield_global,
+    uInt size_extrafield_global,
+    const char* comment,
+    int method,
+    int level)
 {
     return zipOpenNewFileInZip2 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
@@ -941,8 +929,8 @@ extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
                                  comment, method, level, 0);
 }
 
-local int zipFlushWriteBuffer(zi)
-  zip_internal* zi;
+local int zipFlushWriteBuffer(
+  zip_internal* zi)
 {
     int err=ZIP_OK;
 
@@ -963,10 +951,10 @@ local int zipFlushWriteBuffer(zi)
     return err;
 }
 
-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
-    zipFile file;
-    const void* buf;
-    unsigned len;
+extern int ZEXPORT zipWriteInFileInZip (
+    zipFile file,
+    const void* buf,
+    unsigned len)
 {
     zip_internal* zi;
     int err=ZIP_OK;
@@ -978,9 +966,9 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
     if (zi->in_opened_file_inzip == 0)
         return ZIP_PARAMERROR;
 
-    zi->ci.stream.next_in = (void*)buf;
+    zi->ci.stream.next_in = (Bytef*)buf;
     zi->ci.stream.avail_in = len;
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
+    zi->ci.crc32 = crc32(zi->ci.crc32,(const Bytef*)buf,len);
 
     while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
     {
@@ -1028,10 +1016,10 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
-    zipFile file;
-    uLong uncompressed_size;
-    uLong crc32;
+extern int ZEXPORT zipCloseFileInZipRaw (
+    zipFile file,
+    uLong uncompressed_size,
+    uLong crc32)
 {
     zip_internal* zi;
     uLong compressed_size;
@@ -1124,15 +1112,15 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZip (file)
-    zipFile file;
+extern int ZEXPORT zipCloseFileInZip (
+    zipFile file)
 {
     return zipCloseFileInZipRaw (file,0,0);
 }
 
-extern int ZEXPORT zipClose (file, global_comment)
-    zipFile file;
-    const char* global_comment;
+extern int ZEXPORT zipClose (
+    zipFile file,
+    const char* global_comment)
 {
     zip_internal* zi;
     int err = 0;

JGE/src/zipFS/zfsystem.cpp

@@ -42,7 +42,6 @@ filesystem * filesystem::pCurrentFS = NULL;
 std::vector<filesystem::pooledBuffer *> filesystem::m_Buffers;
 
 static const int STORED = 0;
-static const int DEFLATED = 8;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -632,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,9 +1,9 @@
 #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)
 
 ## Description
 
@@ -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")
 
 
 

appveyor.yml

@@ -4,6 +4,14 @@
 #   - All section names are case-sensitive.
 #   - Section names should be unique on each level.
 
+# branches to build
+branches:
+  # blacklist
+  except:
+    - travis_mac_osx
+# Do not build on tags (GitHub only)
+skip_tags: true
+
 #---------------------------------#
 #    environment configuration    #
 #---------------------------------#
@@ -14,7 +22,7 @@ environment:
 
 # scripts that run after cloning repository
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
+  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py')
   - "C:/Python27/python.exe C:/get-pip.py"
   - "C:/Python27/Scripts/pip.exe install pyjavaproperties"
   - "C:/Python27/Scripts/pip.exe install github3.py"
@@ -61,7 +69,7 @@ after_deploy:
 
 # to run your custom scripts instead of provider deployments
 deploy_script:
-  - "C:/Python27/python.exe upload-binaries.py -t %GH_TOKEN% -s %APPVEYOR_REPO_COMMIT% -l projects/mtg/bin/Wagic-windows.zip -r Wagic-windows.zip -b %APPVEYOR_REPO_BRANCH%"
+  - "C:/Python27/python.exe tools/upload-binaries.py -t %GH_TOKEN% -s %APPVEYOR_REPO_COMMIT% -l projects/mtg/bin/Wagic-windows.zip -r Wagic-windows.zip -b %APPVEYOR_REPO_BRANCH%"
 
 # to disable deployment
 #deploy: off

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="0192" 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.19.2</string>
-    <string name="info_text">Wagic v0.19.2\\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

@@ -0,0 +1,279 @@
+package net.wagic.utils;
+
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.File;
+import java.io.IOException;
+import java.util.Scanner;
+
+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 = "";
+        int cardcount = 0;
+        if(f.exists() && !f.isDirectory())
+        { 
+            deckname = f.getName();
+            int pos = deckname.lastIndexOf(".");
+            if (pos > 0) 
+            {
+                deckname = deckname.substring(0, pos);
+            }
+            deck += "#NAME:"+deckname+"\n"; 
+            try
+            {
+                Scanner scanner = new Scanner(new File(mypath));                
+                if (scanner.hasNext()) 
+                {
+                    while (scanner.hasNext()) 
+                    {
+                        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++)
+                            {
+                                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)
+    {
+        try
+        {
+            Integer.parseInt(input);
+        }
+        catch(NumberFormatException ex)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    private static String getActiveProfile(File mypath)
+    {
+        String name = "";
+        try
+            {
+                Scanner scanner = new Scanner(new File(mypath.toString()));                
+                if (scanner.hasNext()) 
+                {
+                    String line = scanner.nextLine();
+                    name = line.substring(8);    
+                }
+                else
+                {
+                    return "Default";
+                }
+            }
+            catch(IOException e)
+            {
+                return "Default";
+            }
+        return name;
+    }
+
+    private static String renameSet(String set)
+    {
+        if (set == "")
+            return "*";
+        if (set == "AL")
+            return "ALL";
+        if (set == "AQ")
+            return "ATQ";
+        if (set == "AP")
+            return "APC";
+        if (set == "AN")
+            return "ARN";
+        if (set == "AE")
+            return "ARC";
+        if (set == "BR")
+            return "BRB";
+        if (set == "BD")
+            return "BTD";
+        if (set == "CH")
+            return "CHR";
+        if (set == "6E")
+            return "6ED";
+        if (set == "CS")
+            return "CSP";
+        if (set == "DS")
+            return "DST";
+        if (set == "D2")
+            return "DD2";
+        if (set == "8E")
+            return "8ED";
+        if (set == "EX")
+            return "EXO";
+        if (set == "FE")
+            return "FEM";
+        if (set == "FD")
+            return "5DN";
+        if (set == "5E")
+            return "5ED";
+        if (set == "4E")
+            return "4ED";
+        if (set == "GP")
+            return "GPT";
+        if (set == "HL")
+            return "HML";
+        if (set == "IA")
+            return "ICE";
+        if (set == "IN")
+            return "INV";
+        if (set == "JU")
+            return "JUD";
+        if (set == "LG")
+            return "LEG";
+        if (set == "LE")
+            return "LGN";
+        if (set == "A")
+            return "LEA";
+        if (set == "B")
+            return "LEB";
+        if (set == "MM")
+            return "MMQ";
+        if (set == "MI")
+            return "MIR";
+        if (set == "MR")
+            return "MRD";
+        if (set == "NE")
+            return "NEM";
+        if (set == "9E")
+            return "9ED";
+        if (set == "OD")
+            return "ODY";
+        if (set == "ON")
+            return "ONS";
+        if (set == "PS")
+            return "PLS";
+        if (set == "PT")
+            return "POR";
+        if (set == "P2")
+            return "P02";
+        if (set == "P3")
+            return "PTK";
+        if (set == "PR")
+            return "PPR";
+        if (set == "PY")
+            return "PCY";
+        if (set == "R")
+            return "RV";
+        if (set == "SC")
+            return "SCG";
+        if (set == "7E")
+            return "7ED";
+        if (set == "ST")
+            return "S99";
+        if (set == "ST2K")
+            return "S00";
+        if (set == "SH")
+            return "STH";
+        if (set == "TE")
+            return "TMP";
+        if (set == "DK")
+            return "DRK";
+        if (set == "TO")
+            return "TOR";
+        if (set == "UG")
+            return "UGL";
+        if (set == "U")
+            return "2ED";
+        if (set == "UD")
+            return "UDS";
+        if (set == "UL")
+            return "ULG";
+        if (set == "US")
+            return "USG";
+        if (set == "VI")
+            return "VIS";
+        if (set == "WL")
+            return "WTH";
+        else
+            return set;
+    }
+}

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

@@ -5,11 +5,16 @@ import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Scanner;
 
+import java.util.HashSet;
+import java.util.Set;
+import android.os.Build;
+
 import android.os.Environment;
 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>();
 
@@ -18,13 +23,29 @@ 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()){
+            readMountsFileTest();
+        }
         readMountsFile();
         readVoldFile();
+        if (findForcemount()){
+            removeDuplicates(mMounts);
+        }
         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();
     }
 
@@ -40,6 +61,42 @@ public class StorageOptions
         }
     }
 
+    private static void readMountsFileTest()
+    {
+        /*
+         * Test mountpoints storage -kevlahnota
+         */
+
+        try
+        {
+            Scanner scanner = new Scanner(new File("/proc/mounts"));
+            while (scanner.hasNext())
+            {
+                String line = scanner.nextLine();
+                if (line.startsWith("/"))
+                {
+                    String[] lineElements = line.split("\\s+");
+                    if ("vfat".equals(lineElements[2]) || "fuse".equals(lineElements[2]) || "sdcardfs".equals(lineElements[2])) 
+                    {
+                        File mountPoint = new File(lineElements[1]);
+                        if (!lineElements[1].equals(defaultMountPoint))
+                            if (mountPoint.isDirectory() && mountPoint.canRead())
+                                mMounts.add(lineElements[1]);
+                    }
+                }
+            }
+        } catch (FileNotFoundException fnfex)
+        {
+            // if proc/mount doesn't exist we just use
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            mMounts.add(defaultMountPoint);
+        } catch (Exception e)
+        {
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading mounts file");
+            mMounts.add(defaultMountPoint);
+        }
+    }
+
     private static void readMountsFile()
     {
         /*
@@ -65,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);
         }
     }
@@ -98,28 +155,48 @@ 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);
         }
     }
+    
+    private static ArrayList<String> removeDuplicates(ArrayList<String> list) 
+    {
+        ArrayList<String> result = new ArrayList<String>();
+
+        HashSet<String> set = new HashSet<String>();
+
+        for (String item : list) 
+        {
+            if (!set.contains(item)) 
+            {
+                result.add(item);
+                set.add(item);
+            }
+        }
+        return result;
+    }
 
     private static void compareMountsWithVold()
     {
         /*
          * 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
@@ -132,18 +209,60 @@ public class StorageOptions
         /*
          * Now that we have a cleaned list of mount paths Test each one to make sure it's a valid and available path. If it is not, remove it from the list.
          */
-
+        int t = 0;
         for (int i = 0; i < mMounts.size(); i++)
         {
+            t++;
             String mount = mMounts.get(i);
             File root = new File(mount);
             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 (System.getenv("EXTERNAL_STORAGE") != null)
+            {
+                File root = new File(System.getenv("EXTERNAL_STORAGE"));
+                if (root.exists() && root.isDirectory() && root.canWrite())
+                {
+                    if(!isRooted())
+                    {
+                        File folder = new File(System.getenv("EXTERNAL_STORAGE")+"/Android/data/net.wagic.app/files");
+                        folder.mkdirs();
+                        mMounts.add(folder.toString());
+                    }
+                    else
+                    {
+                        mMounts.add(System.getenv("EXTERNAL_STORAGE"));
+                    }
+                }
+            }
+
+            if (System.getenv("SECONDARY_STORAGE") != null)
+            {
+                File root = new File(System.getenv("SECONDARY_STORAGE"));
+                if (root.exists() && root.isDirectory() && root.canWrite())
+                {
+                    if(!isRooted())
+                    {
+                        File folder = new File(System.getenv("SECONDARY_STORAGE")+"/Android/data/net.wagic.app/files");
+                        folder.mkdirs();
+                        mMounts.add(folder.toString());
+                    }
+                    else
+                    {
+                        mMounts.add(System.getenv("SECONDARY_STORAGE"));
+                    }
+                }
+            }
+        }
     }
 
     private static void setProperties()
     {
+        Log.d(TAG, "setProperties()");
         /*
          * At this point all the paths in the list should be valid. Build the public properties.
          */
@@ -151,14 +270,29 @@ public class StorageOptions
         ArrayList<String> mLabels = new ArrayList<String>();
 
         int i = 1;
-        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");
-            else
-                mLabels.add("External SD Card " + i++);
+        if(findForcemount()){
+            for (String path : mMounts)
+            {//with forcemount menu
+                if ("/mnt/sdcard".equalsIgnoreCase(path) || "/storage/sdcard0".equalsIgnoreCase(path))
+                    mLabels.add("Internal SD " + "[" + path + "/]");
+                else if (path.contains("emulated"))
+                    mLabels.add("Emulated SD " + " [" + path + "/]");
+                else
+                    mLabels.add("External SD " + " [" + path + "/]");
+            }
         }
-
+        else
+        {
+            for (String path : mMounts)
+            {
+                // 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 " + "[" + path + "/]");
+            }
+        }
+        
         labels = new String[mLabels.size()];
         mLabels.toArray(labels);
 
@@ -171,4 +305,119 @@ public class StorageOptions
         // use and to prepare it for the next time it's needed.
         mMounts.clear();
     }
-}
+    
+    private static boolean isExternalStorageReadOnly() {
+        String extStorageState = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(extStorageState)) {
+            return true;
+        }
+        return false;
+    }
+ 
+    private static boolean isExternalStorageAvailable() {
+        String extStorageState = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED.equals(extStorageState)) {
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+    * Checks if the device is rooted.
+    *
+    * @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()
+    {
+        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;
+    }
+}

projects/mtg/MacOS/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+        <string>wagic.launcher</string>
+	<key>CFBundleIdentifier</key>
+	<string>wagic.wagic</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+</dict>
+</plist>

projects/mtg/MacOS/wagic.launcher

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd ${0%/*/*}/Resources
+#cd ../Resources
+exec ../MacOS/wagic -platformpluginpath ../PlugIns >> ../logs/out.log 2> ../logs/err.log

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/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 & 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,23 +1,29 @@
-#NAME:Kill by Numbers
-#DESC:They just keep multiplying.
-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:Kazandu the Redeemed
+#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/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})
@@ -23,4 +23,4 @@ Searing Spear * 4
 Krenko's Command * 4
 
 #20 lands
-Mountain (RTR) * 20
+Mountain (RTR) * 20

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})
@@ -37,4 +37,4 @@ Isolated Chapel * 4
 Clifftop Retreat * 2
 Urborg, Tomb of Yawgmoth * 1
 Plains (CHK) * 2
-Swamp (RTR) * 1
+Swamp (RTR) * 1

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
+
+
+

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