Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Bump version number to 0.18

Browse Source 
- Fix issue introduced in 0.17 with Immortal task
This commit is contained in:
wagic.the.homebrew
2012-02-04 14:28:07 +00:00
parent 86e7a9b97f
commit b0532b8059
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/Android/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.wagic.app"
android:versionCode="171"
android:versionName="0.17.1">
android:versionCode="180"
android:versionName="0.18.0">
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/>

2
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
View File

@@ -72,7 +72,7 @@ public class SDLActivity extends Activity {
public String mErrorMessage = "";
public Boolean mErrorHappened = false;
public final static String RES_FOLDER = "/sdcard/Wagic/Res/";
public static final String RES_FILENAME = "core_0171.zip";
public static final String RES_FILENAME = "core_0180.zip";
public static final String RES_URL = "http://wagic.googlecode.com/files/";
private void startDownload() {

4
projects/mtg/bin/Res/createResourceZip.py
View File

@@ -26,14 +26,14 @@ def createResZipFile(filename):
zip_file.close()
def createStandardResFile():
filename = 'core_017.zip'
filename = 'core_0180.zip'
createResZipFile( filename )
print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename)
def createIosResFile():
print 'Preparing Resource Package for iOS'
utilities = ZipUtilities()
filename = 'core_0171_iOS.zip'
filename = 'core_0180_iOS.zip'
#createResZipFile( filename )
zip_file = zipfile.ZipFile(filename, 'a', zipfile.ZIP_STORED)
zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED)

4
projects/mtg/include/GameApp.h
View File

@@ -28,8 +28,8 @@
/* Wagic versions */
#define WAGIC_VERSION_MAJOR 0
#define WAGIC_VERSION_MEDIUM 17
#define WAGIC_VERSION_MINOR 1
#define WAGIC_VERSION_MEDIUM 18
#define WAGIC_VERSION_MINOR 0
#define VERSION_DOT(a, b, c) a ##.## b ##.## c
#define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c

2
projects/mtg/src/Tasks.cpp
View File

@@ -824,7 +824,7 @@ string TaskImmortal::getShortDesc()
bool TaskImmortal::isDone(GameObserver *observer, GameApp * _app)
{
return (!observer->players[0]->isAI()) && (observer->players[1]->isAI()) && (observer->gameOver != observer->players[0]) // Human player wins
&& (observer->players[1]->life >= targetLife);
&& (observer->players[0]->life >= targetLife);
}
void TaskImmortal::storeCustomAttribs()